mirror of
https://github.com/flutter/flutter
synced 2024-08-25 11:07:06 +00:00
Revert "[Impeller] Temporary flag flip for devicelab tests to use Impeller redux. (#122340)" (#122362)
Revert "[Impeller] Temporary flag flip for devicelab tests to use Impeller redux."
This commit is contained in:
parent
5753b6158b
commit
e98c53751e
|
@ -10,6 +10,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createAnimatedComplexOpacityPerfE2ETest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createBackdropFilterPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -10,6 +10,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createColorFilterAndFadePerfE2ETest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createComplexLayoutScrollPerfTest(badScroll: true, enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createComplexLayoutScrollPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/gallery.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createGalleryTransitionE2ETest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -10,6 +10,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createFullscreenTextfieldPerfE2ETest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createImageFilteredTransformAnimationPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.android;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createListTextLayoutPerfE2ETest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -9,6 +9,5 @@ import 'package:flutter_devicelab/tasks/microbenchmarks.dart';
|
|||
/// Runs microbenchmarks on iOS.
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createMicrobenchmarkTask(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@ Future<void> main() async {
|
|||
final Directory galleryDir = Directory(path.join(galleryParentDir.path, 'gallery'));
|
||||
|
||||
try {
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(NewGalleryPerfTest(galleryDir, enableImpeller: true).run);
|
||||
} finally {
|
||||
rmTree(galleryParentDir);
|
||||
|
|
|
@ -17,7 +17,6 @@ Future<void> main() async {
|
|||
final Directory galleryDir = Directory(path.join(galleryParentDir.path, 'gallery'));
|
||||
|
||||
try {
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(NewGalleryPerfTest(galleryDir, enableImpeller: true).run);
|
||||
} finally {
|
||||
rmTree(galleryParentDir);
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createUiKitViewScrollPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createUiKitViewScrollPerfNonIntersectingTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createSimpleAnimationPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -8,6 +8,5 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
|
|||
|
||||
Future<void> main() async {
|
||||
deviceOperatingSystem = DeviceOperatingSystem.ios;
|
||||
// ignore: avoid_redundant_argument_values
|
||||
await task(createTilesScrollPerfTest(enableImpeller: true));
|
||||
}
|
||||
|
|
|
@ -15,8 +15,6 @@ import 'devices.dart';
|
|||
import 'host_agent.dart';
|
||||
import 'task_result.dart';
|
||||
|
||||
const bool kEnableImpellerDefault = true;
|
||||
|
||||
/// Virtual current working directory, which affect functions, such as [exec].
|
||||
String cwd = Directory.current.path;
|
||||
|
||||
|
@ -448,13 +446,6 @@ List<String> _flutterCommandArgs(String command, List<String> options) {
|
|||
};
|
||||
final String? localEngine = localEngineFromEnv;
|
||||
final String? localEngineSrcPath = localEngineSrcPathFromEnv;
|
||||
|
||||
bool addEnableImpeller() {
|
||||
return !options.contains('--enable-impeller')
|
||||
&& deviceOperatingSystem == DeviceOperatingSystem.ios
|
||||
&& (command == 'drive' || command == 'run');
|
||||
}
|
||||
|
||||
return <String>[
|
||||
command,
|
||||
if (deviceOperatingSystem == DeviceOperatingSystem.ios && supportedDeviceTimeoutCommands.contains(command))
|
||||
|
@ -462,8 +453,7 @@ List<String> _flutterCommandArgs(String command, List<String> options) {
|
|||
'--device-timeout',
|
||||
'5',
|
||||
],
|
||||
if (addEnableImpeller())
|
||||
'--enable-impeller',
|
||||
|
||||
if (command == 'drive' && hostAgent.dumpDirectory != null) ...<String>[
|
||||
'--screenshot',
|
||||
hostAgent.dumpDirectory!.path,
|
||||
|
|
|
@ -28,7 +28,7 @@ TaskFunction createGalleryTransitionTest({bool semanticsEnabled = false}) {
|
|||
TaskFunction createGalleryTransitionE2EBuildTest(
|
||||
List<String> args, {
|
||||
bool semanticsEnabled = false,
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return GalleryTransitionBuildTest(
|
||||
args,
|
||||
|
@ -44,7 +44,7 @@ TaskFunction createGalleryTransitionE2EBuildTest(
|
|||
|
||||
TaskFunction createGalleryTransitionE2ETest({
|
||||
bool semanticsEnabled = false,
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return GalleryTransitionTest(
|
||||
testFile: semanticsEnabled
|
||||
|
@ -91,7 +91,7 @@ class GalleryTransitionTest {
|
|||
this.driverFile,
|
||||
this.measureCpuGpu = true,
|
||||
this.measureMemory = true,
|
||||
this.enableImpeller = kEnableImpellerDefault,
|
||||
this.enableImpeller = false,
|
||||
});
|
||||
|
||||
final bool semanticsEnabled;
|
||||
|
@ -233,7 +233,7 @@ class GalleryTransitionBuildTest extends BuildTestTask {
|
|||
this.driverFile,
|
||||
this.measureCpuGpu = true,
|
||||
this.measureMemory = true,
|
||||
this.enableImpeller = kEnableImpellerDefault,
|
||||
this.enableImpeller = false,
|
||||
}) : super(workingDirectory: galleryDirectory);
|
||||
|
||||
final bool semanticsEnabled;
|
||||
|
|
|
@ -15,7 +15,7 @@ import '../microbenchmarks.dart';
|
|||
|
||||
/// Creates a device lab task that runs benchmarks in
|
||||
/// `dev/benchmarks/microbenchmarks` reports results to the dashboard.
|
||||
TaskFunction createMicrobenchmarkTask({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createMicrobenchmarkTask({bool enableImpeller = false}) {
|
||||
return () async {
|
||||
final Device device = await devices.workingDevice;
|
||||
await device.unlock();
|
||||
|
|
|
@ -14,7 +14,7 @@ class NewGalleryPerfTest extends PerfTest {
|
|||
this.galleryDir, {
|
||||
String timelineFileName = 'transitions',
|
||||
String dartDefine = '',
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
super.timeoutSeconds,
|
||||
}) : super(
|
||||
galleryDir.path,
|
||||
|
|
|
@ -26,7 +26,7 @@ String _testOutputDirectory(String testDirectory) {
|
|||
TaskFunction createComplexLayoutScrollPerfTest({
|
||||
bool measureCpuGpu = true,
|
||||
bool badScroll = false,
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/complex_layout',
|
||||
|
@ -39,7 +39,7 @@ TaskFunction createComplexLayoutScrollPerfTest({
|
|||
).run;
|
||||
}
|
||||
|
||||
TaskFunction createTilesScrollPerfTest({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createTilesScrollPerfTest({bool enableImpeller = false}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/complex_layout',
|
||||
'test_driver/scroll_perf.dart',
|
||||
|
@ -48,7 +48,7 @@ TaskFunction createTilesScrollPerfTest({bool enableImpeller = kEnableImpellerDef
|
|||
).run;
|
||||
}
|
||||
|
||||
TaskFunction createUiKitViewScrollPerfTest({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createUiKitViewScrollPerfTest({bool enableImpeller = false}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/platform_views_layout',
|
||||
'test_driver/uikit_view_scroll_perf.dart',
|
||||
|
@ -59,7 +59,7 @@ TaskFunction createUiKitViewScrollPerfTest({bool enableImpeller = kEnableImpelle
|
|||
).run;
|
||||
}
|
||||
|
||||
TaskFunction createUiKitViewScrollPerfNonIntersectingTest({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createUiKitViewScrollPerfNonIntersectingTest({bool enableImpeller = false}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/platform_views_layout',
|
||||
'test_driver/uikit_view_scroll_perf_non_intersecting.dart',
|
||||
|
@ -138,7 +138,7 @@ TaskFunction createFlutterGalleryTransitionsPerfSkSLWarmupTest() {
|
|||
|
||||
TaskFunction createBackdropFilterPerfTest({
|
||||
bool measureCpuGpu = true,
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -182,7 +182,7 @@ TaskFunction createPostBackdropFilterPerfTest({bool measureCpuGpu = true}) {
|
|||
|
||||
TaskFunction createSimpleAnimationPerfTest({
|
||||
bool measureCpuGpu = true,
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -363,7 +363,7 @@ TaskFunction createFullscreenTextfieldPerfTest() {
|
|||
}
|
||||
|
||||
TaskFunction createFullscreenTextfieldPerfE2ETest({
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest.e2e(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -389,7 +389,7 @@ TaskFunction createColorFilterAndFadePerfTest() {
|
|||
).run;
|
||||
}
|
||||
|
||||
TaskFunction createColorFilterAndFadePerfE2ETest({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createColorFilterAndFadePerfE2ETest({bool enableImpeller = false}) {
|
||||
return PerfTest.e2e(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
'test/color_filter_and_fade_perf_e2e.dart',
|
||||
|
@ -436,7 +436,7 @@ TaskFunction createFadingChildAnimationPerfTest() {
|
|||
}
|
||||
|
||||
TaskFunction createImageFilteredTransformAnimationPerfTest({
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -455,7 +455,7 @@ TaskFunction createsMultiWidgetConstructPerfE2ETest() {
|
|||
).run;
|
||||
}
|
||||
|
||||
TaskFunction createListTextLayoutPerfE2ETest({bool enableImpeller = kEnableImpellerDefault}) {
|
||||
TaskFunction createListTextLayoutPerfE2ETest({bool enableImpeller = false}) {
|
||||
return PerfTest.e2e(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
'test/list_text_layout_perf_e2e.dart',
|
||||
|
@ -629,7 +629,7 @@ TaskFunction createGradientStaticPerfE2ETest() {
|
|||
}
|
||||
|
||||
TaskFunction createAnimatedComplexOpacityPerfE2ETest({
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest.e2e(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -639,7 +639,7 @@ TaskFunction createAnimatedComplexOpacityPerfE2ETest({
|
|||
}
|
||||
|
||||
TaskFunction createAnimatedComplexImageFilteredPerfE2ETest({
|
||||
bool enableImpeller = kEnableImpellerDefault,
|
||||
bool enableImpeller = false,
|
||||
}) {
|
||||
return PerfTest.e2e(
|
||||
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
|
||||
|
@ -939,7 +939,7 @@ class PerfTest {
|
|||
String? resultFilename,
|
||||
this.device,
|
||||
this.flutterDriveCallback,
|
||||
this.enableImpeller = kEnableImpellerDefault,
|
||||
this.enableImpeller = false,
|
||||
this.timeoutSeconds,
|
||||
}): _resultFilename = resultFilename;
|
||||
|
||||
|
@ -955,7 +955,7 @@ class PerfTest {
|
|||
String resultFilename = 'e2e_perf_summary',
|
||||
this.device,
|
||||
this.flutterDriveCallback,
|
||||
this.enableImpeller = kEnableImpellerDefault,
|
||||
this.enableImpeller = false,
|
||||
this.timeoutSeconds,
|
||||
}) : saveTraceFile = false, timelineFileName = null, _resultFilename = resultFilename;
|
||||
|
||||
|
|
Loading…
Reference in a new issue