Update location of benchmark timing files & shard map files

Previously, the benchmark timing files & shard map files are manually named. This
CL simplifies all of them to be based on the builder names. This simplifies
the implementation of tools/perf/core/bot_platforms.py file.

This should be a pure refactoring & has no visible effect on how we schedule tests

This is a follow up of Juan's comment in https://chromium-review.googlesource.com/c/chromium/src/+/1188945/6/tools/perf/core/bot_platforms.py#85

Bug:863768

Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: I7aa08e10978f54b7f2b15759d20d64a9c7bd8533
Reviewed-on: https://chromium-review.googlesource.com/1213317Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#589676}

testing/buildbot/chromium.perf.fyi.json

 {
-  "Android Go": {
-    "isolated_scripts": [
-      {
-        "args": [
-          "-v",
-          "--browser=android-chromium",
-          "--upload-results",
-          "--run-ref-build",
-          "--test-shard-map-filename=android_go_shard_map.json"
-        ],
-        "isolate_name": "performance_test_suite",
-        "merge": {
-          "args": [
-            "--service-account-file",
-            "/creds/service_accounts/service-account-chromium-perf-histograms.json"
-          ],
-          "script": "//tools/perf/process_perf_results.py"
-        },
-        "name": "performance_test_suite",
-        "override_compile_targets": [
-          "performance_test_suite"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "O",
-              "device_os_flavor": "google",
-              "device_type": "gobo",
-              "os": "Android",
-              "pool": "chrome.tests.perf-fyi"
-            }
-          ],
-          "expiration": 21600,
-          "hard_timeout": 25200,
-          "ignore_task_failure": false,
-          "io_timeout": 1800,
-          "shards": 19,
-          "upload_test_results": true
-        },
-        "trigger_script": {
-          "args": [
-            "--multiple-dimension-script-verbose",
-            "True"
-          ],
-          "script": "//testing/trigger_scripts/perf_device_trigger.py"
-        }
-      }
-    ]
-  },
   "Android Nexus 5X Perf FYI": {
     "isolated_scripts": [
       {

testing/buildbot/chromium.perf.json

@@ -196,7 +196,7 @@
           "--browser=android-chromium",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=android_nexus5_16_shard_map.json",
+          "--test-shard-map-filename=android_nexus5_perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -247,7 +247,7 @@
           "--browser=android-webview",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android_nexus5x_webview_16_shard_map.json",
+          "--test-shard-map-filename=android_nexus5x_webview_perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_webview_test_suite",
@@ -298,7 +298,7 @@
           "--browser=android-webview",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android_nexus6_webview_shard_map.json",
+          "--test-shard-map-filename=android_nexus6_webview_perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_webview_test_suite",
@@ -584,7 +584,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=win7_nvidia_shard_map.json",
+          "--test-shard-map-filename=win_7_nvidia_gpu_perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -762,7 +762,7 @@
           "--browser=release",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=win7_shard_map.json"
+          "--test-shard-map-filename=win_7_perf_map.json"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -820,7 +820,7 @@
           "--browser=android-chromium",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=android_go_shard_map.json"
+          "--test-shard-map-filename=android-go-perf_map.json"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -1096,7 +1096,7 @@
           "--browser=android-chromium",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=android_nexus5x_16_shard_map.json",
+          "--test-shard-map-filename=android-nexus5x-perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1319,7 +1319,7 @@
           "--browser=release",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=linux_perf_shard_map.json",
+          "--test-shard-map-filename=linux-perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1454,7 +1454,7 @@
           "--browser=release",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=mac_1012_low_end_26_shard_map.json",
+          "--test-shard-map-filename=mac-10_12_laptop_low_end-perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1632,7 +1632,7 @@
           "--browser=release",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=mac_1013_high_end_26_shard_map.json",
+          "--test-shard-map-filename=mac-10_13_laptop_high_end-perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",
@@ -1810,7 +1810,7 @@
           "--browser=release_x64",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=win10_shard_map.json",
+          "--test-shard-map-filename=win-10-perf_map.json",
           "--assert-gpu-compositing"
         ],
         "isolate_name": "performance_test_suite",

tools/perf/core/bot_platforms.py

@@ -39,9 +39,8 @@ _ANDROID_GO_BENCHMARK_NAMES = {
 
 
 class PerfPlatform(object):
-  def __init__(self, name, description, timing_data_file_name,
-               shards_map_file_name, is_fyi=False, benchmarks_names_to_run=None,
-               num_shards=None):
+  def __init__(self, name, description, is_fyi=False,
+               benchmarks_names_to_run=None, num_shards=None):
     self._name = name
     self._description = description
     # For sorting ignore case and "segments" in the bot name.
@@ -51,19 +50,18 @@ class PerfPlatform(object):
     self._num_shards = num_shards
     if benchmarks_names_to_run:
       benchmarks = []
-      for name in benchmarks_names_to_run:
-        benchmarks.append(_ALL_TELEMETRY_BENCHMARKS_BY_NAMES[name])
+      for benchmark_name in benchmarks_names_to_run:
+        benchmarks.append(_ALL_TELEMETRY_BENCHMARKS_BY_NAMES[benchmark_name])
       benchmarks_to_run = frozenset(benchmarks)
     else:
       benchmarks_to_run = _ALL_PERF_WATERFALL_TELEMETRY_BENCHMARKS
     self._benchmarks_to_run = benchmarks_to_run
 
+    base_file_name = name.replace(' ', '_').lower()
     self._timing_file_path = os.path.join(
-        _SHARD_MAP_DIR, 'timing_data', timing_data_file_name)
-
+        _SHARD_MAP_DIR, 'timing_data', base_file_name + '_timing.json')
     self._shards_map_file_path = os.path.join(
-        _SHARD_MAP_DIR, shards_map_file_name)
-
+        _SHARD_MAP_DIR, base_file_name + '_map.json')
 
   def __lt__(self, other):
     if not isinstance(other, type(self)):
@@ -112,23 +110,17 @@ class PerfPlatform(object):
 # Linux
 LINUX = PerfPlatform(
     'linux-perf', 'Ubuntu-14.04, 8 core, NVIDIA Quadro P400',
-    timing_data_file_name='linux_perf_story_timing.json',
-    shards_map_file_name='linux_perf_shard_map.json',
     num_shards=26)
 
 # Mac
 MAC_HIGH_END = PerfPlatform(
     'mac-10_13_laptop_high_end-perf',
     'MacBook Pro, Core i7 2.8 GHz, 16GB RAM, 256GB SSD, Radeon 55',
-    timing_data_file_name='mac_1013_high_end_story_timing.json',
-    shards_map_file_name='mac_1013_high_end_26_shard_map.json',
     num_shards=26)
 
 MAC_LOW_END = PerfPlatform(
     'mac-10_12_laptop_low_end-perf',
     'MacBook Air, Core i5 1.8 GHz, 8GB RAM, 128GB SSD, HD Graphics',
-    timing_data_file_name='mac_1012_low_end_story_timing.json',
-    shards_map_file_name='mac_1012_low_end_26_shard_map.json',
     num_shards=26)
 
 # Win
@@ -136,53 +128,37 @@ 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',
-    timing_data_file_name='win10_story_timing.json',
-    shards_map_file_name='win10_shard_map.json',
     num_shards=26)
 
 WIN_7 = PerfPlatform(
     'Win 7 Perf', 'N/A',
-    timing_data_file_name='win7_story_timing.json',
-    shards_map_file_name='win7_shard_map.json',
     num_shards=5)
 
 WIN_7_GPU = PerfPlatform(
     'Win 7 Nvidia GPU Perf', 'N/A',
-    timing_data_file_name='win7_nvidia_story_timing.json',
-    shards_map_file_name='win7_nvidia_shard_map.json',
     num_shards=5)
 
 # Android
 ANDROID_GO = PerfPlatform(
     'android-go-perf', 'Android O',
-    timing_data_file_name='android_go_timing.json',
-    shards_map_file_name='android_go_shard_map.json',
     num_shards=19,
     benchmarks_names_to_run=_ANDROID_GO_BENCHMARK_NAMES)
 
 ANDROID_NEXUS_5 = PerfPlatform(
     'Android Nexus5 Perf', 'Android KOT49H',
-    timing_data_file_name='android_nexus5_story_timing.json',
-    shards_map_file_name='android_nexus5_16_shard_map.json',
     num_shards=16)
 
 ANDROID_NEXUS_5X = PerfPlatform(
     'android-nexus5x-perf', 'Android MMB29Q',
-    timing_data_file_name='android_nexus5x_story_timing.json',
-    shards_map_file_name='android_nexus5x_16_shard_map.json',
     num_shards=16)
 
 ANDROID_NEXUS_5X_WEBVIEW = PerfPlatform(
     'Android Nexus5X WebView Perf', 'Android AOSP MOB30K',
-    timing_data_file_name='android_nexus5x_webview_story_timing.json',
-    shards_map_file_name='android_nexus5x_webview_16_shard_map.json',
     num_shards=16)
 
 
 ANDROID_NEXUS_6_WEBVIEW = PerfPlatform(
     'Android Nexus6 WebView Perf', 'Android AOSP MOB30K',
-    timing_data_file_name='android_nexus6_webview_story_timing.json',
-    shards_map_file_name='android_nexus6_webview_shard_map.json',
     num_shards=16)
 
 

