Move FxAA jobs to Win2k8, Clang, GCE, 64-bit; run fewer configs.

These jobs were originally added in
https://skia-review.googlesource.com/c/skia/+/60540.

No-Try: true
Change-Id: I38677933dbb05dac8df9ea236af9a5d7b8227623
Reviewed-on: https://skia-review.googlesource.com/63742
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Yuqian Li <liyuqian@google.com>

7 files changed, 242 insertions, 489 deletions

diff --git a/infra/bots/README.recipes.md b/infra/bots/README.recipes.md
index bec9a9bc63..6aa76508e7 100644
--- a/infra/bots/README.recipes.md
+++ b/infra/bots/README.recipes.md
@@ -837,17 +837,17 @@ benchmark Skia using skpbench.
 
 [DEPS](/infra/bots/recipes/test.py#9): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [core](#recipe_modules-core), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars)
 
-— **def [RunSteps](/infra/bots/recipes/test.py#855)(api):**
+— **def [RunSteps](/infra/bots/recipes/test.py#860)(api):**
 
 — **def [dm\_flags](/infra/bots/recipes/test.py#27)(api, bot):**
 
-— **def [key\_params](/infra/bots/recipes/test.py#711)(api):**
+— **def [key\_params](/infra/bots/recipes/test.py#716)(api):**
 
 Build a unique key from the builder name (as a list).
 
 E.g.  arch x86 gpu GeForce320M mode MacMini4.1 os Mac10.6
 
-— **def [test\_steps](/infra/bots/recipes/test.py#727)(api):**
+— **def [test\_steps](/infra/bots/recipes/test.py#732)(api):**
 
 Run the DM test.
 ### *recipes* / [update\_meta\_config](/infra/bots/recipes/update_meta_config.py)
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 0edb22b291..da94711bd3 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -449,8 +449,14 @@
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
+  "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
   "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
   "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
@@ -461,13 +467,7 @@
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
-  "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA.json b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
index b425427626..5c98ec4edc 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA",
+      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -206,15 +206,15 @@
       "configuration",
       "Debug",
       "cpu_or_gpu",
-      "GPU",
+      "CPU",
       "cpu_or_gpu_value",
-      "GTX1070",
+      "AVX2",
       "extra_config",
-      "Vulkan_FAAA",
+      "FAAA",
       "model",
-      "ZBOX",
+      "GCE",
       "os",
-      "Win10",
+      "Win2k8",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
@@ -222,21 +222,17 @@
       "--dont_write",
       "pdf",
       "--randomProcessorTest",
-      "--nocpu",
+      "--nogpu",
       "--config",
-      "vk",
+      "8888",
+      "tiles_rt-8888",
       "--src",
       "tests",
       "gm",
       "image",
       "colorImage",
-      "svg",
       "--blacklist",
       "_",
-      "svg",
-      "_",
-      "svgparse_",
-      "_",
       "image",
       "gen_platf",
       "pal8os2v2.bmp",
@@ -273,6 +269,10 @@
       "gen_platf",
       "24bpp-pixeldata-cropped.bmp",
       "_",
+      "gm",
+      "_",
+      "composeshader_bitmap",
+      "_",
       "image",
       "gen_platf",
       "testimgari.jpg",
@@ -284,98 +284,14 @@
       "image",
       "gen_platf",
       "rle4-height-negative.bmp",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      "image",
-      "_",
-      "interlaced1.png",
-      "_",
-      "image",
-      "_",
-      "interlaced2.png",
-      "_",
-      "image",
-      "_",
-      "interlaced3.png",
-      "_",
-      "image",
-      "_",
-      ".arw",
-      "_",
-      "image",
-      "_",
-      ".cr2",
-      "_",
-      "image",
-      "_",
-      ".dng",
-      "_",
-      "image",
-      "_",
-      ".nef",
-      "_",
-      "image",
-      "_",
-      ".nrw",
-      "_",
-      "image",
-      "_",
-      ".orf",
-      "_",
-      "image",
-      "_",
-      ".raf",
-      "_",
-      "image",
-      "_",
-      ".rw2",
-      "_",
-      "image",
-      "_",
-      ".pef",
-      "_",
-      "image",
-      "_",
-      ".srw",
-      "_",
-      "image",
-      "_",
-      ".ARW",
-      "_",
-      "image",
-      "_",
-      ".CR2",
-      "_",
-      "image",
-      "_",
-      ".DNG",
-      "_",
-      "image",
-      "_",
-      ".NEF",
-      "_",
-      "image",
-      "_",
-      ".NRW",
-      "_",
-      "image",
-      "_",
-      ".ORF",
-      "_",
-      "image",
-      "_",
-      ".RAF",
-      "_",
-      "image",
-      "_",
-      ".RW2",
-      "_",
-      "image",
-      "_",
-      ".PEF",
-      "_",
-      "image",
+      "complexclip4_bw",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      ".SRW",
+      "complexclip4_aa",
       "--deltaAA",
       "false",
       "--forceAnalyticAA",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA.json b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
index 9fb2a72956..6173ecef1f 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA",
+      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -206,15 +206,15 @@
       "configuration",
       "Debug",
       "cpu_or_gpu",
-      "GPU",
+      "CPU",
       "cpu_or_gpu_value",
-      "GTX1070",
+      "AVX2",
       "extra_config",
-      "Vulkan_FDAA",
+      "FDAA",
       "model",
-      "ZBOX",
+      "GCE",
       "os",
-      "Win10",
+      "Win2k8",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
@@ -222,21 +222,17 @@
       "--dont_write",
       "pdf",
       "--randomProcessorTest",
-      "--nocpu",
+      "--nogpu",
       "--config",
-      "vk",
+      "8888",
+      "tiles_rt-8888",
       "--src",
       "tests",
       "gm",
       "image",
       "colorImage",
-      "svg",
       "--blacklist",
       "_",
-      "svg",
-      "_",
-      "svgparse_",
-      "_",
       "image",
       "gen_platf",
       "pal8os2v2.bmp",
@@ -273,6 +269,10 @@
       "gen_platf",
       "24bpp-pixeldata-cropped.bmp",
       "_",
+      "gm",
+      "_",
+      "composeshader_bitmap",
+      "_",
       "image",
       "gen_platf",
       "testimgari.jpg",
@@ -284,98 +284,14 @@
       "image",
       "gen_platf",
       "rle4-height-negative.bmp",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      "image",
-      "_",
-      "interlaced1.png",
-      "_",
-      "image",
-      "_",
-      "interlaced2.png",
-      "_",
-      "image",
-      "_",
-      "interlaced3.png",
-      "_",
-      "image",
-      "_",
-      ".arw",
-      "_",
-      "image",
-      "_",
-      ".cr2",
-      "_",
-      "image",
-      "_",
-      ".dng",
-      "_",
-      "image",
-      "_",
-      ".nef",
-      "_",
-      "image",
-      "_",
-      ".nrw",
-      "_",
-      "image",
-      "_",
-      ".orf",
-      "_",
-      "image",
-      "_",
-      ".raf",
-      "_",
-      "image",
-      "_",
-      ".rw2",
-      "_",
-      "image",
-      "_",
-      ".pef",
-      "_",
-      "image",
-      "_",
-      ".srw",
-      "_",
-      "image",
-      "_",
-      ".ARW",
-      "_",
-      "image",
-      "_",
-      ".CR2",
-      "_",
-      "image",
-      "_",
-      ".DNG",
-      "_",
-      "image",
-      "_",
-      ".NEF",
-      "_",
-      "image",
-      "_",
-      ".NRW",
-      "_",
-      "image",
-      "_",
-      ".ORF",
-      "_",
-      "image",
-      "_",
-      ".RAF",
-      "_",
-      "image",
-      "_",
-      ".RW2",
-      "_",
-      "image",
-      "_",
-      ".PEF",
-      "_",
-      "image",
+      "complexclip4_bw",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      ".SRW",
+      "complexclip4_aa",
       "--deltaAA",
       "--forceDeltaAA",
       "--verbose"
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA.json b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
index 17ff879989..d0a0c2b604 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA.json
+++ b/infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
@@ -191,7 +191,7 @@
       "gitHash",
       "abc123",
       "builder",
-      "Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA",
+      "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
       "swarming_bot_id",
       "skia-bot-123",
       "swarming_task_id",
@@ -206,15 +206,15 @@
       "configuration",
       "Debug",
       "cpu_or_gpu",
-      "GPU",
+      "CPU",
       "cpu_or_gpu_value",
-      "GTX1070",
+      "AVX2",
       "extra_config",
-      "Vulkan_FSAA",
+      "FSAA",
       "model",
-      "ZBOX",
+      "GCE",
       "os",
-      "Win10",
+      "Win2k8",
       "--uninterestingHashesFile",
       "[START_DIR]\\tmp\\uninteresting_hashes.txt",
       "--writePath",
@@ -222,21 +222,17 @@
       "--dont_write",
       "pdf",
       "--randomProcessorTest",
-      "--nocpu",
+      "--nogpu",
       "--config",
-      "vk",
+      "8888",
+      "tiles_rt-8888",
       "--src",
       "tests",
       "gm",
       "image",
       "colorImage",
-      "svg",
       "--blacklist",
       "_",
-      "svg",
-      "_",
-      "svgparse_",
-      "_",
       "image",
       "gen_platf",
       "pal8os2v2.bmp",
@@ -273,6 +269,10 @@
       "gen_platf",
       "24bpp-pixeldata-cropped.bmp",
       "_",
+      "gm",
+      "_",
+      "composeshader_bitmap",
+      "_",
       "image",
       "gen_platf",
       "testimgari.jpg",
@@ -284,98 +284,14 @@
       "image",
       "gen_platf",
       "rle4-height-negative.bmp",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      "image",
-      "_",
-      "interlaced1.png",
-      "_",
-      "image",
-      "_",
-      "interlaced2.png",
-      "_",
-      "image",
-      "_",
-      "interlaced3.png",
-      "_",
-      "image",
-      "_",
-      ".arw",
-      "_",
-      "image",
-      "_",
-      ".cr2",
-      "_",
-      "image",
-      "_",
-      ".dng",
-      "_",
-      "image",
-      "_",
-      ".nef",
-      "_",
-      "image",
-      "_",
-      ".nrw",
-      "_",
-      "image",
-      "_",
-      ".orf",
-      "_",
-      "image",
-      "_",
-      ".raf",
-      "_",
-      "image",
-      "_",
-      ".rw2",
-      "_",
-      "image",
-      "_",
-      ".pef",
-      "_",
-      "image",
-      "_",
-      ".srw",
-      "_",
-      "image",
-      "_",
-      ".ARW",
-      "_",
-      "image",
-      "_",
-      ".CR2",
-      "_",
-      "image",
-      "_",
-      ".DNG",
-      "_",
-      "image",
-      "_",
-      ".NEF",
-      "_",
-      "image",
-      "_",
-      ".NRW",
-      "_",
-      "image",
-      "_",
-      ".ORF",
-      "_",
-      "image",
-      "_",
-      ".RAF",
-      "_",
-      "image",
-      "_",
-      ".RW2",
-      "_",
-      "image",
-      "_",
-      ".PEF",
-      "_",
-      "image",
+      "complexclip4_bw",
+      "tiles_rt-8888",
+      "gm",
       "_",
-      ".SRW",
+      "complexclip4_aa",
       "--analyticAA",
       "false",
       "--deltaAA",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index a450379463..06b5cb2b61 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -106,6 +106,11 @@ def dm_flags(api, bot):
     if 'SK_FORCE_RASTER_PIPELINE_BLITTER' in bot:
       configs = ['8888', 'srgb']
 
+    if 'FSAA' in bot or 'FAAA' in bot or 'FDAA' in bot:
+      # Scan converters shouldn't really be sensitive to different color
+      # configurations.
+      configs = ['8888', 'tiles_rt-8888']
+
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     args.append('--nocpu')
 
@@ -922,9 +927,9 @@ TEST_BUILDERS = [
   'Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan',
   'Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE',
   'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan',
-  'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA',
-  'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA',
-  'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA',
+  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA',
+  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA',
+  'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
   'Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All',
   'Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
 ]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 07f25aa7e5..4c8556afa5 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -2711,6 +2711,24 @@
         "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
       ]
     },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
+      ]
+    },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
+      ]
+    },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
+      ]
+    },
     "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI": {
       "priority": 0.8,
       "tasks": [
@@ -2723,6 +2741,24 @@
         "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ]
     },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
+      ]
+    },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
+      ]
+    },
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
+      ]
+    },
     "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI": {
       "priority": 0.8,
       "tasks": [
@@ -2783,48 +2819,12 @@
         "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"
       ]
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA"
-      ]
-    },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA"
-      ]
-    },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA"
-      ]
-    },
     "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All": {
       "priority": 0.8,
       "tasks": [
         "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All"
       ]
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA"
-      ]
-    },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA"
-      ]
-    },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA": {
-      "priority": 0.8,
-      "tasks": [
-        "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA"
-      ]
-    },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -21701,7 +21701,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21720,7 +21720,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-GDI",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21736,7 +21736,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21749,7 +21749,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21768,7 +21768,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21784,7 +21784,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21797,7 +21797,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21816,7 +21816,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-GDI",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21832,7 +21832,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21845,7 +21845,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21864,7 +21864,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-Clang-x86_64-Debug-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21873,14 +21873,14 @@
         "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21893,7 +21893,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21912,7 +21912,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21928,7 +21928,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21941,7 +21941,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -21960,7 +21960,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -21976,7 +21976,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -21989,7 +21989,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22008,7 +22008,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22024,7 +22024,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22037,7 +22037,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22056,13 +22056,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22072,7 +22072,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22085,7 +22085,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI": {
+    "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22104,13 +22104,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-GDI",
+        "Build-Win-Clang-x86_64-Release-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22120,7 +22120,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22133,7 +22133,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22152,23 +22152,23 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22181,7 +22181,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22200,13 +22200,13 @@
         }
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-GDI",
+        "Build-Win-MSVC-x86-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -22216,7 +22216,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22229,7 +22229,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22248,23 +22248,23 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-MSVC-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22277,7 +22277,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA": {
+    "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22296,23 +22296,23 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-E5-2670",
+        "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "os:Windows-7-SP1",
+        "os:Windows-2008ServerR2-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22325,7 +22325,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22344,7 +22344,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22353,14 +22353,14 @@
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22373,7 +22373,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22392,7 +22392,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Debug",
+        "Build-Win-Clang-x86_64-Debug-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22401,14 +22401,14 @@
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22421,7 +22421,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22440,7 +22440,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22456,7 +22456,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22469,7 +22469,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA": {
+    "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22488,7 +22488,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Win-Clang-x86_64-Release-GDI",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22504,7 +22504,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22517,7 +22517,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22536,7 +22536,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86-Release",
+        "Build-Win-MSVC-x86-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -22545,14 +22545,14 @@
         "os:Windows-7-SP1",
         "pool:Skia"
       ],
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
       "extra_args": [
         "--workdir",
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -22565,7 +22565,7 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA": {
+    "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -22600,7 +22600,7 @@
         "../../..",
         "test",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29294,9 +29294,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29309,7 +29309,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29321,9 +29321,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29336,7 +29336,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29348,9 +29348,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA": {
       "dependencies": [
-        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29363,7 +29363,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29375,9 +29375,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI": {
       "dependencies": [
-        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29390,7 +29390,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29402,9 +29402,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29417,7 +29417,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29429,9 +29429,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA": {
       "dependencies": [
-        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29444,7 +29444,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29456,9 +29456,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA": {
       "dependencies": [
-        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29471,7 +29471,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29483,9 +29483,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29498,7 +29498,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29510,9 +29510,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI": {
+    "Upload-Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI"
+        "Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29525,7 +29525,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
+        "buildername=Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29537,9 +29537,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29552,7 +29552,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29564,9 +29564,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All": {
       "dependencies": [
-        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29579,7 +29579,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29591,9 +29591,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29606,7 +29606,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29618,9 +29618,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA": {
+    "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA"
+        "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29633,7 +29633,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
+        "buildername=Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29645,9 +29645,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29660,7 +29660,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29672,9 +29672,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29687,7 +29687,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29699,9 +29699,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29714,7 +29714,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29726,9 +29726,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA": {
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA"
+        "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29741,7 +29741,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29753,9 +29753,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA": {
+    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA"
+        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29768,7 +29768,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",
@@ -29780,9 +29780,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA": {
+    "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All": {
       "dependencies": [
-        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA"
+        "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -29795,7 +29795,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
+        "buildername=Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",