[nobuildbot] Migrate all Linux GCE bots

author Eric Boren <borenet@google.com>

Fri, 18 Nov 2016 18:10:51 +0000 (13:10 -0500)

committer Skia Commit-Bot <skia-commit-bot@chromium.org>

Wed, 23 Nov 2016 14:49:14 +0000 (14:49 +0000)
author Eric Boren <borenet@google.com>
Fri, 18 Nov 2016 18:10:51 +0000 (13:10 -0500)
committer Skia Commit-Bot <skia-commit-bot@chromium.org>
Wed, 23 Nov 2016 14:49:14 +0000 (14:49 +0000)
diff --git a/PRESUBMIT.py b/PRESUBMIT.py

index 281ca5a..4dc21c9 100644 (file)
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -40,11 +40,10 @@ GOLD_TRYBOT_URL = 'https://gold.skia.org/search?issue='
  
  # Path to CQ bots feature is described in https://bug.skia.org/4364
  PATH_PREFIX_TO_EXTRA_TRYBOTS = {
-    # pylint: disable=line-too-long
-    'src/opts/': 'master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot',
-
-    'include/private/SkAtomics.h': ('master.client.skia:'
-      'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN-Trybot,'
+    'src/opts/':
+        'skia.primary:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD',
+    'include/private/SkAtomics.h': ('skia.primary:'
+      'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN,'
        'Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN-Trybot'
      ),
  
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go

index c30d85d..5b46391 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -43,14 +43,31 @@ var (
                 "Build-Ubuntu-Clang-arm-Debug-GN_Android",
                 "Build-Ubuntu-Clang-arm-Release-GN_Android",
                 "Build-Ubuntu-Clang-arm64-Debug-GN_Android",
+               "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs",
                 "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan",
                 "Build-Ubuntu-Clang-arm64-Release-GN_Android",
                 "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan",
+               "Build-Ubuntu-Clang-mips64el-Debug-GN_Android",
+               "Build-Ubuntu-Clang-mips64el-Release-GN_Android",
+               "Build-Ubuntu-Clang-mipsel-Debug-GN_Android",
+               "Build-Ubuntu-Clang-mipsel-Release-GN_Android",
+               "Build-Ubuntu-Clang-x64-Debug-GN_Android",
+               "Build-Ubuntu-Clang-x64-Release-GN_Android",
                 "Build-Ubuntu-Clang-x86-Debug-GN_Android",
                 "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan",
                 "Build-Ubuntu-Clang-x86-Release-GN_Android",
                 "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan",
+               "Build-Ubuntu-Clang-x86_64-Debug-GN",
+               "Build-Ubuntu-Clang-x86_64-Release-GN",
+               "Build-Ubuntu-GCC-x86-Debug",
+               "Build-Ubuntu-GCC-x86-Release",
+               "Build-Ubuntu-GCC-x86_64-Debug-GN",
+               "Build-Ubuntu-GCC-x86_64-Debug-NoGPU",
+               "Build-Ubuntu-GCC-x86_64-Release-ANGLE",
                 "Build-Ubuntu-GCC-x86_64-Release-GN",
+               "Build-Ubuntu-GCC-x86_64-Release-Mesa",
+               "Build-Ubuntu-GCC-x86_64-Release-NoGPU",
+               "Build-Ubuntu-GCC-x86_64-Release-PDFium",
                 "Build-Win-Clang-arm64-Release-GN_Android",
                 "Housekeeper-Nightly-RecreateSKPs_Canary",
                 "Housekeeper-PerCommit-InfraTests",
@@ -93,6 +110,13 @@ var (
                 "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
                 "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
                 "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+               "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+               "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
                 "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
                 "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
                 "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
@@ -132,7 +156,17 @@ var (
                 "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
                 "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
                 "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
+               "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
                 "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+               "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
                 "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
                 "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
         }
@@ -172,14 +206,17 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string {
                 } else if strings.Contains(task_os, "Win") {
                         task_os = "Win"
                 }
-               name, err := jobNameSchema.MakeJobName(map[string]string{
+               jobNameMap := map[string]string{
                         "role":          "Build",
                         "os":            task_os,
                         "compiler":      parts["compiler"],
                         "target_arch":   parts["arch"],
                         "configuration": parts["configuration"],
-                       "extra_config":  ec,
-               })
+               }
+               if ec != "" {
+                       jobNameMap["extra_config"] = ec
+               }
+               name, err := jobNameSchema.MakeJobName(jobNameMap)
                 if err != nil {
                         glog.Fatal(err)
                 }
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json

index b4671ae..d284011 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -36,6 +36,12 @@
          "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ]
      },
+    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs"
+      ]
+    },
      "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan": {
        "priority": 0.8,
        "tasks": [
@@ -54,6 +60,42 @@
          "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ]
      },
+    "Build-Ubuntu-Clang-mips64el-Debug-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-mips64el-Debug-GN_Android"
+      ]
+    },
+    "Build-Ubuntu-Clang-mips64el-Release-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-mips64el-Release-GN_Android"
+      ]
+    },
+    "Build-Ubuntu-Clang-mipsel-Debug-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-mipsel-Debug-GN_Android"
+      ]
+    },
+    "Build-Ubuntu-Clang-mipsel-Release-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-mipsel-Release-GN_Android"
+      ]
+    },
+    "Build-Ubuntu-Clang-x64-Debug-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x64-Debug-GN_Android"
+      ]
+    },
+    "Build-Ubuntu-Clang-x64-Release-GN_Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x64-Release-GN_Android"
+      ]
+    },
      "Build-Ubuntu-Clang-x86-Debug-GN_Android": {
        "priority": 0.8,
        "tasks": [
@@ -78,12 +120,108 @@
          "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
        ]
      },
