Add remaining gn_v2 Win/Clang builders

Adds the remaining Win/Clang builders using the gn_v2 recipe and their
manual trybot mirrors.

CI builders:
* dawn-win-x64-builder-dbg
* dawn-win-x86-builder-dbg
* dawn-win-x86-builder-rel
* dawn-win-x64-sws-dbg
* dawn-win-x86-sws-dbg
* dawn-win-x86-sws-rel

Tests will be enabled in a follow-up CL.

Bug: 385317083
Change-Id: I60651de8890b048c4e37dc51851b23463a3094ce
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/263142
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/builders/ci/dawn-win-x64-builder-dbg/gn-args.json b/infra/config/global/generated/builders/ci/dawn-win-x64-builder-dbg/gn-args.json
new file mode 100644
index 0000000..edbe624
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-win-x64-builder-dbg/gn-args.json
@@ -0,0 +1,20 @@
+{
+  "gn_args": {
+    "dawn_build_node_bindings": true,
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/gn-args.json b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/gn-args.json
new file mode 100644
index 0000000..3c3a0f0
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-dbg/gn-args.json
@@ -0,0 +1,19 @@
+{
+  "gn_args": {
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x86",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/ci/dawn-win-x86-builder-rel/gn-args.json b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-rel/gn-args.json
new file mode 100644
index 0000000..0cca9e4
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-win-x86-builder-rel/gn-args.json
@@ -0,0 +1,19 @@
+{
+  "gn_args": {
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": false,
+    "target_cpu": "x86",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/gn_args_locations.json b/infra/config/global/generated/builders/gn_args_locations.json
index d110d3d..da93bac 100644
--- a/infra/config/global/generated/builders/gn_args_locations.json
+++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -8,7 +8,10 @@
     "dawn-linux-x86-builder-rel": "ci/dawn-linux-x86-builder-rel/gn-args.json",
     "dawn-linux-x86-fuzz-dbg": "ci/dawn-linux-x86-fuzz-dbg/gn-args.json",
     "dawn-linux-x86-fuzz-rel": "ci/dawn-linux-x86-fuzz-rel/gn-args.json",
-    "dawn-win-x64-builder-rel": "ci/dawn-win-x64-builder-rel/gn-args.json"
+    "dawn-win-x64-builder-dbg": "ci/dawn-win-x64-builder-dbg/gn-args.json",
+    "dawn-win-x64-builder-rel": "ci/dawn-win-x64-builder-rel/gn-args.json",
+    "dawn-win-x86-builder-dbg": "ci/dawn-win-x86-builder-dbg/gn-args.json",
+    "dawn-win-x86-builder-rel": "ci/dawn-win-x86-builder-rel/gn-args.json"
   },
   "try": {
     "dawn-cq-linux-x64-dbg": "try/dawn-cq-linux-x64-dbg/gn-args.json",
@@ -27,6 +30,9 @@
     "dawn-try-linux-x86-fuzz-rel": "try/dawn-try-linux-x86-fuzz-rel/gn-args.json",
     "dawn-try-linux-x86-sws-dbg": "try/dawn-try-linux-x86-sws-dbg/gn-args.json",
     "dawn-try-linux-x86-sws-rel": "try/dawn-try-linux-x86-sws-rel/gn-args.json",
-    "dawn-try-win-x64-sws-rel": "try/dawn-try-win-x64-sws-rel/gn-args.json"
+    "dawn-try-win-x64-sws-dbg": "try/dawn-try-win-x64-sws-dbg/gn-args.json",
+    "dawn-try-win-x64-sws-rel": "try/dawn-try-win-x64-sws-rel/gn-args.json",
+    "dawn-try-win-x86-sws-dbg": "try/dawn-try-win-x86-sws-dbg/gn-args.json",
+    "dawn-try-win-x86-sws-rel": "try/dawn-try-win-x86-sws-rel/gn-args.json"
   }
 }
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-win-x64-sws-dbg/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-win-x64-sws-dbg/gn-args.json
new file mode 100644
index 0000000..edbe624
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-win-x64-sws-dbg/gn-args.json
@@ -0,0 +1,20 @@
+{
+  "gn_args": {
+    "dawn_build_node_bindings": true,
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/gn-args.json
new file mode 100644
index 0000000..3c3a0f0
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-dbg/gn-args.json
@@ -0,0 +1,19 @@
+{
+  "gn_args": {
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x86",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-rel/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-rel/gn-args.json
new file mode 100644
index 0000000..0cca9e4
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-win-x86-sws-rel/gn-args.json
@@ -0,0 +1,19 @@
+{
+  "gn_args": {
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": false,
+    "target_cpu": "x86",
+    "target_os": "win",
+    "tint_build_hlsl_writer": true,
+    "tint_build_msl_writer": true,
+    "tint_build_spv_reader": true,
+    "tint_build_spv_writer": true,
+    "tint_build_wgsl_reader": true,
+    "tint_build_wgsl_writer": true,
+    "use_reclient": false,
+    "use_remoteexec": true,
+    "use_siso": true
+  }
+}
\ No newline at end of file
diff --git a/infra/config/global/generated/luci/commit-queue.cfg b/infra/config/global/generated/luci/commit-queue.cfg
index 8602667..2155617 100644
--- a/infra/config/global/generated/luci/commit-queue.cfg
+++ b/infra/config/global/generated/luci/commit-queue.cfg
@@ -739,11 +739,26 @@
         disable_reuse_footers: "Include-Ci-Only-Tests"
       }
       builders {
+        name: "dawn/try/dawn-try-win-x64-sws-dbg"
+        includable_only: true
+        disable_reuse_footers: "Include-Ci-Only-Tests"
+      }
+      builders {
         name: "dawn/try/dawn-try-win-x64-sws-rel"
         includable_only: true
         disable_reuse_footers: "Include-Ci-Only-Tests"
       }
       builders {
+        name: "dawn/try/dawn-try-win-x86-sws-dbg"
+        includable_only: true
+        disable_reuse_footers: "Include-Ci-Only-Tests"
+      }
+      builders {
+        name: "dawn/try/dawn-try-win-x86-sws-rel"
+        includable_only: true
+        disable_reuse_footers: "Include-Ci-Only-Tests"
+      }
+      builders {
         name: "dawn/try/mac-dbg"
         location_filters {
           gerrit_host_regexp: ".*"
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index e410470..6e21640 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -2719,6 +2719,179 @@
       }
     }
     builders {
+      name: "dawn-win-x64-builder-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-win-x64-builder-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x64-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x64-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x64-sws-dbg",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-trusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Compiles debug Dawn test binaries for Windows/x64<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x64-sws-dbg\">dawn-try-win-x64-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
       name: "dawn-win-x64-builder-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -2892,6 +3065,157 @@
       }
     }
     builders {
+      name: "dawn-win-x64-sws-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x64-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x64-sws-dbg",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests debug Dawn on Windows/x64 with SwiftShader<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x64-sws-dbg\">dawn-try-win-x64-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
       name: "dawn-win-x64-sws-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -3043,6 +3367,644 @@
       }
     }
     builders {
+      name: "dawn-win-x86-builder-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-win-x86-builder-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x86-sws-dbg",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-trusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Compiles debug Dawn test binaries for Windows/x86<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-dbg\">dawn-try-win-x86-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
+      name: "dawn-win-x86-builder-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-win-x86-builder-rel/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-rel",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-builder-rel",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-rel",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x86-sws-rel",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-trusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Compiles release Dawn test binaries for Windows/x86<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-rel\">dawn-try-win-x86-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
+      name: "dawn-win-x86-sws-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "os:Ubuntu-22.04"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x86-sws-dbg",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests debug Dawn on Windows/x86 with SwiftShader<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-dbg\">dawn-try-win-x86-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
+      name: "dawn-win-x86-sws-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:2"
+      dimensions: "os:Ubuntu-22.04"
+      dimensions: "pool:luci.chromium.gpu.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-rel",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-rel",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-win-x86-sws-rel",'
+        '          "group": "try"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "builder_group": "ci",'
+        '  "recipe": "dawn/gn_v2"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests release Dawn on Windows/x86 with SwiftShader<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-rel\">dawn-try-win-x86-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      shadow_builder_adjustments {
+        service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      }
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+    }
+    builders {
       name: "mac-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
@@ -6346,6 +7308,170 @@
       max_concurrent_builds: 1
     }
     builders {
+      name: "dawn-try-win-x64-sws-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/try/dawn-try-win-x64-sws-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x64-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 64,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x64-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x64-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-untrusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "try",'
+        '  "recipe": "dawn/gn_v2_trybot"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests debug Dawn on Windows/x64 with SwiftShader. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-builder-dbg\">dawn-win-x64-builder-dbg</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-sws-dbg\">dawn-win-x64-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+      max_concurrent_builds: 1
+    }
+    builders {
       name: "dawn-try-win-x64-sws-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -6510,6 +7636,328 @@
       max_concurrent_builds: 1
     }
     builders {
+      name: "dawn-try-win-x86-sws-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/try/dawn-try-win-x86-sws-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-dbg",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Debug",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-untrusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "try",'
+        '  "recipe": "dawn/gn_v2_trybot"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests debug Dawn on Windows/x86 with SwiftShader. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-builder-dbg\">dawn-win-x86-builder-dbg</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-sws-dbg\">dawn-win-x86-sws-dbg</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+      max_concurrent_builds: 1
+    }
+    builders {
+      name: "dawn-try-win-x86-sws-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.gpu.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "$build/chromium_tests_builder_config": {'
+        '    "builder_config": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/try/dawn-try-win-x86-sws-rel/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-builder-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "COMPILE_AND_TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-win-x86-sws-rel",'
+        '              "project": "dawn"'
+        '            },'
+        '            "builder_spec": {'
+        '              "builder_group": "ci",'
+        '              "execution_mode": "TEST",'
+        '              "legacy_chromium_config": {'
+        '                "build_config": "Release",'
+        '                "config": "dawn_base",'
+        '                "target_arch": "intel",'
+        '                "target_bits": 32,'
+        '                "target_platform": "win"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-win-x86-builder-rel",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-builder-rel",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-win-x86-sws-rel",'
+        '          "project": "dawn"'
+        '        }'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$build/siso": {'
+        '    "configs": ['
+        '      "builder"'
+        '    ],'
+        '    "enable_cloud_monitoring": true,'
+        '    "enable_cloud_profiler": true,'
+        '    "enable_cloud_trace": true,'
+        '    "experiments": [],'
+        '    "metrics_project": "chromium-reclient-metrics",'
+        '    "project": "rbe-chromium-untrusted",'
+        '    "remote_jobs": 250'
+        '  },'
+        '  "builder_group": "try",'
+        '  "recipe": "dawn/gn_v2_trybot"'
+        '}'
+      build_numbers: YES
+      service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.use_per_builder_build_dir_name"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+      description_html: "Tests release Dawn on Windows/x86 with SwiftShader. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-builder-rel\">dawn-win-x86-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-sws-rel\">dawn-win-x86-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      contact_team_email: "chrome-gpu-infra@google.com"
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/cached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"true\""
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count"
+        predicates: "has(build.output.properties.ran_tests_retry_shard)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/ran_tests_without_patch_count"
+        predicates: "has(build.output.properties.ran_tests_without_patch)"
+      }
+      custom_metric_definitions {
+        name: "/chrome/infra/browser/builds/uncached_count"
+        predicates: "has(build.output.properties.is_cached)"
+        predicates: "string(build.output.properties.is_cached) == \"false\""
+      }
+      max_concurrent_builds: 1
+    }
+    builders {
       name: "mac-dbg"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci/luci-milo.cfg
index 6eb034d..f824b2f 100644
--- a/infra/config/global/generated/luci/luci-milo.cfg
+++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -131,11 +131,26 @@
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x64-builder-dbg"
+    category: "win|build|clang|dbg"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x86-builder-dbg"
+    category: "win|build|clang|dbg"
+    short_name: "x86"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/dawn-win-x64-builder-rel"
     category: "win|build|clang|rel"
     short_name: "x64"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x86-builder-rel"
+    category: "win|build|clang|rel"
+    short_name: "x86"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/win-clang-dbg-x64"
     category: "win|clang|dbg"
     short_name: "x64"
@@ -176,10 +191,25 @@
     short_name: "rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x64-sws-dbg"
+    category: "win|test|clang|dbg|x64"
+    short_name: "sws"
+  }
+  builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x86-sws-dbg"
+    category: "win|test|clang|dbg|x86"
+    short_name: "sws"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/dawn-win-x64-sws-rel"
     category: "win|test|clang|rel|x64"
     short_name: "sws"
   }
+  builders {
+    name: "buildbucket/luci.dawn.ci/dawn-win-x86-sws-rel"
+    category: "win|test|clang|rel|x86"
+    short_name: "sws"
+  }
 }
 consoles {
   id: "try"
@@ -263,9 +293,18 @@
     name: "buildbucket/luci.dawn.try/dawn-try-linux-x86-sws-rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.try/dawn-try-win-x64-sws-dbg"
+  }
+  builders {
     name: "buildbucket/luci.dawn.try/dawn-try-win-x64-sws-rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.try/dawn-try-win-x86-sws-dbg"
+  }
+  builders {
+    name: "buildbucket/luci.dawn.try/dawn-try-win-x86-sws-rel"
+  }
+  builders {
     name: "buildbucket/luci.dawn.try/mac-dbg"
   }
   builders {
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci/luci-scheduler.cfg
index 3a47acb..c2d4f4d 100644
--- a/infra/config/global/generated/luci/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci/luci-scheduler.cfg
@@ -231,6 +231,16 @@
   }
 }
 job {
+  id: "dawn-win-x64-builder-dbg"
+  realm: "ci"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x64-builder-dbg"
+  }
+}
+job {
   id: "dawn-win-x64-builder-rel"
   realm: "ci"
   schedule: "triggered"
@@ -241,6 +251,15 @@
   }
 }
 job {
+  id: "dawn-win-x64-sws-dbg"
+  realm: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x64-sws-dbg"
+  }
+}
+job {
   id: "dawn-win-x64-sws-rel"
   realm: "ci"
   buildbucket {
@@ -250,6 +269,44 @@
   }
 }
 job {
+  id: "dawn-win-x86-builder-dbg"
+  realm: "ci"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x86-builder-dbg"
+  }
+}
+job {
+  id: "dawn-win-x86-builder-rel"
+  realm: "ci"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x86-builder-rel"
+  }
+}
+job {
+  id: "dawn-win-x86-sws-dbg"
+  realm: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x86-sws-dbg"
+  }
+}
+job {
+  id: "dawn-win-x86-sws-rel"
+  realm: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-win-x86-sws-rel"
+  }
+}
+job {
   id: "mac-dbg"
   realm: "ci"
   buildbucket {
@@ -342,7 +399,10 @@
   triggers: "dawn-linux-x86-builder-rel"
   triggers: "dawn-linux-x86-fuzz-dbg"
   triggers: "dawn-linux-x86-fuzz-rel"
+  triggers: "dawn-win-x64-builder-dbg"
   triggers: "dawn-win-x64-builder-rel"
+  triggers: "dawn-win-x86-builder-dbg"
+  triggers: "dawn-win-x86-builder-rel"
   triggers: "mac-dbg"
   triggers: "mac-rel"
   triggers: "win-clang-dbg-x64"
diff --git a/infra/config/global/generated/luci/realms.cfg b/infra/config/global/generated/luci/realms.cfg
index df66787..23d5c80 100644
--- a/infra/config/global/generated/luci/realms.cfg
+++ b/infra/config/global/generated/luci/realms.cfg
@@ -77,7 +77,10 @@
         values: "dawn-linux-x64-sws-rel"
         values: "dawn-linux-x86-sws-dbg"
         values: "dawn-linux-x86-sws-rel"
+        values: "dawn-win-x64-sws-dbg"
         values: "dawn-win-x64-sws-rel"
+        values: "dawn-win-x86-sws-dbg"
+        values: "dawn-win-x86-sws-rel"
       }
     }
   }
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index 89df3c0..dcdc59d 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -198,6 +198,44 @@
 )
 
 ci.builder(
+    name = "dawn-win-x64-builder-dbg",
+    description_html = "Compiles debug Dawn test binaries for Windows/x64",
+    schedule = "triggered",
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+            apply_configs = [
+                "dawn_node",
+            ],
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.DEBUG,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "component",
+            "dawn_node_bindings",
+            "dawn_swiftshader",
+            "debug",
+            "win_clang",
+            "x64",
+        ],
+    ),
+    cores = 8,
+    os = os.WINDOWS_DEFAULT,
+    ssd = None,
+    console_view_entry = consoles.console_view_entry(
+        category = "win|build|clang|dbg",
+        short_name = "x64",
+    ),
+)
+
+ci.builder(
     name = "dawn-win-x64-builder-rel",
     description_html = "Compiles release Dawn test binaries for Windows/x64",
     schedule = "triggered",
@@ -235,6 +273,78 @@
     ),
 )
 
