[nobuildbot] Remaining Win bots
authorEric Boren <borenet@google.com>
Wed, 30 Nov 2016 13:46:14 +0000 (08:46 -0500)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Wed, 30 Nov 2016 14:18:31 +0000 (14:18 +0000)
Also renamed Win8 and Win10 to Win

BUG=skia:

Change-Id: If6439ba8108d9fec288223a5561230a1559dad44
Reviewed-on: https://skia-review.googlesource.com/5237
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
infra/bots/gen_tasks.go
infra/bots/tasks.json

index b71e1e06d06de5757a8ba2569ddcd0b01f7a4d79..86ea8d57d50c1a1659fae7fe51e25870f82fd589 100644 (file)
@@ -149,6 +149,23 @@ var (
                "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
                "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
                "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+               "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+               "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+               "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+               "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+               "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+               "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+               "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
+               "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
+               "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
+               "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
+               "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
+               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+               "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+               "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+               "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
                "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
                "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
                "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
@@ -216,6 +233,22 @@ var (
                "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
                "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
                "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+               "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+               "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+               "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+               "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+               "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
+               "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+               "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
+               "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
+               "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
+               "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
+               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+               "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+               "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+               "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
                "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
                "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
        }
index 2b8d46289f9da1be2a299315b96314aaa4838364..5a39939fd316d1f43f339e7edaac86e364435cad 100644 (file)
         "Build-Win-MSVC-x86_64-Debug"
       ]
     },
+    "Build-Win-MSVC-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ]
+    },
     "Build-Win-MSVC-x86_64-Debug-GDI": {
       "priority": 0.8,
       "tasks": [
         "Build-Win-MSVC-x86_64-Debug-GN"
       ]
     },
+    "Build-Win-MSVC-x86_64-Debug-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+      ]
+    },
     "Build-Win-MSVC-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
         "Build-Win-MSVC-x86_64-Release"
       ]
     },
+    "Build-Win-MSVC-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ]
+    },
     "Build-Win-MSVC-x86_64-Release-GDI": {
       "priority": 0.8,
       "tasks": [
         "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
+    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+      ]
+    },
+    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ]
+    },
     "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ]
     },
+    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
+      ]
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
+      ]
+    },
     "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
       "priority": 0.8,
       "tasks": [
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Win-MSVC-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/win_toolchain",
+          "path": "t",
+          "version": "version:5"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Win-MSVC-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Win-MSVC-x86_64-Debug-GDI": {
       "cipd_packages": [
         {
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Win-MSVC-x86_64-Debug-Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/win_toolchain",
+          "path": "t",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/win_vulkan_sdk",
+          "path": "win_vulkan_sdk",
+          "version": "version:2"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Win-MSVC-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Win-MSVC-x86_64-Release": {
       "cipd_packages": [
         {
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Win-MSVC-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/win_toolchain",
+          "path": "t",
+          "version": "version:5"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Win-MSVC-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Win-MSVC-x86_64-Release-GDI": {
       "cipd_packages": [
         {
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
+    "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-Arm7-Debug-iOS"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:10de:104a",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
+        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-Arm7-Release-iOS"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:8086:162b",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "gpu:8086:162b",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "gpu:10de:11c0",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "gpu:10de:11c0",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
-        "os:Android",
+        "gpu:10de:11c0",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Release-Vulkan"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
+        "gpu:10de:11c0",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
+        "gpu:1002:683d",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-HD7770-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
+        "gpu:1002:683d",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-HD7770-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
-        "os:Android",
+        "gpu:8086:0412",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleB-GPU-HD4600-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
-        "os:Android",
+        "gpu:8086:0412",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleB-GPU-HD4600-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
-        "os:Android",
+        "gpu:10de:1401",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
-        "os:Android",
+        "gpu:10de:1401",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
-        "os:Android",
+        "gpu:10de:1401",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
-        "os:Android",
+        "gpu:10de:1401",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Win-MSVC-x86_64-Debug"
       ],
       "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
-        "os:Android",
+        "gpu:8086:1912",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Win-MSVC-x86_64-Release"
       ],
       "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
-        "os:Android",
+        "gpu:8086:1912",
+        "os:Windows",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "swarm_test",
+        "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-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",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Mac-Clang-Arm7-Debug-iOS"
       ],
       "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
-        "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-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Mac-Clang-Arm7-Release-iOS"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
-        "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-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_set=<(PATCHSET)"
       ],
       "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
+      "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:MOB30Q",
+        "device_type:sprout",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
-        "os:Android",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:MRA58K",
+        "device_type:foster",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:LMY49J",
+        "device_type:manta",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
+        "device_os:NMF26C",
+        "device_type:angler",
         "os:Android",
         "pool:Skia"
       ],
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:08a4",
-        "os:Mac",
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "gpu:10de:08a4",
-        "os:Mac",
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac",
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Mac",
+        "device_os:LMY47V",
+        "device_type:grouper",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac",
+        "device_os:LMY47V",
+        "device_type:grouper",
+        "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-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac",
+        "device_os:NRD91D",
+        "device_type:flounder",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "gpu:8086:0a2e",
-        "os:Mac",
+        "device_os:NRD91D",
+        "device_type:flounder",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "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-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Ubuntu",
+        "device_os:NRD90R",
+        "device_type:fugu",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
       ],
       "dimensions": [
-        "gpu:10de:104a",
-        "os:Ubuntu",
+        "device_os:NMF25",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86-Debug"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NMF25",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NMF25",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:NMF25",
+        "device_type:marlin",
+        "os:Android",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Fast"
+        "Build-Mac-Clang-x86_64-Debug-GN"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "gpu:10de:08a4",
+        "os:Mac",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Release-GN"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "gpu:10de:08a4",
+        "os:Mac",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
+        "Build-Mac-Clang-x86_64-Debug-GN"
       ],
       "dimensions": [
-        "cpu:x86-64-avx2",
+        "cpu:x86-64",
         "gpu:none",
-        "os:Ubuntu",
+        "os:Mac",
         "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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+    "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+        "Build-Mac-Clang-x86_64-Release-GN"
       ],
       "dimensions": [
-        "gpu:10de:1244",
-        "os:Ubuntu",
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Mac",
         "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-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
         "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",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu",
+        "gpu:8086:0a2e",
+        "os:Mac",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Mac-Clang-x86_64-Debug-GN"
       ],
       "dimensions": [
-        "gpu:10de:11c0",
-        "os:Ubuntu",
+        "gpu:8086:0a2e",
+        "os:Mac",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug"
+        "Build-Mac-Clang-x86_64-Release-GN"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "gpu:8086:0a2e",
+        "os:Mac",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Ubuntu-Clang-x86_64-Debug-GN"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug-GDI"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Ubuntu",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 32400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Ubuntu-Clang-x86_64-Release-GN"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-GDI"
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
-        "cpu:x86-64",
+        "cpu:x86-64-avx2",
         "gpu:none",
-        "os:Windows-2008ServerR2-SP1",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-Arm7-Debug-iOS"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:10de:104a",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
+    "Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
         }
       ],
       "dependencies": [
-        "Build-Mac-Clang-Arm7-Release-iOS"
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
       ],
       "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "gpu:10de:104a",