+    "Build-Ubuntu-Clang-x86_64-Debug-ASAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
+      ]
+    },
+    "Build-Ubuntu-Clang-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Debug-GN"
+      ]
+    },
+    "Build-Ubuntu-Clang-x86_64-Debug-MSAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
+      ]
+    },
+    "Build-Ubuntu-Clang-x86_64-Release-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Release-GN"
+      ]
+    },
+    "Build-Ubuntu-Clang-x86_64-Release-TSAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86-Debug"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86-Release"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Debug-GN"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Debug-NoGPU"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-ANGLE"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-Fast"
+      ]
+    },
      "Build-Ubuntu-GCC-x86_64-Release-GN": {
        "priority": 0.8,
        "tasks": [
          "Build-Ubuntu-GCC-x86_64-Release-GN"
        ]
      },
+    "Build-Ubuntu-GCC-x86_64-Release-Mesa": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-Mesa"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-NoGPU": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-NoGPU"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-PDFium": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-PDFium"
+      ]
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
+      ]
+    },
      "Build-Win-Clang-arm64-Release-GN_Android": {
        "priority": 0.8,
        "tasks": [
@@ -338,6 +476,48 @@
          "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
        ]
      },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
+      ]
+    },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ]
+    },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN"
+      ]
+    },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+      ]
+    },
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
+      ]
+    },
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ]
+    },
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ]
+    },
      "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
        "priority": 0.8,
        "tasks": [
@@ -572,12 +752,72 @@
          "Upload-Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan"
        ]
      },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN"
+      ]
+    },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ]
+    },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN"
+      ]
+    },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+      ]
+    },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
+      "priority": 0.8,
+      "tasks": [
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN"
+      ]
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
+      ]
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ]
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ]
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+      ]
+    },
      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
        "priority": 0.8,
        "tasks": [
          "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
        ]
      },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
