Add a cpu x86 dimension to android and android_arm64 resource tests.

This allows adding a linux arm64 ubuntu 16.04 server to the chrome.tests
pool.

Without the cpu dimension, android and android_arm64 resource
size tests would be run on the linux arm64 server and would fail.

Bug: 1111100
Change-Id: I5ae6e20e6a0de67854aecf02d619fcd269a11c18
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2337678Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Stephen Roe <steveroe@google.com>
Cr-Commit-Position: refs/heads/master@{#795076}

testing/buildbot/chromium.perf.json

@@ -211,6 +211,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -236,6 +237,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -261,6 +263,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -286,6 +289,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -311,6 +315,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -336,6 +341,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -361,6 +367,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -663,6 +670,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -688,6 +696,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -713,6 +722,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -738,6 +748,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -763,6 +774,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -788,6 +800,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -813,6 +826,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }
@@ -838,6 +852,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "cpu": "x86",
               "os": "Ubuntu-16.04",
               "pool": "chrome.tests"
             }

tools/perf/core/perf_data_generator.py

@@ -298,6 +298,7 @@ BUILDERS = {
             },
         ],
         'dimension': {
+            'cpu': 'x86',
             'os': 'Ubuntu-16.04',
             'pool': 'chrome.tests',
         },
@@ -352,6 +353,7 @@ BUILDERS = {
             },
         ],
         'dimension': {
+            'cpu': 'x86',
             'os': 'Ubuntu-16.04',
             'pool': 'chrome.tests',
         },

tools/perf/core/perf_json_config_validator.py

@@ -11,8 +11,9 @@ from core import bot_platforms
 
 _VALID_SWARMING_DIMENSIONS = {
     'gpu', 'device_ids', 'os', 'pool', 'perf_tests', 'perf_tests_with_args',
-    'device_os', 'device_type', 'device_os_flavor', 'id',
-    'synthetic_product_name'}
+    'cpu', 'device_os', 'device_type', 'device_os_flavor', 'id',
+    'synthetic_product_name'
+}
 _DEFAULT_VALID_PERF_POOLS = {
     'chrome.tests.perf',
     'chrome.tests.perf-webview',