[Benchmarking] Remove duplication in waterfall configs.

We now only define shard_num and shard map location
in bot_platforms.py.

Bug: 902089
Change-Id: I101743f3a4aaa2291d2dba03d7338d9dbe03798c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1941273
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720609}

testing/buildbot/chromium.perf.fyi.json

@@ -8,8 +8,8 @@
           "-v",
           "--browser=android-chrome",
           "--upload-results",
-          "--output-format=histograms",
-          "--test-shard-map-filename=android-nexus5x-perf-fyi_map.json"
+          "--test-shard-map-filename=android-nexus5x-perf-fyi_map.json",
+          "--output-format=histograms"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -54,9 +54,9 @@
           "-v",
           "--browser=exact",
           "--upload-results",
+          "--test-shard-map-filename=android-pixel2-perf-fyi_map.json",
           "--browser-executable=../../out/Release/bin/monochrome_64_32_bundle",
-          "--device=android",
-          "--test-shard-map-filename=android-pixel2-perf-fyi_map.json"
+          "--device=android"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -146,9 +146,9 @@
           "-v",
           "--browser=release",
           "--upload-results",
+          "--test-shard-map-filename=linux-perf-fyi_map.json",
           "--output-format=histograms",
-          "--experimental-proto-trace-format",
-          "--test-shard-map-filename=linux-perf-fyi_map.json"
+          "--experimental-proto-trace-format"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -192,8 +192,8 @@
           "-v",
           "--browser=release_x64",
           "--upload-results",
-          "--run-ref-build",
-          "--test-shard-map-filename=win-10_laptop_low_end-perf_HP-Candidate_map.json"
+          "--test-shard-map-filename=win-10_laptop_low_end-perf_hp-candidate_map.json",
+          "--run-ref-build"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {

testing/buildbot/chromium.perf.json

@@ -125,8 +125,8 @@
           "-v",
           "--browser=android-chromium",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=android_nexus5_perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -172,8 +172,8 @@
           "-v",
           "--browser=android-webview",
           "--upload-results",
-          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--test-shard-map-filename=android_nexus5x_webview_perf_map.json",
+          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_webview_test_suite",
@@ -219,8 +219,8 @@
           "-v",
           "--browser=android-webview",
           "--upload-results",
-          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--test-shard-map-filename=android_nexus6_webview_perf_map.json",
+          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_webview_test_suite",
@@ -460,8 +460,8 @@
           "-v",
           "--browser=release_x64",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=win_7_nvidia_gpu_perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -620,8 +620,8 @@
           "-v",
           "--browser=release",
           "--upload-results",
-          "--run-ref-build",
-          "--test-shard-map-filename=win_7_perf_map.json"
+          "--test-shard-map-filename=win_7_perf_map.json",
+          "--run-ref-build"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -866,8 +866,8 @@
           "-v",
           "--browser=android-chrome",
           "--upload-results",
-          "--run-ref-build",
-          "--test-shard-map-filename=android-go-perf_map.json"
+          "--test-shard-map-filename=android-go-perf_map.json",
+          "--run-ref-build"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -912,8 +912,8 @@
           "-v",
           "--browser=android-webview-google",
           "--upload-results",
-          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android-go_webview-perf_map.json"
+          "--test-shard-map-filename=android-go_webview-perf_map.json",
+          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -1193,8 +1193,8 @@
           "-v",
           "--browser=android-chromium",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=android-nexus5x-perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1240,8 +1240,8 @@
           "-v",
           "--browser=android-chrome",
           "--upload-results",
-          "--run-ref-build",
-          "--test-shard-map-filename=android-pixel2-perf_map.json"
+          "--test-shard-map-filename=android-pixel2-perf_map.json",
+          "--run-ref-build"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -1286,9 +1286,9 @@
           "-v",
           "--browser=android-weblayer",
           "--upload-results",
+          "--test-shard-map-filename=android-pixel2_weblayer-perf_map.json",
           "--webview-embedder-apk=../../out/Release/apks/WebLayerShell.apk",
-          "--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk",
-          "--test-shard-map-filename=android-pixel2_weblayer-perf_map.json"
+          "--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk"
         ],
         "isolate_name": "performance_weblayer_test_suite",
         "merge": {
@@ -1333,8 +1333,8 @@
           "-v",
           "--browser=android-webview-google",
           "--upload-results",
-          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android-pixel2_webview-perf_map.json"
+          "--test-shard-map-filename=android-pixel2_webview-perf_map.json",
+          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -1789,8 +1789,8 @@
           "-v",
           "--browser=release",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=linux-perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1909,8 +1909,8 @@
           "-v",
           "--browser=release",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=mac-10_12_laptop_low_end-perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2182,8 +2182,8 @@
           "-v",
           "--browser=release",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=mac-10_13_laptop_high_end-perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -2463,8 +2463,8 @@
           "-v",
           "--browser=release_x64",
           "--upload-results",
-          "--run-ref-build",
           "--test-shard-map-filename=win-10-perf_map.json",
+          "--run-ref-build",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",

tools/perf/core/bot_platforms.py

@@ -47,8 +47,9 @@ class PerfPlatform(object):
     base_file_name = name.replace(' ', '_').lower()
     self._timing_file_path = os.path.join(
         _SHARD_MAP_DIR, 'timing_data', base_file_name + '_timing.json')
+    self.shards_map_file_name = base_file_name + '_map.json'
     self._shards_map_file_path = os.path.join(
-        _SHARD_MAP_DIR, base_file_name + '_map.json')
+        _SHARD_MAP_DIR, self.shards_map_file_name)
 
   def __lt__(self, other):
     if not isinstance(other, type(self)):
@@ -295,6 +296,7 @@ LINUX_PERF_FYI = PerfPlatform(
 ALL_PLATFORMS = {
     p for p in locals().values() if isinstance(p, PerfPlatform)
 }
+PLATFORMS_BY_NAME = {p.name: p for p in ALL_PLATFORMS}
 FYI_PLATFORMS = {
     p for p in ALL_PLATFORMS if p.is_fyi
 }