+      ]
+    },
      "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
        "priority": 0.8,
        "tasks": [
@@ -763,7 +1003,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -781,7 +1021,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -795,7 +1035,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -813,7 +1053,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -827,7 +1067,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -845,7 +1085,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -859,7 +1099,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -877,7 +1117,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android",
+        "buildername=Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -891,7 +1131,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-mips64el-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -909,7 +1149,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-mips64el-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -923,7 +1163,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android": {
+    "Build-Ubuntu-Clang-mips64el-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -941,7 +1181,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-mips64el-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -955,7 +1195,7 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan": {
+    "Build-Ubuntu-Clang-mipsel-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/android_ndk_linux",
@@ -973,7 +1213,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan",
+        "buildername=Build-Ubuntu-Clang-mipsel-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -987,7 +1227,14 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Ubuntu-GCC-x86_64-Release-GN": {
+    "Build-Ubuntu-Clang-mipsel-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
        "dimensions": [
          "gpu:none",
          "os:Ubuntu",
@@ -998,7 +1245,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-GN",
+        "buildername=Build-Ubuntu-Clang-mipsel-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1012,17 +1259,17 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Build-Win-Clang-arm64-Release-GN_Android": {
+    "Build-Ubuntu-Clang-x64-Debug-GN_Android": {
        "cipd_packages": [
          {
-          "name": "skia/bots/android_ndk_windows",
-          "path": "n",
-          "version": "version:2"
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
          }
        ],
        "dimensions": [
          "gpu:none",
-        "os:Windows",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "extra_args": [
@@ -1030,7 +1277,7 @@
          "../../..",
          "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Build-Win-Clang-arm64-Release-GN_Android",
+        "buildername=Build-Ubuntu-Clang-x64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1044,20 +1291,25 @@
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Housekeeper-Nightly-RecreateSKPs_Canary": {
+    "Build-Ubuntu-Clang-x64-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
        "dimensions": [
-        "cpu:x86-64-avx2",
          "gpu:none",
          "os:Ubuntu",
          "pool:Skia"
        ],
-      "execution_timeout_ns": 14400000000000,
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_RecreateSKPs",
+        "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Housekeeper-Nightly-RecreateSKPs_Canary",
+        "buildername=Build-Ubuntu-Clang-x64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1068,13 +1320,18 @@
          "patch_issue=<(ISSUE)",
          "patch_set=<(PATCHSET)"
        ],
-      "io_timeout_ns": 2400000000000,
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Housekeeper-PerCommit-InfraTests": {
+    "Build-Ubuntu-Clang-x86-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
        "dimensions": [
-        "cpu:x86-64-avx2",
          "gpu:none",
          "os:Ubuntu",
          "pool:Skia"
@@ -1082,9 +1339,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_infra",
+        "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Housekeeper-PerCommit-InfraTests",
+        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1095,23 +1352,28 @@
          "patch_issue=<(ISSUE)",
          "patch_set=<(PATCHSET)"
        ],
-      "isolate": "infra_skia.isolate",
+      "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Housekeeper-Weekly-RecreateSKPs": {
+    "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
        "dimensions": [
-        "cpu:x86-64-avx2",
          "gpu:none",
          "os:Ubuntu",
          "pool:Skia"
        ],
-      "execution_timeout_ns": 14400000000000,
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_RecreateSKPs",
+        "swarm_compile",
          "repository=<(REPO)",
-        "buildername=Housekeeper-Weekly-RecreateSKPs",
+        "buildername=Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1122,22 +1384,1345 @@
          "patch_issue=<(ISSUE)",
          "patch_set=<(PATCHSET)"
        ],
-      "io_timeout_ns": 2400000000000,
        "isolate": "compile_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Build-Ubuntu-Clang-x86-Release-GN_Android": {
        "cipd_packages": [
          {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:13"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:15"
-        },
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_linux",
+          "path": "android_ndk_linux",
+          "version": "version:5"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-Clang-x86_64-Debug-ASAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-x86_64-Debug-ASAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-Clang-x86_64-Debug-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-Clang-x86_64-Debug-MSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-x86_64-Debug-MSAN",
+        "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-Ubuntu-Clang-x86_64-Release-GN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-Clang-x86_64-Release-TSAN": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86-Debug": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86-Debug",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86-Release": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86-Release",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86_64-Debug-GN": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86_64-Debug-NoGPU",
+        "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-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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-Ubuntu-GCC-x86_64-Release-Fast": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-GN": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Ubuntu-GCC-x86_64-Release-Mesa": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-Mesa",
+        "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-Ubuntu-GCC-x86_64-Release-NoGPU": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-NoGPU",
+        "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-Ubuntu-GCC-x86_64-Release-PDFium": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-PDFium",
+        "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-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD": {
+      "dimensions": [
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Ubuntu-GCC-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)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Build-Win-Clang-arm64-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/android_ndk_windows",
+          "path": "n",
+          "version": "version:2"
+        }
+      ],
+      "dimensions": [
+        "gpu:none",
+        "os:Windows",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_compile",
+        "repository=<(REPO)",
+        "buildername=Build-Win-Clang-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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Housekeeper-Nightly-RecreateSKPs_Canary": {
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_RecreateSKPs",
+        "repository=<(REPO)",
+        "buildername=Housekeeper-Nightly-RecreateSKPs_Canary",
+        "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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Housekeeper-PerCommit-InfraTests": {
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_infra",
+        "repository=<(REPO)",
+        "buildername=Housekeeper-PerCommit-InfraTests",
+        "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": "infra_skia.isolate",
+      "priority": 0.8
+    },
+    "Housekeeper-Weekly-RecreateSKPs": {
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_RecreateSKPs",
+        "repository=<(REPO)",
+        "buildername=Housekeeper-Weekly-RecreateSKPs",
+        "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": "compile_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:LMY49J",
+        "device_type:manta",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:LMY49J",
+        "device_type:manta",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
          {
            "name": "skia/bots/svg",
            "path": "svg",
@@ -1148,8 +2733,8 @@
          "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
          "os:Android",
          "pool:Skia"
        ],
@@ -1160,7 +2745,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1175,7 +2760,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1197,8 +2782,8 @@
          "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
          "os:Android",
          "pool:Skia"
        ],
@@ -1209,7 +2794,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1224,7 +2809,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1243,11 +2828,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -1258,7 +2843,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1273,7 +2858,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1292,11 +2877,158 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+      ],
+      "dimensions": [
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+      ],
+      "dimensions": [
+        "device_os:NMF26C",
+        "device_type:angler",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-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)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -1307,7 +3039,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1322,7 +3054,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1341,11 +3073,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -1356,7 +3088,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1371,7 +3103,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1390,11 +3122,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:LMY47V",
+        "device_type:grouper",
          "os:Android",
          "pool:Skia"
        ],
@@ -1405,7 +3137,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1420,7 +3152,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1439,11 +3171,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:LMY47V",
+        "device_type:grouper",
          "os:Android",
          "pool:Skia"
        ],
@@ -1454,7 +3186,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1469,7 +3201,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1488,11 +3220,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:NRD91D",
+        "device_type:flounder",
          "os:Android",
          "pool:Skia"
        ],
@@ -1503,7 +3235,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1518,7 +3250,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1537,11 +3269,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD91D",
+        "device_type:flounder",
          "os:Android",
          "pool:Skia"
        ],
@@ -1552,7 +3284,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1567,7 +3299,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1586,11 +3318,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1601,7 +3333,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1616,7 +3348,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1635,11 +3367,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1650,7 +3382,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1665,7 +3397,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1684,11 +3416,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1699,7 +3431,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1714,7 +3446,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1733,11 +3465,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1748,7 +3480,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1763,7 +3495,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1782,11 +3514,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1797,7 +3529,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1812,7 +3544,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1831,11 +3563,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -1846,7 +3578,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1861,7 +3593,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1880,11 +3612,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
+        "device_os:NMF25",
+        "device_type:sailfish",
          "os:Android",
          "pool:Skia"
        ],
@@ -1895,7 +3627,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1910,7 +3642,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1929,11 +3661,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NMF25",
+        "device_type:sailfish",
          "os:Android",
          "pool:Skia"
        ],
@@ -1944,7 +3676,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -1959,7 +3691,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -1981,8 +3713,8 @@
          "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NMF25",
+        "device_type:sailfish",
          "os:Android",
          "pool:Skia"
        ],
@@ -1993,7 +3725,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2008,7 +3740,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2027,11 +3759,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NMF25",
+        "device_type:sailfish",
          "os:Android",
          "pool:Skia"
        ],
@@ -2042,7 +3774,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2057,30 +3789,20 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
        "cipd_packages": [
          {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:13"
-        },
-        {
            "name": "skia/bots/skp",
            "path": "skp",
            "version": "version:15"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
          "device_os:NMF26C",
-        "device_type:angler",
+        "device_type:dragon",
          "os:Android",
          "pool:Skia"
        ],
@@ -2089,9 +3811,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_skpbench",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2103,33 +3825,23 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "skpbench_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
        "cipd_packages": [
          {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:13"
-        },
-        {
            "name": "skia/bots/skp",
            "path": "skp",
            "version": "version:15"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
          "device_os:NMF26C",
-        "device_type:angler",
+        "device_type:dragon",
          "os:Android",
          "pool:Skia"
        ],
@@ -2138,9 +3850,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_skpbench",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2152,10 +3864,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "skpbench_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2171,15 +3883,20 @@
            "name": "skia/bots/svg",
            "path": "svg",
            "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2189,7 +3906,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2204,7 +3921,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2223,12 +3940,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Debug-GN"
        ],
        "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2238,7 +3955,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2253,7 +3970,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2269,25 +3986,30 @@
            "name": "skia/bots/svg",
            "path": "svg",
            "version": "version:3"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:4"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
        ],
        "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 32400000000000,
        "expiration_ns": 72000000000000,
        "extra_args": [
          "--workdir",
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2302,7 +4024,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2321,12 +4043,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Release-GN"
        ],
        "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2336,7 +4058,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2351,7 +4073,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2370,12 +4092,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-GCC-x86-Debug"
        ],
        "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2385,7 +4107,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2400,7 +4122,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2419,12 +4141,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-GCC-x86_64-Debug-GN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2434,7 +4156,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2449,7 +4171,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2468,12 +4190,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2483,7 +4205,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2498,7 +4220,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2517,12 +4239,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
+        "Build-Ubuntu-GCC-x86_64-Release-GN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2532,7 +4254,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2547,7 +4269,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2566,12 +4288,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Mac-Clang-Arm7-Debug-iOS"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2581,7 +4302,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2596,7 +4317,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2615,12 +4336,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Mac-Clang-Arm7-Release-iOS"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "device:iPad5,1",
+        "os:iOS-9.3.1",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -2630,7 +4350,7 @@
          "../../..",
          "swarm_perf",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2645,7 +4365,7 @@
        "isolate": "perf_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2664,11 +4384,11 @@
          }
        ],
        "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:MOB30Q",
