Add timing data & regenerate shard maps for FYI perf builders

With this CL, perf FYI builders sharding data can be generated by running:
$ ./tools/perf/generate_perf_sharding update -w perf-fyi -r

This CL also remove 'One Buildbot Step Test Builder' in
perf.fyi.json since the corresponding builder has been removed.

BUG:chromium:898832

Change-Id: I7caf239d55259b95418750bdecf3ccb4d6e94398
Reviewed-on: https://chromium-review.googlesource.com/c/1318682Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#607581}

testing/buildbot/chromium.perf.fyi.json

@@ -91,7 +91,7 @@
           "--browser=android-webview",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android_go_webview_shard_map.json"
+          "--test-shard-map-filename=android-go_webview-perf_map.json"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {
@@ -137,7 +137,7 @@
           "--browser=android-chrome",
           "--upload-results",
           "--output-format=histograms",
-          "--test-shard-map-filename=android_nexus5x_fyi_4_shard_map.json"
+          "--test-shard-map-filename=android-nexus5x-perf-fyi_map.json"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -182,7 +182,7 @@
           "--browser=android-chrome",
           "--upload-results",
           "--run-ref-build",
-          "--test-shard-map-filename=android_pixel2_shard_map.json"
+          "--test-shard-map-filename=android-pixel2-perf_map.json"
         ],
         "isolate_name": "performance_test_suite",
         "merge": {
@@ -228,7 +228,7 @@
           "--browser=android-webview",
           "--upload-results",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk",
-          "--test-shard-map-filename=android_pixel2_webview_shard_map.json"
+          "--test-shard-map-filename=android-pixel2_webview-perf_map.json"
         ],
         "isolate_name": "performance_webview_test_suite",
         "merge": {

tools/perf/core/bot_platforms.py

@@ -18,19 +18,6 @@ _ALL_PERF_WATERFALL_TELEMETRY_BENCHMARKS = frozenset(
     benchmark_finders.GetAllPerfBenchmarks())
 
 
-_ANDROID_GO_BENCHMARK_NAMES = {
-    'memory.top_10_mobile',
-    'system_health.memory_mobile',
-    'system_health.common_mobile',
-    'power.typical_10_mobile',
-    'startup.mobile',
-    'system_health.webview_startup',
-    'v8.browsing_mobile',
-    'speedometer',
-    'speedometer2'
-}
-
-
 class PerfPlatform(object):
   def __init__(self, name, description, is_fyi=False,
                benchmarks_names_to_run=None, num_shards=None):
@@ -132,6 +119,20 @@ WIN_7_GPU = PerfPlatform(
     num_shards=5)
 
 # Android
+
+_ANDROID_GO_BENCHMARK_NAMES = {
+    'memory.top_10_mobile',
+    'system_health.memory_mobile',
+    'system_health.common_mobile',
+    'power.typical_10_mobile',
+    'startup.mobile',
+    'system_health.webview_startup',
+    'v8.browsing_mobile',
+    'speedometer',
+    'speedometer2'
+}
+
+
 ANDROID_GO = PerfPlatform(
     'android-go-perf', 'Android O',
     num_shards=19,
@@ -155,10 +156,51 @@ ANDROID_NEXUS_6_WEBVIEW = PerfPlatform(
     num_shards=8)  # Reduced from 16 per crbug.com/891848.
 
 
+# FYI bots
+ANDROID_PIXEL2 = PerfPlatform(
+    'android-pixel2-perf', 'Android OPM1.171019.021', is_fyi=True,
+    num_shards=7)
+
+ANDROID_PIXEL2_WEBVIEW = PerfPlatform(
+    'android-pixel2_webview-perf', 'Android OPM1.171019.021', is_fyi=True,
+    num_shards=7)
+
+ANDROID_GO_WEBVIEW = PerfPlatform(
+    'android-go_webview-perf', 'Android OPM1.171019.021', is_fyi=True,
+    num_shards=25)
+
+ANDROID_NEXUS5X_PERF_FYI =  PerfPlatform(
+    'android-nexus5x-perf-fyi', 'Android MMB29Q', is_fyi=True,
+    num_shards=4, benchmarks_names_to_run={
+      'heap_profiling.mobile.disabled',
+      'heap_profiling.mobile.native',
+      'heap_profiling.mobile.pseudo',
+      'rendering.oopd.mobile',
+    })
+
+# TODO(crbug.com/902089): Add linux-perf-fyi once the bot is configured to use
+# the sharding map.
+
+
 ALL_PLATFORMS = {
     p for p in locals().values() if isinstance(p, PerfPlatform)
 }
 
+ALL_PERF_FYI_PLATFORMS = {
+    p for p in ALL_PLATFORMS if p.is_fyi
+}
+
+
+ALL_PERF_PLATFORMS = {
+    p for p in ALL_PLATFORMS if not p.is_fyi
+}
+
+
 ALL_PLATFORM_NAMES = {
     p.name for p in ALL_PLATFORMS
 }
+
+
+ALL_PERF_PLATFORM_NAMES = {
+    p.name for p in ALL_PERF_PLATFORMS
+}

tools/perf/core/perf_data_generator.py

@@ -66,39 +66,17 @@ BUILDER_ADDITIONAL_COMPILE_TARGETS = {
 #     will run on all shards.
 # telemetry: boolean indicating if this is a telemetry test.  If omitted
 #     assumed to be true.
+
+# TODO(crbug.com/902089): automatically generate --test-shard-map-filename
+# arguments once we track all the perf FYI builders to core/bot_platforms.py
 NEW_PERF_RECIPE_FYI_TESTERS = {
   'testers' : {
-    'One Buildbot Step Test Builder': {
-      'tests': [
-        {
-          'isolate': 'telemetry_perf_tests_without_chrome',
-          'extra_args': [
-            '--xvfb',
-            '--run-ref-build',
-            '--test-shard-map-filename=benchmark_bot_map.json'
-          ],
-          'num_shards': 3
-        },
-        {
-          'isolate': 'load_library_perf_tests',
-          'num_shards': 1,
-          'telemetry': False,
-        }
-      ],
-      'platform': 'linux',
-      'dimension': {
-        'gpu': 'none',
-        'pool': 'chrome.tests.perf-fyi',
-        'os': 'Linux',
-      },
-      'testing': True,
-    },
     'android-pixel2_webview-perf': {
       'tests': [
         {
           'isolate': 'performance_webview_test_suite',
           'extra_args': [
-            '--test-shard-map-filename=android_pixel2_webview_shard_map.json',
+            '--test-shard-map-filename=android-pixel2_webview-perf_map.json',
           ],
           'num_shards': 7
         }
@@ -118,7 +96,7 @@ NEW_PERF_RECIPE_FYI_TESTERS = {
           'isolate': 'performance_test_suite',
           'extra_args': [
             '--run-ref-build',
-            '--test-shard-map-filename=android_pixel2_shard_map.json',
+            '--test-shard-map-filename=android-pixel2-perf_map.json',
           ],
           'num_shards': 7
         }
@@ -137,7 +115,7 @@ NEW_PERF_RECIPE_FYI_TESTERS = {
         {
           'isolate': 'performance_webview_test_suite',
           'extra_args': [
-              '--test-shard-map-filename=android_go_webview_shard_map.json',
+              '--test-shard-map-filename=android-go_webview-perf_map.json',
           ],
           'num_shards': 25
         }

tools/perf/core/perf_json_config_validator.py

@@ -153,7 +153,7 @@ def ValidatePerfConfigFile(file_handle, is_main_perf_waterfall):
     else:
       raise ValueError('%s has unrecognizable type: %s' % key)
   if (is_main_perf_waterfall and
-      perf_testing_builder_names != bot_platforms.ALL_PLATFORM_NAMES):
+      perf_testing_builder_names != bot_platforms.ALL_PERF_PLATFORM_NAMES):
     raise ValueError(
         'Found mismatches between actual perf waterfall builders and platforms '
         'in core.bot_platforms. Please update the platforms in '

tools/perf/core/shard_maps/android_go_webview_shard_map.json → tools/perf/core/shard_maps/android-go_webview-perf_map.json

 {
     "0": {
         "benchmarks": {
-            "system_health.common_mobile": {
-                "end": 13
+            "blink_perf.accessibility": {},
+            "blink_perf.bindings": {},
+            "blink_perf.canvas": {},
+            "blink_perf.css": {},
+            "blink_perf.dom": {},
+            "blink_perf.events": {},
+            "blink_perf.image_decoder": {},
+            "blink_perf.layout": {},
+            "blink_perf.owp_storage": {},
+            "blink_perf.paint": {},
+            "blink_perf.parser": {},
+            "blink_perf.shadow_dom": {},
+            "blink_perf.svg": {},
+            "dromaeo": {},
+            "dummy_benchmark.noisy_benchmark_1": {},
+            "dummy_benchmark.stable_benchmark_1": {},
+            "jetstream": {},
+            "kraken": {},
+            "loading.desktop": {},
+            "loading.mobile": {},
+            "media.desktop": {},
+            "media.mobile": {},
+            "memory.desktop": {},
+            "memory.long_running_idle_gmail_background_tbmv2": {},
+            "memory.long_running_idle_gmail_tbmv2": {},
+            "memory.top_10_mobile": {
+                "end": 1
             }
         }
     },
     "1": {
         "benchmarks": {
-            "system_health.common_mobile": {
-                "begin": 13,
-                "end": 19
+            "memory.top_10_mobile": {
+                "begin": 1,
+                "end": 8
             }
         }
     },
     "2": {
         "benchmarks": {
-            "system_health.common_mobile": {
-                "begin": 19,
-                "end": 37
+            "memory.top_10_mobile": {
+                "begin": 8,
+                "end": 15
             }
         }
     },
     "3": {
         "benchmarks": {
-            "system_health.common_mobile": {
-                "begin": 37,
-                "end": 54
+            "memory.top_10_mobile": {
+                "begin": 15
+            },
+            "octane": {},
+            "oortonline_tbmv2": {},
+            "power.desktop": {},
+            "power.typical_10_mobile": {
+                "end": 3
             }
         }
     },
     "4": {
         "benchmarks": {
-            "system_health.common_mobile": {
-                "begin": 54
+            "power.typical_10_mobile": {
+                "begin": 3
+            },
+            "rasterize_and_record_micro.partial_invalidation": {},
+            "rasterize_and_record_micro.top_25": {},
+            "rendering.desktop": {},
+            "rendering.mobile": {
+                "end": 117
             }
         }
     },
     "5": {
         "benchmarks": {
-            "memory.top_10_mobile": {
-                "end": 7
+            "rendering.mobile": {
+                "begin": 117
+            },
+            "smoothness.gpu_rasterization.tough_pinch_zoom_cases": {},
+            "smoothness.tough_pinch_zoom_cases": {},
+            "speedometer": {},
+            "speedometer-future": {},
+            "speedometer2": {},
+            "speedometer2-future": {},
+            "startup.mobile": {},
+            "system_health.common_desktop": {},
+            "system_health.common_mobile": {
+                "end": 1
             }
         }
     },
     "6": {
         "benchmarks": {
-            "memory.top_10_mobile": {
-                "begin": 7,
-                "end": 13
+            "system_health.common_mobile": {
+                "begin": 1,
+                "end": 15
             }
         }
     },
     "7": {
         "benchmarks": {
-            "memory.top_10_mobile": {
-                "begin": 13
+            "system_health.common_mobile": {
+                "begin": 15,
+                "end": 20
             }
         }
     },
     "8": {
         "benchmarks": {
-            "start_with_url.warm.startup_pages": {}
+            "system_health.common_mobile": {
+                "begin": 20,
+                "end": 34
+            }
         }
     },
     "9": {
         "benchmarks": {
-            "start_with_url.cold.startup_pages": {},
-            "system_health.memory_mobile": {
-                "end": 6
+            "system_health.common_mobile": {
+                "begin": 34,
+                "end": 61
             }
         }
     },
     "10": {
         "benchmarks": {
+            "system_health.common_mobile": {
+                "begin": 61
+            },
+            "system_health.memory_desktop": {},
             "system_health.memory_mobile": {
-                "begin": 6,
-                "end": 12
+                "end": 1
             }
         }
     },
     "11": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 12,
-                "end": 14
+                "begin": 1,
+                "end": 8
             }
         }
     },
     "12": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 14,
-                "end": 17
+                "begin": 8,
+                "end": 16
             }
         }
     },
     "13": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 17,
+                "begin": 16,
                 "end": 21
             }
         }
@@ -108,30 +162,30 @@
         "benchmarks": {
             "system_health.memory_mobile": {
                 "begin": 21,
-                "end": 27
+                "end": 24
             }
         }
     },
     "15": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 27,
-                "end": 37
+                "begin": 24,
+                "end": 31
             }
         }
     },
     "16": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 37,
-                "end": 45
+                "begin": 31,
+                "end": 42
             }
         }
     },
     "17": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 45,
+                "begin": 42,
                 "end": 52
             }
         }
@@ -140,69 +194,94 @@
         "benchmarks": {
             "system_health.memory_mobile": {
                 "begin": 52,
-                "end": 54
+                "end": 61
             }
         }
     },
     "19": {
         "benchmarks": {
             "system_health.memory_mobile": {
-                "begin": 54,
-                "end": 57
+                "begin": 61
             }
         }
     },
     "20": {
         "benchmarks": {
-            "system_health.memory_mobile": {
-                "begin": 57,
-                "end": 61
+            "system_health.webview_startup": {},
+            "tab_switching.typical_25": {},
+            "tracing.tracing_with_background_memory_infra": {},
+            "v8.browsing_desktop": {},
+            "v8.browsing_desktop-future": {},
+            "v8.browsing_mobile": {
+                "end": 1
             }
         }
     },
     "21": {
         "benchmarks": {
-            "system_health.memory_mobile": {
-                "begin": 61
-            },
-            "system_health.webview_startup": {},
-            "power.typical_10_mobile": {
-                "end": 7
+            "v8.browsing_mobile": {
+                "begin": 1,
+                "end": 10
             }
         }
     },
     "22": {
         "benchmarks": {
-            "power.typical_10_mobile": {
-                "begin": 7
-            },
-            "speedometer2": {},
-            "speedometer": {},
             "v8.browsing_mobile": {
-                "end": 2
+                "begin": 10,
+                "end": 14
             }
         }
     },
     "23": {
         "benchmarks": {
             "v8.browsing_mobile": {
-                "begin": 2,
-                "end": 13
+                "begin": 14,
+                "end": 20
             }
         }
     },
     "24": {
         "benchmarks": {
             "v8.browsing_mobile": {
-                "begin": 13
-            }
+                "begin": 20
+            },
+            "v8.browsing_mobile-future": {},
+            "v8.runtime_stats.top_25": {},
+            "wasm": {},
+            "webrtc": {}
         }
     },
     "extra_infos": {
-        "num_stories": 187,
-        "predicted_min_shard_time": 1242.0,
-        "predicted_min_shard_index": 17,
-        "predicted_max_shard_time": 2820.0,
-        "predicted_max_shard_index": 18
+        "num_stories": 2007,
+        "predicted_min_shard_time": 1326.0,
+        "predicted_min_shard_index": 14,
+        "predicted_max_shard_time": 2418.0,
+        "predicted_max_shard_index": 12,
+        "shard #0": 1996.0,
+        "shard #1": 1980.0,
+        "shard #2": 2160.0,
+        "shard #3": 1916.0,
+        "shard #4": 2044.0,
+        "shard #5": 2036.0,
+        "shard #6": 2240.0,
+        "shard #7": 1584.0,
+        "shard #8": 2246.0,
+        "shard #9": 2050.0,
+        "shard #10": 1998.0,
+        "shard #11": 1812.0,
+        "shard #12": 2418.0,
+        "shard #13": 2238.0,
+        "shard #14": 1326.0,
+        "shard #15": 2340.0,
+        "shard #16": 1992.0,
+        "shard #17": 2100.0,
+        "shard #18": 1992.0,
+        "shard #19": 1908.0,
+        "shard #20": 1866.0,
+        "shard #21": 2028.0,
+        "shard #22": 1964.0,
+        "shard #23": 2142.0,
+        "shard #24": 2102.0
     }
 }
\ No newline at end of file

tools/perf/core/shard_maps/android-nexus5x-perf-fyi_map.json

+{
+    "0": {
+        "benchmarks": {
+            "heap_profiling.mobile.disabled": {},
+            "heap_profiling.mobile.native": {
+                "end": 1
+            }
+        }
+    },
+    "1": {
+        "benchmarks": {
+            "heap_profiling.mobile.native": {
+                "begin": 1
+            },
+            "heap_profiling.mobile.pseudo": {},
+            "rendering.oopd.mobile": {
+                "end": 61
+            }
+        }
+    },
+    "2": {
+        "benchmarks": {
+            "rendering.oopd.mobile": {
+                "begin": 61,
+                "end": 245
+            }
+        }
+    },
+    "3": {
+        "benchmarks": {
+            "rendering.oopd.mobile": {
+                "begin": 245
+            }
+        }
+    },
+    "extra_infos": {
+        "num_stories": 438,
+        "predicted_min_shard_time": 338.0,
+        "predicted_min_shard_index": 1,
+        "predicted_max_shard_time": 396.0,
+        "predicted_max_shard_index": 0,
+        "shard #0": 396.0,
+        "shard #1": 338.0,
+        "shard #2": 368,
+        "shard #3": 368
+    }
+}

tools/perf/core/shard_maps/android_pixel2_shard_map.json → tools/perf/core/shard_maps/android-pixel2-perf_map.json

 {
     "0": {
         "benchmarks": {
-            "system_health.common_mobile": {},
-            "v8.browsing_mobile-future": {},
-            "rendering.mobile": {
-                "end": 83
+            "blink_perf.accessibility": {},
+            "blink_perf.bindings": {},
+            "blink_perf.canvas": {},
+            "blink_perf.css": {},
+            "blink_perf.dom": {},
+            "blink_perf.events": {},
+            "blink_perf.image_decoder": {},
+            "blink_perf.layout": {},
+            "blink_perf.owp_storage": {},
+            "blink_perf.paint": {},
+            "blink_perf.parser": {},
+            "blink_perf.shadow_dom": {},
+            "blink_perf.svg": {},
+            "dromaeo": {},
+            "dummy_benchmark.noisy_benchmark_1": {},
+            "dummy_benchmark.stable_benchmark_1": {},
+            "jetstream": {},
+            "kraken": {},
+            "loading.desktop": {},
+            "loading.mobile": {
+                "end": 22
             }
         }
     },
     "1": {
         "benchmarks": {
-            "rendering.mobile": {
-                "begin": 83,
-                "end": 389
-            }
+            "loading.mobile": {
+                "begin": 22
+            },
+            "media.desktop": {},
+            "media.mobile": {},
+            "memory.desktop": {},
+            "memory.long_running_idle_gmail_background_tbmv2": {}
         }
     },
     "2": {
         "benchmarks": {
-            "rendering.mobile": {
-                "begin": 389
-            },
-            "blink_perf.image_decoder": {},
-            "power.desktop": {},
-            "speedometer-future": {},
-            "blink_perf.owp_storage": {},
-            "memory.desktop": {},
-            "start_with_url.warm.startup_pages": {},
-            "wasm": {},
-            "dummy_benchmark.histogram_benchmark_1": {},
-            "speedometer": {},
             "memory.long_running_idle_gmail_tbmv2": {},
+            "memory.top_10_mobile": {},
             "octane": {},
-            "dummy_benchmark.noisy_benchmark_1": {},
-            "blink_perf.svg": {},
-            "system_health.webview_startup": {},
-            "v8.browsing_mobile": {
-                "end": 11
+            "oortonline_tbmv2": {},
+            "power.desktop": {},
+            "power.typical_10_mobile": {},
+            "rasterize_and_record_micro.partial_invalidation": {},
+            "rasterize_and_record_micro.top_25": {},
+            "rendering.desktop": {},
+            "rendering.mobile": {
+                "end": 136
             }
         }
     },
     "3": {
         "benchmarks": {
-            "v8.browsing_mobile": {
-                "begin": 11
-            },
-            "jetstream": {},
-            "smoothness.tough_pinch_zoom_cases": {},
-            "speedometer2-future": {},
-            "power.typical_10_mobile": {},
-            "v8.runtime_stats.top_25": {},
-            "loading.mobile": {
-                "end": 28
+            "rendering.mobile": {
+                "begin": 136,
+                "end": 407
             }
         }
     },
     "4": {
         "benchmarks": {
-            "loading.mobile": {
-                "begin": 28,
-                "end": 93
+            "rendering.mobile": {
+                "begin": 407
+            },
+            "smoothness.gpu_rasterization.tough_pinch_zoom_cases": {},
+            "smoothness.tough_pinch_zoom_cases": {},
+            "speedometer": {},
+            "speedometer-future": {},
+            "speedometer2": {},
+            "speedometer2-future": {},
+            "startup.mobile": {},
+            "system_health.common_desktop": {},
+            "system_health.common_mobile": {},
+            "system_health.memory_desktop": {},
+            "system_health.memory_mobile": {
+                "end": 15
             }
         }
     },
     "5": {
         "benchmarks": {
-            "loading.mobile": {
-                "begin": 93
+            "system_health.memory_mobile": {
+                "begin": 15
             },
-            "speedometer2": {},
-            "v8.browsing_desktop-future": {},
-            "webrtc": {},
-            "blink_perf.shadow_dom": {},
-            "blink_perf.events": {},
-            "blink_perf.layout": {},
-            "memory.long_running_idle_gmail_background_tbmv2": {},
+            "system_health.webview_startup": {},
             "tab_switching.typical_25": {},
-            "blink_perf.dom": {},
-            "media.mobile": {},
-            "start_with_url.cold.startup_pages": {},
-            "blink_perf.bindings": {},
-            "system_health.memory_desktop": {},
-            "media.desktop": {},
-            "smoothness.gpu_rasterization.tough_pinch_zoom_cases": {},
-            "rasterize_and_record_micro.partial_invalidation": {},
+            "tracing.tracing_with_background_memory_infra": {},
             "v8.browsing_desktop": {},
-            "blink_perf.parser": {},
-            "memory.top_10_mobile": {},
-            "blink_perf.canvas": {},
-            "loading.desktop": {},
-            "dromaeo": {},
-            "kraken": {},
-            "oortonline_tbmv2": {},
-            "system_health.common_desktop": {},
-            "rasterize_and_record_micro.top_25": {},
-            "dummy_benchmark.stable_benchmark_1": {},
-            "system_health.memory_mobile": {
-                "end": 7
+            "v8.browsing_desktop-future": {},
+            "v8.browsing_mobile": {
+                "end": 13
             }
         }
     },
     "6": {
         "benchmarks": {
-            "system_health.memory_mobile": {
-                "begin": 7
+            "v8.browsing_mobile": {
+                "begin": 13
             },
-            "rendering.desktop": {},
-            "blink_perf.css": {},
-            "blink_perf.paint": {},
-            "tracing.tracing_with_background_memory_infra": {}
+            "v8.browsing_mobile-future": {},
+            "v8.runtime_stats.top_25": {},
+            "wasm": {},
+            "webrtc": {}
         }
     },
     "extra_infos": {
-        "num_stories": 1985,
-        "predicted_min_shard_time": 16140.0,
-        "predicted_min_shard_index": 4,
-        "predicted_max_shard_time": 16848.0,
-        "predicted_max_shard_index": 5
+        "num_stories": 2007,
+        "predicted_min_shard_time": 17464.0,
+        "predicted_min_shard_index": 2,
+        "predicted_max_shard_time": 18022.0,
+        "predicted_max_shard_index": 1,
+        "shard #0": 17690.0,
+        "shard #1": 18022.0,
+        "shard #2": 17464.0,
+        "shard #3": 17756.0,
+        "shard #4": 17544.0,
+        "shard #5": 17946.0,
+        "shard #6": 17644.0
     }
 }
\ No newline at end of file

tools/perf/core/shard_maps/android_pixel2_webview_shard_map.json → tools/perf/core/shard_maps/android-pixel2_webview-perf_map.json

 {
     "0": {
         "benchmarks": {
-            "system_health.common_mobile": {},
-            "v8.browsing_mobile-future": {},
-            "rendering.mobile": {
-                "end": 83
+            "blink_perf.accessibility": {},
+            "blink_perf.bindings": {},
+            "blink_perf.canvas": {},
+            "blink_perf.css": {},
+            "blink_perf.dom": {},
+            "blink_perf.events": {},
+            "blink_perf.image_decoder": {},
+            "blink_perf.layout": {},
+            "blink_perf.owp_storage": {},
+            "blink_perf.paint": {},
+            "blink_perf.parser": {},
+            "blink_perf.shadow_dom": {},
+            "blink_perf.svg": {},
+            "dromaeo": {},
+            "dummy_benchmark.noisy_benchmark_1": {},
+            "dummy_benchmark.stable_benchmark_1": {},
+            "jetstream": {},
+            "kraken": {},
+            "loading.desktop": {},
+            "loading.mobile": {},
+            "media.desktop": {},
+            "media.mobile": {},
+            "memory.desktop": {},
+            "memory.long_running_idle_gmail_background_tbmv2": {},
+            "memory.long_running_idle_gmail_tbmv2": {},
+            "memory.top_10_mobile": {
+                "end": 2
             }
         }
     },
     "1": {
         "benchmarks": {
+            "memory.top_10_mobile": {
+                "begin": 2
+            },
+            "octane": {},
+            "oortonline_tbmv2": {},
+            "power.desktop": {},
+            "power.typical_10_mobile": {},
+            "rasterize_and_record_micro.partial_invalidation": {},
+            "rasterize_and_record_micro.top_25": {},
+            "rendering.desktop": {},
             "rendering.mobile": {
-                "begin": 83,
-                "end": 389
+                "end": 67
             }
         }
     },
     "2": {
         "benchmarks": {
             "rendering.mobile": {
-                "begin": 389
-            },
-            "blink_perf.image_decoder": {},
-            "power.desktop": {},
-            "speedometer-future": {},
-            "blink_perf.owp_storage": {},
-            "memory.desktop": {},
-            "start_with_url.warm.startup_pages": {},
-            "wasm": {},
-            "dummy_benchmark.histogram_benchmark_1": {},
-            "speedometer": {},
-            "memory.long_running_idle_gmail_tbmv2": {},
-            "octane": {},
-            "dummy_benchmark.noisy_benchmark_1": {},
-            "blink_perf.svg": {},
-            "system_health.webview_startup": {},
-            "v8.browsing_mobile": {
-                "end": 11
+                "begin": 67,
+                "end": 265
             }
         }
     },
     "3": {
         "benchmarks": {
-            "v8.browsing_mobile": {
-                "begin": 11
+            "rendering.mobile": {
+                "begin": 265
             },
-            "jetstream": {},
+            "smoothness.gpu_rasterization.tough_pinch_zoom_cases": {},
             "smoothness.tough_pinch_zoom_cases": {},
+            "speedometer": {},
+            "speedometer-future": {},
+            "speedometer2": {},
             "speedometer2-future": {},
-            "power.typical_10_mobile": {},
-            "v8.runtime_stats.top_25": {},
-            "loading.mobile": {
-                "end": 28
+            "startup.mobile": {},
+            "system_health.common_desktop": {},
+            "system_health.common_mobile": {},
+            "system_health.memory_desktop": {
+                "end": 56
             }
         }
     },
     "4": {
         "benchmarks": {
-            "loading.mobile": {
-                "begin": 28,
-                "end": 93
+            "system_health.memory_desktop": {
+                "begin": 56
+            },
+            "system_health.memory_mobile": {
+                "end": 52
             }
         }
     },
     "5": {
         "benchmarks": {
-            "loading.mobile": {
-                "begin": 93
+            "system_health.memory_mobile": {
+                "begin": 52
             },
-            "speedometer2": {},
-            "v8.browsing_desktop-future": {},
-            "webrtc": {},
-            "blink_perf.shadow_dom": {},
-            "blink_perf.events": {},
-            "blink_perf.layout": {},
-            "memory.long_running_idle_gmail_background_tbmv2": {},
+            "system_health.webview_startup": {},
             "tab_switching.typical_25": {},
-            "blink_perf.dom": {},
-            "media.mobile": {},
-            "start_with_url.cold.startup_pages": {},
-            "blink_perf.bindings": {},
-            "system_health.memory_desktop": {},
-            "media.desktop": {},
-            "smoothness.gpu_rasterization.tough_pinch_zoom_cases": {},
-            "rasterize_and_record_micro.partial_invalidation": {},
+            "tracing.tracing_with_background_memory_infra": {},
             "v8.browsing_desktop": {},
-            "blink_perf.parser": {},
-            "memory.top_10_mobile": {},
-            "blink_perf.canvas": {},
-            "loading.desktop": {},
-            "dromaeo": {},
-            "kraken": {},
-            "oortonline_tbmv2": {},
-            "system_health.common_desktop": {},
-            "rasterize_and_record_micro.top_25": {},
-            "dummy_benchmark.stable_benchmark_1": {},
-            "system_health.memory_mobile": {
-                "end": 7
+            "v8.browsing_desktop-future": {},
+            "v8.browsing_mobile": {
+                "end": 21
             }
         }
     },
     "6": {
         "benchmarks": {
-            "system_health.memory_mobile": {
-                "begin": 7
+            "v8.browsing_mobile": {
+                "begin": 21
             },
-            "rendering.desktop": {},
-            "blink_perf.css": {},
-            "blink_perf.paint": {},
-            "tracing.tracing_with_background_memory_infra": {}
+            "v8.browsing_mobile-future": {},
+            "v8.runtime_stats.top_25": {},
+            "wasm": {},
+            "webrtc": {}
         }
     },
     "extra_infos": {
-        "num_stories": 1985,
-        "predicted_min_shard_time": 16140.0,
-        "predicted_min_shard_index": 4,
-        "predicted_max_shard_time": 16848.0,
-        "predicted_max_shard_index": 5
+        "num_stories": 2007,
+        "predicted_min_shard_time": 10556.0,
+        "predicted_min_shard_index": 6,
+        "predicted_max_shard_time": 10600.0,
+        "predicted_max_shard_index": 1,
+        "shard #0": 10586.0,
+        "shard #1": 10600.0,
+        "shard #2": 10576.0,
+        "shard #3": 10562.0,
+        "shard #4": 10596.0,
+        "shard #5": 10588.0,
+        "shard #6": 10556.0
     }
 }
\ No newline at end of file

tools/perf/core/shard_maps/android_nexus5x_fyi_4_shard_map.json

-{
-  "0": {
-    "benchmarks": {
-      "heap_profiling.mobile.disabled": {}
-    }
-  },
-  "1": {
-    "benchmarks": {
-      "heap_profiling.mobile.native": {}
-    }
-  },
-  "2": {
-    "benchmarks": {
-      "heap_profiling.mobile.pseudo": {},
-      "smoothness.oop_rasterization.top_25_smooth": {}
-    }
-  },
-  "3": {
-    "benchmarks": {
-      "thread_times.oop_rasterization.key_mobile": {},
-      "rendering.oopd.mobile": {}
-    }
-  }
-}

tools/perf/core/shard_maps/timing_data/android-nexus5x-perf-fyi_timing.json

+[
+    {
+        "duration": "68.0",
+        "name": "heap_profiling.mobile.disabled/load:news:cnn"
+    },
+    {
+        "duration": "49.0",
+        "name": "heap_profiling.mobile.disabled/load:search:google"
+    },
+    {
+        "duration": "34.0",
+        "name": "heap_profiling.mobile.disabled/load:social:twitter"
+    },
+    {
+        "duration": "72.0",
+        "name": "heap_profiling.mobile.native/load:news:cnn"
+    },
+    {
+        "duration": "47.0",
+        "name": "heap_profiling.mobile.native/load:search:google"
+    },
+    {
+        "duration": "33.0",
+        "name": "heap_profiling.mobile.native/load:social:twitter"
+    }
+]
\ No newline at end of file

tools/perf/generate_perf_sharding

@@ -22,14 +22,17 @@ def GetParser():
   parser_update = subparsers.add_parser('update')
   parser_update.add_argument(
       '--regenerate-timing-data', '-r', action='store_true',
-      help=('Whether to regenerate timing data for all builders in '
-            'chromium.perf'), default=False)
+      help=('Whether to regenerate timing data for builders in '
+            'chromium.perf & chromium.perf.fyi waterfall'), default=False)
   parser_update.add_argument(
       '--builders', '-b', action='store', nargs='*',
-      help=('The builder names to reshard. If not specified, use all '
-            'perf builders'),
-      choices=bot_platforms.ALL_PLATFORM_NAMES,
-      default=bot_platforms.ALL_PLATFORM_NAMES)
+      help=('The builder names to reshard.'),
+      default=[],
+      choices=bot_platforms.ALL_PLATFORM_NAMES)
+  parser_update.add_argument(
+      '--waterfall', '-w', choices=['perf', 'perf-fyi', 'all'], default=None,
+      help=('The name of waterfall whose builders to be resharded. If not '
+            'specified, use all perf builders by default'))
   parser.add_argument(
       '--debug', action='store_true',
       help=('Whether to include detailed debug info of the sharding map in the'
@@ -115,7 +118,16 @@ def _GenerateShardMap(
 
 
 def _UpdateShardsForBuilders(args):
-  builders = {b for b in bot_platforms.ALL_PLATFORMS if b.name in args.builders}
+  if args.builders:
+    builders = {b for b in bot_platforms.ALL_PLATFORMS if b.name in
+                args.builders}
+  elif args.waterfall == 'perf':
+    builders = bot_platforms.ALL_PERF_PLATFORMS
+  elif args.waterfall == 'perf-fyi':
+    builders = bot_platforms.ALL_PERF_FYI_PLATFORMS
+  else:
+    builders = bot_platforms.ALL_PLATFORMS
+
   if args.regenerate_timing_data:
     print 'Update shards timing data. May take a while...'
     load_timing_args = []
@@ -153,6 +165,10 @@ def _CreateShardMapForBenchmark(args):
 def main():
   parser = GetParser()
   options = parser.parse_args()
+  if options.builders and options.waterfall:
+    parser.error('Cannot specify both --builders and --waterfall '
+                 'at the same time')
+
   options.func(options)
 
 if __name__ == '__main__':