Cleanup jobs.

NUC6i7KYK with GTX960 is an experimental eGPU setup that will be
replaced with the NUC7i5BNK.

IntelHD4600 has been replaced with IntelHD4400.

Move remainder of *AbandonGpuContext jobs to QuadroP400.

No-Try: true
Change-Id: Ic81392ec162cb88500c9da7609471dbdc4a64f84
Reviewed-on: https://skia-review.googlesource.com/57320
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

7 files changed, 70 insertions, 666 deletions

diff --git a/infra/bots/README.recipes.md b/infra/bots/README.recipes.md
index 2118af1673..5335690334 100644
--- a/infra/bots/README.recipes.md
+++ b/infra/bots/README.recipes.md
@@ -804,17 +804,17 @@ benchmark Skia using skpbench.
 
 [DEPS](/infra/bots/recipes/test.py#9): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [core](#recipe_modules-core), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars)
 
-— **def [RunSteps](/infra/bots/recipes/test.py#834)(api):**
+— **def [RunSteps](/infra/bots/recipes/test.py#838)(api):**
 
 — **def [dm\_flags](/infra/bots/recipes/test.py#27)(api, bot):**
 
-— **def [key\_params](/infra/bots/recipes/test.py#685)(api):**
+— **def [key\_params](/infra/bots/recipes/test.py#689)(api):**
 
 Build a unique key from the builder name (as a list).
 
 E.g.  arch x86 gpu GeForce320M mode MacMini4.1 os Mac10.6
 
-— **def [test\_steps](/infra/bots/recipes/test.py#702)(api):**
+— **def [test\_steps](/infra/bots/recipes/test.py#706)(api):**
 
 Run the DM test.
 ### *recipes* / [update\_meta\_config](/infra/bots/recipes/update_meta_config.py)
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index bb31305d98..1692e9a42f 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -207,16 +207,12 @@
   "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
   "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
-  "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
-  "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
   "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
   "Perf-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
-  "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug",
   "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release",
   "Perf-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug",
@@ -369,13 +365,13 @@
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
   "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug",
   "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release",
-  "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN",
+  "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-PreAbandonGpuContext",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-TSAN",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-UBSAN_float_cast_overflow",
   "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan",
@@ -388,20 +384,16 @@
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release",
+  "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan",
-  "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
   "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release",
-  "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
-  "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug",
   "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
   "Test-Win10-Clang-ShuttleA-GPU-AMDHD7770-x86_64-Release",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug",
   "Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release",
-  "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
-  "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug",
   "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release",
   "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug",
diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json
index 133657ce07..3c0fc38ce6 100644
--- a/infra/bots/recipes/perf.expected/trybot.json
+++ b/infra/bots/recipes/perf.expected/trybot.json
@@ -91,7 +91,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release/data"
     ],
     "infra_step": true,
     "name": "rmtree data"
@@ -106,7 +106,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release/data"
     ],
     "infra_step": true,
     "name": "makedirs data"
@@ -182,7 +182,7 @@
       "~inc0.webp",
       "~inc1.webp",
       "--outResultsFile",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data/nanobench_abc123_1337000001.json",
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release/data/nanobench_abc123_1337000001.json",
       "--properties",
       "gitHash",
       "abc123",
@@ -204,9 +204,9 @@
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
-      "IntelHD4600",
+      "IntelHD4400",
       "model",
-      "ShuttleB",
+      "NUCD34010WYKH",
       "os",
       "Win10"
     ],
@@ -228,7 +228,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release/data"
+      "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release/data"
     ],
     "infra_step": true,
     "name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 73d32416fa..0c53be698b 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -412,7 +412,7 @@ def GenTests(api):
 
     yield test
 
-  builder = 'Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release'
+  builder = 'Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release'
   yield (
     api.test('trybot') +
     api.properties(buildername=builder,
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext.json
index 85d189fc41..0635ab08e6 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext.json
@@ -219,7 +219,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
+      "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -236,11 +236,11 @@
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
-      "IntelIris6100",
+      "QuadroP400",
       "extra_config",
       "ReleaseAndAbandonGpuContext",
       "model",
-      "NUC5i7RYH",
+      "Golo",
       "os",
       "Win10",
       "--uninterestingHashesFile",
@@ -255,6 +255,8 @@
       "gl",
       "gldft",
       "glsrgb",
+      "glmsaa8",
+      "glnvprdit8",
       "--src",
       "tests",
       "gm",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index dfbd34190c..6aa15dc69a 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -892,7 +892,7 @@ TEST_BUILDERS = [
    '-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41'),
   ('Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release'
    '-Valgrind_SK_CPU_LIMIT_SSE41'),
-  ('Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release'
+  ('Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release'
    '-ReleaseAndAbandonGpuContext'),
   'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE',
   'Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 82371ea8cc..09a8f184b9 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1257,18 +1257,6 @@
         "Upload-Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
-      ]
-    },
-    "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release"
-      ]
-    },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1305,18 +1293,6 @@
         "Upload-Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug"
-      ]
-    },
-    "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release"
-      ]
-    },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2231,12 +2207,6 @@
         "Upload-Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release"
       ]
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
-      "priority": 0.8,
-      "tasks": [
-        "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext"
-      ]
-    },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2273,6 +2243,12 @@
         "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN"
       ]
     },
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-PreAbandonGpuContext": {
+      "priority": 0.8,
+      "tasks": [
+        "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-PreAbandonGpuContext"
+      ]
+    },
     "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-TSAN": {
       "priority": 0.8,
       "tasks": [
@@ -2345,16 +2321,16 @@
         "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release"
       ]
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan"
+        "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext"
       ]
     },
-    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan": {
       "priority": 0.8,
       "tasks": [
-        "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext"
+        "Upload-Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan"
       ]
     },
     "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug": {
@@ -2369,18 +2345,6 @@
         "Upload-Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release"
       ]
     },
-    "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
-      ]
-    },
-    "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release"
-      ]
-    },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -2417,18 +2381,6 @@
         "Upload-Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release"
       ]
     },
-    "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug"
-      ]
-    },
-    "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release"
-      ]
-    },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -10218,102 +10170,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-i7-6770HQ",
-        "gpu:10de:1401-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-i7-6770HQ",
-        "gpu:10de:1401-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -10596,100 +10452,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:0412-20.19.15.4703",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:0412-20.19.15.4703",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "perf",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -17119,7 +16881,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17138,11 +16900,11 @@
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release",
+        "Build-Debian9-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:104a-384.59",
+        "gpu:10de:1cb3-384.59",
         "os:Ubuntu-17.04",
         "pool:Skia"
       ],
@@ -17153,7 +16915,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17166,7 +16928,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17182,10 +16944,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:9"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:10"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug",
+        "Build-Debian9-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17200,7 +16967,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17213,7 +16980,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17237,7 +17004,7 @@
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-ASAN",
+        "Build-Debian9-Clang-x86_64-Debug-UBSAN_float_cast_overflow",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17252,7 +17019,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-ASAN",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17265,7 +17032,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17283,13 +17050,13 @@
           "version": "version:9"
         },
         {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:10"
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:0"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-UBSAN_float_cast_overflow",
+        "Build-Debian9-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17304,7 +17071,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-UBSAN_float_cast_overflow",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17317,7 +17084,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17333,15 +17100,10 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:9"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:0"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Debug-Vulkan",
+        "Build-Debian9-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17356,7 +17118,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-Vulkan",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17369,7 +17131,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17385,10 +17147,15 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:9"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:10"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release",
+        "Build-Debian9-Clang-x86_64-Release-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17403,7 +17170,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -17416,7 +17183,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN": {
+    "Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-PreAbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -17432,15 +17199,10 @@
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:9"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:10"
         }
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-ASAN",
+        "Build-Debian9-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17455,7 +17217,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-ASAN",
+        "buildername=Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Release-PreAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18062,7 +17824,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -18081,7 +17843,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -18096,7 +17858,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-ReleaseAndAbandonGpuContext",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18109,7 +17871,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext": {
+    "Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -18128,11 +17890,11 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4703",
+        "gpu:10de:1cb3-22.21.13.8205",
         "os:Windows-10-15063",
         "pool:Skia"
       ],
@@ -18143,7 +17905,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext",
+        "buildername=Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-Vulkan",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -18250,102 +18012,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-i7-6770HQ",
-        "gpu:10de:1401-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-i7-6770HQ",
-        "gpu:10de:1401-22.21.13.8205",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -18628,100 +18294,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:0412-20.19.15.4703",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
-    "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:32"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:89"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:9"
-        }
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:0412-20.19.15.4703",
-        "os:Windows-10-15063",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "test",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia_bundled_win.isolate",
-      "max_attempts": 1,
-      "priority": 0.8
-    },
     "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -22624,33 +22196,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release"
@@ -22732,33 +22277,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "dependencies": [
-        "Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-perf"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release"
@@ -26161,60 +25679,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
-      "dependencies": [
-        "Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-NUC6i7KYK-GPU-GTX960-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug"
@@ -26377,60 +25841,6 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
-      "dependencies": [
-        "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
-    "Upload-Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
-      "dependencies": [
-        "Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.1",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_dm_results",
-        "repository=<(REPO)",
-        "buildername=Test-Win10-Clang-ShuttleB-GPU-IntelHD4600-x86_64-Release",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)",
-        "gs_bucket=skia-infra-gm"
-      ],
-      "isolate": "upload_dm_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug"