Move 6p arm64 CPU tests to Pixel C

We have much more capacity on the Pixel Cs.

BUG=skia:

Change-Id: I65e136d5e2f44ec4bef9c168a86e706537878532
Reviewed-on: https://skia-review.googlesource.com/5755
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 2a08635..1c05c49 100644 (file)
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -103,8 +103,6 @@ var (
                "Perf-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
                "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
                "Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
-               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
-               "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
                "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
                "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
                "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
@@ -123,6 +121,8 @@ var (
                "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan",
                "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
                "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
+               "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
+               "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
                "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench",
                "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench",
                "Perf-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug",
@@ -185,8 +185,6 @@ var (
                "Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android",
                "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android",
                "Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android",
-               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
-               "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
                "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
                "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
                "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
@@ -201,6 +199,8 @@ var (
                "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
                "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
                "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+               "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
+               "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
                "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android",
                "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan",
                "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Release-Android",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 473c9af..acae387 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -482,18 +482,6 @@
         "Upload-Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ]
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
-      ]
-    },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
-      ]
-    },
     "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -602,6 +590,18 @@
         "Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan"
       ]
     },
+    "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android"
+      ]
+    },
+    "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
+      ]
+    },
     "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench": {
       "priority": 0.8,
       "tasks": [
@@ -974,18 +974,6 @@
         "Upload-Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android"
       ]
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
-      ]
-    },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
-      ]
-    },
     "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -1070,6 +1058,18 @@
         "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ]
     },
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android"
+      ]
+    },
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
+      ]
+    },
     "Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -4082,7 +4082,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4116,7 +4116,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4131,7 +4131,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4150,7 +4150,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4165,7 +4165,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4180,7 +4180,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4199,7 +4199,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4214,7 +4214,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4229,7 +4229,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
+    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4248,7 +4248,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -4263,7 +4263,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4278,7 +4278,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4297,11 +4297,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -4312,7 +4312,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4327,7 +4327,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
+    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4346,11 +4346,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -4361,7 +4361,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4376,7 +4376,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4395,11 +4395,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NRD91D",
+        "device_type:flounder",
         "os:Android",
         "pool:Skia"
       ],
@@ -4410,7 +4410,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4425,7 +4425,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
+    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4444,11 +4444,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NRD91D",
+        "device_type:flounder",
         "os:Android",
         "pool:Skia"
       ],
@@ -4459,7 +4459,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4474,7 +4474,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4493,11 +4493,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NRD90R",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -4508,7 +4508,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4523,7 +4523,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
+    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4542,11 +4542,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NRD90R",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -4557,7 +4557,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4572,7 +4572,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4606,7 +4606,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4621,7 +4621,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4640,7 +4640,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4655,7 +4655,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4670,7 +4670,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4689,7 +4689,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4704,7 +4704,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4719,7 +4719,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
+    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4738,7 +4738,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -4753,7 +4753,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4768,7 +4768,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4787,11 +4787,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:NMF25",
+        "device_type:sailfish",
         "os:Android",
         "pool:Skia"
       ],
@@ -4802,7 +4802,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4817,7 +4817,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4836,11 +4836,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:NMF25",
+        "device_type:sailfish",
         "os:Android",
         "pool:Skia"
       ],
@@ -4851,7 +4851,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4866,7 +4866,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4885,7 +4885,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -4900,7 +4900,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4915,7 +4915,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan": {
+    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4934,7 +4934,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF25",
@@ -4949,7 +4949,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-Android_Vulkan",
+        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -4964,7 +4964,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android": {
+    "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -4983,11 +4983,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:NMF26C",
+        "device_type:dragon",
         "os:Android",
         "pool:Skia"
       ],
@@ -4998,7 +4998,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android",
+        "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5013,7 +5013,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan": {
+    "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -5032,11 +5032,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF25",
-        "device_type:sailfish",
+        "device_os:NMF26C",
+        "device_type:dragon",
         "os:Android",
         "pool:Skia"
       ],
