[Sanitizer API] Remove UNSCHEDULED_ prefix.

Enable blink_perf.sanitizer-api benchmark on linux-perf. Bug: 1159795 Change-Id: Ibc1008347276ade081397c23e3bfb3aa5ef9d1ab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2858161 Reviewed-by: Yifan Luo <lyf@chromium.org> Reviewed-by: John Chen <johnchen@chromium.org> Commit-Queue: Yifan Luo <lyf@chromium.org> Cr-Commit-Position: refs/heads/master@{#878765}
qweri0p · May 4, 2021 · 4400436 · 4400436
1 parent d6e2573
commit 4400436
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/tools/perf/benchmark.csv b/tools/perf/benchmark.csv
@@ -3,7 +3,6 @@ See the following link for directions for making changes to this data:,https://b
 Googlers can view additional information about internal perf infrastructure at,https://goto.google.com/chrome-benchmarking-sheet
 Benchmark name,Individual owners,Component,Documentation,Tags
 UNSCHEDULED_blink_perf.performance_apis,yoavweiss@chromium.org,Blink>PerformanceAPIs,https://bit.ly/blink-perf-benchmarks,all
-UNSCHEDULED_blink_perf.sanitizer-api,lyf@chromium.org,Blink>Security>SanitizerAPI,https://bit.ly/blink-perf-benchmarks,all
 UNSCHEDULED_blink_perf.service_worker,"shimazu@chromium.org, falken@chromium.org, ting.shao@intel.com",Blink>ServiceWorker,https://bit.ly/blink-perf-benchmarks,all
 UNSCHEDULED_loading.mbi,blink-isolation-dev@chromium.org,Blink>Internals>Modularization,https://bit.ly/loading-benchmarks,"all,many_agents"
 UNSCHEDULED_v8.loading_desktop,"mythria@chromium.org, tmrts@chromium.org, almuthanna@chromium.org",Blink>JavaScript,https://bit.ly/system-health-v8-benchmarks,"2016,2018,2019,2020,all,emerging_market,health_check,international,javascript_heavy"
@@ -20,6 +19,7 @@ blink_perf.layout,"ikilpatrick@chromium.org, kojii@chromium.org",Blink>Layout,ht
 blink_perf.owp_storage,dmurph@chromium.org,Blink>Storage,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.paint,"pdr@chromium.org, wangxianzhu@chromium.org",Blink>Paint,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.parser,"jbroman@chromium.org, yukishiino@chromium.org, haraken@chromium.org",Blink>Bindings,https://bit.ly/blink-perf-benchmarks,all
+blink_perf.sanitizer-api,lyf@chromium.org,Blink>Security>SanitizerAPI,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.shadow_dom,masonf@chromium.org,Blink>DOM>ShadowDOM,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.svg,"fs@opera.com, pdr@chromium.org",Blink>SVG,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.webaudio,"hongchan@chromium.org, rtoy@chromium.org",Blink>WebAudio,https://bit.ly/blink-perf-benchmarks,all

diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
@@ -650,7 +650,7 @@ class BlinkPerfSanitizerAPI(_BlinkPerfBenchmark):
 
   @classmethod
   def Name(cls):
-    return 'UNSCHEDULED_blink_perf.sanitizer-api'
+    return 'blink_perf.sanitizer-api'
 
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs([

diff --git a/tools/perf/core/bot_platforms.py b/tools/perf/core/bot_platforms.py
@@ -222,7 +222,11 @@ def _GetBenchmarkConfig(benchmark_name, abridged=False):
 OFFICIAL_BENCHMARK_CONFIGS = PerfSuite(
     [_GetBenchmarkConfig(b.Name()) for b in OFFICIAL_BENCHMARKS])
 # power.mobile requires special hardware.
-OFFICIAL_BENCHMARK_CONFIGS = OFFICIAL_BENCHMARK_CONFIGS.Remove(['power.mobile'])
+# only run blink_perf.sanitizer-api on linux-perf.
+OFFICIAL_BENCHMARK_CONFIGS = OFFICIAL_BENCHMARK_CONFIGS.Remove([
+    'power.mobile',
+    'blink_perf.sanitizer-api',
+])
 # TODO(crbug.com/965158): Remove OFFICIAL_BENCHMARK_NAMES once sharding
 # scripts are no longer using it.
 OFFICIAL_BENCHMARK_NAMES = frozenset(
@@ -307,6 +311,8 @@ def _views_perftests(estimated_runtime=7):
 _LINUX_BENCHMARK_CONFIGS = PerfSuite(OFFICIAL_BENCHMARK_CONFIGS).Remove([
     'blink_perf.display_locking',
     'v8.runtime_stats.top_25',
+]).Add([
+    'blink_perf.sanitizer-api',
 ])
 _LINUX_EXECUTABLE_CONFIGS = frozenset([
     # TODO(crbug.com/811766): Add views_perftests.

diff --git a/tools/perf/core/shard_maps/linux-perf_map.json b/tools/perf/core/shard_maps/linux-perf_map.json
@@ -92,6 +92,9 @@
             "blink_perf.parser": {
                 "abridged": false
             },
+            "blink_perf.sanitizer-api": {
+                "abridged": false
+            },
             "blink_perf.shadow_dom": {
                 "abridged": false
             },

diff --git a/tools/perf/core/test_data/benchmarks_to_shard.json b/tools/perf/core/test_data/benchmarks_to_shard.json
@@ -51,7 +51,7 @@
     "stories": [
       "sanitizer.html"
     ],
-    "name": "UNSCHEDULED_blink_perf.sanitizer-api"
+    "name": "blink_perf.sanitizer-api"
   },
   {
     "repeat": 1,