Commit 6e7189bc authored by Caleb Rouleau's avatar Caleb Rouleau Committed by Commit Bot

[Speed Infra] Restrict bot_platforms to those that run sharded tests.

https://chromium-review.googlesource.com/c/chromium/src/+/1589012
added the new android compilers which also upload resource_sizes
data to bot_platforms. However, in generate_perf_sharding and elsewhere
we assume that every bot_platform has a shard map. Also, the other platforms
in this list are similar in that they run Telemetry benchmarks, whereas
resource_sizes is running some math on the compiler builder to find the
size of the APK and other related data.

Bug: 961830
Change-Id: Ib3c1460923863f21c28e5bfb08ae170ef59565c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612359
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659755}
parent f7477d8e
......@@ -6,7 +6,6 @@
## Android
* [android-builder-perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/android-builder-perf): Static analysis of 32-bit ARM Android build products.
* [android-go-perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/android-go-perf): Android O (gobo).
* [android-go_webview-perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/android-go_webview-perf): Android OPM1.171019.021 (gobo).
* [Android Nexus5 Perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/Android%20Nexus5%20Perf): Android KOT49H.
......@@ -14,10 +13,6 @@
* [Android Nexus5X WebView Perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/Android%20Nexus5X%20WebView%20Perf): Android AOSP MOB30K.
* [Android Nexus6 WebView Perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/Android%20Nexus6%20WebView%20Perf): Android AOSP MOB30K.
## Android_Arm64
* [android_arm64-builder-perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/android_arm64-builder-perf): Static analysis of 64-bit ARM Android build products..
## Linux
* [linux-perf](https://ci.chromium.org/p/chrome/builders/luci.chrome.ci/linux-perf): Ubuntu-14.04, 8 core, NVIDIA Quadro P400.
......
......@@ -143,16 +143,6 @@ WIN_7_GPU = PerfPlatform(
num_shards=5)
# Android
ANDROID_ARM_BUILDER = PerfPlatform(
'android-builder-perf',
'Static analysis of 32-bit ARM Android build products',
_OFFICIAL_BENCHMARK_NAMES, num_shards=1)
ANDROID_ARM64_BUILDER = PerfPlatform(
'android_arm64-builder-perf',
'Static analysis of 64-bit ARM Android build products.',
_OFFICIAL_BENCHMARK_NAMES, num_shards=1)
ANDROID_GO = PerfPlatform(
'android-go-perf', 'Android O (gobo)', _ANDROID_GO_BENCHMARK_NAMES,
num_shards=19)
......
......@@ -137,11 +137,6 @@ def _IsBuilderName(name):
return not name.startswith('AAA')
def _IsCompilingBuilder(builder_name, builder_data):
del builder_name # unused
return 'isolated_scripts' not in builder_data
def _IsTestingBuilder(builder_name, builder_data):
del builder_name # unused
return 'isolated_scripts' in builder_data
......@@ -153,13 +148,15 @@ def ValidatePerfConfigFile(file_handle, is_main_perf_waterfall):
for key, value in perf_data.iteritems():
if not _IsBuilderName(key):
continue
if _IsCompilingBuilder(builder_name=key, builder_data=value):
pass
elif _IsTestingBuilder(builder_name=key, builder_data=value):
if _IsTestingBuilder(builder_name=key, builder_data=value):
ValidateTestingBuilder(builder_name=key, builder_data=value)
perf_testing_builder_names.add(key)
else:
raise ValueError('%s has unrecognizable type: %s' % key)
try:
trigger_script = value['isolated_scripts'][-1]['trigger_script'][
'script']
except KeyError:
continue
if trigger_script == '//testing/trigger_scripts/perf_device_trigger.py':
perf_testing_builder_names.add(key)
if (is_main_perf_waterfall and
perf_testing_builder_names != bot_platforms.OFFICIAL_PLATFORM_NAMES):
raise ValueError(
......
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