Unverified Commit 647044c9 authored by keyonghan's avatar keyonghan Committed by GitHub

Use separate metric file names for same tests running on different platforms (#101317)

* use separate file names for same test

* use string buffer
parent 78551323
...@@ -133,5 +133,49 @@ Future<void> uploadToSkiaPerf(String? resultsPath, String? commitTime, String? t ...@@ -133,5 +133,49 @@ Future<void> uploadToSkiaPerf(String? resultsPath, String? commitTime, String? t
resultsJson = json.decode(await resultFile.readAsString()) as Map<String, dynamic>; resultsJson = json.decode(await resultFile.readAsString()) as Map<String, dynamic>;
final List<MetricPoint> metricPoints = parse(resultsJson, benchmarkTagsMap, taskName); final List<MetricPoint> metricPoints = parse(resultsJson, benchmarkTagsMap, taskName);
final FlutterDestination metricsDestination = await connectFlutterDestination(); final FlutterDestination metricsDestination = await connectFlutterDestination();
await upload(metricsDestination, metricPoints, commitTimeSinceEpoch, taskName); await upload(
metricsDestination,
metricPoints,
commitTimeSinceEpoch,
metricFileName(taskName, benchmarkTagsMap),
);
}
/// Create metric file name based on `taskName`, `arch`, `host type`, and `device type`.
///
/// Same `taskName` may run on different platforms. Considering host/device tags to
/// use different metric file names.
///
/// This affects only the metric file name which contains metric data, and does not affect
/// real host/device tags.
///
/// For example:
/// Old file name: `backdrop_filter_perf__timeline_summary`
/// New file name: `backdrop_filter_perf__timeline_summary_intel_linux_motoG4`
String metricFileName(
String taskName,
Map<String, dynamic> benchmarkTagsMap,
) {
final StringBuffer fileName = StringBuffer(taskName);
if (benchmarkTagsMap.containsKey('arch')) {
fileName
..write('_')
..write(_fileNameFormat(benchmarkTagsMap['arch'] as String));
}
if (benchmarkTagsMap.containsKey('host_type')) {
fileName
..write('_')
..write(_fileNameFormat(benchmarkTagsMap['host_type'] as String));
}
if (benchmarkTagsMap.containsKey('device_type')) {
fileName
..write('_')
..write(_fileNameFormat(benchmarkTagsMap['device_type'] as String));
}
return fileName.toString();
}
/// Format `fileName` removing non letter and number characters.
String _fileNameFormat(String fileName) {
return fileName.replaceAll(RegExp('[^a-zA-Z0-9]'), '');
} }
...@@ -155,4 +155,24 @@ void main() { ...@@ -155,4 +155,24 @@ void main() {
expect(flutterDestination.name, taskName); expect(flutterDestination.name, taskName);
}); });
}); });
group('metric file name', () {
test('without tags', () async {
final Map<String, dynamic> tags = <String, dynamic>{};
final String fileName = metricFileName('test', tags);
expect(fileName, 'test');
});
test('with device tags', () async {
final Map<String, dynamic> tags = <String, dynamic>{'device_type': 'ab-c'};
final String fileName = metricFileName('test', tags);
expect(fileName, 'test_abc');
});
test('with device host and arch tags', () async {
final Map<String, dynamic> tags = <String, dynamic>{'device_type': 'ab-c', 'host_type': 'de-f', 'arch': 'm1'};
final String fileName = metricFileName('test', tags);
expect(fileName, 'test_m1_def_abc');
});
});
} }
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