+        "os:Ubuntu",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
+        "buildername=Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Build-Ubuntu-GCC-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "os:Ubuntu",
         "pool:Skia"
       ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "swarm_test",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "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",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "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-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "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-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",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-Fast"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "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-Fast",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "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-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "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",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-Valgrind"
+      ],
+      "dimensions": [
+        "gpu:10de:1244",
+        "os:Ubuntu",
+        "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",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+      ],
+      "dimensions": [
+        "gpu:10de:11c0",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-GCC-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "gpu:10de:11c0",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-GDI"
+      ],
+      "dimensions": [
+        "cpu:x86-64",
+        "gpu:none",
+        "os:Windows-2008ServerR2-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:104a",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:162b",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:162b",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:11c0",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-Vulkan"
+      ],
+      "dimensions": [
+        "gpu:10de:11c0",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:11c0",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:1002:683d",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:1002:683d",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:0412",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:0412",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:8086:1912",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-Arm7-Debug-iOS"
+      ],
+      "dimensions": [
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:14"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:22"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-Arm7-Release-iOS"
+      ],
+      "dimensions": [
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+      "dependencies": [
+        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_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)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+      "dependencies": [
+        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_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)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_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)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+      "dependencies": [
+        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_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)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+      "dependencies": [
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+      "dependencies": [
+        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_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)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+      "dependencies": [
+        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+      "dependencies": [
+        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+      "dependencies": [
+        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+      "dependencies": [
+        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+      "dependencies": [
+        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+      "dependencies": [
+        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "dependencies": [
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "dependencies": [
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
       "dependencies": [
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Upload-Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Perf-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
       "dependencies": [
-        "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android"
+        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
       "dependencies": [
-        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
       "dependencies": [
-        "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
       "dependencies": [
-        "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
       "dependencies": [
-        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
       "dependencies": [
-        "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
       "dependencies": [
-        "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
+    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
       "dependencies": [
-        "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release"
+        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
       "extra_args": [
         "--workdir",
         "../../..",
-        "upload_nano_results",
+        "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
         "patch_issue=<(ISSUE)",
         "patch_set=<(PATCHSET)"
       ],
-      "isolate": "upload_nano_results.isolate",
+      "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android"
+        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android"
+        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan"
+        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android"
+        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
+        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android"
+        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android"
+        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
       "dependencies": [
-        "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
+        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN": {
+    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN"
+        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug-GN",
+        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug-GN",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-GN",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
       "dependencies": [
-        "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN"
+        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
+        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+    "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+        "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+        "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Upload-Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+        "Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-GTX660-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
+        "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+    "Upload-Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
+        "Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
+        "buildername=Test-Win-MSVC-ShuttleA-GPU-HD7770-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN": {
+    "Upload-Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN"
+        "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug-GN",
+        "buildername=Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN": {
+    "Upload-Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN"
+        "Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN",
+        "buildername=Test-Win-MSVC-ShuttleB-GPU-HD4600-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug"
+        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86-Release"
+        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86-Release",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug"
+        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI"
+        "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release"
+        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI": {
+    "Upload-Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release": {
       "dependencies": [
-        "Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI"
+        "Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
+        "buildername=Test-Win-MSVC-ShuttleC-GPU-iHD530-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",