+ci.builder(
+    name = "dawn-win-x86-builder-dbg",
+    description_html = "Compiles debug Dawn test binaries for Windows/x86",
+    schedule = "triggered",
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+            # dawn_node is intentionally omitted since the original standalone
+            # Win/x86/Clang builders did not build/test with node.
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.DEBUG,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 32,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "component",
+            "dawn_swiftshader",
+            "debug",
+            "win_clang",
+            "x86",
+        ],
+    ),
+    cores = 8,
+    os = os.WINDOWS_DEFAULT,
+    ssd = None,
+    console_view_entry = consoles.console_view_entry(
+        category = "win|build|clang|dbg",
+        short_name = "x86",
+    ),
+)
+
+ci.builder(
+    name = "dawn-win-x86-builder-rel",
+    description_html = "Compiles release Dawn test binaries for Windows/x86",
+    schedule = "triggered",
+    builder_spec = builder_config.builder_spec(
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+            # dawn_node is intentionally omitted since the original standalone
+            # Win/x86/Clang builders did not build/test with node.
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.RELEASE,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 32,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "component",
+            "dawn_swiftshader",
+            "release",
+            "win_clang",
+            "x86",
+        ],
+    ),
+    cores = 8,
+    os = os.WINDOWS_DEFAULT,
+    ssd = None,
+    console_view_entry = consoles.console_view_entry(
+        category = "win|build|clang|rel",
+        short_name = "x86",
+    ),
+)
+
 ################################################################################
 # Fuzz Builders                                                                #
 ################################################################################
