[Benchmarking] Revert windows gtests to not use shard maps.

The gtests aren't working on the windows bots for
some reason. The hotfix I tried didn't work.
This is a partial revert of
https://chromium-review.googlesource.com/c/chromium/src/+/1985134
and
https://chromium-review.googlesource.com/c/chromium/src/+/1986118

TBR=bsheedy@chromium.org

Bug: 1039019
Change-Id: I1a7bf86bd1b563f46b4a19970e89ae0f89f2c98e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986342Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728382}

tools/perf/benchmark_schedules.csv

@@ -17,7 +17,6 @@ v8.browsing_desktop-future,2.63,7,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-pe
 rasterize_and_record_micro.top_25,2.55,12,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.bindings,2.40,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.parser,1.69,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
-angle_perftests,1.66,3,0,"Win 7 Nvidia GPU Perf, android-pixel2-perf, win-10-perf",
 blink_perf.canvas,1.43,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.css,1.08,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 webrtc,1.01,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
@@ -30,6 +29,7 @@ media.desktop,0.67,6,0,"Win 7 Nvidia GPU Perf, linux-perf, mac-10_12_laptop_low_
 speedometer2-future,0.66,12,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.dom,0.64,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 dromaeo,0.57,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
+angle_perftests,0.55,1,0,android-pixel2-perf,
 blink_perf.svg,0.54,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.events,0.53,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 speedometer2,0.48,14,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-go-perf, android-go_webview-perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
@@ -45,19 +45,12 @@ kraken,0.22,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nex
 octane,0.21,12,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 blink_perf.accessibility,0.18,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 speedometer-future,0.11,11,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf",
-components_perftests,0.09,3,0,"Android Nexus5 Perf, Win 7 Perf, win-10-perf",
-dawn_perf_tests,0.07,1,0,win-10-perf,
-base_perftests,0.07,1,0,win-10-perf,
 rasterize_and_record_micro.partial_invalidation,0.05,12,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 dummy_benchmark.stable_benchmark_1,0.03,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
 dummy_benchmark.noisy_benchmark_1,0.03,13,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, Win 7 Nvidia GPU Perf, Win 7 Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",
+components_perftests,0.03,1,0,Android Nexus5 Perf,
 system_health.webview_startup,0.03,4,0,"Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, android-go_webview-perf, android-pixel2_webview-perf",
 gpu_perftests,0.02,1,0,Android Nexus5 Perf,
 tracing_perftests,0.01,1,0,Android Nexus5 Perf,
-media_perftests,0.01,3,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, win-10-perf",
-passthrough_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf,
-validating_command_buffer_perftests,0.01,1,0,Win 7 Nvidia GPU Perf,
-views_perftests,0.00,1,0,win-10-perf,
-load_library_perf_tests,0.00,2,0,"Win 7 Nvidia GPU Perf, Win 7 Perf",
 v8.browsing_mobile-future,0.00,6,0,"Android Nexus5 Perf, Android Nexus5X WebView Perf, Android Nexus6 WebView Perf, android-nexus5x-perf, android-pixel2-perf, android-pixel2_webview-perf",
 tab_switching.typical_25,0.00,7,0,"Win 7 Nvidia GPU Perf, Win 7 Perf, linux-perf, mac-10_12_laptop_low_end-perf, mac-10_13_laptop_high_end-perf, win-10-perf, win-10_laptop_low_end-perf",

tools/perf/core/bot_platforms.py

