Add perf tests for M1s

Bug: chromium:1138593
Change-Id: Ie821d672487612933865610bfba722faf1bc6e6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2573679Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Ryan Heise <heiserya@google.com>
Auto-Submit: Ryan Heise <heiserya@google.com>
Cr-Commit-Position: refs/heads/master@{#833783}

docs/speed/perf_lab_platforms.md

@@ -24,6 +24,7 @@
  * [mac-10_12_laptop_low_end-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-10_12_laptop_low_end-perf): MacBook Air, Core i5 1.8 GHz, 8GB RAM, 128GB SSD, HD Graphics.
  * [mac-10_13_laptop_high_end-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-10_13_laptop_high_end-perf): MacBook Pro, Core i7 2.8 GHz, 16GB RAM, 256GB SSD, Radeon 55.
  * [mac-arm_dtk_arm-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-arm_dtk_arm-perf): Mac ARM DTK (ARM Chrome).
+ * [mac-m1_mini_2020-perf](https://ci.chromium.org/p/chrome/builders/ci/mac-m1_mini_2020-perf): Mac M1 Mini 2020.
 
 ## Win
 

testing/buildbot/chromium.perf.json

@@ -1169,6 +1169,7 @@
           "dimension_sets": [
             {
               "cpu": "arm",
+              "mac_model": "ADP3,2",
               "os": "Mac",
               "pool": "chrome.tests.perf"
             }
@@ -1197,6 +1198,52 @@
       "chromium_builder_perf"
     ]
   },
+  "mac-m1_mini_2020-perf": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "-v",
+          "--browser=release",
+          "--upload-results",
+          "--test-shard-map-filename=mac-m1_mini_2020-perf_map.json",
+          "--assert-gpu-compositing"
+        ],
+        "isolate_name": "performance_test_suite",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_test_suite",
+        "override_compile_targets": [
+          "performance_test_suite"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "arm",
+              "mac_model": "Macmini9,1",
+              "os": "Mac",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 21600,
+          "ignore_task_failure": false,
+          "io_timeout": 21600,
+          "service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "requires_simultaneous_shard_dispatch": true,
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      }
+    ]
+  },
   "win-10-perf": {
     "isolated_scripts": [
       {

tools/perf/core/bot_platforms.py

@@ -342,6 +342,11 @@ _MAC_ARM_DTK_EXECUTABLE_CONFIGS = frozenset([
     _performance_browser_tests(190),
     _views_perftests(),
 ])
+_MAC_M1_MINI_2020_BENCHMARK_CONFIGS = PerfSuite([
+    'loading.desktop',
+]).Abridge([
+    'loading.desktop',
+])
 
 _WIN_10_BENCHMARK_CONFIGS = PerfSuite(OFFICIAL_BENCHMARK_CONFIGS).Remove([
     'blink_perf.display_locking',
@@ -480,6 +485,8 @@ MAC_ARM_DTK_ARM = PerfPlatform('mac-arm_dtk_arm-perf',
                                8,
                                'mac',
                                executables=_MAC_ARM_DTK_EXECUTABLE_CONFIGS)
+MAC_M1_MINI_2020 = PerfPlatform('mac-m1_mini_2020-perf', 'Mac M1 Mini 2020',
+                                _MAC_M1_MINI_2020_BENCHMARK_CONFIGS, 2, 'mac')
 
 # Win
 WIN_10_LOW_END = PerfPlatform(

tools/perf/core/perf_data_generator.py

@@ -665,6 +665,25 @@ BUILDERS = {
         'mac',
         'dimension': {
             'cpu': 'arm',
+            'mac_model': 'ADP3,2',
+            'os': 'Mac',
+            'pool': 'chrome.tests.perf',
+        },
+    },
+    'mac-m1_mini_2020-perf': {
+        'tests': [
+            {
+                'isolate': 'performance_test_suite',
+                'extra_args': [
+                    '--assert-gpu-compositing',
+                ],
+            },
+        ],
+        'platform':
+        'mac',
+        'dimension': {
+            'cpu': 'arm',
+            'mac_model': 'Macmini9,1',
             'os': 'Mac',
             'pool': 'chrome.tests.perf',
         },

tools/perf/core/perf_json_config_validator.py

@@ -11,7 +11,7 @@ from core import bot_platforms
 
 _VALID_SWARMING_DIMENSIONS = {
     'gpu', 'device_ids', 'os', 'pool', 'perf_tests', 'perf_tests_with_args',
-    'cpu', 'device_os', 'device_type', 'device_os_flavor', 'id',
+    'cpu', 'device_os', 'device_type', 'device_os_flavor', 'id', 'mac_model',
     'synthetic_product_name'
 }
 _DEFAULT_VALID_PERF_POOLS = {

tools/perf/core/shard_maps/mac-m1_mini_2020-perf_map.json

+{
+    "0": {
+        "benchmarks": {
+            "loading.desktop": {
+                "end": 5,
+                "abridged": true
+            }
+        }
+    },
+    "1": {
+        "benchmarks": {
+            "loading.desktop": {
+                "begin": 5,
+                "abridged": true
+            }
+        }
+    },
+    "extra_infos": {
+        "num_stories": 10,
+        "predicted_min_shard_time": 50,
+        "predicted_min_shard_index": 0,
+        "predicted_max_shard_time": 50,
+        "predicted_max_shard_index": 0,
+        "shard #0": 50,
+        "shard #1": 50
+    }
+}
\ No newline at end of file

tools/perf/core/shard_maps/timing_data/mac-m1_mini_2020-perf_timing.json

+[]
\ No newline at end of file