@@ -483,6 +593,30 @@
 )
 
 win_thin_tester(
+    name = "dawn-win-x64-sws-dbg",
+    description_html = "Tests debug Dawn on Windows/x64 with SwiftShader",
+    parent = "dawn-win-x64-builder-dbg",
+    builder_spec = builder_config.builder_spec(
+        execution_mode = builder_config.execution_mode.TEST,
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.DEBUG,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+        run_tests_serially = True,
+    ),
+    console_view_entry = consoles.console_view_entry(
+        category = "win|test|clang|dbg|x64",
+        short_name = "sws",
+    ),
+)
+
+win_thin_tester(
     name = "dawn-win-x64-sws-rel",
     description_html = "Tests release Dawn on Windows/x64 with SwiftShader",
     parent = "dawn-win-x64-builder-rel",
@@ -505,3 +639,53 @@
         short_name = "sws",
     ),
 )
+
+# Does not need to use win_thin_tester since all tests are run on Swarming.
+ci.thin_tester(
+    name = "dawn-win-x86-sws-dbg",
+    description_html = "Tests debug Dawn on Windows/x86 with SwiftShader",
+    parent = "dawn-win-x86-builder-dbg",
+    builder_spec = builder_config.builder_spec(
+        execution_mode = builder_config.execution_mode.TEST,
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.DEBUG,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 32,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+        run_tests_serially = True,
+    ),
+    console_view_entry = consoles.console_view_entry(
+        category = "win|test|clang|dbg|x86",
+        short_name = "sws",
+    ),
+)
+
+# Does not need to use win_thin_tester since all tests are run on Swarming.
+ci.thin_tester(
+    name = "dawn-win-x86-sws-rel",
+    description_html = "Tests release Dawn on Windows/x86 with SwiftShader",
+    parent = "dawn-win-x86-builder-rel",
+    builder_spec = builder_config.builder_spec(
+        execution_mode = builder_config.execution_mode.TEST,
+        gclient_config = builder_config.gclient_config(
+            config = "dawn",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "dawn_base",
+            build_config = builder_config.build_config.RELEASE,
+            target_arch = builder_config.target_arch.INTEL,
+            target_bits = 32,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+        run_tests_serially = True,
+    ),
+    console_view_entry = consoles.console_view_entry(
+        category = "win|test|clang|rel|x86",
+        short_name = "sws",
+    ),
+)
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star
index 3a4238a..96649eb 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -245,6 +245,16 @@
 )
 
 dawn_win_manual_builder(
+    name = "dawn-try-win-x64-sws-dbg",
+    description_html = "Tests debug Dawn on Windows/x64 with SwiftShader. Manual only.",
+    mirrors = [
+        "ci/dawn-win-x64-builder-dbg",
+        "ci/dawn-win-x64-sws-dbg",
+    ],
+    gn_args = "ci/dawn-win-x64-builder-dbg",
+)
+
+dawn_win_manual_builder(
     name = "dawn-try-win-x64-sws-rel",
     description_html = "Tests release Dawn on Windows/x64 with SwiftShader. Manual only.",
     mirrors = [
@@ -254,6 +264,26 @@
     gn_args = "ci/dawn-win-x64-builder-rel",
 )
 
+dawn_win_manual_builder(
+    name = "dawn-try-win-x86-sws-dbg",
+    description_html = "Tests debug Dawn on Windows/x86 with SwiftShader. Manual only.",
+    mirrors = [
+        "ci/dawn-win-x86-builder-dbg",
+        "ci/dawn-win-x86-sws-dbg",
+    ],
+    gn_args = "ci/dawn-win-x86-builder-dbg",
+)
+
+dawn_win_manual_builder(
+    name = "dawn-try-win-x86-sws-rel",
+    description_html = "Tests release Dawn on Windows/x86 with SwiftShader. Manual only.",
+    mirrors = [
+        "ci/dawn-win-x86-builder-rel",
+        "ci/dawn-win-x86-sws-rel",
+    ],
+    gn_args = "ci/dawn-win-x86-builder-rel",
+)
+
 ## Fuzz testers
 
 dawn_linux_manual_builder(
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index ada4114..892d95a 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -609,6 +609,7 @@
       }
     ]
   },