@@ -359,13 +359,13 @@ 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', _WIN_10_BENCHMARK_CONFIGS,
-    26, 'win', executables=_WIN_10_EXECUTABLE_CONFIGS)
+    26, 'win')#, executables=_WIN_10_EXECUTABLE_CONFIGS) crbug.com/1039019
 WIN_7 = PerfPlatform(
     'Win 7 Perf', 'N/A', _WIN_7_BENCHMARK_CONFIGS,
-    4, 'win', executables=_WIN_7_EXECUTABLE_CONFIGS)
+    4, 'win')#, executables=_WIN_7_EXECUTABLE_CONFIGS) crbug.com/1039019
 WIN_7_GPU = PerfPlatform(
     'Win 7 Nvidia GPU Perf', 'N/A', _WIN_7_GPU_BENCHMARK_CONFIGS,
-    4, 'win', executables=_WIN_7_GPU_EXECUTABLE_CONFIGS)
+    4, 'win')#, executables=_WIN_7_GPU_EXECUTABLE_CONFIGS) crbug.com/1039019
 
 # Android
 ANDROID_GO = PerfPlatform(

tools/perf/core/perf_data_generator.py

@@ -545,6 +545,44 @@ BUILDERS = {
             '--assert-gpu-compositing',
         ],
       },
+      # TODO(crbug.com/1039019): Remove all of the following gtests and enable
+      # as part of the shard maps.
+      {
+        'isolate': 'angle_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+        'extra_args': [
+            '--shard-timeout=300'
+        ],
+      },
+      {
+        'isolate': 'media_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'components_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'views_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'base_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'dawn_perf_tests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+        'extra_args': [
+            '--shard-timeout=300'
+        ],
+      },
     ],
     'platform': 'win',
     'target_bits': 64,
@@ -564,6 +602,23 @@ BUILDERS = {
       {
         'isolate': 'performance_test_suite',
       },
+      # TODO(crbug.com/1039019): Remove all of the following gtests and enable
+      # as part of the shard maps.
+      {
+        'isolate': 'load_library_perf_tests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'components_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'media_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      }
     ],
     'platform': 'win',
     'target_bits': 32,
@@ -582,6 +637,43 @@ BUILDERS = {
             '--assert-gpu-compositing',
         ],
       },
+      # TODO(crbug.com/1039019): Remove all of the following gtests and enable
+      # as part of the shard maps.
+      {
+        'isolate': 'load_library_perf_tests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'angle_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'isolate': 'media_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
+      {
+        'name': 'passthrough_command_buffer_perftests',
+        'isolate': 'command_buffer_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+        'extra_args': [
+            '--use-cmd-decoder=passthrough',
+            '--use-angle=gl-null',
+        ],
+      },
+      {
+        'name': 'validating_command_buffer_perftests',
+        'isolate': 'command_buffer_perftests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+        'extra_args': [
+            '--use-cmd-decoder=validating',
+            '--use-stub',
+        ],
+      },
     ],
     'platform': 'win',
     'target_bits': 64,

tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json

@@ -4662,29 +4662,5 @@
     {
         "duration": "52.0",
         "name": "webrtc/pause_play_peerconnections"
-    },
-    {
-        "duration": "16.0",
-        "name": "media_perftests/_gtest_"
-    },
-    {
-        "duration": "7.0",
-        "name": "views_perftests/_gtest_"
-    },
-    {
-        "duration": "270.0",
-        "name": "base_perftests/_gtest_"
-    },
-    {
-        "duration": "270.0",
-        "name": "dawn_perf_tests/_gtest_"
-    },
-    {
-        "duration": "1988.0",
-        "name": "angle_perftests/_gtest_"
-    },
-    {
-        "duration": "110.0",
-        "name": "components_perftests/_gtest_"
     }
 ]
\ No newline at end of file

tools/perf/core/shard_maps/timing_data/win_7_nvidia_gpu_perf_timing.json

@@ -4658,25 +4658,5 @@
     {
         "duration": "41.0",
         "name": "webrtc/pause_play_peerconnections"
-    },
-    {
-        "duration": "30.0",
-        "name": "passthrough_command_buffer_perftests/_gtest_"
-    },
-    {
-        "duration": "1988.0",
-        "name": "angle_perftests/_gtest_"
-    },
-    {
-        "duration": "16.0",
-        "name": "media_perftests/_gtest_"
-    },
-    {
-        "duration": "3.0",
-        "name": "load_library_perf_tests/_gtest_"
-    },
-    {
-        "duration": "23.0",
-        "name": "validating_command_buffer_perftests/_gtest_"
     }
 ]
