Commit d1c32eb3 authored by Caleb Rouleau's avatar Caleb Rouleau Committed by Commit Bot

[Benchmarking] Add gtest perf tests to OBBS for win-10-perf

Note that this change also reshards the win-10-perf builder, which
may cause false positive regressions. In the event of
perf regressions, this CL should not be reverted, since it
is not causing the regression; it is just moving the test
to run on a different device (of the same model and OS).
See
https://chromium-review.googlesource.com/c/chromium/src/+/1983326
for background.

This moves all the gtest perf tests on win-10-perf
into the performance_test_suite and onto the
shard maps. This allows us to run them in parallel with the Telemetry
benchmarks and account for their runtime within our system.

Bug: 921353
Change-Id: Ibfd03a63256a884488c005e853527b4d9ac582b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986118
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728319}
parent e6327a50
......@@ -2884,7 +2884,9 @@ group("ct_telemetry_perf_tests_without_chrome") {
group("performance_test_suite") {
testonly = true
deps = [
"//base:base_perftests",
"//chrome/test:angle_perftests",
"//chrome/test:dawn_perf_tests",
"//chrome/test:telemetry_perf_tests",
"//components:components_perftests",
"//components/tracing:tracing_perftests",
......@@ -2894,7 +2896,10 @@ group("performance_test_suite") {
]
if (!is_android && !is_fuchsia) {
deps += [ "//chrome/test:load_library_perf_tests" ]
deps += [
"//chrome/test:load_library_perf_tests",
"//ui/views:views_perftests",
]
}
data_deps = [
......
......@@ -1572,236 +1572,6 @@
},
"win-10-perf": {
"isolated_scripts": [
{
"args": [
"--gtest-benchmark-name",
"angle_perftests",
"--shard-timeout=300"
],
"isolate_name": "angle_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "angle_perftests",
"override_compile_targets": [
"angle_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"base_perftests"
],
"isolate_name": "base_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "base_perftests",
"override_compile_targets": [
"base_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"components_perftests"
],
"isolate_name": "components_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "components_perftests",
"override_compile_targets": [
"components_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"dawn_perf_tests",
"--shard-timeout=300"
],
"isolate_name": "dawn_perf_tests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "dawn_perf_tests",
"override_compile_targets": [
"dawn_perf_tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"media_perftests"
],
"isolate_name": "media_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "media_perftests",
"override_compile_targets": [
"media_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"--gtest-benchmark-name",
"views_perftests"
],
"isolate_name": "views_perftests",
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"name": "views_perftests",
"override_compile_targets": [
"views_perftests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-23.20.16.4877",
"os": "Windows-10-16299.309",
"pool": "chrome.tests.perf",
"synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
}
],
"expiration": 7200,
"hard_timeout": 19800,
"ignore_task_failure": false,
"io_timeout": 19800,
"shards": 1
},
"trigger_script": {
"args": [
"--multiple-dimension-script-verbose",
"True"
],
"requires_simultaneous_shard_dispatch": true,
"script": "//testing/trigger_scripts/perf_device_trigger.py"
}
},
{
"args": [
"-v",
......
This diff is collapsed.
......@@ -250,11 +250,28 @@ _VALIDATING_COMMAND_BUFFER_PERFTESTS = ExecutableConfig(
'--use-cmd-decoder=validating',
'--use-stub',
], estimated_runtime=23)
_VIEWS_PERFTESTS = ExecutableConfig(
'views_perftests', flags=[
'--xvfb'
], estimated_runtime=7)
_BASE_PERFTESTS = ExecutableConfig(
'base_perftests', flags=[
'--test-launcher-jobs=1',
'--test-launcher-retry-limit=0'
], estimated_runtime=270)
_DAWN_PERF_TESTS = ExecutableConfig(
'dawn_perf_tests', flags=[
'--test-launcher-jobs=1',
'--test-launcher-retry-limit=0'
], estimated_runtime=270)
_LINUX_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
_MAC_HIGH_END_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
_MAC_LOW_END_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_JETSTREAM2
_WIN_10_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
_WIN_10_EXECUTABLE_CONFIGS = frozenset([
_ANGLE_PERFTESTS, _MEDIA_PERFTESTS, _COMPONENTS_PERFTESTS, _VIEWS_PERFTESTS,
_BASE_PERFTESTS, _DAWN_PERF_TESTS])
_WIN_10_LOW_END_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
_WIN_10_LOW_END_HP_CANDIDATE_BENCHMARK_CONFIGS = PerfSuite(
[_GetBenchmarkConfig('v8.browsing_desktop')])
......@@ -341,7 +358,7 @@ WIN_10 = PerfPlatform(
'win-10-perf',
'Windows Intel HD 630 towers, Core i7-7700 3.6 GHz, 16GB RAM,'
' Intel Kaby Lake HD Graphics 630', _WIN_10_BENCHMARK_CONFIGS,
26, 'win')
26, 'win', executables=_WIN_10_EXECUTABLE_CONFIGS)
WIN_7 = PerfPlatform(
'Win 7 Perf', 'N/A', _WIN_7_BENCHMARK_CONFIGS,
4, 'win', executables=_WIN_7_EXECUTABLE_CONFIGS)
......
......@@ -545,42 +545,6 @@ BUILDERS = {
'--assert-gpu-compositing',
],
},
{
'isolate': 'angle_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
'extra_args': [
'--shard-timeout=300'
],
},
{
'isolate': 'media_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'components_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'views_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'base_perftests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
},
{
'isolate': 'dawn_perf_tests',
'num_shards': 1,
'type': TEST_TYPES.GTEST,
'extra_args': [
'--shard-timeout=300'
],
},
],
'platform': 'win',
'target_bits': 64,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,8 +2,9 @@ AUTOGENERATED FILE DO NOT EDIT
View a prettier version of this at,https://docs.google.com/spreadsheets/d/15pJY4cxtM2NVNFKQDgDnoT5PLo0Nm5Td-Ov-5PZefAw
platform,Android Nexus5 Perf,Android Nexus5X WebView Perf,Android Nexus6 WebView Perf,Win 7 Nvidia GPU Perf,Win 7 Perf,android-go-perf,android-go_webview-perf,android-nexus5x-perf,android-pixel2-perf,android-pixel2_weblayer-perf,android-pixel2_webview-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
shards,16,16,12,4,4,19,13,10,35,4,21,26,26,26,26,26
idealized cycle time (hours),2.24,0.56,0.76,3.45,2.45,0.70,0.26,1.37,0.65,0.15,0.34,0.39,0.43,0.33,0.47,0.70
angle_perftests,0.000,0.000,0.000,0.276,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
idealized cycle time (hours),2.24,0.56,0.76,3.45,2.45,0.70,0.26,1.37,0.65,0.15,0.34,0.39,0.43,0.33,0.55,0.70
angle_perftests,0.000,0.000,0.000,0.276,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.042,0.000
base_perftests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.006,0.000
blink_perf.accessibility,0.003,0.001,0.001,0.005,0.006,0.000,0.000,0.003,0.001,0.000,0.001,0.001,0.001,0.001,0.001,0.001
blink_perf.bindings,0.052,0.014,0.029,0.052,0.061,0.000,0.000,0.050,0.013,0.000,0.009,0.006,0.009,0.007,0.008,0.011
blink_perf.canvas,0.036,0.000,0.012,0.067,0.020,0.000,0.000,0.000,0.010,0.000,0.005,0.006,0.010,0.008,0.008,0.010
......@@ -15,10 +16,11 @@ blink_perf.image_decoder,0.017,0.005,0.007,0.020,0.024,0.000,0.000,0.020,0.006,0
blink_perf.layout,0.111,0.027,0.053,0.087,0.103,0.000,0.000,0.110,0.024,0.000,0.015,0.009,0.015,0.012,0.014,0.016
blink_perf.owp_storage,0.006,0.001,0.002,0.010,0.012,0.000,0.000,0.007,0.001,0.000,0.001,0.001,0.001,0.001,0.001,0.002
blink_perf.paint,0.000,0.000,0.000,0.032,0.040,0.000,0.000,0.000,0.006,0.000,0.005,0.003,0.005,0.004,0.004,0.008
blink_perf.parser,0.042,0.011,0.017,0.034,0.039,0.000,0.000,0.043,0.008,0.000,0.006,0.004,0.006,0.005,0.006,0.006
blink_perf.parser,0.042,0.011,0.017,0.034,0.039,0.000,0.000,0.043,0.008,0.000,0.006,0.004,0.006,0.005,0.005,0.006
blink_perf.shadow_dom,0.037,0.000,0.011,0.020,0.024,0.000,0.000,0.000,0.008,0.000,0.004,0.001,0.003,0.002,0.004,0.004
blink_perf.svg,0.016,0.002,0.006,0.010,0.012,0.000,0.000,0.011,0.004,0.000,0.002,0.001,0.001,0.001,0.002,0.002
components_perftests,0.004,0.000,0.000,0.000,0.015,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
components_perftests,0.004,0.000,0.000,0.000,0.015,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.002,0.000
dawn_perf_tests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.006,0.000
dromaeo,0.007,0.003,0.004,0.020,0.020,0.000,0.000,0.010,0.003,0.000,0.002,0.002,0.003,0.003,0.003,0.003
dummy_benchmark.noisy_benchmark_1,0.001,0.000,0.000,0.000,0.001,0.000,0.000,0.001,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
dummy_benchmark.stable_benchmark_1,0.001,0.001,0.000,0.000,0.001,0.000,0.000,0.001,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
......@@ -27,36 +29,37 @@ jetstream,0.000,0.000,0.000,0.024,0.027,0.000,0.000,0.000,0.000,0.000,0.000,0.00
jetstream2,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.008,0.000,0.000,0.003,0.000,0.004,0.003,0.007
kraken,0.006,0.002,0.002,0.003,0.004,0.000,0.000,0.006,0.001,0.000,0.001,0.000,0.001,0.001,0.001,0.001
load_library_perf_tests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
loading.desktop,0.000,0.000,0.000,0.218,0.172,0.000,0.000,0.000,0.000,0.000,0.000,0.022,0.037,0.023,0.032,0.056
loading.desktop,0.000,0.000,0.000,0.218,0.172,0.000,0.000,0.000,0.000,0.000,0.000,0.022,0.037,0.023,0.034,0.056
loading.mobile,0.094,0.021,0.029,0.000,0.000,0.000,0.000,0.085,0.025,0.000,0.014,0.000,0.000,0.000,0.000,0.000
media.desktop,0.000,0.000,0.000,0.055,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.007,0.009,0.007,0.008,0.012
media.desktop,0.000,0.000,0.000,0.055,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.007,0.009,0.007,0.009,0.012
media.mobile,0.025,0.000,0.000,0.000,0.000,0.000,0.000,0.027,0.006,0.000,0.000,0.000,0.000,0.000,0.000,0.000
media_perftests,0.000,0.000,0.000,0.002,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
memory.desktop,0.000,0.000,0.000,0.031,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.003,0.004,0.003,0.005,0.005
octane,0.005,0.001,0.002,0.005,0.000,0.000,0.000,0.005,0.001,0.000,0.001,0.001,0.001,0.001,0.001,0.001
passthrough_command_buffer_perftests,0.000,0.000,0.000,0.004,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
power.desktop,0.000,0.000,0.000,0.076,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.012,0.013,0.011,0.012,0.016
power.desktop,0.000,0.000,0.000,0.076,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.012,0.013,0.011,0.013,0.016
rasterize_and_record_micro.partial_invalidation,0.001,0.000,0.001,0.001,0.000,0.000,0.000,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
rasterize_and_record_micro.top_25,0.049,0.016,0.025,0.083,0.000,0.000,0.000,0.056,0.013,0.000,0.010,0.008,0.009,0.009,0.013,0.017
rendering.desktop,0.000,0.000,0.000,0.593,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.069,0.102,0.070,0.083,0.149
rendering.desktop,0.000,0.000,0.000,0.593,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.069,0.102,0.070,0.091,0.149
rendering.mobile,0.707,0.205,0.235,0.000,0.000,0.000,0.000,0.019,0.178,0.000,0.107,0.000,0.000,0.000,0.000,0.000
speedometer,0.005,0.001,0.002,0.005,0.000,0.004,0.003,0.004,0.001,0.000,0.000,0.001,0.001,0.001,0.001,0.002
speedometer-future,0.000,0.001,0.002,0.000,0.000,0.000,0.000,0.004,0.001,0.000,0.000,0.001,0.001,0.001,0.001,0.000
speedometer-future,0.000,0.001,0.002,0.000,0.000,0.000,0.000,0.004,0.001,0.000,0.000,0.001,0.001,0.001,0.000,0.000
speedometer2,0.008,0.002,0.003,0.009,0.000,0.008,0.006,0.007,0.001,0.000,0.001,0.001,0.002,0.002,0.001,0.003
speedometer2-future,0.021,0.003,0.006,0.012,0.000,0.000,0.000,0.013,0.002,0.000,0.001,0.003,0.004,0.003,0.003,0.007
speedometer2-future,0.021,0.003,0.006,0.012,0.000,0.000,0.000,0.013,0.002,0.000,0.001,0.003,0.004,0.003,0.002,0.007
startup.mobile,0.025,0.000,0.000,0.000,0.000,0.030,0.000,0.027,0.073,0.018,0.000,0.000,0.000,0.000,0.000,0.000
system_health.common_desktop,0.000,0.000,0.000,0.322,0.272,0.000,0.000,0.000,0.000,0.000,0.000,0.048,0.054,0.045,0.050,0.073
system_health.common_desktop,0.000,0.000,0.000,0.322,0.272,0.000,0.000,0.000,0.000,0.000,0.000,0.048,0.054,0.045,0.054,0.073
system_health.common_mobile,0.325,0.085,0.109,0.000,0.000,0.233,0.143,0.337,0.070,0.063,0.050,0.000,0.000,0.000,0.000,0.000
system_health.memory_desktop,0.000,0.000,0.000,0.277,0.299,0.000,0.000,0.000,0.000,0.000,0.000,0.032,0.045,0.037,0.043,0.058
system_health.memory_desktop,0.000,0.000,0.000,0.277,0.299,0.000,0.000,0.000,0.000,0.000,0.000,0.032,0.045,0.037,0.044,0.058
system_health.memory_mobile,0.216,0.063,0.092,0.000,0.000,0.170,0.104,0.063,0.109,0.064,0.045,0.000,0.000,0.000,0.000,0.000
system_health.webview_startup,0.000,0.000,0.001,0.000,0.000,0.000,0.001,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
tab_switching.typical_25,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
tracing.tracing_with_background_memory_infra,0.010,0.002,0.002,0.017,0.025,0.000,0.000,0.008,0.002,0.000,0.001,0.001,0.002,0.002,0.002,0.003
tracing_perftests,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
v8.browsing_desktop,0.000,0.000,0.000,0.191,0.177,0.000,0.000,0.000,0.000,0.000,0.000,0.023,0.030,0.024,0.027,0.042
v8.browsing_desktop-future,0.000,0.000,0.000,0.178,0.175,0.000,0.000,0.000,0.000,0.000,0.000,0.025,0.030,0.024,0.026,0.040
v8.browsing_desktop,0.000,0.000,0.000,0.191,0.177,0.000,0.000,0.000,0.000,0.000,0.000,0.023,0.030,0.024,0.029,0.042
v8.browsing_desktop-future,0.000,0.000,0.000,0.178,0.175,0.000,0.000,0.000,0.000,0.000,0.000,0.025,0.030,0.024,0.028,0.040
v8.browsing_mobile,0.338,0.072,0.079,0.000,0.000,0.255,0.000,0.339,0.059,0.000,0.041,0.000,0.000,0.000,0.000,0.000
v8.browsing_mobile-future,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
v8.runtime_stats.top_25,0.000,0.000,0.000,0.613,0.805,0.000,0.000,0.000,0.000,0.000,0.000,0.079,0.000,0.000,0.089,0.116
v8.runtime_stats.top_25,0.000,0.000,0.000,0.613,0.805,0.000,0.000,0.000,0.000,0.000,0.000,0.079,0.000,0.000,0.094,0.116
validating_command_buffer_perftests,0.000,0.000,0.000,0.003,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
views_perftests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
webrtc,0.017,0.004,0.006,0.034,0.038,0.000,0.000,0.016,0.004,0.000,0.003,0.004,0.005,0.004,0.005,0.010
......@@ -391,8 +391,10 @@ def _ParseBenchmarks(shard_map_path):
for shard, benchmarks_in_shard in shard_map.iteritems():
if "extra_infos" in shard:
continue
for benchmark, _ in benchmarks_in_shard['benchmarks'].iteritems():
all_benchmarks.add(benchmark)
if benchmarks_in_shard.get('benchmarks'):
all_benchmarks |= set(benchmarks_in_shard['benchmarks'].keys())
if benchmarks_in_shard.get('executables'):
all_benchmarks |= set(benchmarks_in_shard['executables'].keys())
return frozenset(all_benchmarks)
......@@ -436,7 +438,8 @@ def _ValidateShardMaps(args):
# Check that bot_platforms.py matches the actual shard maps
for platform in bot_platforms.ALL_PLATFORMS:
platform_benchmark_names = set(
b.name for b in platform.benchmark_configs)
b.name for b in platform.benchmark_configs) | set(
e.name for e in platform.executables)
shard_map_benchmark_names = _ParseBenchmarks(platform.shards_map_file_path)
for benchmark in platform_benchmark_names - shard_map_benchmark_names:
errors.append(
......
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