Update Win/CMake dimensions

Updates the dimensions for Dawn's Win/CMake builders to specify the
n2-standard-8 machine type instead of a specific CPU generation. The
latter was originally used as a proxy for the machine type since machine
type was not supported as a dimension in chromium-luci at the time.

Bug: 483104765
Change-Id: I798bd4deacf03ec30ee003b7be86139e54f8b25c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/302900
Commit-Queue: Jonathan Lee <jonathanjlee@google.com>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Jonathan Lee <jonathanjlee@google.com>

infra/config/global/cmake_shared.star

diff --git a/infra/config/global/cmake_shared.star b/infra/config/global/cmake_shared.star
index cbaae39..f04a58e 100644
--- a/infra/config/global/cmake_shared.star
+++ b/infra/config/global/cmake_shared.star
@@ -49,14 +49,14 @@
     return kwargs
 
 def _apply_win_cmake_builder_defaults(kwargs):
-    # This CPU dimension acts as a proxy for machine_type: n2-standard-8 since
-    # machine_type cannot currently be set via Starlark. n2-standard-8 is
-    # specifically targeted for Win/CMake instead of the more common
-    # e2-standard-8 because Windows compilation takes the most time and the use
-    # of MSVC means that RBE is unsupported for remote compilation. The newer
-    # CPUs used by n2-standard-8 GCE instances result in significantly faster
-    # compile times.
-    kwargs.setdefault("cpu", "x86-64-Ice_Lake_GCE")
+    kwargs.setdefault("cpu", "x86-64")
+
+    # n2-standard-8 is specifically targeted for Win/CMake instead of the more
+    # common e2-standard-8 because Windows compilation takes the most time and
+    # the use of MSVC means that RBE is unsupported for remote compilation. The
+    # newer CPUs used by n2-standard-8 GCE instances result in significantly
+    # faster compile times.
+    kwargs.setdefault("machine_type", "n2-standard-8")
     kwargs.setdefault("os", os.WINDOWS_DEFAULT)
     kwargs.setdefault("ssd", None)
     return kwargs

infra/config/global/generated/luci/cr-buildbucket.cfg

diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index 29e841b..85121098 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -8568,7 +8568,8 @@
       name: "dawn-win-x64-sws-msvc-cmake-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
-      dimensions: "cpu:x86-64-Ice_Lake_GCE"
+      dimensions: "cpu:x86-64"
+      dimensions: "machine_type:n2-standard-8"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.gpu.ci"
       exe {
@@ -8721,7 +8722,8 @@
       name: "dawn-win-x64-sws-msvc-cmake-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
-      dimensions: "cpu:x86-64-Ice_Lake_GCE"
+      dimensions: "cpu:x86-64"
+      dimensions: "machine_type:n2-standard-8"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.gpu.ci"
       exe {
@@ -13294,7 +13296,8 @@
       name: "dawn-cq-win-x64-msvc-cmake-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
-      dimensions: "cpu:x86-64-Ice_Lake_GCE"
+      dimensions: "cpu:x86-64"
+      dimensions: "machine_type:n2-standard-8"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.gpu.try"
       exe {
@@ -13424,7 +13427,8 @@
       name: "dawn-cq-win-x64-msvc-cmake-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
-      dimensions: "cpu:x86-64-Ice_Lake_GCE"
+      dimensions: "cpu:x86-64"
+      dimensions: "machine_type:n2-standard-8"
       dimensions: "os:Windows-10"
       dimensions: "pool:luci.chromium.gpu.try"
       exe {