Revert "[Impeller] Temporary flag flip for devicelab tests to use Impeller. (#122224)" (#122236)
This reverts commit 21b8b7297f34322a3172f6653f1f68c8ee68c5b4.
diff --git a/dev/devicelab/bin/tasks/animated_complex_opacity_perf_impeller_ios__e2e_summary.dart b/dev/devicelab/bin/tasks/animated_complex_opacity_perf_impeller_ios__e2e_summary.dart
index b11fc18..71eacab 100644
--- a/dev/devicelab/bin/tasks/animated_complex_opacity_perf_impeller_ios__e2e_summary.dart
+++ b/dev/devicelab/bin/tasks/animated_complex_opacity_perf_impeller_ios__e2e_summary.dart
@@ -10,6 +10,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createAnimatedComplexOpacityPerfE2ETest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/backdrop_filter_perf_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/backdrop_filter_perf_impeller_ios__timeline_summary.dart
index fed5a75..52ad4ac 100644
--- a/dev/devicelab/bin/tasks/backdrop_filter_perf_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/backdrop_filter_perf_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createBackdropFilterPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/color_filter_and_fade_perf_impeller_ios__e2e_summary.dart b/dev/devicelab/bin/tasks/color_filter_and_fade_perf_impeller_ios__e2e_summary.dart
index e47e6b9..682b1e3 100644
--- a/dev/devicelab/bin/tasks/color_filter_and_fade_perf_impeller_ios__e2e_summary.dart
+++ b/dev/devicelab/bin/tasks/color_filter_and_fade_perf_impeller_ios__e2e_summary.dart
@@ -10,6 +10,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createColorFilterAndFadePerfE2ETest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_impeller_ios__timeline_summary.dart
index 18b8032..996d04b 100644
--- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createComplexLayoutScrollPerfTest(badScroll: true, enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_ios__timeline_summary.dart
index e04f5db..53578a3 100644
--- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createComplexLayoutScrollPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_impeller_ios.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_impeller_ios.dart
index 0f29fea..859025e 100644
--- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_impeller_ios.dart
+++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_impeller_ios.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createGalleryTransitionE2ETest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/fullscreen_textfield_perf_impeller_ios__e2e_summary.dart b/dev/devicelab/bin/tasks/fullscreen_textfield_perf_impeller_ios__e2e_summary.dart
index 9d3d213..5972a38 100644
--- a/dev/devicelab/bin/tasks/fullscreen_textfield_perf_impeller_ios__e2e_summary.dart
+++ b/dev/devicelab/bin/tasks/fullscreen_textfield_perf_impeller_ios__e2e_summary.dart
@@ -10,6 +10,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createFullscreenTextfieldPerfE2ETest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_impeller_ios__timeline_summary.dart
index be27385..51586c0 100644
--- a/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createImageFilteredTransformAnimationPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/list_text_layout_impeller_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/list_text_layout_impeller_perf__e2e_summary.dart
index 34f8be1..2e4490d 100644
--- a/dev/devicelab/bin/tasks/list_text_layout_impeller_perf__e2e_summary.dart
+++ b/dev/devicelab/bin/tasks/list_text_layout_impeller_perf__e2e_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.android;
- // ignore: avoid_redundant_argument_values
await task(createListTextLayoutPerfE2ETest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart b/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart
index 7e9ad55..3daa6d7 100644
--- a/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart
+++ b/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart
@@ -9,6 +9,5 @@
/// Runs microbenchmarks on iOS.
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createMicrobenchmarkTask(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/new_gallery_impeller__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery_impeller__transition_perf.dart
index e3e137b..3ddb155 100644
--- a/dev/devicelab/bin/tasks/new_gallery_impeller__transition_perf.dart
+++ b/dev/devicelab/bin/tasks/new_gallery_impeller__transition_perf.dart
@@ -17,7 +17,6 @@
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);
diff --git a/dev/devicelab/bin/tasks/new_gallery_impeller_ios__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery_impeller_ios__transition_perf.dart
index 394f2e0..a331c4d 100644
--- a/dev/devicelab/bin/tasks/new_gallery_impeller_ios__transition_perf.dart
+++ b/dev/devicelab/bin/tasks/new_gallery_impeller_ios__transition_perf.dart
@@ -17,7 +17,6 @@
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);
diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller_ios__timeline_summary.dart
index 0090863..2b8106f 100644
--- a/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createUiKitViewScrollPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart
index 346742f..3be1c76 100644
--- a/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createUiKitViewScrollPerfNonIntersectingTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/simple_animation_perf_impeller_ios.dart b/dev/devicelab/bin/tasks/simple_animation_perf_impeller_ios.dart
index 4bee66a..9f6a379 100644
--- a/dev/devicelab/bin/tasks/simple_animation_perf_impeller_ios.dart
+++ b/dev/devicelab/bin/tasks/simple_animation_perf_impeller_ios.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createSimpleAnimationPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf_impeller_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf_impeller_ios__timeline_summary.dart
index 9e62ac1..361df86 100644
--- a/dev/devicelab/bin/tasks/tiles_scroll_perf_impeller_ios__timeline_summary.dart
+++ b/dev/devicelab/bin/tasks/tiles_scroll_perf_impeller_ios__timeline_summary.dart
@@ -8,6 +8,5 @@
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.ios;
- // ignore: avoid_redundant_argument_values
await task(createTilesScrollPerfTest(enableImpeller: true));
}
diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart
index 938d909..dae7465 100644
--- a/dev/devicelab/lib/framework/utils.dart
+++ b/dev/devicelab/lib/framework/utils.dart
@@ -15,8 +15,6 @@
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;
@@ -450,9 +448,6 @@
final String? localEngineSrcPath = localEngineSrcPathFromEnv;
return <String>[
command,
- if (!command.contains('--enable-impeller')
- && deviceOperatingSystem == DeviceOperatingSystem.ios)
- '--enable-impeller',
if (deviceOperatingSystem == DeviceOperatingSystem.ios && supportedDeviceTimeoutCommands.contains(command))
...<String>[
'--device-timeout',
diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart
index 664f76c..ea7a07d7 100644
--- a/dev/devicelab/lib/tasks/gallery.dart
+++ b/dev/devicelab/lib/tasks/gallery.dart
@@ -28,7 +28,7 @@
TaskFunction createGalleryTransitionE2EBuildTest(
List<String> args, {
bool semanticsEnabled = false,
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return GalleryTransitionBuildTest(
args,
@@ -44,7 +44,7 @@
TaskFunction createGalleryTransitionE2ETest({
bool semanticsEnabled = false,
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return GalleryTransitionTest(
testFile: semanticsEnabled
@@ -91,7 +91,7 @@
this.driverFile,
this.measureCpuGpu = true,
this.measureMemory = true,
- this.enableImpeller = kEnableImpellerDefault,
+ this.enableImpeller = false,
});
final bool semanticsEnabled;
@@ -233,7 +233,7 @@
this.driverFile,
this.measureCpuGpu = true,
this.measureMemory = true,
- this.enableImpeller = kEnableImpellerDefault,
+ this.enableImpeller = false,
}) : super(workingDirectory: galleryDirectory);
final bool semanticsEnabled;
diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart
index c53f24d..6d35e8a 100644
--- a/dev/devicelab/lib/tasks/microbenchmarks.dart
+++ b/dev/devicelab/lib/tasks/microbenchmarks.dart
@@ -15,7 +15,7 @@
/// 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();
diff --git a/dev/devicelab/lib/tasks/new_gallery.dart b/dev/devicelab/lib/tasks/new_gallery.dart
index 3532aed..e7695c8 100644
--- a/dev/devicelab/lib/tasks/new_gallery.dart
+++ b/dev/devicelab/lib/tasks/new_gallery.dart
@@ -14,7 +14,7 @@
this.galleryDir, {
String timelineFileName = 'transitions',
String dartDefine = '',
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
super.timeoutSeconds,
}) : super(
galleryDir.path,
diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index 32997bd..88fd1bd 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -26,7 +26,7 @@
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 @@
).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 @@
).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 @@
).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 createBackdropFilterPerfTest({
bool measureCpuGpu = true,
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -182,7 +182,7 @@
TaskFunction createSimpleAnimationPerfTest({
bool measureCpuGpu = true,
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -363,7 +363,7 @@
}
TaskFunction createFullscreenTextfieldPerfE2ETest({
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest.e2e(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -389,7 +389,7 @@
).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 createImageFilteredTransformAnimationPerfTest({
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -455,7 +455,7 @@
).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 createAnimatedComplexOpacityPerfE2ETest({
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest.e2e(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -639,7 +639,7 @@
}
TaskFunction createAnimatedComplexImageFilteredPerfE2ETest({
- bool enableImpeller = kEnableImpellerDefault,
+ bool enableImpeller = false,
}) {
return PerfTest.e2e(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
@@ -939,7 +939,7 @@
String? resultFilename,
this.device,
this.flutterDriveCallback,
- this.enableImpeller = kEnableImpellerDefault,
+ this.enableImpeller = false,
this.timeoutSeconds,
}): _resultFilename = resultFilename;
@@ -955,7 +955,7 @@
String resultFilename = 'e2e_perf_summary',
this.device,
this.flutterDriveCallback,
- this.enableImpeller = kEnableImpellerDefault,
+ this.enableImpeller = false,
this.timeoutSeconds,
}) : saveTraceFile = false, timelineFileName = null, _resultFilename = resultFilename;