\ No newline at end of file

tools/perf/core/shard_maps/timing_data/win_7_perf_timing.json

@@ -3122,17 +3122,5 @@
     {
         "duration": "45.0",
         "name": "webrtc/pause_play_peerconnections"
-    },
-    {
-        "duration": "110.0",
-        "name": "components_perftests/_gtest_"
-    },
-    {
-        "duration": "16.0",
-        "name": "media_perftests/_gtest_"
-    },
-    {
-        "duration": "3.0",
-        "name": "load_library_perf_tests/_gtest_"
     }
 ]
\ No newline at end of file

tools/perf/core/shard_maps/win-10-perf_map.json

 {
     "0": {
-        "executables": {
-            "angle_perftests": {
-                "path": "angle_perftests",
-                "arguments": [
-                    "--test-launcher-retry-limit=0",
-                    "--test-launcher-jobs=1"
-                ]
+        "benchmarks": {
+            "dummy_benchmark.noisy_benchmark_1": {
+                "abridged": false
             }
         }
     },
@@ -19,15 +15,6 @@
                 "end": 27,
                 "abridged": false
             }
-        },
-        "executables": {
-            "base_perftests": {
-                "path": "base_perftests",
-                "arguments": [
-                    "--test-launcher-jobs=1",
-                    "--test-launcher-retry-limit=0"
-                ]
-            }
         }
     },
     "2": {
@@ -90,9 +77,6 @@
             "dromaeo": {
                 "abridged": false
             },
-            "dummy_benchmark.noisy_benchmark_1": {
-                "abridged": false
-            },
             "dummy_benchmark.stable_benchmark_1": {
                 "abridged": false
             },
@@ -109,21 +93,6 @@
                 "end": 12,
                 "abridged": false
             }
-        },
-        "executables": {
-            "components_perftests": {
-                "path": "components_perftests",
-                "arguments": [
-                    "--xvfb"
-                ]
-            },
-            "dawn_perf_tests": {
-                "path": "dawn_perf_tests",
-                "arguments": [
-                    "--test-launcher-jobs=1",
-                    "--test-launcher-retry-limit=0"
-                ]
-            }
         }
     },
     "5": {
@@ -157,16 +126,6 @@
                 "end": 4,
                 "abridged": false
             }
-        },
-        "executables": {
-            "media_perftests": {
-                "path": "media_perftests",
-                "arguments": [
-                    "--single-process-tests",
-                    "--test-launcher-retry-limit=0",
-                    "--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned"
-                ]
-            }
         }
     },
     "8": {
@@ -369,14 +328,6 @@
             "webrtc": {
                 "abridged": false
             }
-        },
-        "executables": {
-            "views_perftests": {
-                "path": "views_perftests",
-                "arguments": [
-                    "--xvfb"
-                ]
-            }
         }
     },
     "extra_infos": {

tools/perf/core/shard_maps/win_7_nvidia_gpu_perf_map.json

@@ -59,18 +59,6 @@
                 "end": 86,
                 "abridged": false
             }
-        },
-        "executables": {
-            "angle_perftests": {
-                "path": "angle_perftests",
-                "arguments": [
-                    "--test-launcher-retry-limit=0",
-                    "--test-launcher-jobs=1"
-                ]
-            },
-            "load_library_perf_tests": {
-                "path": "load_library_perf_tests"
-            }
         }
     },
     "1": {
@@ -116,23 +104,6 @@
                 "end": 5,
                 "abridged": false
             }