+        "device_type:sprout",
          "os:Android",
          "pool:Skia"
        ],
@@ -2677,9 +4397,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2691,10 +4411,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2713,11 +4433,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:MOB30Q",
+        "device_type:sprout",
          "os:Android",
          "pool:Skia"
        ],
@@ -2726,9 +4446,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2740,10 +4460,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2762,11 +4482,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:MOB30Q",
+        "device_type:sprout",
          "os:Android",
          "pool:Skia"
        ],
@@ -2775,9 +4495,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -2789,10 +4509,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2811,11 +4531,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:MOB30Q",
+        "device_type:sprout",
          "os:Android",
          "pool:Skia"
        ],
@@ -2824,9 +4544,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "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",
@@ -2838,10 +4558,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2860,11 +4580,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
          "os:Android",
          "pool:Skia"
        ],
@@ -2873,9 +4593,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "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",
@@ -2887,23 +4607,33 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
            "name": "skia/bots/skp",
            "path": "skp",
            "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:dragon",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
          "os:Android",
          "pool:Skia"
        ],
@@ -2912,9 +4642,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_skpbench",
+        "swarm_test",
          "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",
@@ -2926,23 +4656,33 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "skpbench_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:13"
+        },
+        {
            "name": "skia/bots/skp",
            "path": "skp",
            "version": "version:15"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:dragon",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
          "os:Android",
          "pool:Skia"
        ],
