diff --git a/dev/benchmarks/macrobenchmarks/lib/common.dart b/dev/benchmarks/macrobenchmarks/lib/common.dart index 7695b53397..746d824a8b 100644 --- a/dev/benchmarks/macrobenchmarks/lib/common.dart +++ b/dev/benchmarks/macrobenchmarks/lib/common.dart @@ -5,4 +5,3 @@ const String kCullOpacityRouteName = '/cull_opacity'; const String kCubicBezierRouteName = '/cubic_bezier'; const String kBackdropFilterRouteName = '/backdrop_filter'; -const String kSimpleAnimationRouteName = '/simple_animation'; diff --git a/dev/benchmarks/macrobenchmarks/lib/main.dart b/dev/benchmarks/macrobenchmarks/lib/main.dart index 267b0f2b36..5f87dfda45 100644 --- a/dev/benchmarks/macrobenchmarks/lib/main.dart +++ b/dev/benchmarks/macrobenchmarks/lib/main.dart @@ -8,7 +8,6 @@ import 'common.dart'; import 'src/backdrop_filter.dart'; import 'src/cubic_bezier.dart'; import 'src/cull_opacity.dart'; -import 'src/simple_animation.dart'; const String kMacrobenchmarks ='Macrobenchmarks'; @@ -25,7 +24,6 @@ class MacrobenchmarksApp extends StatelessWidget { kCullOpacityRouteName: (BuildContext context) => CullOpacityPage(), kCubicBezierRouteName: (BuildContext context) => CubicBezierPage(), kBackdropFilterRouteName: (BuildContext context) => BackdropFilterPage(), - kSimpleAnimationRouteName: (BuildContext conttext) => SimpleAnimationPage(), }, ); } @@ -41,31 +39,24 @@ class HomePage extends StatelessWidget { RaisedButton( key: const Key(kCullOpacityRouteName), child: const Text('Cull opacity'), - onPressed: () { + onPressed: (){ Navigator.pushNamed(context, kCullOpacityRouteName); }, ), RaisedButton( key: const Key(kCubicBezierRouteName), child: const Text('Cubic Bezier'), - onPressed: () { + onPressed: (){ Navigator.pushNamed(context, kCubicBezierRouteName); }, ), RaisedButton( key: const Key(kBackdropFilterRouteName), child: const Text('Backdrop Filter'), - onPressed: () { + onPressed: (){ Navigator.pushNamed(context, kBackdropFilterRouteName); }, ), - RaisedButton( - key: const Key(kSimpleAnimationRouteName), - child: const Text('Simple Animation'), - onPressed: () { - Navigator.pushNamed(context, kSimpleAnimationRouteName); - }, - ), ], ), ); diff --git a/dev/benchmarks/macrobenchmarks/lib/src/backdrop_filter.dart b/dev/benchmarks/macrobenchmarks/lib/src/backdrop_filter.dart index 57ceb4105b..5e93117155 100644 --- a/dev/benchmarks/macrobenchmarks/lib/src/backdrop_filter.dart +++ b/dev/benchmarks/macrobenchmarks/lib/src/backdrop_filter.dart @@ -1,7 +1,3 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - import 'dart:ui'; import 'package:flutter/material.dart'; diff --git a/dev/benchmarks/macrobenchmarks/lib/src/simple_animation.dart b/dev/benchmarks/macrobenchmarks/lib/src/simple_animation.dart deleted file mode 100644 index 7182bedb1d..0000000000 --- a/dev/benchmarks/macrobenchmarks/lib/src/simple_animation.dart +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter/material.dart'; - -class SimpleAnimationPage extends StatelessWidget { - @override - Widget build(BuildContext context) { - return const Center(child: LinearProgressIndicator()); - } -} diff --git a/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf.dart b/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf.dart deleted file mode 100644 index 80361f3704..0000000000 --- a/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf.dart +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:flutter_driver/driver_extension.dart'; -import 'package:macrobenchmarks/main.dart' as app; - -void main() { - enableFlutterDriverExtension(); - app.main(); -} diff --git a/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf_test.dart b/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf_test.dart deleted file mode 100644 index 494f2c6443..0000000000 --- a/dev/benchmarks/macrobenchmarks/test_driver/simple_animation_perf_test.dart +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:macrobenchmarks/common.dart'; - -import 'util.dart'; - -void main() { - macroPerfTest( - 'simple_animation_perf', - kSimpleAnimationRouteName, - ); -} diff --git a/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart index 20dc420f2e..840c775416 100644 --- a/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart @@ -10,5 +10,5 @@ import 'package:flutter_devicelab/framework/framework.dart'; Future main() async { deviceOperatingSystem = DeviceOperatingSystem.ios; - await task(createBackdropFilterPerfTest(needsMeasureCpuGpu: true)); + await task(createBackdropFilterPerfTest()); } diff --git a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart b/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart deleted file mode 100644 index 3982569aa3..0000000000 --- a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - - -import 'package:flutter_devicelab/framework/adb.dart'; -import 'package:flutter_devicelab/framework/framework.dart'; -import 'package:flutter_devicelab/tasks/perf_tests.dart'; - -Future main() async { - deviceOperatingSystem = DeviceOperatingSystem.ios; - await task(createSimpleAnimationPerfTest(needsMeasureCpuGpu: true)); -} diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index 307de3b77a..e5f3d34b85 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -622,46 +622,3 @@ void checkFileExists(String file) { throw FileSystemException('Expected file to exit.', file); } } - -void _checkExitCode(int code) { - if (code != 0) { - throw Exception( - 'Unexpected exit code = $code!', - ); - } -} - -Future _execAndCheck(String executable, List args) async { - _checkExitCode(await exec(executable, args)); -} - -// Measure the CPU/GPU percentage for [duration] while a Flutter app is running -// on an iOS device (e.g., right after a Flutter driver test has finished, which -// doesn't close the Flutter app, and the Flutter app has an indefinite -// animation). The return should have a format like the following json -// ``` -// {"gpu_percentage":12.6,"cpu_percentage":18.15} -// ``` -Future> measureIosCpuGpu({ - Duration duration = const Duration(seconds: 10), - String deviceId, -}) async { - await _execAndCheck('pub', [ - 'global', - 'activate', - 'gauge', - '0.1.4', - ]); - - await _execAndCheck('pub', [ - 'global', - 'run', - 'gauge', - 'ioscpugpu', - 'new', - if (deviceId != null) ...['-w', deviceId], - '-l', - '${duration.inMilliseconds}', - ]); - return json.decode(file('$cwd/result.json').readAsStringSync()); -} diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index 9aa2bf5626..88c6f81eb6 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -54,21 +54,11 @@ TaskFunction createCubicBezierPerfTest() { ).run; } -TaskFunction createBackdropFilterPerfTest({bool needsMeasureCpuGpu = false}) { +TaskFunction createBackdropFilterPerfTest() { return PerfTest( '${flutterDirectory.path}/dev/benchmarks/macrobenchmarks', 'test_driver/backdrop_filter_perf.dart', 'backdrop_filter_perf', - needsMeasureCpuGPu: needsMeasureCpuGpu, - ).run; -} - -TaskFunction createSimpleAnimationPerfTest({bool needsMeasureCpuGpu = false}) { - return PerfTest( - '${flutterDirectory.path}/dev/benchmarks/macrobenchmarks', - 'test_driver/simple_animation_perf.dart', - 'simple_animation_perf', - needsMeasureCpuGPu: needsMeasureCpuGpu, ).run; } @@ -178,18 +168,12 @@ class StartupTest { /// Measures application runtime performance, specifically per-frame /// performance. class PerfTest { - const PerfTest( - this.testDirectory, - this.testTarget, - this.timelineFileName, - {this.needsMeasureCpuGPu = false}); + const PerfTest(this.testDirectory, this.testTarget, this.timelineFileName); final String testDirectory; final String testTarget; final String timelineFileName; - final bool needsMeasureCpuGPu; - Future run() { return inDirectory(testDirectory, () async { final Device device = await devices.workingDevice; @@ -218,12 +202,6 @@ class PerfTest { ); } - if (needsMeasureCpuGPu) { - await inDirectory('$testDirectory/build', () async { - data.addAll(await measureIosCpuGpu(deviceId: deviceId)); - }); - } - return TaskResult.success(data, benchmarkScoreKeys: [ 'average_frame_build_time_millis', 'worst_frame_build_time_millis', @@ -235,8 +213,6 @@ class PerfTest { 'missed_frame_rasterizer_budget_count', '90th_percentile_frame_rasterizer_time_millis', '99th_percentile_frame_rasterizer_time_millis', - if (needsMeasureCpuGPu) 'cpu_percentage', - if (needsMeasureCpuGPu) 'gpu_percentage', ]); }); } diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml index f6612bf611..46e63dff27 100644 --- a/dev/devicelab/manifest.yaml +++ b/dev/devicelab/manifest.yaml @@ -535,12 +535,6 @@ tasks: stage: devicelab_ios required_agent_capabilities: ["mac/ios"] - simple_animation_perf_ios: - description: > - Measure CPU/GPU usage percentages of a simple animation. - stage: devicelab_ios - required_agent_capabilities: ["mac/ios"] - smoke_catalina_start_up_ios: description: > A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.