-        },
-        "executables": {
-            "media_perftests": {
-                "path": "media_perftests",
-                "arguments": [
-                    "--single-process-tests",
-                    "--test-launcher-retry-limit=0",
-                    "--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned"
-                ]
-            },
-            "passthrough_command_buffer_perftests": {
-                "path": "command_buffer_perftests",
-                "arguments": [
-                    "--use-cmd-decoder=passthrough",
-                    "--use-angle=gl-null"
-                ]
-            }
         }
     },
     "2": {
@@ -171,15 +142,6 @@
             "webrtc": {
                 "abridged": false
             }
-        },
-        "executables": {
-            "validating_command_buffer_perftests": {
-                "path": "command_buffer_perftests",
-                "arguments": [
-                    "--use-cmd-decoder=validating",
-                    "--use-stub"
-                ]
-            }
         }
     },
     "extra_infos": {

tools/perf/core/shard_maps/win_7_perf_map.json

@@ -59,17 +59,6 @@
                 "end": 77,
                 "abridged": false
             }
-        },
-        "executables": {
-            "components_perftests": {
-                "path": "components_perftests",
-                "arguments": [
-                    "--xvfb"
-                ]
-            },
-            "load_library_perf_tests": {
-                "path": "load_library_perf_tests"
-            }
         }
     },
     "1": {
@@ -115,16 +104,6 @@
                 "end": 39,
                 "abridged": false
             }
