Add standalone experimental Mac Intel and AMD bots

For qualifying Mac OS 11 on Mac Retina AMD and Mac Mini 8,1

Bug: chromium:1241597, chromium:1128540
Change-Id: I753b504f5910541f5d3f244d117d369937a06d38
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3150752
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

9 files changed, 581 insertions, 4 deletions

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 323e73965e..996f1bc161 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -432,6 +432,37 @@ buckets {
       }
     }
     builders {
+      name: "mac-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "os:Mac"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org"'
+        '  },'
+        '  "builder_group": "angle",'
+        '  "platform": "mac",'
+        '  "recipe": "angle",'
+        '  "test_mode": "compile_and_test",'
+        '  "toolchain": "clang"'
+        '}'
+      build_numbers: YES
+      service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
       name: "mac-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Mac"
@@ -1228,6 +1259,37 @@ buckets {
       }
     }
     builders {
+      name: "mac-exp"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "os:Mac"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties:
+        '{'
+        '  "$build/goma": {'
+        '    "rpc_extra_params": "?prod",'
+        '    "server_host": "goma.chromium.org"'
+        '  },'
+        '  "builder_group": "angle",'
+        '  "platform": "mac",'
+        '  "recipe": "angle",'
+        '  "test_mode": "compile_and_test",'
+        '  "toolchain": "clang"'
+        '}'
+      build_numbers: YES
+      service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+      }
+    }
+    builders {
       name: "mac-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "os:Mac"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index 2e3012e4c9..bce57a0e2f 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -56,6 +56,11 @@ consoles {
     short_name: "dbg"
   }
   builders {
+    name: "buildbucket/luci.angle.ci/mac-exp"
+    category: "angle|mac|clang|x64"
+    short_name: "exp"
+  }
+  builders {
     name: "buildbucket/luci.angle.ci/mac-rel"
     category: "angle|mac|clang|x64"
     short_name: "rel"
@@ -177,6 +182,9 @@ consoles {
     name: "buildbucket/luci.angle.try/mac-dbg"
   }
   builders {
+    name: "buildbucket/luci.angle.try/mac-exp"
+  }
+  builders {
     name: "buildbucket/luci.angle.try/mac-rel"
   }
   builders {
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 3d1c61b7a7..93cf572825 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -135,6 +135,16 @@ job {
   }
 }
 job {
+  id: "mac-exp"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.angle.ci"
+    builder: "mac-exp"
+  }
+}
+job {
   id: "mac-rel"
   realm: "ci"
   acl_sets: "ci"
@@ -292,6 +302,7 @@ trigger {
   triggers: "linux-nvidia-p400-perf"
   triggers: "linux-trace-rel"
   triggers: "mac-dbg"
+  triggers: "mac-exp"
   triggers: "mac-rel"
   triggers: "win-clang-x64-dbg"
   triggers: "win-clang-x64-rel"
diff --git a/infra/config/main.star b/infra/config/main.star
index a57a3f1cef..10a6fa3dae 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -230,6 +230,7 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode
     )
 
     is_perf = "-perf" in name
+    is_experimental = "-exp" in name
 
     # Trace tests are only included automatically if files in the capture folder change.
     if test_mode == "trace_tests":
@@ -251,6 +252,8 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode
 
     if is_perf:
         short_name = get_gpu_type_from_builder_name(name)
+    elif is_experimental:
+        short_name = "exp"
     elif debug:
         short_name = "dbg"
     else:
@@ -282,7 +285,8 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode
         )
 
         # Include all other bots in the CQ by default except the placeholder GCC configs.
-        if toolchain != "gcc":
+        # Also exclude experimental bots.
+        if toolchain != "gcc" and not is_experimental:
             luci.cq_tryjob_verifier(
                 cq_group = "master",
                 builder = "angle:try/" + name,
@@ -350,6 +354,7 @@ angle_builder("linux-clang-rel", debug = False, cpu = "x64")
 angle_builder("linux-gcc-dbg", debug = True, cpu = "x64", toolchain = "gcc")
 angle_builder("linux-gcc-rel", debug = False, cpu = "x64", toolchain = "gcc")
 angle_builder("mac-dbg", debug = True, cpu = "x64")
+angle_builder("mac-exp", debug = False, cpu = "x64")
 angle_builder("mac-rel", debug = False, cpu = "x64")
 angle_builder("win-clang-x86-dbg", debug = True, cpu = "x86")
 angle_builder("win-clang-x86-rel", debug = False, cpu = "x86")
diff --git a/infra/specs/angle.json b/infra/specs/angle.json
index 4d3eea558f..9f03116085 100644
--- a/infra/specs/angle.json
+++ b/infra/specs/angle.json
@@ -1964,6 +1964,245 @@
       }
     ]
   },
+  "mac-amd-exp": {
+    "gtest_tests": [
+      {
+        "args": [
+          "angle_deqp_egl_tests",
+          "--use-angle=gl",
+          "--bot-mode",
+          "--max-processes=1"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_egl_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_egl_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_egl_tests",
+          "--use-angle=metal",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_egl_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_egl_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles2_tests",
+          "--use-angle=gl",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles2_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_gles2_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles2_tests",
+          "--use-angle=metal",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles2_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_gles2_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles3_tests",
+          "--use-angle=gl",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles3_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_deqp_gles3_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles3_tests",
+          "--use-angle=metal",
+          "--flaky-retries=2",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles3_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_deqp_gles3_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_end2end_tests",
+          "--gtest_filter=-*Vulkan_SwiftShader*",
+          "--bot-mode"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_end2end_tests",
+        "test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_unittests"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "1002:6821",
+              "hidpi": "1",
+              "os": "Mac-11.4",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_unittests",
+        "test_id_prefix": "ninja://src/tests:angle_unittests/",
+        "use_isolated_scripts_api": true
+      }
+    ]
+  },
   "mac-intel": {
     "gtest_tests": [
       {
@@ -2187,6 +2426,229 @@
       }
     ]
   },
+  "mac-intel-exp": {
+    "gtest_tests": [
+      {
+        "args": [
+          "angle_deqp_egl_tests",
+          "--use-angle=gl",
+          "--bot-mode",
+          "--max-processes=1"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_egl_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_egl_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_egl_tests",
+          "--use-angle=metal",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_egl_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_egl_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles2_tests",
+          "--use-angle=gl",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles2_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_gles2_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles2_tests",
+          "--use-angle=metal",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles2_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_deqp_gles2_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles3_tests",
+          "--use-angle=gl",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles3_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_deqp_gles3_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_deqp_gles3_tests",
+          "--use-angle=metal",
+          "--flaky-retries=2",
+          "--bot-mode"
+        ],
+        "merge": {
+          "script": "//scripts/angle_deqp_test_merge.py"
+        },
+        "name": "angle_deqp_gles3_metal_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_deqp_gles3_tests",
+        "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_end2end_tests",
+          "--gtest_filter=-*Vulkan_SwiftShader*",
+          "--bot-mode"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 2
+        },
+        "test": "angle_end2end_tests",
+        "test_id_prefix": "ninja://src/tests:angle_end2end_tests/",
+        "use_isolated_scripts_api": true
+      },
+      {
+        "args": [
+          "angle_unittests"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "display_attached": "1",
+              "gpu": "8086:3e9b",
+              "os": "Mac-11.5.2"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "angle_unittests",
+        "test_id_prefix": "ninja://src/tests:angle_unittests/",
+        "use_isolated_scripts_api": true
+      }
+    ]
+  },
   "mac-nvidia": {
     "gtest_tests": [
       {
diff --git a/infra/specs/angle_mb_config.pyl b/infra/specs/angle_mb_config.pyl
index 05e9f86d72..d44056d84f 100644
--- a/infra/specs/angle_mb_config.pyl
+++ b/infra/specs/angle_mb_config.pyl
@@ -26,6 +26,7 @@
       'linux-intel-hd630-perf': 'angle_goma_perf_bot',
       'linux-nvidia-p400-perf': 'angle_goma_perf_bot',
       'mac-dbg': 'angle_goma_debug_bot',
+      'mac-exp': 'angle_goma_release_bot',
       'mac-rel': 'angle_goma_release_bot',
       'win-clang-x64-dbg': 'angle_goma_debug_bot',
       'win-clang-x64-rel': 'angle_goma_release_bot',
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index f4d66e1d5e..64dfd7eaa2 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -33,6 +33,16 @@
                                                                'display_attached': '1',
                                                                'gpu': '8086:0a2e',
                                                                'os': 'Mac-10.15.7'}}},
+  'mac_mini_intel_uhd_630_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
+                                                                       'display_attached': '1',
+                                                                       'gpu': '8086:3e9b',
+                                                                       'os': 'Mac-11.5.2'}}},
+  'mac_retina_amd_gpu_experimental': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
+                                                                     'display_attached': '1',
+                                                                     'gpu': '1002:6821',
+                                                                     'hidpi': '1',
+                                                                     'os': 'Mac-11.4',
+                                                                     'pool': 'chromium.tests.gpu'}}},
   'mac_retina_amd_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64',
                                                                'display_attached': '1',
                                                                'gpu': '1002:6821',
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 3df1070c90..66cf7e3fee 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -89,6 +89,15 @@
           'gtest_tests': 'mac_amd_and_intel_gtests',
         },
       },
+      'mac-amd-exp': {
+        'os_type': 'mac',
+        'mixins': [
+          'mac_retina_amd_gpu_experimental',
+        ],
+        'test_suites': {
+          'gtest_tests': 'mac_amd_and_intel_gtests',
+        },
+      },
       'mac-intel': {
         'os_type': 'mac',
         'mixins': [
@@ -98,6 +107,15 @@
           'gtest_tests': 'mac_amd_and_intel_gtests',
         },
       },
+      'mac-intel-exp': {
+        'os_type': 'mac',
+        'mixins': [
+          'mac_mini_intel_uhd_630_gpu_stable',
+        ],
+        'test_suites': {
+          'gtest_tests': 'mac_amd_and_intel_gtests',
+        },
+      },
       'mac-nvidia': {
         'os_type': 'mac',
         'mixins': [
diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json
index 265bff8073..89b6f117fc 100644
--- a/scripts/code_generation_hashes/Test_spec_JSON.json
+++ b/scripts/code_generation_hashes/Test_spec_JSON.json
@@ -1,10 +1,10 @@
 {
   "infra/specs/angle.json":
-    "ac4e0fa2f8991a24ef234ef3ed14ba95",
+    "afe18ee5bf271576b28369d8ecdb56cb",
   "infra/specs/generate_test_spec_json.py":
     "348921bf70270ec6ee51fbb7e97d6925",
   "infra/specs/mixins.pyl":
-    "902aa44f4dbcaf91d313e3de008ee422",
+    "4c2309d7cebe8a1d43292c5c2012b1db",
   "infra/specs/test_suite_exceptions.pyl":
     "723460da84a90884a9668c07a0893390",
   "infra/specs/test_suites.pyl":
@@ -12,7 +12,7 @@
   "infra/specs/variants.pyl":
     "8cfcaa99fa07ad2a2d5d14f220fd5037",
   "infra/specs/waterfalls.pyl":
-    "7aadb90c13b22384200c56bd07de652d",
+    "a196371a2661764b889ed75cb1e243f5",
   "testing/buildbot/generate_buildbot_json.py":
     "3071268b1128295391f5b9b88cbb0253",
   "testing/buildbot/mixins.pyl":