Make all tasks specify an OS version

Rename Win->Win10 where appropriate

BUG=skia:

Change-Id: I8692340cebf646e2cb0cb825e808b5ea1b695a8f
Reviewed-on: https://skia-review.googlesource.com/5356
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 1c5daca..0852dbd 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -148,23 +148,23 @@
 		"Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
 		"Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
 		"Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
-		"Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-		"Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-		"Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-		"Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-		"Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-		"Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-		"Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+		"Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+		"Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+		"Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
 		"Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
 		"Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
 		"Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
 		"Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+		"Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+		"Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+		"Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+		"Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+		"Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+		"Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+		"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+		"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+		"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+		"Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
 		"Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
 		"Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
 		"Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
@@ -233,24 +233,24 @@
 		"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
 		"Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
 		"Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
-		"Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-		"Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-		"Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+		"Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+		"Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+		"Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
 		"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
 		"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
 		"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+		"Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+		"Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+		"Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+		"Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+		"Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+		"Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+		"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
 		"Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
 		"Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
 		"Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
@@ -320,13 +320,19 @@
 		"pool": POOL_SKIA,
 	}
 	if os, ok := parts["os"]; ok {
-		d["os"] = os
+		d["os"] = map[string]string{
+			"Android": "Android",
+			"Mac":     "Mac-10.11",
+			"Ubuntu":  "Ubuntu-14.04",
+			"Win":     "Windows-2008ServerR2-SP1",
+			"Win10":   "Windows-10-10586",
+			"Win2k8":  "Windows-2008ServerR2-SP1",
+			"Win8":    "Windows-8.1-SP0",
+			"iOS":     "iOS-9.3.1",
+		}[os]
 	} else {
 		d["os"] = DEFAULT_OS
 	}
-	if strings.Contains(d["os"], "Win") {
-		d["os"] = "Windows"
-	}
 	if parts["role"] == "Test" || parts["role"] == "Perf" {
 		if strings.Contains(parts["os"], "Android") {
 			// For Android, the device type is a better dimension
@@ -353,9 +359,6 @@
 			d["device"] = map[string]string{
 				"iPadMini4": "iPad5,1",
 			}[parts["model"]]
-			// TODO(borenet): Replace this hack with something
-			// better.
-			d["os"] = "iOS-9.3.1"
 		} else if parts["cpu_or_gpu"] == "CPU" {
 			d["gpu"] = "none"
 			d["cpu"] = map[string]string{
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index bd8c915..a317411 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -752,82 +752,22 @@
         "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
-      ]
-    },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
-      ]
-    },
-    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
-      ]
-    },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ]
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
     "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
@@ -854,6 +794,66 @@
         "Upload-Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
       ]
     },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ]
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ]
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+      ]
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ]
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
+      ]
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+      ]
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+      ]
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
+      ]
+    },
     "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1263,94 +1263,22 @@
         "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
+        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
-      ]
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
-      ]
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
-      ]
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
-      ]
-    },
-    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
-      ]
-    },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ]
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+        "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
     "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
@@ -1371,6 +1299,78 @@
         "Upload-Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ]
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ]
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+      ]
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
+      ]
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
+      ]
+    },
     "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1412,7 +1412,7 @@
     "Build-Mac-Clang-Arm7-Debug-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1437,7 +1437,7 @@
     "Build-Mac-Clang-Arm7-Release-iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1469,7 +1469,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1494,7 +1494,7 @@
     "Build-Mac-Clang-arm64-Debug-GN_iOS": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1519,7 +1519,7 @@
     "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1544,7 +1544,7 @@
     "Build-Mac-Clang-x86_64-Debug-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1569,7 +1569,7 @@
     "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1594,7 +1594,7 @@
     "Build-Mac-Clang-x86_64-Release-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1626,7 +1626,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1658,7 +1658,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1690,7 +1690,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1722,7 +1722,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1754,7 +1754,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1786,7 +1786,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1818,7 +1818,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1850,7 +1850,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1882,7 +1882,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1914,7 +1914,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1946,7 +1946,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -1978,7 +1978,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2010,7 +2010,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2042,7 +2042,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2074,7 +2074,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2106,7 +2106,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2138,7 +2138,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2170,7 +2170,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2202,7 +2202,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2234,7 +2234,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2266,7 +2266,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2298,7 +2298,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2323,7 +2323,7 @@
     "Build-Ubuntu-GCC-x86-Debug": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2348,7 +2348,7 @@
     "Build-Ubuntu-GCC-x86-Release": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2373,7 +2373,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2398,7 +2398,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2423,7 +2423,7 @@
     "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2448,7 +2448,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2473,7 +2473,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Fast": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2498,7 +2498,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-GN": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2523,7 +2523,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Mesa": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2548,7 +2548,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-NoGPU": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2573,7 +2573,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-PDFium": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2598,7 +2598,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2648,7 +2648,7 @@
     "Build-Ubuntu-GCC-x86_64-Release-Valgrind": {
       "dimensions": [
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2680,7 +2680,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2712,7 +2712,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2744,7 +2744,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2776,7 +2776,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2808,7 +2808,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2840,7 +2840,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2872,7 +2872,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2904,7 +2904,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2936,7 +2936,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -2968,7 +2968,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3000,7 +3000,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3032,7 +3032,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3069,7 +3069,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3101,7 +3101,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3133,7 +3133,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3165,7 +3165,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3197,7 +3197,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -3234,7 +3234,7 @@
       ],
       "dimensions": [
         "gpu:none",
-        "os:Windows",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "extra_args": [
@@ -5239,7 +5239,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5287,7 +5287,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5336,7 +5336,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5385,7 +5385,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5433,7 +5433,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5481,7 +5481,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5529,7 +5529,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5583,7 +5583,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5632,7 +5632,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5686,7 +5686,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -5735,7 +5735,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5788,7 +5788,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5837,7 +5837,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5886,7 +5886,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -5935,7 +5935,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6009,7 +6009,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6082,7 +6082,7 @@
       ],
       "dimensions": [
         "gpu:10de:1244",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -6130,7 +6130,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6178,7 +6178,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6203,203 +6203,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6422,7 +6226,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6432,7 +6236,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6447,7 +6251,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6470,7 +6274,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6480,7 +6284,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6495,7 +6299,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6518,7 +6322,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6528,295 +6332,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6854,7 +6370,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6902,7 +6418,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6950,7 +6466,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -6998,7 +6514,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7023,6 +6539,490 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -7046,7 +7046,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7094,7 +7094,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7142,7 +7142,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -7190,7 +7190,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9098,7 +9098,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9146,7 +9146,7 @@
       ],
       "dimensions": [
         "gpu:10de:08a4",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9195,7 +9195,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9244,7 +9244,7 @@
       "dimensions": [
         "cpu:x86-64",
         "gpu:none",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9292,7 +9292,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9340,7 +9340,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9388,7 +9388,7 @@
       ],
       "dimensions": [
         "gpu:8086:0a2e",
-        "os:Mac",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9442,7 +9442,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9491,7 +9491,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9545,7 +9545,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -9594,7 +9594,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9648,7 +9648,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9701,7 +9701,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9754,7 +9754,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9803,7 +9803,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9927,7 +9927,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -9976,7 +9976,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10025,7 +10025,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10074,7 +10074,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10123,7 +10123,7 @@
       "dimensions": [
         "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10171,7 +10171,7 @@
       ],
       "dimensions": [
         "gpu:10de:1244",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 32400000000000,
@@ -10219,7 +10219,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10267,7 +10267,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Ubuntu",
+        "os:Ubuntu-14.04",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10292,301 +10292,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-GDI"
-      ],
-      "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10609,7 +10315,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10619,7 +10325,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10634,7 +10340,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10657,7 +10363,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10667,7 +10373,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10682,7 +10388,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10705,7 +10411,7 @@
       ],
       "dimensions": [
         "gpu:8086:162b",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10715,295 +10421,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "gpu:10de:1401",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:16"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:22"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
-      ],
-      "dimensions": [
-        "gpu:8086:1912",
-        "os:Windows",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11041,7 +10459,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11089,7 +10507,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11137,7 +10555,7 @@
       ],
       "dimensions": [
         "gpu:10de:11c0",
-        "os:Windows",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11162,6 +10580,588 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows-10-10586",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:16"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -11185,7 +11185,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11233,7 +11233,7 @@
       ],
       "dimensions": [
         "gpu:1002:683d",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11281,7 +11281,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -11329,7 +11329,7 @@
       ],
       "dimensions": [
         "gpu:8086:0412",
-        "os:Windows",
+        "os:Windows-8.1-SP0",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -12233,9 +12233,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12248,7 +12248,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12262,9 +12262,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+        "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12277,123 +12277,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12465,6 +12349,122 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "dependencies": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "dependencies": [
+        "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "dependencies": [
+        "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
       "dependencies": [
         "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release"
@@ -14089,9 +14089,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14104,7 +14104,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14118,9 +14118,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
+        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14133,7 +14133,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14147,9 +14147,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14162,355 +14162,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
-      "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
-      "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
-      "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
-      "dependencies": [
-        "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
-      "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
-      "dependencies": [
-        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "buildername=Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14611,6 +14263,354 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "dependencies": [
+        "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+      "dependencies": [
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "dependencies": [
         "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug"