Move most remaining ANGLE bots to Clang.

Sort job names.

Docs-Preview: https://skia.org/?cl=63080
No-Try: true
Change-Id: Ia72c055c4ddb903063b8a4be5ebd6ba92fc8b6d6
Reviewed-on: https://skia-review.googlesource.com/63080
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

12 files changed, 765 insertions, 765 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index a7600ec026..b159f884d8 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -89,6 +89,7 @@
   "Build-Win-MSVC-x86_64-Release",
   "Build-Win-MSVC-x86_64-Release-ANGLE",
   "Build-Win-MSVC-x86_64-Release-Vulkan",
+  "Calmbench-Debian9-Clang-x86_64-Release",
   "Housekeeper-Nightly-RecreateSKPs_Canary",
   "Housekeeper-Nightly-UpdateMetaConfig",
   "Housekeeper-PerCommit",
@@ -133,13 +134,13 @@
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android",
+  "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan",
   "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-All-Android",
   "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-All-Android",
+  "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench",
   "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench",
-  "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
-  "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
   "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug-All",
   "Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release-All",
   "Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug-All",
@@ -207,8 +208,10 @@
   "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41",
   "Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All",
+  "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+  "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
@@ -217,12 +220,18 @@
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+  "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+  "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+  "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+  "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+  "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
@@ -230,29 +239,21 @@
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+  "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+  "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+  "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+  "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
-  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
-  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
-  "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
-  "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
   "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -330,17 +331,17 @@
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FDAA",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_16-Coverage",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FAAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FDAA",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN_FSAA",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow",
+  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Shard_16-Coverage",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN",
   "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast",
@@ -399,8 +400,10 @@
   "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41",
   "Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All",
+  "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+  "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
   "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
@@ -410,41 +413,39 @@
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+  "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+  "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+  "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+  "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+  "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+  "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+  "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+  "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
-  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
-  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
-  "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
-  "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -458,13 +459,13 @@
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
+  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
+  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",
@@ -476,6 +477,5 @@
   "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Debug-All",
   "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All",
   "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All",
-  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All",
-  "Calmbench-Debian9-Clang-x86_64-Release"
+  "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All"
 ]
diff --git a/infra/bots/recipe_modules/core/examples/full.py b/infra/bots/recipe_modules/core/examples/full.py
index 0e713dcfb4..6f7d9b6336 100644
--- a/infra/bots/recipe_modules/core/examples/full.py
+++ b/infra/bots/recipe_modules/core/examples/full.py
@@ -31,7 +31,7 @@ def GenTests(api):
       )
     )
 
-  buildername = ('Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-' +
+  buildername = ('Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-' +
                  'Debug-All-ANGLE')
   yield (
       api.test('no_persistent_checkout') +
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json
index b4b3458afe..a754447426 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE.json
@@ -91,7 +91,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "rmtree data"
@@ -106,7 +106,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "makedirs data"
@@ -182,7 +182,7 @@
       "~inc0.webp",
       "~inc1.webp",
       "--outResultsFile",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
       "--properties",
       "gitHash",
       "abc123",
@@ -194,7 +194,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
@@ -224,7 +224,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
     ],
     "infra_step": true,
     "name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
index 4899cd7f0b..d413c3f2b6 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE.json
@@ -91,7 +91,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "rmtree data"
@@ -106,7 +106,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "makedirs data"
@@ -182,7 +182,7 @@
       "~inc0.webp",
       "~inc1.webp",
       "--outResultsFile",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
       "--properties",
       "gitHash",
       "abc123",
@@ -194,7 +194,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
@@ -224,7 +224,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
     ],
     "infra_step": true,
     "name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json
index 1844864463..02b7495b66 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE.json
@@ -91,7 +91,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "rmtree data"
@@ -106,7 +106,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data"
     ],
     "infra_step": true,
     "name": "makedirs data"
@@ -182,7 +182,7 @@
       "~inc0.webp",
       "~inc1.webp",
       "--outResultsFile",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\data\\nanobench_abc123_1337000001.json",
       "--properties",
       "gitHash",
       "abc123",
@@ -194,7 +194,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
@@ -224,7 +224,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
+      "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
     ],
     "infra_step": true,
     "name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 5d7a7750af..7c963fdfb2 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -358,10 +358,10 @@ TEST_BUILDERS = [
    'Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'),
   ('Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-'
    'Valgrind_SK_CPU_LIMIT_SSE41'),
+  'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE',
+  'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE',
   'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan',
-  'Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE',
-  'Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE',
-  'Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE',
+  'Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE',
   'Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All',
   'Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All',
   'Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
index cf13629712..f86618b590 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
+      "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -202,7 +202,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "configuration",
       "Debug",
       "cpu_or_gpu",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
index 4442d09297..0835dadc2a 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
+      "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -202,7 +202,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "configuration",
       "Debug",
       "cpu_or_gpu",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
index 6a53040a5a..68ef0e52bd 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
+      "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -202,7 +202,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "configuration",
       "Release",
       "cpu_or_gpu",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
index 66e6c1a8ba..ae89f7afd1 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
+      "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -202,7 +202,7 @@
       "arch",
       "x86_64",
       "compiler",
-      "MSVC",
+      "Clang",
       "configuration",
       "Debug",
       "cpu_or_gpu",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 4bf06e9e5f..d190c98771 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -910,19 +910,19 @@ TEST_BUILDERS = [
    '-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41'),
   ('Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All'
    '-Valgrind_SK_CPU_LIMIT_SSE41'),
+  'Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE',
   'Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan',
   ('Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All'
    '-ReleaseAndAbandonGpuContext'),
+  'Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE',
   'Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan',
+  'Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE',
   'Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan',
+  'Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA',
-  'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE',
-  'Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE',
-  'Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE',
-  'Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE',
   'Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All',
   'Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
 ]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index abd377707b..0c63bd8d4f 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1263,6 +1263,12 @@
         "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All"
       ]
     },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1275,6 +1281,12 @@
         "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All"
       ]
     },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1323,12 +1335,30 @@
         "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
+      ]
+    },
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
         "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All"
       ]
     },
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1341,6 +1371,12 @@
         "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
       ]
     },
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -1353,12 +1389,24 @@
         "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All"
       ]
     },
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
       ]
     },
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -1401,46 +1449,58 @@
         "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All"
       ]
     },
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
       ]
     },
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
         "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All"
       ]
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
+        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
       ]
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
+        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
       ]
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
+        "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
       ]
     },
-    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
+        "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
       ]
     },
-    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+        "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
       ]
     },
     "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
@@ -1479,66 +1539,6 @@
         "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
-    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
-      ]
-    },
     "Perf-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -2417,6 +2417,12 @@
         "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All"
       ]
     },
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2429,6 +2435,12 @@
         "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All"
       ]
     },
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2483,12 +2495,30 @@
         "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
+    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
+      ]
+    },
+    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All"
       ]
     },
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2501,6 +2531,12 @@
         "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
       ]
     },
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
@@ -2513,12 +2549,24 @@
         "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All"
       ]
     },
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
       ]
     },
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -2555,46 +2603,58 @@
         "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All"
       ]
     },
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
       ]
     },
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
+      ]
+    },
     "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All"
       ]
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
+        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
       ]
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
+        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
       ]
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
+        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
       ]
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
+        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
       ]
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+        "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
       ]
     },
     "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
@@ -2633,66 +2693,6 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
-      ]
-    },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
-      ]
-    },
     "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -10279,7 +10279,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10298,7 +10298,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10313,7 +10313,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10326,7 +10326,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10345,7 +10345,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10360,7 +10360,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10373,7 +10373,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10392,7 +10392,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10407,7 +10407,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10420,7 +10420,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10439,12 +10439,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-22.21.13.8205",
-        "os:Windows-10-10586",
+        "gpu:1002:6646-22.19.165.512",
+        "os:Windows-10-15063",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10454,7 +10454,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10467,7 +10467,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10486,11 +10486,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:1002:6646-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10501,7 +10501,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10514,7 +10514,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10533,12 +10533,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:104a-22.21.13.8205",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -10548,7 +10548,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10561,7 +10561,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10580,7 +10580,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10595,7 +10595,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10608,7 +10608,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10627,7 +10627,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10642,7 +10642,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10655,7 +10655,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10674,7 +10674,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10689,7 +10689,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10702,7 +10702,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10721,7 +10721,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -10736,7 +10736,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10749,7 +10749,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10768,11 +10768,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10783,7 +10783,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10796,7 +10796,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10815,11 +10815,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10830,7 +10830,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10843,7 +10843,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10862,11 +10862,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:8086:162b-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10877,7 +10877,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10890,7 +10890,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10909,11 +10909,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:8086:162b-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10924,7 +10924,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10937,7 +10937,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10960,7 +10960,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -10971,7 +10971,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -10984,7 +10984,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11003,11 +11003,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11018,7 +11018,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11031,7 +11031,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11050,11 +11050,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11065,7 +11065,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11078,7 +11078,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11101,7 +11101,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11112,7 +11112,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11125,7 +11125,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11144,11 +11144,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11159,7 +11159,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11172,7 +11172,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11191,11 +11191,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11206,7 +11206,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11219,7 +11219,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11238,11 +11238,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11253,7 +11253,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11266,7 +11266,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11285,11 +11285,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11300,7 +11300,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11313,7 +11313,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11332,12 +11332,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11348,7 +11347,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11361,7 +11360,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11380,12 +11379,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11396,7 +11394,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11409,7 +11407,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
+    "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11432,7 +11430,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:1002:683d-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11443,7 +11441,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11456,7 +11454,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11475,11 +11473,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:1002:683d-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11490,7 +11488,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11503,7 +11501,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11522,11 +11520,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11537,7 +11535,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11550,7 +11548,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11569,11 +11567,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11584,7 +11582,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11597,7 +11595,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11616,11 +11614,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11631,7 +11629,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11644,7 +11642,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11663,11 +11661,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11678,7 +11676,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11691,7 +11689,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11710,11 +11708,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11725,7 +11724,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11738,7 +11737,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11757,11 +11756,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11772,7 +11772,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11785,7 +11785,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11804,11 +11804,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11819,7 +11820,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11832,7 +11833,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11851,11 +11852,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11866,7 +11868,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11879,7 +11881,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11898,11 +11900,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11913,7 +11915,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11926,7 +11928,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11945,11 +11947,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -11960,7 +11962,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -11973,7 +11975,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -11992,11 +11994,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4703",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12007,7 +12009,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12020,7 +12022,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12039,11 +12041,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4703",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12054,7 +12056,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12067,7 +12069,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12086,11 +12088,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12101,7 +12103,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12114,7 +12116,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12133,11 +12135,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12148,7 +12150,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12161,7 +12163,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12180,11 +12182,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12195,7 +12197,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12208,7 +12210,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12227,11 +12229,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12242,7 +12244,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12255,7 +12257,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12274,12 +12276,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12290,7 +12291,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12303,7 +12304,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12322,12 +12323,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12338,7 +12338,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12351,7 +12351,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12370,11 +12370,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12385,7 +12385,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -12398,7 +12398,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -12417,11 +12417,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -12432,7 +12432,7 @@
         "../../..",
         "perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19411,7 +19411,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19430,7 +19430,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19445,7 +19445,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19458,7 +19458,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19477,7 +19477,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19492,7 +19492,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19505,7 +19505,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19524,7 +19524,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19539,7 +19539,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19552,7 +19552,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19571,12 +19571,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-22.21.13.8205",
-        "os:Windows-10-10586",
+        "gpu:1002:6646-22.19.165.512",
+        "os:Windows-10-15063",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -19586,7 +19586,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19599,7 +19599,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19618,11 +19618,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:1002:6646-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -19633,7 +19633,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19646,7 +19646,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19665,12 +19665,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
-        "os:Windows-10-15063",
+        "gpu:10de:104a-22.21.13.8205",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -19680,7 +19680,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19693,7 +19693,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19712,7 +19712,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19727,7 +19727,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19740,7 +19740,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19759,7 +19759,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19774,7 +19774,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19787,7 +19787,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19806,7 +19806,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19821,7 +19821,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19834,7 +19834,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19868,7 +19868,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19881,7 +19881,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19900,7 +19900,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -19915,7 +19915,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19928,7 +19928,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19947,11 +19947,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -19962,7 +19962,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -19975,7 +19975,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -19994,11 +19994,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20009,7 +20009,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20022,7 +20022,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
+    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20041,11 +20041,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:8086:162b-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20056,7 +20056,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20069,7 +20069,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20088,11 +20088,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:8086:162b-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20103,7 +20103,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20116,7 +20116,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20139,7 +20139,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20150,7 +20150,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20163,7 +20163,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20182,11 +20182,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20197,7 +20197,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20210,7 +20210,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20229,11 +20229,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20244,7 +20244,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20257,7 +20257,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20280,7 +20280,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-22.19.165.512",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20291,7 +20291,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20304,7 +20304,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20323,11 +20323,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20338,7 +20338,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20351,7 +20351,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20370,11 +20370,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:1926-21.20.16.4590",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20385,7 +20385,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20398,7 +20398,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20417,11 +20417,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20432,7 +20432,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20445,7 +20445,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20464,12 +20464,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20480,7 +20479,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20493,7 +20492,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20516,8 +20515,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20528,7 +20526,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20541,7 +20539,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
+    "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20560,11 +20558,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:8086:0a16-20.19.15.4703",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20575,7 +20573,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20588,7 +20586,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20607,11 +20605,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:1002:683d-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20622,7 +20620,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20635,7 +20633,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20658,7 +20656,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:1002:683d-22.19.165.512",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20669,7 +20667,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20682,7 +20680,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20701,11 +20699,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20716,7 +20714,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20729,7 +20727,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20748,11 +20746,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20763,7 +20761,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20776,7 +20774,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20795,11 +20793,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-22.19.165.512",
+        "gpu:10de:11c0-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20810,7 +20808,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20823,7 +20821,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20842,11 +20840,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20857,7 +20856,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20870,7 +20869,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20889,11 +20888,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20904,7 +20904,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20917,7 +20917,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20936,11 +20936,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20951,7 +20952,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -20964,7 +20965,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -20983,11 +20984,12 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "cpu:x86-64-i7-6700K",
+        "gpu:10de:1401-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -20998,7 +21000,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21011,7 +21013,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21030,11 +21032,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21045,7 +21047,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21058,7 +21060,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21077,11 +21079,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-22.21.13.8205",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21092,7 +21094,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21105,7 +21107,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21124,11 +21126,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4703",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21139,7 +21141,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21152,7 +21154,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21171,11 +21173,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4703",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21186,7 +21188,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21199,7 +21201,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21218,11 +21220,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21233,7 +21235,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21246,7 +21248,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+    "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21265,11 +21267,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-21.20.16.4590",
+        "gpu:10de:1ba1-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21280,7 +21282,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21293,7 +21295,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21312,11 +21314,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21327,7 +21329,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21340,7 +21342,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21359,11 +21361,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4703",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21374,7 +21376,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21387,7 +21389,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21406,12 +21408,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21422,7 +21423,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21435,7 +21436,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21454,12 +21455,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-6700K",
-        "gpu:10de:1401-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21470,7 +21470,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21483,7 +21483,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21502,11 +21502,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21517,7 +21517,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21530,7 +21530,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
+    "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21549,11 +21549,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1ba1-22.21.13.8205",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -21564,7 +21564,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24373,9 +24373,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24388,7 +24388,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24400,9 +24400,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All"
+        "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24415,7 +24415,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24427,9 +24427,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
+        "Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24442,7 +24442,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24454,9 +24454,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24469,7 +24469,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24481,9 +24481,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24496,7 +24496,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24508,9 +24508,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
+        "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24523,7 +24523,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24535,9 +24535,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24550,7 +24550,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24562,9 +24562,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
+        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24577,7 +24577,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24589,9 +24589,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All"
+        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24604,7 +24604,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24616,9 +24616,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All"
+        "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24631,7 +24631,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24643,9 +24643,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24658,7 +24658,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24670,9 +24670,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
+        "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24685,7 +24685,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24697,9 +24697,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
+        "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24712,7 +24712,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24724,9 +24724,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24739,7 +24739,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24751,9 +24751,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+        "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24766,7 +24766,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24778,9 +24778,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
+        "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24793,7 +24793,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24805,9 +24805,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+        "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24820,7 +24820,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24832,9 +24832,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
+        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24847,7 +24847,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24859,9 +24859,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
+        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24874,7 +24874,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24886,9 +24886,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+        "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24901,7 +24901,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24913,9 +24913,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "dependencies": [
-        "Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
+        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24928,7 +24928,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24940,9 +24940,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
+        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24955,7 +24955,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -24967,9 +24967,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
+    "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
+        "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -24982,7 +24982,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -27922,9 +27922,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -27937,7 +27937,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -27949,9 +27949,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All"
+        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -27964,7 +27964,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -27976,9 +27976,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
+        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -27991,7 +27991,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28003,9 +28003,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All"
+        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28018,7 +28018,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28030,9 +28030,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All"
+        "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28045,7 +28045,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28057,9 +28057,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
+        "Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28072,7 +28072,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-Golo-GPU-GT610-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28084,9 +28084,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28099,7 +28099,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28111,9 +28111,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28126,7 +28126,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28138,9 +28138,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28153,7 +28153,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28165,9 +28165,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28180,7 +28180,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28192,9 +28192,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28207,7 +28207,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28219,9 +28219,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28234,7 +28234,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28246,9 +28246,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
+        "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28261,7 +28261,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28273,9 +28273,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
+    "Upload-Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan"
+        "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28288,7 +28288,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28300,9 +28300,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28315,7 +28315,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28327,9 +28327,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28342,7 +28342,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28354,9 +28354,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28369,7 +28369,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28381,9 +28381,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28396,7 +28396,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28408,9 +28408,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28423,7 +28423,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28435,9 +28435,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28450,7 +28450,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28462,9 +28462,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All"
+        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28477,7 +28477,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28489,9 +28489,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All"
+        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28504,7 +28504,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28516,9 +28516,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
+        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28531,7 +28531,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28543,9 +28543,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All"
+        "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28558,7 +28558,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28570,9 +28570,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28585,7 +28585,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28597,9 +28597,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
+        "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28612,7 +28612,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28624,9 +28624,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
+    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
+        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28639,7 +28639,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28651,9 +28651,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE"
+        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28666,7 +28666,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28678,9 +28678,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE"
+        "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28693,7 +28693,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28705,9 +28705,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
+    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All"
+        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28720,7 +28720,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28732,9 +28732,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
+        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28747,7 +28747,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28759,9 +28759,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
+        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28774,7 +28774,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28786,9 +28786,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
+        "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28801,7 +28801,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
+        "buildername=Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28813,9 +28813,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28828,7 +28828,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28840,9 +28840,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28855,7 +28855,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28867,9 +28867,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28882,7 +28882,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28894,9 +28894,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28909,7 +28909,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28921,9 +28921,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28936,7 +28936,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28948,9 +28948,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE"
+        "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28963,7 +28963,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -28975,9 +28975,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -28990,7 +28990,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29002,9 +29002,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29017,7 +29017,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29029,9 +29029,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29044,7 +29044,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29056,9 +29056,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29071,7 +29071,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29083,9 +29083,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "dependencies": [
-        "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29098,7 +29098,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29110,9 +29110,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE": {
+    "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "dependencies": [
-        "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE"
+        "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29125,7 +29125,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-All-ANGLE",
+        "buildername=Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",