diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 8fc69e5a50..2b9aa8e172 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -98,7 +98,8 @@ func internalHardwareLabel(parts map[string]string) *int {
 // instances.
 func linuxGceDimensions() []string {
 	return []string{
-		"cpu:x86-64-avx2",
+		// Specify CPU to avoid running builds on bots with a more unique CPU.
+		"cpu:x86-64-Haswell_GCE",
 		"gpu:none",
 		fmt.Sprintf("os:%s", DEFAULT_OS_DEBIAN),
 		fmt.Sprintf("pool:%s", CONFIG.Pool),
@@ -247,24 +248,23 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			d["device"] = device
 		} else if parts["cpu_or_gpu"] == "CPU" {
 			d["gpu"] = "none"
-			cpu, ok := map[string]string{
-				"AVX":  "x86-64",
-				"AVX2": "x86-64-avx2",
-				"SSE4": "x86-64",
+			modelMapping, ok := map[string]map[string]string{
+				"AVX": {
+					"MacMini7.1": "x86-64-E5-2697_v2",
+					"Golo":       "x86-64-E5-2670",
+				},
+				"AVX2": {
+					"GCE": "x86-64-Haswell_GCE",
+				},
 			}[parts["cpu_or_gpu_value"]]
 			if !ok {
 				glog.Fatalf("Entry %q not found in CPU mapping.", parts["cpu_or_gpu_value"])
 			}
-			d["cpu"] = cpu
-			if strings.Contains(parts["os"], "Win") && parts["cpu_or_gpu_value"] == "AVX2" {
-				// AVX2 is not correctly detected on Windows. Fall back on other
-				// dimensions to ensure that we correctly target machines which we know
-				// have AVX2 support.
-				d["cpu"] = "x86-64"
-				if parts["model"] != "GCE" {
-					glog.Fatalf("Please double-check that %q supports AVX2 and update this assertion.", parts["model"])
-				}
+			cpu, ok := modelMapping[parts["model"]]
+			if !ok {
+				glog.Fatalf("Entry %q not found in %q model mapping.", parts["model"], parts["cpu_or_gpu_value"])
 			}
+			d["cpu"] = cpu
 		} else {
 			if strings.Contains(parts["os"], "Win") {
 				gpu, ok := map[string]string{
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a3e6fb765e..ec35c84d47 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2692,7 +2692,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2732,7 +2732,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2762,7 +2762,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2792,7 +2792,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2832,7 +2832,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2862,7 +2862,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2892,7 +2892,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2922,7 +2922,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2952,7 +2952,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -2982,7 +2982,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3012,7 +3012,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3042,7 +3042,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3072,7 +3072,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3102,7 +3102,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3132,7 +3132,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3162,7 +3162,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3192,7 +3192,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3222,7 +3222,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3252,7 +3252,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3282,7 +3282,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3312,7 +3312,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3342,7 +3342,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3372,7 +3372,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3407,7 +3407,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3437,7 +3437,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3467,7 +3467,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3497,7 +3497,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3527,7 +3527,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3557,7 +3557,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3587,7 +3587,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3617,7 +3617,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3647,7 +3647,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3677,7 +3677,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3712,7 +3712,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3742,7 +3742,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3777,7 +3777,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3812,7 +3812,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3835,7 +3835,7 @@
     },
     "Build-Debian9-GCC-x86-Debug": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3858,7 +3858,7 @@
     },
     "Build-Debian9-GCC-x86-Release": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3881,7 +3881,7 @@
     },
     "Build-Debian9-GCC-x86_64-Debug": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3904,7 +3904,7 @@
     },
     "Build-Debian9-GCC-x86_64-Debug-NoGPU": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3927,7 +3927,7 @@
     },
     "Build-Debian9-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3950,7 +3950,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -3973,7 +3973,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-ANGLE": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4003,7 +4003,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4026,7 +4026,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-Mesa": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4049,7 +4049,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-NoGPU": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4072,7 +4072,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-PDFium": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4095,7 +4095,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4118,7 +4118,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-SKNX_NO_SIMD": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4141,7 +4141,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-SK_CPU_LIMIT_SSE41": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -4164,7 +4164,7 @@
     },
     "Build-Debian9-GCC-x86_64-Release-Shared": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5007,7 +5007,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5032,7 +5032,7 @@
     },
     "Housekeeper-Nightly-UpdateMetaConfig": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5065,7 +5065,7 @@
         "Build-Debian9-GCC-x86_64-Release-Shared"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5100,7 +5100,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5117,7 +5117,7 @@
     },
     "Housekeeper-PerCommit-CheckGeneratedFiles": {
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5147,7 +5147,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5177,7 +5177,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5194,7 +5194,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5211,7 +5211,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -5228,7 +5228,7 @@
         }
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7054,7 +7054,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7107,7 +7107,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7160,7 +7160,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7213,7 +7213,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7261,7 +7261,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7314,7 +7314,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7362,7 +7362,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7410,7 +7410,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7463,7 +7463,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7511,7 +7511,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7559,7 +7559,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7607,7 +7607,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7655,7 +7655,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -7891,7 +7891,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2697_v2",
         "gpu:none",
         "os:Mac-10.12",
         "pool:Skia"
@@ -7939,7 +7939,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2697_v2",
         "gpu:none",
         "os:Mac-10.12",
         "pool:Skia"
@@ -11731,7 +11731,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -11779,7 +11779,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -11827,7 +11827,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -11875,7 +11875,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -11923,7 +11923,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -11971,7 +11971,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -12019,7 +12019,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -12067,7 +12067,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -12115,7 +12115,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -12163,7 +12163,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -12211,7 +12211,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -12259,7 +12259,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -12307,7 +12307,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -12355,7 +12355,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -14419,7 +14419,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14472,7 +14472,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14525,7 +14525,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14578,7 +14578,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14626,7 +14626,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14679,7 +14679,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14727,7 +14727,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14775,7 +14775,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14823,7 +14823,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14871,7 +14871,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14924,7 +14924,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -14977,7 +14977,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15025,7 +15025,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15073,7 +15073,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15121,7 +15121,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15169,7 +15169,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15217,7 +15217,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -15453,7 +15453,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2697_v2",
         "gpu:none",
         "os:Mac-10.12",
         "pool:Skia"
@@ -15501,7 +15501,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2697_v2",
         "gpu:none",
         "os:Mac-10.12",
         "pool:Skia"
@@ -15549,7 +15549,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2697_v2",
         "gpu:none",
         "os:Mac-10.12",
         "pool:Skia"
@@ -19374,7 +19374,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19422,7 +19422,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19470,7 +19470,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19518,7 +19518,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19566,7 +19566,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19614,7 +19614,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19662,7 +19662,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19710,7 +19710,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
@@ -19758,7 +19758,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -19806,7 +19806,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -19854,7 +19854,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -19902,7 +19902,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -19950,7 +19950,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -19998,7 +19998,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-7-SP1",
         "pool:Skia"
@@ -20046,7 +20046,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20094,7 +20094,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20142,7 +20142,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20190,7 +20190,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20238,7 +20238,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20286,7 +20286,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-E5-2670",
         "gpu:none",
         "os:Windows-8.1-SP0",
         "pool:Skia"
@@ -20514,7 +20514,7 @@
         "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20541,7 +20541,7 @@
         "Perf-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20568,7 +20568,7 @@
         "Perf-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20595,7 +20595,7 @@
         "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20622,7 +20622,7 @@
         "Perf-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20649,7 +20649,7 @@
         "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20676,7 +20676,7 @@
         "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20703,7 +20703,7 @@
         "Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20730,7 +20730,7 @@
         "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20757,7 +20757,7 @@
         "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20784,7 +20784,7 @@
         "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20811,7 +20811,7 @@
         "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20838,7 +20838,7 @@
         "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20865,7 +20865,7 @@
         "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20892,7 +20892,7 @@
         "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20919,7 +20919,7 @@
         "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20946,7 +20946,7 @@
         "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -20973,7 +20973,7 @@
         "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21000,7 +21000,7 @@
         "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21027,7 +21027,7 @@
         "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21054,7 +21054,7 @@
         "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21081,7 +21081,7 @@
         "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21108,7 +21108,7 @@
         "Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21135,7 +21135,7 @@
         "Perf-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21162,7 +21162,7 @@
         "Perf-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21189,7 +21189,7 @@
         "Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21216,7 +21216,7 @@
         "Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21243,7 +21243,7 @@
         "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21270,7 +21270,7 @@
         "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21297,7 +21297,7 @@
         "Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21324,7 +21324,7 @@
         "Perf-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21351,7 +21351,7 @@
         "Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21378,7 +21378,7 @@
         "Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21405,7 +21405,7 @@
         "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21432,7 +21432,7 @@
         "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21459,7 +21459,7 @@
         "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21486,7 +21486,7 @@
         "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21513,7 +21513,7 @@
         "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21540,7 +21540,7 @@
         "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21567,7 +21567,7 @@
         "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21594,7 +21594,7 @@
         "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21621,7 +21621,7 @@
         "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21648,7 +21648,7 @@
         "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21675,7 +21675,7 @@
         "Perf-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21702,7 +21702,7 @@
         "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21729,7 +21729,7 @@
         "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21756,7 +21756,7 @@
         "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21783,7 +21783,7 @@
         "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21810,7 +21810,7 @@
         "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21837,7 +21837,7 @@
         "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21864,7 +21864,7 @@
         "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21891,7 +21891,7 @@
         "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21918,7 +21918,7 @@
         "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21945,7 +21945,7 @@
         "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21972,7 +21972,7 @@
         "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -21999,7 +21999,7 @@
         "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22026,7 +22026,7 @@
         "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22053,7 +22053,7 @@
         "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22080,7 +22080,7 @@
         "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22107,7 +22107,7 @@
         "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22134,7 +22134,7 @@
         "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22161,7 +22161,7 @@
         "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22188,7 +22188,7 @@
         "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22215,7 +22215,7 @@
         "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22242,7 +22242,7 @@
         "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22269,7 +22269,7 @@
         "Perf-Win10-MSVC-SurfacePro2017-GPU-IntelHD615-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22296,7 +22296,7 @@
         "Perf-Win10-MSVC-SurfacePro2017-GPU-IntelHD615-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22323,7 +22323,7 @@
         "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22350,7 +22350,7 @@
         "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22377,7 +22377,7 @@
         "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22404,7 +22404,7 @@
         "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22431,7 +22431,7 @@
         "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22458,7 +22458,7 @@
         "Perf-Win7-MSVC-Golo-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22485,7 +22485,7 @@
         "Perf-Win8-MSVC-Golo-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22512,7 +22512,7 @@
         "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22539,7 +22539,7 @@
         "Perf-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22566,7 +22566,7 @@
         "Perf-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22593,7 +22593,7 @@
         "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22620,7 +22620,7 @@
         "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22647,7 +22647,7 @@
         "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22674,7 +22674,7 @@
         "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22701,7 +22701,7 @@
         "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22728,7 +22728,7 @@
         "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22755,7 +22755,7 @@
         "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22782,7 +22782,7 @@
         "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22809,7 +22809,7 @@
         "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22836,7 +22836,7 @@
         "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22863,7 +22863,7 @@
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22890,7 +22890,7 @@
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_CCPR"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22917,7 +22917,7 @@
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22944,7 +22944,7 @@
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22971,7 +22971,7 @@
         "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -22998,7 +22998,7 @@
         "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23025,7 +23025,7 @@
         "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23052,7 +23052,7 @@
         "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23079,7 +23079,7 @@
         "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23106,7 +23106,7 @@
         "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23133,7 +23133,7 @@
         "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23160,7 +23160,7 @@
         "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23187,7 +23187,7 @@
         "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23214,7 +23214,7 @@
         "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23241,7 +23241,7 @@
         "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23268,7 +23268,7 @@
         "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23295,7 +23295,7 @@
         "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23322,7 +23322,7 @@
         "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23349,7 +23349,7 @@
         "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23376,7 +23376,7 @@
         "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23403,7 +23403,7 @@
         "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23430,7 +23430,7 @@
         "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23457,7 +23457,7 @@
         "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23484,7 +23484,7 @@
         "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23511,7 +23511,7 @@
         "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23538,7 +23538,7 @@
         "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23565,7 +23565,7 @@
         "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_CCPR"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23592,7 +23592,7 @@
         "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23619,7 +23619,7 @@
         "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23646,7 +23646,7 @@
         "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23673,7 +23673,7 @@
         "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23700,7 +23700,7 @@
         "Test-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23727,7 +23727,7 @@
         "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23754,7 +23754,7 @@
         "Test-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23781,7 +23781,7 @@
         "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23808,7 +23808,7 @@
         "Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23835,7 +23835,7 @@
         "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23862,7 +23862,7 @@
         "Test-ChromeOS-Clang-Chromebook_CB5_311-GPU-TegraK1-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23889,7 +23889,7 @@
         "Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23916,7 +23916,7 @@
         "Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23943,7 +23943,7 @@
         "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23970,7 +23970,7 @@
         "Test-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -23997,7 +23997,7 @@
         "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24024,7 +24024,7 @@
         "Test-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24051,7 +24051,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24078,7 +24078,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24105,7 +24105,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24132,7 +24132,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-SK_CPU_LIMIT_SSE2"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24159,7 +24159,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-SK_CPU_LIMIT_SSE41"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24186,7 +24186,7 @@
         "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24213,7 +24213,7 @@
         "Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24240,7 +24240,7 @@
         "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24267,7 +24267,7 @@
         "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24294,7 +24294,7 @@
         "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24321,7 +24321,7 @@
         "Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24348,7 +24348,7 @@
         "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24375,7 +24375,7 @@
         "Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24402,7 +24402,7 @@
         "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24429,7 +24429,7 @@
         "Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24456,7 +24456,7 @@
         "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24483,7 +24483,7 @@
         "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24510,7 +24510,7 @@
         "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24537,7 +24537,7 @@
         "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24564,7 +24564,7 @@
         "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24591,7 +24591,7 @@
         "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24618,7 +24618,7 @@
         "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24645,7 +24645,7 @@
         "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24672,7 +24672,7 @@
         "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24699,7 +24699,7 @@
         "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24726,7 +24726,7 @@
         "Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24753,7 +24753,7 @@
         "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24780,7 +24780,7 @@
         "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24807,7 +24807,7 @@
         "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24834,7 +24834,7 @@
         "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24861,7 +24861,7 @@
         "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24888,7 +24888,7 @@
         "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24915,7 +24915,7 @@
         "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24942,7 +24942,7 @@
         "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24969,7 +24969,7 @@
         "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -24996,7 +24996,7 @@
         "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25023,7 +25023,7 @@
         "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25050,7 +25050,7 @@
         "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25077,7 +25077,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25104,7 +25104,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25131,7 +25131,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25158,7 +25158,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25185,7 +25185,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25212,7 +25212,7 @@
         "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25239,7 +25239,7 @@
         "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25266,7 +25266,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25293,7 +25293,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25320,7 +25320,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25347,7 +25347,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25374,7 +25374,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25401,7 +25401,7 @@
         "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25428,7 +25428,7 @@
         "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25455,7 +25455,7 @@
         "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25482,7 +25482,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25509,7 +25509,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25536,7 +25536,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25563,7 +25563,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25590,7 +25590,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25617,7 +25617,7 @@
         "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25644,7 +25644,7 @@
         "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25671,7 +25671,7 @@
         "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25698,7 +25698,7 @@
         "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25725,7 +25725,7 @@
         "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25752,7 +25752,7 @@
         "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25779,7 +25779,7 @@
         "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25806,7 +25806,7 @@
         "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25833,7 +25833,7 @@
         "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25860,7 +25860,7 @@
         "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25887,7 +25887,7 @@
         "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25914,7 +25914,7 @@
         "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25941,7 +25941,7 @@
         "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25968,7 +25968,7 @@
         "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -25995,7 +25995,7 @@
         "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26022,7 +26022,7 @@
         "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26049,7 +26049,7 @@
         "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26076,7 +26076,7 @@
         "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26103,7 +26103,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26130,7 +26130,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26157,7 +26157,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26184,7 +26184,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26211,7 +26211,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26238,7 +26238,7 @@
         "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26265,7 +26265,7 @@
         "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26292,7 +26292,7 @@
         "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26319,7 +26319,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26346,7 +26346,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26373,7 +26373,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26400,7 +26400,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26427,7 +26427,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26454,7 +26454,7 @@
         "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26481,7 +26481,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26508,7 +26508,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26535,7 +26535,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26562,7 +26562,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26589,7 +26589,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26616,7 +26616,7 @@
         "Test-Win7-MSVC-Golo-CPU-AVX-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26643,7 +26643,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26670,7 +26670,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26697,7 +26697,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26724,7 +26724,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26751,7 +26751,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26778,7 +26778,7 @@
         "Test-Win8-MSVC-Golo-CPU-AVX-x86_64-Release-GDI"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26805,7 +26805,7 @@
         "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26832,7 +26832,7 @@
         "Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26859,7 +26859,7 @@
         "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26886,7 +26886,7 @@
         "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26913,7 +26913,7 @@
         "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"
@@ -26940,7 +26940,7 @@
         "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "os:Debian-9.1",
         "pool:Skia"