Add Win x86 Clang Perf/Test jobs.

Also switch CQ Win 32-bit Build from MSVC to Clang.

No-Try: true
Change-Id: Ic312ee611b1e99143480840c08a9266a4d8b448b
Reviewed-on: https://skia-review.googlesource.com/113672
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

3 files changed, 658 insertions, 1 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 64a9b7bb77..c41a6ffe35 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -288,6 +288,7 @@
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN",
   "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Release-All",
@@ -297,8 +298,10 @@
   "Perf-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+  "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
   "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Perf-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
+  "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
   "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Perf-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All",
@@ -517,6 +520,8 @@
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All",
   "Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
+  "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
   "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
@@ -533,12 +538,16 @@
   "Test-Win2016-MSVC-GCE-CPU-AVX2-x86_64-Release-All",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All",
   "Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All",
+  "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
+  "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All-NativeFonts_GDI",
   "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
   "Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
+  "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
+  "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
   "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",
   "Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 5e94ee9900..e09959ae03 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1746,6 +1746,12 @@
         "Upload-Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
+    "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
+      ]
+    },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -1800,6 +1806,12 @@
         "Upload-Perf-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
+    "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ]
+    },
     "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -1812,6 +1824,12 @@
         "Perf-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All"
       ]
     },
+    "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ]
+    },
     "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3124,6 +3142,18 @@
         "Upload-Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"
       ]
     },
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
+      ]
+    },
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All"
+      ]
+    },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3220,6 +3250,18 @@
         "Upload-Test-Win2k8-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ]
+    },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All"
+      ]
+    },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -3256,6 +3298,18 @@
         "Upload-Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All"
       ]
     },
+    "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ]
+    },
+    "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All"
+      ]
+    },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "priority": 0.8,
       "tasks": [
@@ -14093,6 +14147,54 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-2016Server-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -14523,6 +14625,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-7-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -14617,6 +14766,53 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-8.1-SP0",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "perf_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Perf-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -24598,6 +24794,104 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-2016Server-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-2016Server-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -25380,6 +25674,102 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-7-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-7-SP1",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -25668,6 +26058,102 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-8.1-SP0",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 21600000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
+    "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:34"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:116"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:9"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-E5-2670",
+        "os:Windows-8.1-SP0",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "test",
+        "repository=<(REPO)",
+        "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)",
+        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 2400000000000,
+      "isolate": "test_skia_bundled_win.isolate",
+      "max_attempts": 1,
+      "priority": 0.8
+    },
     "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "cipd_packages": [
         {
@@ -33790,6 +34276,60 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+      "dependencies": [
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All": {
+      "dependencies": [
+        "Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win2016-Clang-GCE-CPU-AVX2-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
@@ -34168,6 +34708,60 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "dependencies": [
+        "Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "dependencies": [
+        "Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win7-Clang-Golo-CPU-AVX-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win7-Clang-Golo-CPU-AVX-x86_64-Debug-All"
@@ -34330,6 +34924,60 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All": {
+      "dependencies": [
+        "Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Debug-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All": {
+      "dependencies": [
+        "Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win8-Clang-Golo-CPU-AVX-x86-Release-All",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All": {
       "dependencies": [
         "Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All"
diff --git a/infra/branch-config/cq.cfg b/infra/branch-config/cq.cfg
index 35605bd3cd..57386a8991 100644
--- a/infra/branch-config/cq.cfg
+++ b/infra/branch-config/cq.cfg
@@ -42,12 +42,12 @@ verifiers {
       builders { name: "Build-Debian9-GCC-x86_64-Release" }
       builders { name: "Build-Mac-Clang-x86_64-Debug-Metal" }
       builders { name: "Build-Mac-Clang-x86_64-Release" }
+      builders { name: "Build-Win-Clang-x86-Debug" }
       builders { name: "Build-Win-Clang-x86_64-Release-Vulkan" }
       builders {
         name: "Build-Win-Clang-x86_64-Release-Vulkan_Goma"
         experiment_percentage: 100
       }
-      builders { name: "Build-Win-MSVC-x86-Debug" }
       builders { name: "Housekeeper-PerCommit-Bookmaker" }
       builders { name: "Housekeeper-PerCommit-InfraTests" }
       builders { name: "Perf-Debian9-Clang-GCE-CPU-AVX2-x86-Debug-All" }