@@ -2951,9 +4691,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_skpbench",
+        "swarm_test",
          "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",
@@ -2965,10 +4705,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "skpbench_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -2987,12 +4727,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
+        "device_os:MMB29M",
+        "device_type:heroqlteatt",
+        "os:Android",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -3000,9 +4740,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3014,10 +4754,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3036,11 +4776,12 @@
          }
        ],
        "dependencies": [
-        "Build-Mac-Clang-Arm7-Debug-iOS"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -3048,9 +4789,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3062,10 +4803,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3084,11 +4825,12 @@
          }
        ],
        "dependencies": [
-        "Build-Mac-Clang-Arm7-Release-iOS"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device:iPad5,1",
-        "os:iOS-9.3.1",
+        "device_os:MRA58K",
+        "device_type:foster",
+        "os:Android",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -3096,9 +4838,9 @@
        "extra_args": [
          "--workdir",
          "../../..",
-        "swarm_perf",
+        "swarm_test",
          "repository=<(REPO)",
-        "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3110,10 +4852,10 @@
          "patch_set=<(PATCHSET)"
        ],
        "io_timeout_ns": 2400000000000,
-      "isolate": "perf_skia.isolate",
+      "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3132,11 +4874,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MRA58K",
+        "device_type:foster",
          "os:Android",
          "pool:Skia"
        ],