+  "dawn-win-x64-sws-dbg": {},
   "dawn-win-x64-sws-rel": {
     "gtest_tests": [
       {
@@ -766,5 +767,7 @@
         "test_id_prefix": "ninja://scripts/dawn_node_cts:dawn_node_cts/"
       }
     ]
-  }
+  },
+  "dawn-win-x86-sws-dbg": {},
+  "dawn-win-x86-sws-rel": {}
 }
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 6f7daa9..986f734 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -104,6 +104,16 @@
           'gtest_tests': 'swiftshader_gtests',
         },
       },
+      'dawn-win-x64-sws-dbg': {
+        'os_type': 'win',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'win10',
+          'x86-64',
+        ],
+        'test_suites': {},
+      },
       'dawn-win-x64-sws-rel': {
         'os_type': 'win',
         'mixins': [
@@ -117,6 +127,26 @@
           'isolated_scripts': 'dawn_node_cts_sws_tests',
         },
       },
+      'dawn-win-x86-sws-dbg': {
+        'os_type': 'win',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'win10',
+          'x86-64',
+        ],
+        'test_suites': {},
+      },
+      'dawn-win-x86-sws-rel': {
+        'os_type': 'win',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'win10',
+          'x86-64',
+        ],
+        'test_suites': {},
+      },
     },
   },
 ]