tools/perf/core/perf_data_generator.py

@@ -190,7 +190,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'isolate': 'performance_test_suite',
           'extra_args': [
             '--run-ref-build',
-            '--test-shard-map-filename=android_go_shard_map.json',
+            '--test-shard-map-filename=android-go-perf_map.json',
           ],
           'num_shards': 19
         }
@@ -211,7 +211,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 16,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=android_nexus5x_16_shard_map.json',
+              '--test-shard-map-filename=android-nexus5x-perf_map.json',
               '--assert-gpu-compositing',
           ],
         },
@@ -260,7 +260,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 16,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=android_nexus5_16_shard_map.json',
+              '--test-shard-map-filename=android_nexus5_perf_map.json',
               '--assert-gpu-compositing',
           ],
         },
@@ -303,7 +303,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'isolate': 'performance_webview_test_suite',
           'num_shards': 16,
           'extra_args': [
-              '--test-shard-map-filename=android_nexus5x_webview_16_shard_map.json',
+              '--test-shard-map-filename=android_nexus5x_webview_perf_map.json',
               '--assert-gpu-compositing',
           ],
         }
@@ -323,7 +323,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'isolate': 'performance_webview_test_suite',
           'num_shards': 16,
           'extra_args': [
-              '--test-shard-map-filename=android_nexus6_webview_shard_map.json',
+              '--test-shard-map-filename=android_nexus6_webview_perf_map.json',
               '--assert-gpu-compositing',
           ],
         }