@@ -3147,7 +4889,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3162,7 +4904,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android": {
+    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3181,11 +4923,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:MRA58K",
+        "device_type:foster",
          "os:Android",
          "pool:Skia"
        ],
@@ -3196,7 +4938,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3211,7 +4953,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3233,8 +4975,8 @@
          "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:LMY49J",
+        "device_type:manta",
          "os:Android",
          "pool:Skia"
        ],
@@ -3245,7 +4987,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3260,7 +5002,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3282,8 +5024,8 @@
          "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:LMY49J",
+        "device_type:manta",
          "os:Android",
          "pool:Skia"
        ],
@@ -3294,7 +5036,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3309,7 +5051,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3328,11 +5070,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
          "os:Android",
          "pool:Skia"
        ],
@@ -3343,7 +5085,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3358,7 +5100,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3377,11 +5119,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:MOB31E",
+        "device_type:hammerhead",
          "os:Android",
          "pool:Skia"
        ],
@@ -3392,7 +5134,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3407,7 +5149,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3426,11 +5168,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3441,7 +5183,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3456,7 +5198,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3475,11 +5217,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MMB29M",
-        "device_type:heroqlteatt",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3490,7 +5232,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-GalaxyS7-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3505,7 +5247,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3527,8 +5269,8 @@
          "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3539,7 +5281,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3554,7 +5296,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3576,8 +5318,8 @@
          "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3588,7 +5330,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3603,7 +5345,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3625,8 +5367,8 @@
          "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3637,7 +5379,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3652,7 +5394,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3674,8 +5416,8 @@
          "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:MRA58K",
-        "device_type:foster",
+        "device_os:NMF26C",
+        "device_type:angler",
          "os:Android",
          "pool:Skia"
        ],
@@ -3686,7 +5428,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3701,7 +5443,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3723,8 +5465,8 @@
          "Build-Ubuntu-Clang-arm-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:LMY47V",
+        "device_type:grouper",
          "os:Android",
          "pool:Skia"
        ],
@@ -3735,7 +5477,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3750,7 +5492,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3772,8 +5514,8 @@
          "Build-Ubuntu-Clang-arm-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:LMY49J",
-        "device_type:manta",
+        "device_os:LMY47V",
+        "device_type:grouper",
          "os:Android",
          "pool:Skia"
        ],
@@ -3784,7 +5526,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3799,7 +5541,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3818,11 +5560,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
+        "device_os:NRD91D",
+        "device_type:flounder",
          "os:Android",
          "pool:Skia"
        ],
@@ -3833,7 +5575,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3848,7 +5590,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3867,11 +5609,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:MOB31E",
-        "device_type:hammerhead",
+        "device_os:NRD91D",
+        "device_type:flounder",
          "os:Android",
          "pool:Skia"
        ],
@@ -3882,7 +5624,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3897,7 +5639,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3916,11 +5658,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -3931,7 +5673,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3946,7 +5688,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -3965,11 +5707,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -3980,7 +5722,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -3995,7 +5737,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4014,11 +5756,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -4029,7 +5771,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4044,7 +5786,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4063,11 +5805,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -4078,7 +5820,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4093,7 +5835,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4112,11 +5854,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -4127,7 +5869,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4142,7 +5884,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4161,11 +5903,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:NRD90R",
+        "device_type:fugu",
          "os:Android",
          "pool:Skia"
        ],
@@ -4176,7 +5918,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4191,7 +5933,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4210,11 +5952,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
        ],
        "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NMF25",
+        "device_type:marlin",
          "os:Android",
          "pool:Skia"
        ],
@@ -4225,7 +5967,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4240,7 +5982,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4259,11 +6001,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NMF25",
+        "device_type:marlin",
          "os:Android",
          "pool:Skia"
        ],
@@ -4274,7 +6016,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4289,7 +6031,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4308,11 +6050,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
        ],
        "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NMF25",
+        "device_type:marlin",
          "os:Android",
          "pool:Skia"
        ],
@@ -4323,7 +6065,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4338,7 +6080,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android": {
+    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4357,11 +6099,11 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
        ],
        "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NMF25",
+        "device_type:marlin",
          "os:Android",
          "pool:Skia"
        ],
@@ -4372,7 +6114,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-GN_Android",
+        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4387,7 +6129,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4403,15 +6145,20 @@
            "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-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Debug-ASAN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4421,7 +6168,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-GN_Android",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4436,7 +6183,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-GN_Android": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4455,12 +6202,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Debug-GN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4470,7 +6217,7 @@
          "../../..",
          "swarm_test",
          "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",
@@ -4485,7 +6232,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4501,25 +6248,30 @@
            "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-Debug-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Debug-MSAN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 32400000000000,
        "expiration_ns": 72000000000000,
        "extra_args": [
          "--workdir",
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4534,7 +6286,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4553,12 +6305,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-Clang-x86_64-Release-GN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4568,7 +6320,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4583,7 +6335,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android": {
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4599,15 +6351,20 @@
            "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-Release-GN_Android"
+        "Build-Ubuntu-Clang-x86_64-Release-TSAN"
        ],
        "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4617,7 +6374,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4632,7 +6389,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4651,12 +6408,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-GN_Android_Vulkan"
-      ],
-      "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
-        "os:Android",
+        "Build-Ubuntu-GCC-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4666,7 +6423,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4681,7 +6438,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4700,12 +6457,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android"
+        "Build-Ubuntu-GCC-x86_64-Debug-GN"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4715,7 +6472,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4730,7 +6487,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-GN_Android_Vulkan": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4749,12 +6506,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-GN_Android_Vulkan"
+        "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4764,7 +6521,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-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",
@@ -4779,7 +6536,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4798,12 +6555,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+        "Build-Ubuntu-GCC-x86_64-Release-Fast"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4813,7 +6570,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4828,7 +6585,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4847,12 +6604,12 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+        "Build-Ubuntu-GCC-x86_64-Release-GN"
        ],
        "dimensions": [
-        "device_os:NMF25",
-        "device_type:marlin",
-        "os:Android",
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
          "pool:Skia"
        ],
        "execution_timeout_ns": 14400000000000,
