Scheduling v8.browsing_mobile-future and v8.browsing_desktop-future

Scheduling these benchmarks on the perf waterfall. Turns out, even if
you know a benchmark won't be run on certain types of devices, you still
have to add them to the sharding map for those configurations.
Example: loading.mobile is sharded onto windows bots even though the tests are
specifically for mobile configurations. We should change the unscheduled benchmarks
check of perf_data_generator.py in the future. perf_data_generator seems to do the
right thing in not scheduling the benchmarks on configurations that don't run them.

BUG=chromium:789571

Change-Id: I1a7b785cc04f5b207d6a60d05b8177bc9e7df37c
Reviewed-on: https://chromium-review.googlesource.com/801580Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Ashley Enstad <ashleymarie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520756}

testing/buildbot/chromium.perf.fyi.json

@@ -4013,6 +4013,68 @@
           "upload_test_results": true
         }
       },
+      {
+        "args": [
+          "v8.browsing_desktop-future",
+          "-v",
+          "--upload-results",
+          "--browser=release_x64",
+          "--output-format=chartjson"
+        ],
+        "isolate_name": "telemetry_perf_tests",
+        "name": "v8.browsing_desktop-future",
+        "override_compile_targets": [
+          "telemetry_perf_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:22b1",
+              "id": "build138-b1",
+              "os": "Windows-10-10586",
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": false,
+          "io_timeout": 600,
+          "upload_test_results": true
+        }
+      },
+      {
+        "args": [
+          "v8.browsing_desktop-future",
+          "-v",
+          "--upload-results",
+          "--browser=reference",
+          "--output-format=chartjson",
+          "--max-failures=5",
+          "--output-trace-tag=_ref"
+        ],
+        "isolate_name": "telemetry_perf_tests",
+        "name": "v8.browsing_desktop-future.reference",
+        "override_compile_targets": [
+          "telemetry_perf_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:22b1",
+              "id": "build138-b1",
+              "os": "Windows-10-10586",
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": true,
+          "io_timeout": 600,
+          "upload_test_results": true
+        }
+      },
       {
         "args": [
           "v8.browsing_desktop",
@@ -7765,6 +7827,68 @@
           "upload_test_results": true
         }
       },