-        },
-        "executables": {
-            "media_perftests": {
-                "path": "media_perftests",
-                "arguments": [
-                    "--single-process-tests",
-                    "--test-launcher-retry-limit=0",
-                    "--isolated-script-test-filter=*::-*_unoptimized::*_unaligned::*unoptimized_aligned"
-                ]
-            }
         }
     },
     "2": {

tools/perf/cycletime_contributions.csv

@@ -2,9 +2,8 @@ AUTOGENERATED FILE DO NOT EDIT
 View a prettier version of this at,https://docs.google.com/spreadsheets/d/15pJY4cxtM2NVNFKQDgDnoT5PLo0Nm5Td-Ov-5PZefAw
 platform,Android Nexus5 Perf,Android Nexus5X WebView Perf,Android Nexus6 WebView Perf,Win 7 Nvidia GPU Perf,Win 7 Perf,android-go-perf,android-go_webview-perf,android-nexus5x-perf,android-pixel2-perf,android-pixel2_weblayer-perf,android-pixel2_webview-perf,linux-perf,mac-10_12_laptop_low_end-perf,mac-10_13_laptop_high_end-perf,win-10-perf,win-10_laptop_low_end-perf
 shards,16,16,12,4,4,19,13,10,35,4,21,26,26,26,26,26
-idealized cycle time (hours),2.24,0.56,0.76,3.45,2.45,0.70,0.26,1.37,0.60,0.15,0.34,0.39,0.43,0.33,0.55,0.70
-angle_perftests,0.000,0.000,0.000,0.276,0.000,0.000,0.000,0.000,0.032,0.000,0.000,0.000,0.000,0.000,0.042,0.000
-base_perftests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.006,0.000
+idealized cycle time (hours),2.24,0.56,0.76,3.17,2.43,0.70,0.26,1.37,0.60,0.15,0.34,0.39,0.43,0.33,0.50,0.70
+angle_perftests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.032,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 blink_perf.accessibility,0.003,0.001,0.001,0.005,0.006,0.000,0.000,0.003,0.001,0.000,0.001,0.001,0.001,0.001,0.001,0.001
 blink_perf.bindings,0.052,0.014,0.029,0.052,0.061,0.000,0.000,0.050,0.013,0.000,0.009,0.006,0.009,0.007,0.008,0.011
 blink_perf.canvas,0.036,0.000,0.012,0.067,0.020,0.000,0.000,0.000,0.010,0.000,0.005,0.006,0.010,0.008,0.008,0.010
@@ -19,8 +18,7 @@ blink_perf.paint,0.000,0.000,0.000,0.032,0.040,0.000,0.000,0.000,0.006,0.000,0.0
 blink_perf.parser,0.042,0.011,0.017,0.034,0.039,0.000,0.000,0.043,0.008,0.000,0.006,0.004,0.006,0.005,0.005,0.006
 blink_perf.shadow_dom,0.037,0.000,0.011,0.020,0.024,0.000,0.000,0.000,0.008,0.000,0.004,0.001,0.003,0.002,0.004,0.004
 blink_perf.svg,0.016,0.002,0.006,0.010,0.012,0.000,0.000,0.011,0.004,0.000,0.002,0.001,0.001,0.001,0.002,0.002
-components_perftests,0.004,0.000,0.000,0.000,0.015,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.002,0.000
-dawn_perf_tests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.006,0.000
+components_perftests,0.004,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 dromaeo,0.007,0.003,0.004,0.020,0.020,0.000,0.000,0.010,0.003,0.000,0.002,0.002,0.003,0.003,0.003,0.003
 dummy_benchmark.noisy_benchmark_1,0.001,0.000,0.000,0.000,0.001,0.000,0.000,0.001,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 dummy_benchmark.stable_benchmark_1,0.001,0.001,0.000,0.000,0.001,0.000,0.000,0.001,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
@@ -28,15 +26,12 @@ gpu_perftests,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,
 jetstream,0.000,0.000,0.000,0.024,0.027,0.000,0.000,0.000,0.000,0.000,0.000,0.004,0.004,0.004,0.004,0.005
 jetstream2,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.008,0.000,0.000,0.003,0.000,0.004,0.003,0.007
 kraken,0.006,0.002,0.002,0.003,0.004,0.000,0.000,0.006,0.001,0.000,0.001,0.000,0.001,0.001,0.001,0.001
-load_library_perf_tests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 loading.desktop,0.000,0.000,0.000,0.218,0.172,0.000,0.000,0.000,0.000,0.000,0.000,0.022,0.037,0.023,0.034,0.056
 loading.mobile,0.094,0.021,0.029,0.000,0.000,0.000,0.000,0.085,0.026,0.000,0.014,0.000,0.000,0.000,0.000,0.000
 media.desktop,0.000,0.000,0.000,0.055,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.007,0.009,0.007,0.009,0.012
 media.mobile,0.025,0.000,0.000,0.000,0.000,0.000,0.000,0.027,0.006,0.000,0.000,0.000,0.000,0.000,0.000,0.000
-media_perftests,0.000,0.000,0.000,0.002,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 memory.desktop,0.000,0.000,0.000,0.031,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.003,0.004,0.003,0.005,0.005
 octane,0.005,0.001,0.002,0.005,0.000,0.000,0.000,0.005,0.001,0.000,0.001,0.001,0.001,0.001,0.001,0.001
-passthrough_command_buffer_perftests,0.000,0.000,0.000,0.004,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 power.desktop,0.000,0.000,0.000,0.076,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.012,0.013,0.011,0.013,0.016
 rasterize_and_record_micro.partial_invalidation,0.001,0.000,0.001,0.001,0.000,0.000,0.000,0.002,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 rasterize_and_record_micro.top_25,0.049,0.016,0.025,0.083,0.000,0.000,0.000,0.056,0.013,0.000,0.010,0.008,0.009,0.009,0.013,0.017
@@ -60,6 +55,4 @@ v8.browsing_desktop-future,0.000,0.000,0.000,0.178,0.175,0.000,0.000,0.000,0.000
 v8.browsing_mobile,0.338,0.072,0.079,0.000,0.000,0.255,0.000,0.339,0.061,0.000,0.041,0.000,0.000,0.000,0.000,0.000
 v8.browsing_mobile-future,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 v8.runtime_stats.top_25,0.000,0.000,0.000,0.613,0.805,0.000,0.000,0.000,0.000,0.000,0.000,0.079,0.000,0.000,0.094,0.116
-validating_command_buffer_perftests,0.000,0.000,0.000,0.003,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
-views_perftests,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000
 webrtc,0.017,0.004,0.006,0.034,0.038,0.000,0.000,0.016,0.004,0.000,0.003,0.004,0.005,0.004,0.005,0.010