Add "chrome_sizes" test to perf builders

Below builders will run "chrome_sizes" test: - linux-builder-perf - mac-arm-builder-perf - mac-builder-perf - win32-builder-perf - win64-builder-perf Upon crrev.com/c/2716771, we will remove "sizes" test for above builders, which is attached in recipe code uncomfortably. Then "chrome_sizes" will fully replace "sizes" to report size info. BUG=chromium:1150897 TEST=led launch Change-Id: Ifcb022ec89ca89cbe156af18f536bcfaa5109c5b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2719608 Commit-Queue: Xinan Lin <linxinan@chromium.org> Reviewed-by: John Chen <johnchen@chromium.org> Cr-Commit-Position: refs/heads/master@{#859105}
qweri0p · Mar 2, 2021 · 5be8a24 · 5be8a24
1 parent dda6a00
commit 5be8a24
Show file tree

Hide file tree

Showing 4 changed files with 218 additions and 1 deletion.
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
@@ -1146,6 +1146,34 @@
     "additional_compile_targets": [
       "chromedriver",
       "chromium_builder_perf"
+    ],
+    "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "chrome_sizes",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "chrome_sizes",
+        "override_compile_targets": [
+          "chrome_sizes"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu-16.04",
+              "pool": "chrome.tests"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      }
     ]
   },
   "linux-builder-perf-rel": {
@@ -1377,12 +1405,68 @@
     "additional_compile_targets": [
       "chromedriver",
       "chromium_builder_perf"
+    ],
+    "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "chrome_sizes",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "chrome_sizes",
+        "override_compile_targets": [
+          "chrome_sizes"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86",
+              "os": "Mac",
+              "pool": "chrome.tests"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      }
     ]
   },
   "mac-builder-perf": {
     "additional_compile_targets": [
       "chromedriver",
       "chromium_builder_perf"
+    ],
+    "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "chrome_sizes",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "chrome_sizes",
+        "override_compile_targets": [
+          "chrome_sizes"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Mac",
+              "pool": "chrome.tests"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      }
     ]
   },
   "mac-m1_mini_2020-perf": {
@@ -1550,12 +1634,68 @@
     "additional_compile_targets": [
       "chromedriver",
       "chromium_builder_perf"
+    ],
+    "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "chrome_sizes",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "chrome_sizes",
+        "override_compile_targets": [
+          "chrome_sizes"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86",
+              "os": "Windows",
+              "pool": "chrome.tests"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      }
     ]
   },
   "win64-builder-perf": {
     "additional_compile_targets": [
       "chromedriver",
       "chromium_builder_perf"
+    ],
+    "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "chrome_sizes",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "chrome_sizes",
+        "override_compile_targets": [
+          "chrome_sizes"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Windows",
+              "pool": "chrome.tests"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      }
     ]
   }
 }
diff --git a/tools/perf/benchmark.csv b/tools/perf/benchmark.csv
@@ -24,6 +24,7 @@ blink_perf.webgl,"kbr@chromium.org, enga@chromium.org, webgl-team@google.com",Bl
 blink_perf.webgl_fast_call,"kbr@chromium.org, enga@chromium.org, mslekova@chromium.org, webgl-team@google.com",Blink>WebGL,https://bit.ly/blink-perf-benchmarks,
 blink_perf.webgpu,"enga@chromium.org, cwallez@chromium.org, webgpu-developers@google.com",Blink>WebGPU,https://bit.ly/blink-perf-benchmarks,
 blink_perf.webgpu_fast_call,"enga@chromium.org, cwallez@chromium.org, mslekova@chromium.org, webgpu-developers@google.com",Blink>WebGPU,https://bit.ly/blink-perf-benchmarks,
+chrome_sizes,"heiserya@chromium.org, johnchen@chromium.org",Build,https://chromium.googlesource.com/chromium/src/+/HEAD/tools/binary_size/README.md#resource_sizes_py,
 components_perftests,csharrison@chromium.org,,,
 dawn_perf_tests,"enga@chromium.org, chrome-gpu-perf-owners@chromium.org",Internals>GPU>Dawn,https://dawn.googlesource.com/dawn/+/HEAD/src/tests/perf_tests/README.md,
 desktop_ui,"yuhengh@chromium.org, tluk@chromium.org, romanarora@chromium.org",UI>Browser,https://chromium.googlesource.com/chromium/src/+/master/docs/speed/benchmark/harnesses/desktop_ui.md,

diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py
@@ -423,21 +423,81 @@ class TEST_TYPES(object):
     },
     'linux-builder-perf': {
         'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
+        'tests': [{
+            'name': 'chrome_sizes',
+            'isolate': 'chrome_sizes',
+            'type': TEST_TYPES.GENERIC,
+        }],
+        'dimension': {
+            'cpu': 'x86-64',
+            'os': 'Ubuntu-16.04',
+            'pool': 'chrome.tests',
+        },
+        'perf_trigger':
+        False,
     },
     'linux-builder-perf-rel': {
         'additional_compile_targets': ['chromium_builder_perf'],
     },
     'mac-builder-perf': {
         'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
+        'tests': [{
+            'name': 'chrome_sizes',
+            'isolate': 'chrome_sizes',
+            'type': TEST_TYPES.GENERIC,
+        }],
+        'dimension': {
+            'cpu': 'x86-64',
+            'os': 'Mac',
+            'pool': 'chrome.tests',
+        },
+        'perf_trigger':
+        False,
     },
     'mac-arm-builder-perf': {
         'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
+        'tests': [{
+            'name': 'chrome_sizes',
+            'isolate': 'chrome_sizes',
+            'type': TEST_TYPES.GENERIC,
+        }],
+        'dimension': {
+            'cpu': 'x86',
+            'os': 'Mac',
+            'pool': 'chrome.tests',
+        },
+        'perf_trigger':
+        False,
     },
     'win32-builder-perf': {
         'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
+        'tests': [{
+            'name': 'chrome_sizes',
+            'isolate': 'chrome_sizes',
+            'type': TEST_TYPES.GENERIC,
+        }],
+        'dimension': {
+            'cpu': 'x86',
+            'os': 'Windows',
+            'pool': 'chrome.tests',
+        },
+        'perf_trigger':
+        False,
     },
     'win64-builder-perf': {
         'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
+        'tests': [{
+            'name': 'chrome_sizes',
+            'isolate': 'chrome_sizes',
+            'type': TEST_TYPES.GENERIC,
+        }],
+        'dimension': {
+            'cpu': 'x86-64',
+            'os': 'Windows',
+            'pool': 'chrome.tests',
+        },
+        'perf_trigger':
+        False,
     },
     'android-go-perf': {
         'tests': [{
@@ -970,6 +1030,17 @@ def tags(self):
 }
 
 
+OTHER_BENCHMARKS.update({
+    'chrome_sizes':
+    BenchmarkMetadata(
+        emails='heiserya@chromium.org, johnchen@chromium.org',
+        component='Build',
+        documentation_url=(
+            'https://chromium.googlesource.com/chromium/'
+            'src/+/HEAD/tools/binary_size/README.md#resource_sizes_py'),
+    ),
+})
+
 OTHER_BENCHMARKS.update({
     'resource_sizes_lacros_chrome':
     BenchmarkMetadata(

diff --git a/tools/perf/core/perf_json_config_validator.py b/tools/perf/core/perf_json_config_validator.py
@@ -28,7 +28,12 @@
     'chromeos-kevin-perf-fyi': {'chrome.tests'},
     'chromeos-amd64-generic-lacros-builder-perf': {'chrome.tests'},
     'fuchsia-perf-fyi': {'chrome.tests'},
-    'lacros-eve-perf': {'chrome.tests'}
+    'lacros-eve-perf': {'chrome.tests'},
+    'linux-builder-perf': {'chrome.tests'},
+    'mac-arm-builder-perf': {'chrome.tests'},
+    'mac-builder-perf': {'chrome.tests'},
+    'win32-builder-perf': {'chrome.tests'},
+    'win64-builder-perf': {'chrome.tests'},
 }
 _VALID_WEBVIEW_BROWSERS = {
     'android-webview',