@@ -4862,7 +6619,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-GN_Android_Vulkan",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -4877,7 +6634,7 @@
        "isolate": "test_skia.isolate",
        "priority": 0.8
      },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
        "cipd_packages": [
          {
            "name": "skia/bots/skimage",
@@ -4896,7 +6653,7 @@
          }
        ],
        "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-GN"
+        "Build-Ubuntu-GCC-x86_64-Release-SKNX_NO_SIMD"
        ],
        "dimensions": [
          "cpu:x86-64-avx2",
@@ -4911,7 +6668,7 @@
          "../../..",
          "swarm_test",
          "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
          "mastername=fake-master",
          "buildnumber=2",
          "slavename=fake-buildslave",
@@ -5602,6 +7359,35 @@
        "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"
@@ -6704,6 +8490,180 @@
        "isolate": "upload_dm_results.isolate",
        "priority": 0.8
      },
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "dependencies": [
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN": {
+      "dependencies": [
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-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_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+      "dependencies": [
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN": {
+      "dependencies": [
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+      "dependencies": [
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "dependencies": [
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
      "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
        "dependencies": [
          "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
@@ -6733,6 +8693,35 @@
        "isolate": "upload_dm_results.isolate",
        "priority": 0.8
      },
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
+      "dependencies": [
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "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)"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
      "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug": {
        "dependencies": [
          "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug"
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg

index 9350920..e36b7b6 100644 (file)
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -30,18 +30,11 @@ verifiers {
    try_job {
      buckets {
        name: "master.client.skia"
-      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN-Trybot" }
        builders { name: "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-GN-Trybot" }
      }
      buckets {
        name: "master.client.skia.compile"
        builders { name: "Build-Mac-Clang-x86_64-Release-GN-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-arm-Debug-GN_Android-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-mips64el-Debug-GN_Android-Trybot" }
-      builders { name: "Build-Ubuntu-Clang-x86_64-Debug-GN-Trybot" }
-      builders { name: "Build-Ubuntu-GCC-x86_64-Release-GN-Trybot" }
        builders { name: "Build-Win-MSVC-x86-Debug-Trybot" }
        builders { name: "Build-Win-MSVC-x86_64-Release-Vulkan-Trybot" }
      }
@@ -56,8 +49,15 @@ verifiers {
      }
      buckets {
        name: "skia.primary"
+      builders { name: "Build-Ubuntu-Clang-arm-Debug-GN_Android" }
+      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android" }
+      builders { name: "Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs" }
+      builders { name: "Build-Ubuntu-Clang-mips64el-Debug-GN_Android" }
+      builders { name: "Build-Ubuntu-Clang-x86_64-Debug-GN" }
+      builders { name: "Build-Ubuntu-GCC-x86_64-Release-GN" }
        builders { name: "Housekeeper-PerCommit-InfraTests" }
        builders { name: "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-GN_Android" }
+      builders { name: "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN" }
      }
      try_job_retry_config {
        try_job_retry_quota: 1
author	Eric Boren <borenet@google.com>
	Fri, 18 Nov 2016 18:10:51 +0000 (13:10 -0500)
committer	Skia Commit-Bot <skia-commit-bot@chromium.org>
	Wed, 23 Nov 2016 14:49:14 +0000 (14:49 +0000)
PRESUBMIT.py		patch \| blob \| history
infra/bots/gen_tasks.go		patch \| blob \| history
infra/bots/tasks.json		patch \| blob \| history
infra/branch-config/cq.cfg		patch \| blob \| history