[Benchmarking] Remove NON_WATERFALL_BENCHMARKS

These were not used for anything other than listing these in
benchmarks.csv.

Furthermore, the names of benchmarks do not match names of test suites
actively uploading data to perf dashboard.

Bug: 1020510
Change-Id: Ib17c4c4fc413a95aefb3003520304482b01109c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1897657Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713416}

docs/speed/benchmark/benchmark_ownership.md

@@ -34,7 +34,7 @@ There can be multiple owners of a benchmark, for example if there are multiple t
 
 ### C++ Perf Benchmarks
 1. Open [`src/tools/perf/core/perf_data_generator.py`](https://cs.chromium.org/chromium/src/tools/perf/core/perf_data_generator.py).
-1. Find the BenchmarkMetadata for the benchmark. It will be in a dictionary named `NON_TELEMETRY_BENCHMARKS` or `NON_WATERFALL_BENCHMARKS`.
+1. Find the BenchmarkMetadata for the benchmark. It will be in a dictionary named `GTEST_BENCHMARKS`.
 1. Update the email (first field of `BenchmarkMetadata`).
 1. Run `tools/perf/generate_perf_data` to update `tools/perf/benchmark.csv`.
 1. Upload `perf_data_generator.py` and `benchmark.csv` to a CL for review. Please add any previous owners to the review.

tools/perf/benchmark.csv

@@ -50,15 +50,11 @@ resource_sizes_monochrome_minimal_apks,"agrieve@chromium.org, jbudorick@chromium
 resource_sizes_monochrome_public_minimal_apks,"agrieve@chromium.org, jbudorick@chromium.org, perezju@chromium.org",Build,https://chromium.googlesource.com/chromium/src/+/HEAD/tools/binary_size/README.md#resource_sizes_py,
 resource_sizes_system_webview_apk,"agrieve@chromium.org, jbudorick@chromium.org, perezju@chromium.org",Build,https://chromium.googlesource.com/chromium/src/+/HEAD/tools/binary_size/README.md#resource_sizes_py,
 resource_sizes_system_webview_google_apk,"agrieve@chromium.org, jbudorick@chromium.org, perezju@chromium.org",Build,https://chromium.googlesource.com/chromium/src/+/HEAD/tools/binary_size/README.md#resource_sizes_py,
-sizes (linux),thestig@chromium.org,thomasanderson@chromium.org,Internals>PlatformIntegration,
-sizes (mac),tapted@chromium.org,,,
-sizes (win),grt@chromium.org,Internals>PlatformIntegration,,
 speedometer,hablich@chromium.org,Blink,,
 speedometer-future,hablich@chromium.org,Blink,,
 speedometer2,hablich@chromium.org,Blink,,
 speedometer2-future,hablich@chromium.org,Blink,,
 startup.mobile,"pasko@chromium.org, chrome-android-perf-status@chromium.org",Speed>Metrics>SystemHealthRegressions,,
-supersize_archive,agrieve@chromium.org,,,
 system_health.common_desktop,"charliea@chromium.org, sullivan@chromium.org, tdresser@chromium.org, chrome-speed-metrics-dev@chromium.org",Speed>Metrics>SystemHealthRegressions,https://bit.ly/system-health-benchmarks,"2016,2018,2019,accessibility,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy,keyboard_input,scroll,tabs_switching,webgl"
 system_health.common_mobile,"charliea@chromium.org, sullivan@chromium.org, tdresser@chromium.org, perezju@chromium.org, chrome-speed-metrics-dev@chromium.org",Speed>Metrics>SystemHealthRegressions,https://bit.ly/system-health-benchmarks,"2016,2018,2019,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy"
 system_health.memory_desktop,perezju@chromium.org,,https://bit.ly/system-health-benchmarks,"2016,2018,2019,accessibility,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy,keyboard_input,scroll,tabs_switching,webgl"

tools/perf/core/perf_data_generator.py

@@ -912,26 +912,9 @@ OTHER_BENCHMARKS = {
 }
 
 
-# If you change this dictionary, run tools/perf/generate_perf_data
-NON_WATERFALL_BENCHMARKS = {
-    'sizes (mac)':
-        BenchmarkMetadata('tapted@chromium.org'),
-    'sizes (win)': BenchmarkMetadata('grt@chromium.org',
-                                     'Internals>PlatformIntegration'),
-    'sizes (linux)': BenchmarkMetadata(
-        'thestig@chromium.org', 'thomasanderson@chromium.org',
-        'Internals>PlatformIntegration'),
-    'supersize_archive': BenchmarkMetadata('agrieve@chromium.org'),
-}
-
 # Valid test suite (benchmark) names should match this regex.
 RE_VALID_TEST_SUITE_NAME = r'^[\w._-]+$'
 
-# Do not add names to this list. TODO(crbug.com/1020510): Rename these so all
-# test suites match the regex above.
-BAD_TEST_SUITE_NAMES = frozenset(
-    ['sizes (mac)', 'sizes (win)', 'sizes (linux)'])
-
 
 def _get_telemetry_perf_benchmarks_metadata():
   metadata = {}
@@ -1041,14 +1024,12 @@ def update_benchmark_csv(file_path):
 
   csv_data = []
   benchmark_metadatas = merge_dicts(
-      GTEST_BENCHMARKS, OTHER_BENCHMARKS, TELEMETRY_PERF_BENCHMARKS,
-      NON_WATERFALL_BENCHMARKS)
+      GTEST_BENCHMARKS, OTHER_BENCHMARKS, TELEMETRY_PERF_BENCHMARKS)
   _verify_benchmark_owners(benchmark_metadatas)
 
   undocumented_benchmarks = set()
   for benchmark_name in benchmark_metadatas:
-    if (not re.match(RE_VALID_TEST_SUITE_NAME, benchmark_name) and
-        benchmark_name not in BAD_TEST_SUITE_NAMES):
+    if not re.match(RE_VALID_TEST_SUITE_NAME, benchmark_name):
       raise ValueError('Invalid benchmark name: %s' % benchmark_name)
     if not benchmark_metadatas[benchmark_name].documentation_url:
       undocumented_benchmarks.add(benchmark_name)

tools/perf/core/undocumented_benchmarks.py

@@ -21,14 +21,11 @@ UNDOCUMENTED_BENCHMARKS = {
   'octane',
   'passthrough_command_buffer_perftests',
   'performance_browser_tests',
-  'sizes (mac)',
-  'sizes (win)',
   'speedometer',
   'speedometer-future',
   'speedometer2',
   'speedometer2-future',
   'startup.mobile',
-  'supersize_archive',
   'system_health.webview_startup',
   'tab_switching.typical_25',
   'tracing.tracing_with_background_memory_infra',