@@ -344,7 +344,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 26,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=win10_shard_map.json',
+              '--test-shard-map-filename=win-10-perf_map.json',
               '--assert-gpu-compositing',
           ],
         },
@@ -379,7 +379,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 5,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=win7_shard_map.json',
+              '--test-shard-map-filename=win_7_perf_map.json',
           ],
         },
         # crbug.com/735679 enable performance_browser_tests
@@ -414,7 +414,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 5,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=win7_nvidia_shard_map.json',
+              '--test-shard-map-filename=win_7_nvidia_gpu_perf_map.json',
               '--assert-gpu-compositing',
           ],
         },
@@ -470,7 +470,8 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 26,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=mac_1012_low_end_26_shard_map.json',
+              ('--test-shard-map-filename='
+               'mac-10_12_laptop_low_end-perf_map.json'),
               '--assert-gpu-compositing',
           ],
         },
@@ -500,7 +501,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'num_shards': 26,
           'extra_args': [
               '--run-ref-build',
-              '--test-shard-map-filename=linux_perf_shard_map.json',
+              '--test-shard-map-filename=linux-perf_map.json',
               '--assert-gpu-compositing',
           ],
         },
@@ -538,7 +539,7 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           'isolate': 'performance_test_suite',
           'extra_args': [
             '--run-ref-build',
-            '--test-shard-map-filename=mac_1013_high_end_26_shard_map.json',
+            '--test-shard-map-filename=mac-10_13_laptop_high_end-perf_map.json',
               '--assert-gpu-compositing',
           ],
           'num_shards': 26
@@ -701,7 +702,7 @@ def get_all_benchmarks_metadata(metadata):
 def get_tests_in_performance_test_suite():
   tests = sets.Set()
   add_benchmarks_from_sharding_map(
-      tests, "shard_maps/linux_perf_shard_map.json")
+      tests, "shard_maps/linux-perf_map.json")
   add_benchmarks_from_sharding_map(
       tests, "shard_maps/pixel2_7_shard_map.json")
   return tests