+      {
+        "args": [
+          "v8.browsing_desktop-future",
+          "-v",
+          "--upload-results",
+          "--browser=release_x64",
+          "--output-format=chartjson"
+        ],
+        "isolate_name": "telemetry_perf_tests",
+        "name": "v8.browsing_desktop-future",
+        "override_compile_targets": [
+          "telemetry_perf_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "1002:9874",
+              "id": "build202-b4",
+              "os": "Windows-10-10586",
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": false,
+          "io_timeout": 600,
+          "upload_test_results": true
+        }
+      },
+      {
+        "args": [
+          "v8.browsing_desktop-future",
+          "-v",
+          "--upload-results",
+          "--browser=reference",
+          "--output-format=chartjson",
+          "--max-failures=5",
+          "--output-trace-tag=_ref"
+        ],
+        "isolate_name": "telemetry_perf_tests",
+        "name": "v8.browsing_desktop-future.reference",
+        "override_compile_targets": [
+          "telemetry_perf_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "1002:9874",
+              "id": "build202-b4",
+              "os": "Windows-10-10586",
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": true,
+          "io_timeout": 600,
+          "upload_test_results": true
+        }
+      },
       {
         "args": [
           "v8.browsing_desktop",

tools/perf/benchmark.csv

@@ -99,7 +99,9 @@ thread_times.tough_scrolling_cases,tdresser@chromium.org,
 tracing.tracing_with_background_memory_infra,ssid@chromium.org,
 tracing_perftests,"kkraynov@chromium.org, primiano@chromium.org",
 v8.browsing_desktop,"mythria@chromium.org, ulan@chromium.org",
+v8.browsing_desktop-future,"mythria@chromium.org, ulan@chromium.org",
 v8.browsing_mobile,"mythria@chromium.org, ulan@chromium.org",
+v8.browsing_mobile-future,"mythria@chromium.org, ulan@chromium.org",
 v8.detached_context_age_in_gc,ulan@chromium.org,
 v8.runtime_stats.top_25,cbruni@chromium.org,
 validating_command_buffer_perftests,"piman@chromium.org, chrome-gpu-perf-owners@chromium.org",Internals>GPU

tools/perf/core/benchmark_sharding_map.json

@@ -22,7 +22,9 @@
     "build13-b1--device4": {
       "benchmarks": [
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build13-b1--device5": {
@@ -203,7 +205,9 @@
     "build73-b1--device4": {
       "benchmarks": [
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build73-b1--device5": {
@@ -386,7 +390,9 @@
     },
     "build164-b1--device4": {
       "benchmarks": [
-        "smoothness.tough_animation_cases"
+        "smoothness.tough_animation_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build164-b1--device5": {
@@ -565,7 +571,9 @@
     "build15-b1--device4": {
       "benchmarks": [
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build15-b1--device5": {
@@ -746,7 +754,9 @@
     },
     "build112-b1--device4": {
       "benchmarks": [
-        "smoothness.tough_animation_cases"
+        "smoothness.tough_animation_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build112-b1--device5": {
@@ -945,7 +955,9 @@
         "rasterize_and_record_micro.partial_invalidation",
         "smoothness.gpu_rasterization.polymer",
         "start_with_url.cold.startup_pages",
-        "system_health.webview_startup"
+        "system_health.webview_startup",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build10-b1--device5": {
@@ -1108,7 +1120,9 @@
     "build17-b1--device4": {
       "benchmarks": [
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build17-b1--device5": {
@@ -1288,7 +1302,10 @@
       ]
     },
     "build245-m4--device4": {
-      "benchmarks": []
+      "benchmarks": [
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
+      ]
     },
     "build245-m4--device5": {
       "benchmarks": [
@@ -1510,7 +1527,9 @@
         "speedometer2",
         "speedometer2-future",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build30-a9": {
@@ -1626,7 +1645,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build105-b1": {
@@ -1745,6 +1766,8 @@
         "speedometer2",
         "tab_switching.typical_25",
         "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future",
         "webrtc"
       ]
     },
@@ -1861,6 +1884,8 @@
         "speedometer2",
         "tab_switching.typical_25",
         "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future",
         "v8.runtime_stats.top_25"
       ]
     },
@@ -1978,7 +2003,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build27-b1": {
@@ -2095,7 +2122,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build131-b1": {
@@ -2216,6 +2245,8 @@
         "thread_times.key_noop_cases",
         "thread_times.tough_scrolling_cases",
         "tracing.tracing_with_background_memory_infra",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future",
         "v8.browsing_mobile",
         "v8.runtimestats.browsing_desktop",
         "webrtc"
@@ -2289,7 +2320,9 @@
       "benchmarks": [
         "smoothness.maps",
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build139-b1": {
@@ -2522,7 +2555,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build120-b1": {
@@ -2591,7 +2626,9 @@
       "benchmarks": [
         "smoothness.maps",
         "speedometer-future",
-        "speedometer2-future"
+        "speedometer2-future",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build203-b4": {
@@ -2825,7 +2862,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build135-m1": {
@@ -2940,7 +2979,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build104-m1": {
@@ -3058,7 +3099,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build167-m1": {
@@ -3175,7 +3218,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build95-m1": {
@@ -3292,7 +3337,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build188-m1": {
@@ -3408,7 +3455,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build141-m1": {
@@ -3526,7 +3575,9 @@
         "speedometer",
         "speedometer2",
         "tab_switching.typical_25",
-        "thread_times.tough_compositor_cases"
+        "thread_times.tough_compositor_cases",
+        "v8.browsing_desktop-future",
+        "v8.browsing_mobile-future"
       ]
     },
     "build146-m1": {
@@ -3668,7 +3719,9 @@
     "thread_times.tough_scrolling_cases",
     "tracing.tracing_with_background_memory_infra",
     "v8.browsing_desktop",
+    "v8.browsing_desktop-future",
     "v8.browsing_mobile",
+    "v8.browsing_mobile-future",
     "v8.detached_context_age_in_gc",
     "v8.runtime_stats.top_25",
     "v8.runtimestats.browsing_desktop",

tools/perf/core/perf_data_generator.py

@@ -31,9 +31,7 @@ from core.sharding_map_generator import load_benchmark_sharding_map
 
 _UNSCHEDULED_TELEMETRY_BENCHMARKS = set([
   'experimental.startup.android.coldish',
-  'wasm',
-  'v8.browsing_desktop-future',
-  'v8.browsing_mobile-future'
+  'wasm'
   ])