@@ -5047,7 +5047,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-Android_Vulkan",
+        "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8019,7 +8019,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8053,7 +8053,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8068,7 +8068,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8087,7 +8087,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8102,7 +8102,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8117,7 +8117,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8136,7 +8136,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8151,7 +8151,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8166,7 +8166,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
+    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8185,7 +8185,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NMF26C",
@@ -8200,7 +8200,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8215,7 +8215,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8234,11 +8234,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-arm-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -8249,7 +8249,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8264,7 +8264,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8283,11 +8283,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm-Release-Android"
       ],
       "dimensions": [
-        "device_os:NMF26C",
-        "device_type:angler",
+        "device_os:LMY47V",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -8298,7 +8298,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8313,7 +8313,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8332,11 +8332,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Debug-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NRD91D",
+        "device_type:flounder",
         "os:Android",
         "pool:Skia"
       ],
@@ -8347,7 +8347,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8362,7 +8362,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
+    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8381,11 +8381,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:LMY47V",
-        "device_type:grouper",
+        "device_os:NRD91D",
+        "device_type:flounder",
         "os:Android",
         "pool:Skia"
       ],
@@ -8396,7 +8396,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8411,7 +8411,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8430,11 +8430,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NRD90R",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -8445,7 +8445,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8460,7 +8460,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8479,11 +8479,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-arm64-Release-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
-        "device_os:NRD91D",
-        "device_type:flounder",
+        "device_os:NRD90R",
+        "device_type:fugu",
         "os:Android",
         "pool:Skia"
       ],
@@ -8494,7 +8494,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8509,7 +8509,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8543,7 +8543,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8558,7 +8558,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8577,7 +8577,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8592,7 +8592,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8607,7 +8607,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8626,7 +8626,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android"
+        "Build-Ubuntu-Clang-x86-Release-Android"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8641,7 +8641,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8656,7 +8656,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
+    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8675,7 +8675,7 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Debug-Android_Vulkan"
+        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "device_os:NRD90R",
@@ -8690,7 +8690,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8705,7 +8705,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8724,11 +8724,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android"
+        "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:dragon",
         "os:Android",
         "pool:Skia"
       ],
@@ -8739,7 +8739,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -8754,7 +8754,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
+    "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -8773,11 +8773,11 @@
         }
       ],
       "dependencies": [
-        "Build-Ubuntu-Clang-x86-Release-Android_Vulkan"
+        "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:NRD90R",
-        "device_type:fugu",
+        "device_os:NMF26C",
+        "device_type:dragon",
         "os:Android",
         "pool:Skia"
       ],
@@ -8788,7 +8788,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -11606,35 +11606,6 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
-      "dependencies": [
-        "Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "upload_nano_results",
-        "repository=<(REPO)",
-        "buildername=Perf-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "upload_nano_results.isolate",
-      "priority": 0.8
-    },
     "Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "dependencies": [
         "Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
@@ -11896,6 +11867,35 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
+      "dependencies": [
+        "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench": {
       "dependencies": [
         "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench"
@@ -12940,9 +12940,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12955,7 +12955,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12969,9 +12969,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12984,7 +12984,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-CPU-Snapdragon810-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12998,9 +12998,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13013,7 +13013,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13027,9 +13027,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan"
+        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13042,7 +13042,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13056,9 +13056,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13071,7 +13071,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13085,9 +13085,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan": {
+    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan"
+        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13100,7 +13100,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13114,9 +13114,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13129,7 +13129,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13143,9 +13143,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android": {
+    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android"
+        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13158,7 +13158,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android",
+        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13172,9 +13172,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13187,7 +13187,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13201,9 +13201,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android"
+        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13216,7 +13216,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-Nexus9-GPU-TegraK1-arm64-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13230,9 +13230,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13245,7 +13245,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13259,9 +13259,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13274,7 +13274,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13288,9 +13288,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13303,7 +13303,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13317,9 +13317,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan": {
+    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan"
+        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13332,7 +13332,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android_Vulkan",
+        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13346,9 +13346,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android": {
+    "Upload-Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android"
+        "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13361,7 +13361,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -13375,9 +13375,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan": {
+    "Upload-Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android": {
       "dependencies": [
-        "Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan"
+        "Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -13390,7 +13390,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan",
+        "buildername=Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-Android",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",