Unverified Commit 3101374f authored by Dan Field's avatar Dan Field Committed by GitHub

Revert "Reland GC benchmark changes again (#82042)" (#82059)

This reverts commit 99a947c3.
parent 99a947c3
......@@ -6,7 +6,7 @@ import 'package:flutter_driver/flutter_driver.dart';
import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
Future<void> main() async {
const String fileName = 'animated_image';
const String fileName = 'large_image_changer';
test('Animate for 250 frames', () async {
final FlutterDriver driver = await FlutterDriver.connect();
......
......@@ -9,11 +9,8 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
Future<void> main() async {
deviceOperatingSystem = DeviceOperatingSystem.android;
await task(PerfTest(
await task(DevToolsMemoryTest(
'${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
'test_driver/animated_image.dart',
'animated_image',
measureCpuGpu: true,
measureMemory: true,
).run);
}
......@@ -705,7 +705,6 @@ class PerfTest {
final String deviceId = device.deviceId;
await flutter('drive', options: <String>[
'--no-dds', // TODO(dnfield): consider removing when https://github.com/flutter/flutter/issues/81707 is fixed
'--no-android-gradle-daemon',
'-v',
'--verbose-system-logs',
......@@ -778,8 +777,6 @@ const List<String> _kCommonScoreKeys = <String>[
'worst_frame_rasterizer_time_millis',
'90th_percentile_frame_rasterizer_time_millis',
'99th_percentile_frame_rasterizer_time_millis',
'new_gen_gc_count',
'old_gen_gc_count',
];
class PerfTestWithSkSL extends PerfTest {
......@@ -871,7 +868,6 @@ class PerfTestWithSkSL extends PerfTest {
_flutterPath,
<String>[
'run',
'--no-dds',
if (deviceOperatingSystem == DeviceOperatingSystem.ios)
...<String>[
'--device-timeout', '5',
......
......@@ -17,11 +17,7 @@ class FrameTimingSummarizer {
/// Summarize `data` to frame build time and frame rasterizer time statistics.
///
/// See [TimelineSummary.summaryJson] for detail.
factory FrameTimingSummarizer(
List<FrameTiming> data, {
int? newGenGCCount,
int? oldGenGCCount,
}) {
factory FrameTimingSummarizer(List<FrameTiming> data) {
assert(data != null);
assert(data.isNotEmpty);
final List<Duration> frameBuildTime = List<Duration>.unmodifiable(
......@@ -62,8 +58,6 @@ class FrameTimingSummarizer {
p90VsyncOverhead: _findPercentile(vsyncOverheadSorted, 0.90),
p99VsyncOverhead: _findPercentile(vsyncOverheadSorted, 0.99),
worstVsyncOverhead: vsyncOverheadSorted.last,
newGenGCCount: newGenGCCount ?? -1,
oldGenGCCount: oldGenGCCount ?? -1,
);
}
......@@ -85,8 +79,6 @@ class FrameTimingSummarizer {
required this.p90VsyncOverhead,
required this.p99VsyncOverhead,
required this.worstVsyncOverhead,
required this.newGenGCCount,
required this.oldGenGCCount,
});
/// List of frame build time in microseconds
......@@ -141,12 +133,6 @@ class FrameTimingSummarizer {
/// The largest value of [vsyncOverhead] in milliseconds.
final Duration worstVsyncOverhead;
/// The number of new generation GCs.
final int newGenGCCount;
/// The number of old generation GCs.
final int oldGenGCCount;
/// Convert the summary result to a json object.
///
/// See [TimelineSummary.summaryJson] for detail.
......@@ -176,8 +162,6 @@ class FrameTimingSummarizer {
'frame_rasterizer_times': frameRasterizerTime
.map<int>((Duration datum) => datum.inMicroseconds)
.toList(),
'new_gen_gc_count': newGenGCCount,
'old_gen_gc_count': oldGenGCCount,
};
}
......
......@@ -228,7 +228,8 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
_vmService = vmService;
}
if (_vmService == null) {
final developer.ServiceProtocolInfo info = await developer.Service.getInfo();
final developer.ServiceProtocolInfo info =
await developer.Service.getInfo();
assert(info.serverUri != null);
_vmService = await vm_io.vmServiceConnectUri(
'ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws',
......@@ -301,29 +302,6 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
reportData![reportKey] = timeline.toJson();
}
Future<_GarbageCollectionInfo> _runAndGetGCInfo(Future<void> Function() action) async {
if (kIsWeb) {
await action();
return const _GarbageCollectionInfo();
}
final vm.Timeline timeline = await traceTimeline(
action,
streams: <String>['GC'],
);
final int oldGenGCCount = timeline.traceEvents!.where((vm.TimelineEvent event) {
return event.json!['cat'] == 'GC' && event.json!['name'] == 'CollectOldGeneration';
}).length;
final int newGenGCCount = timeline.traceEvents!.where((vm.TimelineEvent event) {
return event.json!['cat'] == 'GC' && event.json!['name'] == 'CollectNewGeneration';
}).length;
return _GarbageCollectionInfo(
oldCount: oldGenGCCount,
newCount: newGenGCCount,
);
}
/// Watches the [FrameTiming] during `action` and report it to the binding
/// with key `reportKey`.
///
......@@ -362,16 +340,11 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
await Future<void>.delayed(const Duration(seconds: 2)); // flush old FrameTimings
final TimingsCallback watcher = frameTimings.addAll;
addTimingsCallback(watcher);
final _GarbageCollectionInfo gcInfo = await _runAndGetGCInfo(action);
await action();
await delayForFrameTimings(); // make sure all FrameTimings are reported
removeTimingsCallback(watcher);
final FrameTimingSummarizer frameTimes = FrameTimingSummarizer(
frameTimings,
newGenGCCount: gcInfo.newCount,
oldGenGCCount: gcInfo.oldCount,
);
final FrameTimingSummarizer frameTimes =
FrameTimingSummarizer(frameTimings);
reportData ??= <String, dynamic>{};
reportData![reportKey] = frameTimes.summary;
}
......@@ -393,11 +366,3 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
super.attachRootWidget(RepaintBoundary(child: rootWidget));
}
}
@immutable
class _GarbageCollectionInfo {
const _GarbageCollectionInfo({this.oldCount = -1, this.newCount = -1});
final int oldCount;
final int newCount;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment