Add GCN gen 2 bot (Radeon R9 M470X)
authorBen Wagner <benjaminwagner@google.com>
Mon, 13 Mar 2017 20:50:06 +0000 (16:50 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Mon, 13 Mar 2017 21:43:09 +0000 (21:43 +0000)
BUG=skia:6364
NOTRY=true

Change-Id: I4fda45c902eb95780c91a9c9a5d38740ec6f9137
Reviewed-on: https://skia-review.googlesource.com/9558
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
infra/bots/gpu_map.json
infra/bots/jobs.json
infra/bots/tasks.json

index cd00344..baa13d3 100644 (file)
@@ -12,5 +12,6 @@
   "IntelHD405":    "8086:22b1",
   "IntelHD4600":   "8086:0412",
   "IntelIris540":  "8086:1926",
-  "IntelIris6100": "8086:162b"
+  "IntelIris6100": "8086:162b",
+  "RadeonR9M470X": "1002:6646"
 }
index 678f569..9ff7566 100644 (file)
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
   "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
   "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
   "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
   "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
index 54d287c..bb9eff2 100644 (file)
         "Upload-Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release"
       ]
     },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug"
+      ]
+    },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan"
+      ]
+    },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
+      ]
+    },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
+      ]
+    },
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
+      ]
+    },
     "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release"
       ]
     },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug"
+      ]
+    },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan"
+      ]
+    },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
+      ]
+    },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
+      ]
+    },
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
+      ]
+    },
     "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:22"
