Commit 9bd426b0 authored by Caleb Rouleau's avatar Caleb Rouleau Committed by Commit Bot

[Benchmarking] Restrict v8.browsing_mobile-future to pixel2_perf.

This benchmark does not need to be run on other platforms.

Also fix a minor bug in generate_perf_sharding that caused
problems for shards that don't have any telemetry benchmarks
on them.

Bug: 1047129
Change-Id: I72f58194ef35a8482fe358dcd99b307c4cdf5c8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2039170
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738628}
parent 10423db9
...@@ -61,5 +61,5 @@ passthrough_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf, ...@@ -61,5 +61,5 @@ passthrough_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf,
validating_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf, validating_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf,
load_library_perf_tests,0.00,4,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-perf, mac-10_12_laptop_low_end-perf", load_library_perf_tests,0.00,4,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-perf, mac-10_12_laptop_low_end-perf",
views_perftests,0.00,1,0,win-10-perf, views_perftests,0.00,1,0,win-10-perf,
v8.browsing_mobile-future,0.00,4,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, android-pixel2-perf, android-pixel2_webview-perf", v8.browsing_mobile-future,0.00,1,0,android-pixel2-perf,
tab_switching.typical_25,0.00,7,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf", tab_switching.typical_25,0.00,7,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
...@@ -335,7 +335,10 @@ _ANDROID_GO_WEBVIEW_BENCHMARK_CONFIGS = _ANDROID_GO_BENCHMARK_CONFIGS ...@@ -335,7 +335,10 @@ _ANDROID_GO_WEBVIEW_BENCHMARK_CONFIGS = _ANDROID_GO_BENCHMARK_CONFIGS
_ANDROID_NEXUS_5_BENCHMARK_CONFIGS = PerfSuite( _ANDROID_NEXUS_5_BENCHMARK_CONFIGS = PerfSuite(
OFFICIAL_BENCHMARK_CONFIGS OFFICIAL_BENCHMARK_CONFIGS
).Remove([ ).Remove([
'blink_perf.display_locking', 'jetstream2', 'blink_perf.layout' 'blink_perf.display_locking',
'jetstream2',
'blink_perf.layout',
'v8.browsing_mobile-future',
]).Abridge([ ]).Abridge([
'rendering.mobile', 'rendering.mobile',
# TODO(crbug.com/1039851): Abridge common_mobile after we make # TODO(crbug.com/1039851): Abridge common_mobile after we make
...@@ -346,13 +349,21 @@ _ANDROID_NEXUS_5_BENCHMARK_CONFIGS = PerfSuite( ...@@ -346,13 +349,21 @@ _ANDROID_NEXUS_5_BENCHMARK_CONFIGS = PerfSuite(
]) ])
_ANDROID_NEXUS_5_EXECUTABLE_CONFIGS = frozenset([ _ANDROID_NEXUS_5_EXECUTABLE_CONFIGS = frozenset([
_TRACING_PERFTESTS, _COMPONENTS_PERFTESTS, _GPU_PERFTESTS]) _TRACING_PERFTESTS, _COMPONENTS_PERFTESTS, _GPU_PERFTESTS])
_ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS = ( _ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS = PerfSuite(
_OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2) OFFICIAL_BENCHMARK_CONFIGS).Remove([
'blink_perf.display_locking',
'jetstream2',
'v8.browsing_mobile-future',
])
_ANDROID_PIXEL2_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING _ANDROID_PIXEL2_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
_ANDROID_PIXEL2_EXECUTABLE_CONFIGS = frozenset([ _ANDROID_PIXEL2_EXECUTABLE_CONFIGS = frozenset([
_COMPONENTS_PERFTESTS, _MEDIA_PERFTESTS]) _COMPONENTS_PERFTESTS, _MEDIA_PERFTESTS])
_ANDROID_PIXEL2_WEBVIEW_BENCHMARK_CONFIGS = ( _ANDROID_PIXEL2_WEBVIEW_BENCHMARK_CONFIGS = PerfSuite(
_OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2) OFFICIAL_BENCHMARK_CONFIGS).Remove([
'blink_perf.display_locking',
'jetstream2',
'v8.browsing_mobile-future',
])
_ANDROID_PIXEL2_WEBLAYER_BENCHMARK_CONFIGS = PerfSuite([ _ANDROID_PIXEL2_WEBLAYER_BENCHMARK_CONFIGS = PerfSuite([
_GetBenchmarkConfig('system_health.common_mobile', True), _GetBenchmarkConfig('system_health.common_mobile', True),
_GetBenchmarkConfig('system_health.memory_mobile', True), _GetBenchmarkConfig('system_health.memory_mobile', True),
......
...@@ -278,9 +278,6 @@ ...@@ -278,9 +278,6 @@
"begin": 23, "begin": 23,
"abridged": false "abridged": false
}, },
"v8.browsing_mobile-future": {
"abridged": false
},
"webrtc": { "webrtc": {
"abridged": false "abridged": false
} }
......
...@@ -246,9 +246,6 @@ ...@@ -246,9 +246,6 @@
"v8.browsing_mobile": { "v8.browsing_mobile": {
"abridged": true "abridged": true
}, },
"v8.browsing_mobile-future": {
"abridged": false
},
"webrtc": { "webrtc": {
"abridged": false "abridged": false
} }
......
...@@ -233,9 +233,6 @@ ...@@ -233,9 +233,6 @@
"begin": 14, "begin": 14,
"abridged": false "abridged": false
}, },
"v8.browsing_mobile-future": {
"abridged": false
},
"webrtc": { "webrtc": {
"abridged": false "abridged": false
} }
......
...@@ -4023,110 +4023,6 @@ ...@@ -4023,110 +4023,6 @@
"duration": "12.0", "duration": "12.0",
"name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/" "name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/"
}, },
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:chrome:omnibox:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:facebook_photos:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:flickr_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:googleplaystore:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:imgur:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:youtube:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cnn:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cricbuzz:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:globo:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:nytimes:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:qq:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:reddit:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:toi:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:washingtonpost:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:sxg:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:amazon:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:avito:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:lazada:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:facebook_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:instagram:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:pinterest_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:tumblr_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:twitter:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tech:discourse_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tools:maps:2019"
},
{ {
"duration": "6.0", "duration": "6.0",
"name": "v8.browsing_mobile/browse:chrome:omnibox:2019" "name": "v8.browsing_mobile/browse:chrome:omnibox:2019"
......
...@@ -2171,118 +2171,6 @@ ...@@ -2171,118 +2171,6 @@
"duration": "30.0", "duration": "30.0",
"name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/" "name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/"
}, },
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:chrome:newtab:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:chrome:omnibox:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:facebook_photos:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:flickr_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:googleplaystore:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:imgur:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:youtube:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cnn:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cricbuzz:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:globo:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:nytimes:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:qq:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:reddit:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:toi:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:washingtonpost:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:sxg:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:amazon:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:avito:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:lazada:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:facebook:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:facebook_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:instagram:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:pinterest_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:tumblr_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:twitter:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tech:discourse_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tools:maps:2019"
},
{ {
"duration": "223.0", "duration": "223.0",
"name": "v8.browsing_mobile/browse:media:youtube:2019" "name": "v8.browsing_mobile/browse:media:youtube:2019"
......
...@@ -4015,106 +4015,6 @@ ...@@ -4015,106 +4015,6 @@
"duration": "12.0", "duration": "12.0",
"name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/" "name": "tracing.tracing_with_background_memory_infra/https://www.google.com/calendar/"
}, },
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:chrome:omnibox:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:facebook_photos:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:flickr_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:googleplaystore:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:media:youtube:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cnn:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:cricbuzz:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:globo:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:nytimes:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:qq:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:reddit:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:toi:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:news:washingtonpost:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:search:amp:sxg:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:amazon:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:avito:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:shopping:lazada:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:facebook_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:instagram:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:pinterest_infinite_scroll:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:tumblr_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:social:twitter:2019"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tech:discourse_infinite_scroll:2018"
},
{
"duration": "0.0",
"name": "v8.browsing_mobile-future/browse:tools:maps:2019"
},
{ {
"duration": "51.0", "duration": "51.0",
"name": "v8.browsing_mobile/browse:chrome:omnibox:2019" "name": "v8.browsing_mobile/browse:chrome:omnibox:2019"
......
...@@ -372,7 +372,7 @@ def _DescheduleBenchmark(args): ...@@ -372,7 +372,7 @@ def _DescheduleBenchmark(args):
for shard, shard_map in shards_map.items(): for shard, shard_map in shards_map.items():
if shard == 'extra_infos': if shard == 'extra_infos':
break break
benchmarks = shard_map['benchmarks'] benchmarks = shard_map.get('benchmarks', dict())
for benchmark in benchmarks.keys(): for benchmark in benchmarks.keys():
if benchmark not in benchmarks_to_keep: if benchmark not in benchmarks_to_keep:
del benchmarks[benchmark] del benchmarks[benchmark]
......
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