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 b11fc18edcb..71eacabfff5 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 fed5a751bbd..52ad4ac0243 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 e47e6b995ec..682b1e3bc0e 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 18b8032a301..996d04b728e 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 e04f5db6c84..53578a3df05 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 0f29fea0bc1..859025ea6e9 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 @@ import 'package:flutter_devicelab/tasks/gallery.dart'; Future 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 9d3d2136817..5972a38f774 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 be27385810c..51586c08dc1 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 34f8be17230..2e4490df9c0 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 7e9ad553ed9..3daa6d791ff 100644 --- a/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart +++ b/dev/devicelab/bin/tasks/microbenchmarks_impeller_ios.dart @@ -9,6 +9,5 @@ import 'package:flutter_devicelab/tasks/microbenchmarks.dart'; /// Runs microbenchmarks on iOS. Future 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 e3e137b8109..3ddb1555a33 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 @@ Future 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); 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 394f2e08494..a331c4d14be 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 @@ Future 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); 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 0090863f98e..2b8106f001e 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 346742f00c5..3be1c768c44 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 4bee66a38e4..9f6a37929f6 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 9e62ac11e35..361df86db50 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 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart'; Future 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 2bf40fc1ce3..dae7465b51c 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -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 _flutterCommandArgs(String command, List options) { }; final String? localEngine = localEngineFromEnv; final String? localEngineSrcPath = localEngineSrcPathFromEnv; - - bool addEnableImpeller() { - return !options.contains('--enable-impeller') - && deviceOperatingSystem == DeviceOperatingSystem.ios - && (command == 'drive' || command == 'run'); - } - return [ command, if (deviceOperatingSystem == DeviceOperatingSystem.ios && supportedDeviceTimeoutCommands.contains(command)) @@ -462,8 +453,7 @@ List _flutterCommandArgs(String command, List options) { '--device-timeout', '5', ], - if (addEnableImpeller()) - '--enable-impeller', + if (command == 'drive' && hostAgent.dumpDirectory != null) ...[ '--screenshot', hostAgent.dumpDirectory!.path, diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart index 664f76cbc2c..ea7a07d74e6 100644 --- a/dev/devicelab/lib/tasks/gallery.dart +++ b/dev/devicelab/lib/tasks/gallery.dart @@ -28,7 +28,7 @@ TaskFunction createGalleryTransitionTest({bool semanticsEnabled = false}) { TaskFunction createGalleryTransitionE2EBuildTest( List 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; diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index c53f24dad9c..6d35e8adae0 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -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(); diff --git a/dev/devicelab/lib/tasks/new_gallery.dart b/dev/devicelab/lib/tasks/new_gallery.dart index 3532aedb9fa..e7695c86311 100644 --- a/dev/devicelab/lib/tasks/new_gallery.dart +++ b/dev/devicelab/lib/tasks/new_gallery.dart @@ -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, diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index 32997bdacf5..88fd1bdb822 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -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;