-Fast bot upgrades

  - GCC -> Clang;
  - Add a Perf bot.

This -Fast mode is a stand-in for "how clients should/do really release code".  Today everyone uses Clang, so we should probably switch this bot too.

I also got interested in how it compares in performance to our ordinary Release build, so I've added a Perf bot.

I did try turning on link-time optimization (much slower build, somewhat faster binary), but that failed at the link step.  Going to save that for later.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-Clang-x86_64-Release-Fast,Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast,Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast


Change-Id: I58e6109f8a89799d80e769316902549131b619cf
Reviewed-on: https://skia-review.googlesource.com/6595
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

2 files changed, 188 insertions, 96 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index fc391378e6..52ea9f92ac 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -67,6 +67,7 @@ var (
 		"Build-Ubuntu-Clang-x86_64-Debug-ASAN",
 		"Build-Ubuntu-Clang-x86_64-Debug-MSAN",
 		"Build-Ubuntu-Clang-x86_64-Release",
+		"Build-Ubuntu-Clang-x86_64-Release-Fast",
 		"Build-Ubuntu-Clang-x86_64-Release-TSAN",
 		"Build-Ubuntu-GCC-x86-Debug",
 		"Build-Ubuntu-GCC-x86-Release",
@@ -75,7 +76,6 @@ var (
 		"Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
 		"Build-Ubuntu-GCC-x86_64-Release",
 		"Build-Ubuntu-GCC-x86_64-Release-ANGLE",
-		"Build-Ubuntu-GCC-x86_64-Release-Fast",
 		"Build-Ubuntu-GCC-x86_64-Release-Mesa",
 		"Build-Ubuntu-GCC-x86_64-Release-NoGPU",
 		"Build-Ubuntu-GCC-x86_64-Release-PDFium",
@@ -150,6 +150,7 @@ var (
 		"Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
 		"Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
 		"Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
+		"Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
 		"Perf-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
 		"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
 		"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
@@ -241,6 +242,7 @@ var (
 		"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN",
 		"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
 		"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release",
+		"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
 		"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN",
 		"Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
 		"Test-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
@@ -251,7 +253,6 @@ var (
 		"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
 		"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
 		"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
-		"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
 		"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD",
 		"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind",
 		"Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 0ac2e7e239..c911e93995 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -174,6 +174,12 @@
         "Build-Ubuntu-Clang-x86_64-Release"
       ]
     },
+    "Build-Ubuntu-Clang-x86_64-Release-Fast": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
+      ]
+    },
     "Build-Ubuntu-Clang-x86_64-Release-TSAN": {
       "priority": 0.8,
       "tasks": [
@@ -222,12 +228,6 @@
         "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-Mesa": {
       "priority": 0.8,
       "tasks": [
@@ -662,6 +662,12 @@
         "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
+      ]
+    },
     "Perf-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
@@ -1196,6 +1202,12 @@
         "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
+      ]
+    },
     "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
       "priority": 0.8,
       "tasks": [
@@ -1257,12 +1269,6 @@
         "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ]
     },
-    "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-SKNX_NO_SIMD": {
       "priority": 0.8,
       "tasks": [
@@ -2384,7 +2390,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-Clang-x86_64-Release-TSAN": {
+    "Build-Ubuntu-Clang-x86_64-Release-Fast": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -2402,7 +2408,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-Clang-x86_64-Release-TSAN",
+        "buildername=Build-Ubuntu-Clang-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2416,7 +2422,14 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86-Debug": {
+    "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-14.04",
@@ -2427,7 +2440,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86-Debug",
+        "buildername=Build-Ubuntu-Clang-x86_64-Release-TSAN",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2441,7 +2454,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86-Release": {
+    "Build-Ubuntu-GCC-x86-Debug": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2452,7 +2465,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86-Release",
+        "buildername=Build-Ubuntu-GCC-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2466,7 +2479,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Debug": {
+    "Build-Ubuntu-GCC-x86-Release": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2477,7 +2490,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Debug",
+        "buildername=Build-Ubuntu-GCC-x86-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2491,7 +2504,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
+    "Build-Ubuntu-GCC-x86_64-Debug": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2502,7 +2515,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Debug-NoGPU",
+        "buildername=Build-Ubuntu-GCC-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2516,7 +2529,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Build-Ubuntu-GCC-x86_64-Debug-NoGPU": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2527,7 +2540,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Build-Ubuntu-GCC-x86_64-Debug-NoGPU",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2541,7 +2554,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release": {
+    "Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2552,7 +2565,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release",
+        "buildername=Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2566,7 +2579,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
+    "Build-Ubuntu-GCC-x86_64-Release": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2577,7 +2590,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-ANGLE",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -2591,7 +2604,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Ubuntu-GCC-x86_64-Release-Fast": {
+    "Build-Ubuntu-GCC-x86_64-Release-ANGLE": {
       "dimensions": [
         "gpu:none",
         "os:Ubuntu-14.04",
@@ -2602,7 +2615,7 @@
         "../../..",
         "swarm_compile",
         "repository=<(REPO)",
-        "buildername=Build-Ubuntu-GCC-x86_64-Release-Fast",
+        "buildername=Build-Ubuntu-GCC-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -5621,6 +5634,55 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
+    "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:17"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:31"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Ubuntu-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
@@ -9909,6 +9971,55 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
+    "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:17"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:31"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Ubuntu-Clang-x86_64-Release-Fast"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "mastername=fake-master",
+        "buildnumber=2",
+        "slavename=fake-buildslave",
+        "nobuildbot=True",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN": {
       "cipd_packages": [
         {
@@ -10340,55 +10451,6 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:17"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:31"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:3"
-        }
-      ],
-      "dependencies": [
-        "Build-Ubuntu-GCC-x86_64-Release-Fast"
-      ],
-      "dimensions": [
-        "cpu:x86-64-avx2",
-        "gpu:none",
-        "os:Ubuntu-14.04",
-        "pool:Skia"
-      ],
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "swarm_test",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
-        "mastername=fake-master",
-        "buildnumber=2",
-        "slavename=fake-buildslave",
-        "nobuildbot=True",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 2400000000000,
-      "isolate": "test_skia.isolate",
-      "priority": 0.8
-    },
     "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
       "cipd_packages": [
         {
@@ -12983,6 +13045,35 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
+      "dependencies": [
+        "Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-Clang-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_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
         "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
@@ -14752,9 +14843,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
+    "Upload-Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
+        "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14767,7 +14858,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
+        "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-Fast",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14781,9 +14872,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14796,7 +14887,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14810,9 +14901,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14825,7 +14916,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14839,9 +14930,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14854,7 +14945,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14868,9 +14959,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast": {
+    "Upload-Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release": {
       "dependencies": [
-        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14883,7 +14974,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",