+          "version": "version:23"
         },
         {
           "name": "skia/bots/skp",
         {
           "name": "skia/bots/svg",
           "path": "svg",
-          "version": "version:3"
+          "version": "version:4"
         }
       ],
       "dependencies": [
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:22"
+          "version": "version:23"
         },
         {
           "name": "skia/bots/skp",
         {
           "name": "skia/bots/svg",
           "path": "svg",
-          "version": "version:3"
+          "version": "version:4"
         }
       ],
       "dependencies": [
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Windows-10-10586",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:1002:6646",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:1002:6646",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:1002:6646",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:1002:6646",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:1002:6646",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Windows-10-14393",
+        "gpu:10de:104a",
+        "os:Windows-10-10586",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:162b",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-highcpu-8",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-highcpu-8",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:1002:683d",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:1002:683d",
+        "gpu:8086:1926",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+    "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:8086:162b",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+        "buildername=Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0412",
+        "gpu:1002:683d",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:0412",
+        "gpu:1002:683d",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1401",
-        "machine_type:n1-standard-8",
+        "gpu:10de:11c0",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
+    "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:8086:0412",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:8086:0412",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-ANGLE"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan": {
+    "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:10de:1ba1",
+        "gpu:10de:1401",
+        "machine_type:n1-standard-8",
         "os:Windows-10-14393",
         "pool:Skia"
       ],
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan",
+        "buildername=Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
+    "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:10de:1ba1",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
+        "buildername=Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Win-MSVC-x86-Debug"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Win-MSVC-x86_64-Debug-GDI"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
+    "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:j5xnlte",
-        "os:Android",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
+        "buildername=Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Mac-Clang-arm64-Debug-iOS"
       ],
       "dimensions": [
-        "device_os:MMB29K",
-        "device_type:zerofltetmo",
-        "os:Android",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Mac-Clang-arm64-Release-iOS"
       ],
       "dimensions": [
-        "device_os:MMB29K",
-        "device_type:zerofltetmo",
-        "os:Android",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
+    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:22"
+          "version": "version:23"
         },
         {
           "name": "skia/bots/skp",
         {
           "name": "skia/bots/svg",
           "path": "svg",
-          "version": "version:3"
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:herolte",
+        "device_os:MMB29M",
+        "device_type:j5xnlte",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
+    "Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:22"
+          "version": "version:23"
         },
         {
           "name": "skia/bots/skp",
         {
           "name": "skia/bots/svg",
           "path": "svg",
-          "version": "version:3"
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:NRD90M",
-        "device_type:herolte",
+        "device_os:MMB29M",
+        "device_type:j5xnlte",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyJ5-GPU-Adreno306-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
+    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:JDQ39",
-        "device_type:goyawifi",
+        "device_os:MMB29K",
+        "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
+    "Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MPJ24.139-64",
-        "device_type:athene",
+        "device_os:MMB29K",
+        "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
+    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MPJ24.139-64",
-        "device_type:athene",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
+    "Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD90M",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD90M",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:JDQ39",
+        "device_type:goyawifi",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyTab3-GPU-Vivante-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
+    "Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:MPJ24.139-64",
+        "device_type:athene",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
+        "buildername=Test-Android-Clang-MotoG4-GPU-Adreno405-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:M4B30Z",
-        "device_type:hammerhead",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:M4B30Z",
-        "device_type:hammerhead",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:M4B30Z",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:M4B30Z",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:N2G10B",
-        "device_type:fugu",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26H",
-        "device_type:dragon",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26H",
-        "device_type:dragon",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NMF26Q",
-        "device_type:marlin",
+        "device_os:N2G10B",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "gpu:10de:08a4",
-        "os:Mac-10.11",
+        "device_os:NMF26H",
+        "device_type:dragon",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "gpu:10de:08a4",
-        "os:Mac-10.11",
+        "device_os:NMF26H",
+        "device_type:dragon",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac-10.11",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac-10.11",
+        "device_os:NMF26Q",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
+        "gpu:10de:08a4",
         "os:Mac-10.11",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:10de:08a4",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
-        "os:Ubuntu-14.04",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
-        "os:Ubuntu-14.04",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Mac-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Fast"
+        "Build-Mac-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:0a2e",
+        "os:Mac-10.11",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 32400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:104a",
+        "cpu:x86-64-avx2",
+        "gpu:none",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86-Debug"
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-ASAN"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_ct_skps",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "ct_skps_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_ct_skps",
+        "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+      "io_timeout_ns": 3600000000000,
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:23"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:39"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:4"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release"
+      ],
       "dimensions": [
-        "pool:SkiaCT"
+        "gpu:10de:1244",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
       ],
-      "execution_timeout_ns": 86400000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_ct_skps",
+        "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
+      "isolate": "test_skia.isolate",
+      "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+        "Build-Ubuntu-GCC-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
+        "gpu:10de:11c0",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-GCC-x86_64-Release"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
+        "gpu:10de:11c0",
         "os:Ubuntu-14.04",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:0"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": {
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": {
+    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:0"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu-14.04",
+        "gpu:8086:1926",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext",
+        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 2400000000000,
       "isolate": "test_skia.isolate",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_debug",
+          "path": "linux_vulkan_intel_driver_debug",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu-14.04",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release": {
+    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
+          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu-14.04",
+        "gpu:8086:22b1",
+        "os:Ubuntu-16.10",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug": {
+    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0f31",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug",
+        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan": {
+    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "version": "version:4"
         },
         {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:0"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
+          "name": "skia/bots/linux_vulkan_intel_driver_release",
+          "path": "linux_vulkan_intel_driver_release",
           "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:1926",
+        "gpu:8086:0f31",
         "os:Ubuntu-16.10",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan",
+        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:0"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-Vulkan"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:1926",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_debug",
-          "path": "linux_vulkan_intel_driver_debug",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release": {
+    "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:4"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_intel_driver_release",
-          "path": "linux_vulkan_intel_driver_release",
-          "version": "version:1"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Ubuntu-16.10",
+        "gpu:1002:6646",
+        "os:Windows-10-14393",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
+      "dependencies": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
+      "dependencies": [
+        "Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan": {
+      "dependencies": [
+        "Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-Vulkan",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
         "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release"