Add gn_v2 Linux/x64/Debug/SwS builders

Adds the following gn_v2 CI builders and their manual trybot mirrors:
* dawn-linux-x64-builder-dbg
* dawn-linux-x64-fuzz-dbg
* dawn-linux-x64-sws-dbg

Tests will be enabled in a follow-up CL.

Bug: 385317083
Change-Id: I7a9cde844ca58041f987d862b95cc7ab3029cd3f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/261795
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/config/global/generated/builders/ci/dawn-linux-x64-builder-dbg/gn-args.json b/infra/config/global/generated/builders/ci/dawn-linux-x64-builder-dbg/gn-args.json
new file mode 100644
index 0000000..a4db003
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-linux-x64-builder-dbg/gn-args.json
@@ -0,0 +1,21 @@
+{
+  "gn_args": {
+    "dawn_build_node_bindings": true,
+    "dawn_enable_d3d12": false,
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "linux",
+    "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-linux-x64-fuzz-dbg/gn-args.json b/infra/config/global/generated/builders/ci/dawn-linux-x64-fuzz-dbg/gn-args.json
new file mode 100644
index 0000000..e44bf04
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-linux-x64-fuzz-dbg/gn-args.json
@@ -0,0 +1,20 @@
+{
+  "gn_args": {
+    "dawn_enable_d3d12": false,
+    "is_clang": true,
+    "is_component_build": false,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "linux",
+    "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_libfuzzer": 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 df7db9d..cc15ebe 100644
--- a/infra/config/global/generated/builders/gn_args_locations.json
+++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -1,12 +1,16 @@
 {
   "ci": {
+    "dawn-linux-x64-builder-dbg": "ci/dawn-linux-x64-builder-dbg/gn-args.json",
     "dawn-linux-x64-builder-rel": "ci/dawn-linux-x64-builder-rel/gn-args.json",
+    "dawn-linux-x64-fuzz-dbg": "ci/dawn-linux-x64-fuzz-dbg/gn-args.json",
     "dawn-linux-x64-fuzz-rel": "ci/dawn-linux-x64-fuzz-rel/gn-args.json"
   },
   "try": {
     "dawn-cq-linux-x64-fuzz-rel": "try/dawn-cq-linux-x64-fuzz-rel/gn-args.json",
     "dawn-cq-linux-x64-rel": "try/dawn-cq-linux-x64-rel/gn-args.json",
+    "dawn-try-linux-x64-fuzz-dbg": "try/dawn-try-linux-x64-fuzz-dbg/gn-args.json",
     "dawn-try-linux-x64-fuzz-rel": "try/dawn-try-linux-x64-fuzz-rel/gn-args.json",
+    "dawn-try-linux-x64-sws-dbg": "try/dawn-try-linux-x64-sws-dbg/gn-args.json",
     "dawn-try-linux-x64-sws-rel": "try/dawn-try-linux-x64-sws-rel/gn-args.json"
   }
 }
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-linux-x64-fuzz-dbg/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-linux-x64-fuzz-dbg/gn-args.json
new file mode 100644
index 0000000..e44bf04
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-linux-x64-fuzz-dbg/gn-args.json
@@ -0,0 +1,20 @@
+{
+  "gn_args": {
+    "dawn_enable_d3d12": false,
+    "is_clang": true,
+    "is_component_build": false,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "linux",
+    "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_libfuzzer": 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-linux-x64-sws-dbg/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-linux-x64-sws-dbg/gn-args.json
new file mode 100644
index 0000000..a4db003
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-linux-x64-sws-dbg/gn-args.json
@@ -0,0 +1,21 @@
+{
+  "gn_args": {
+    "dawn_build_node_bindings": true,
+    "dawn_enable_d3d12": false,
+    "dawn_use_swiftshader": true,
+    "is_clang": true,
+    "is_component_build": true,
+    "is_debug": true,
+    "target_cpu": "x64",
+    "target_os": "linux",
+    "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 15fd1aa..17551b5 100644
--- a/infra/config/global/generated/luci/commit-queue.cfg
+++ b/infra/config/global/generated/luci/commit-queue.cfg
@@ -508,11 +508,21 @@
         mode_allowlist: "FULL_RUN"
       }
       builders {
+        name: "dawn/try/dawn-try-linux-x64-fuzz-dbg"
+        includable_only: true
+        disable_reuse_footers: "Include-Ci-Only-Tests"
+      }
+      builders {
         name: "dawn/try/dawn-try-linux-x64-fuzz-rel"
         includable_only: true
         disable_reuse_footers: "Include-Ci-Only-Tests"
       }
       builders {
+        name: "dawn/try/dawn-try-linux-x64-sws-dbg"
+        includable_only: true
+        disable_reuse_footers: "Include-Ci-Only-Tests"
+      }
+      builders {
         name: "dawn/try/dawn-try-linux-x64-sws-rel"
         includable_only: true
         disable_reuse_footers: "Include-Ci-Only-Tests"
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index c6beee0..c0ca0e8 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -831,6 +831,180 @@
       service_account: "dawn-automated-expectations@chops-service-accounts.iam.gserviceaccount.com"
     }
     builders {
+      name: "dawn-linux-x64-builder-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      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": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-linux-x64-builder-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-linux-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-linux-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: "Compile debug Dawn test binaries for Linux/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-linux-x64-sws-dbg\">dawn-try-linux-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-linux-x64-builder-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -984,7 +1158,144 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Compiles Dawn test binaries for Linux/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-cq-linux-x64-rel\">dawn-cq-linux-x64-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-sws-rel\">dawn-try-linux-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Compiles release Dawn test binaries for Linux/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-cq-linux-x64-rel\">dawn-cq-linux-x64-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-sws-rel\">dawn-try-linux-x64-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-linux-x64-fuzz-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      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": {'
+        '      "additional_exclusions": ['
+        '        "infra/config/generated/builders/ci/dawn-linux-x64-fuzz-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-x64-fuzz-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-fuzz-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-linux-x64-fuzz-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 and runs debug Dawn binaries for 'tools/run fuzz' for Linux/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-linux-x64-fuzz-dbg\">dawn-try-linux-x64-fuzz-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"
       }
@@ -1125,7 +1436,159 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Compiles and runs Dawn binaries for 'tools/run fuzz' for Linux/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-cq-linux-x64-fuzz-rel\">dawn-cq-linux-x64-fuzz-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-fuzz-rel\">dawn-try-linux-x64-fuzz-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/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-cq-linux-x64-fuzz-rel\">dawn-cq-linux-x64-fuzz-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-fuzz-rel\">dawn-try-linux-x64-fuzz-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-linux-x64-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-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-linux-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-sws-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "mirroring_builder_group_and_names": ['
+        '        {'
+        '          "builder": "dawn-try-linux-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 Linux/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-linux-x64-sws-dbg\">dawn-try-linux-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"
       }
@@ -1281,7 +1744,7 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Tests Dawn on Linux/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-cq-linux-x64-rel\">dawn-cq-linux-x64-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-sws-rel\">dawn-try-linux-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Tests release Dawn on Linux/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-cq-linux-x64-rel\">dawn-cq-linux-x64-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-linux-x64-sws-rel\">dawn-try-linux-x64-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"
       }
@@ -2575,7 +3038,7 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Compiles and runs Dawn binaries for 'tools/run fuzz' for Linux/x64. Blocks CL submission.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-fuzz-rel\">dawn-linux-x64-fuzz-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/x64. Blocks CL submission.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-fuzz-rel\">dawn-linux-x64-fuzz-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"
@@ -2744,7 +3207,7 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Tests Dawn on Linux/x64 on multiple hardware configs. Blocks CL submission<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-builder-rel\">dawn-linux-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-sws-rel\">dawn-linux-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Tests release Dawn on Linux/x64 on multiple hardware configs. Blocks CL submission<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-builder-rel\">dawn-linux-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-sws-rel\">dawn-linux-x64-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"
@@ -2767,6 +3230,133 @@
       max_concurrent_builds: 3
     }
     builders {
+      name: "dawn-try-linux-x64-fuzz-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "os:Ubuntu-22.04"
+      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-linux-x64-fuzz-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-x64-fuzz-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-fuzz-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: "Runs debug Dawn fuzz tests on Linux/x64. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-fuzz-dbg\">dawn-linux-x64-fuzz-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-linux-x64-fuzz-rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "builderless:1"
@@ -2871,7 +3461,171 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Runs Dawn fuzz tests on Linux/x64. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-fuzz-rel\">dawn-linux-x64-fuzz-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Runs release Dawn fuzz tests on Linux/x64. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-fuzz-rel\">dawn-linux-x64-fuzz-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: "dawn-try-linux-x64-sws-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "os:Ubuntu-22.04"
+      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-linux-x64-sws-dbg/gn-args.json"'
+        '      ],'
+        '      "builder_db": {'
+        '        "entries": ['
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "apply_configs": ['
+        '                  "dawn_node"'
+        '                ],'
+        '                "config": "dawn"'
+        '              }'
+        '            }'
+        '          },'
+        '          {'
+        '            "builder_id": {'
+        '              "bucket": "ci",'
+        '              "builder": "dawn-linux-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": "linux"'
+        '              },'
+        '              "legacy_gclient_config": {'
+        '                "config": "dawn"'
+        '              },'
+        '              "parent": {'
+        '                "bucket": "ci",'
+        '                "builder": "dawn-linux-x64-builder-dbg",'
+        '                "project": "dawn"'
+        '              },'
+        '              "run_tests_serially": true'
+        '            }'
+        '          }'
+        '        ]'
+        '      },'
+        '      "builder_ids": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-x64-builder-dbg",'
+        '          "project": "dawn"'
+        '        }'
+        '      ],'
+        '      "builder_ids_in_scope_for_testing": ['
+        '        {'
+        '          "bucket": "ci",'
+        '          "builder": "dawn-linux-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 Linux/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-linux-x64-builder-dbg\">dawn-linux-x64-builder-dbg</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-sws-dbg\">dawn-linux-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"
@@ -3035,7 +3789,7 @@
           use_invocation_timestamp: true
         }
       }
-      description_html: "Tests Dawn on Linux/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-linux-x64-builder-rel\">dawn-linux-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-sws-rel\">dawn-linux-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>"
+      description_html: "Tests release Dawn on Linux/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-linux-x64-builder-rel\">dawn-linux-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x64-sws-rel\">dawn-linux-x64-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"
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci/luci-milo.cfg
index e5abc96..f0f789a 100644
--- a/infra/config/global/generated/luci/luci-milo.cfg
+++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -21,6 +21,16 @@
     short_name: "cts"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-linux-x64-builder-dbg"
+    category: "linux|build|clang|dbg"
+    short_name: "x64"
+  }
+  builders {
+    name: "buildbucket/luci.dawn.ci/dawn-linux-x64-fuzz-dbg"
+    category: "linux|build|clang|dbg|fuzz"
+    short_name: "x64"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/dawn-linux-x64-builder-rel"
     category: "linux|build|clang|rel"
     short_name: "x64"
@@ -76,6 +86,11 @@
     short_name: "x86"
   }
   builders {
+    name: "buildbucket/luci.dawn.ci/dawn-linux-x64-sws-dbg"
+    category: "linux|test|clang|dbg|x64"
+    short_name: "sws"
+  }
+  builders {
     name: "buildbucket/luci.dawn.ci/dawn-linux-x64-sws-rel"
     category: "linux|test|clang|rel|x64"
     short_name: "sws"
@@ -181,9 +196,15 @@
     name: "buildbucket/luci.dawn.try/dawn-cq-linux-x64-rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.try/dawn-try-linux-x64-fuzz-dbg"
+  }
+  builders {
     name: "buildbucket/luci.dawn.try/dawn-try-linux-x64-fuzz-rel"
   }
   builders {
+    name: "buildbucket/luci.dawn.try/dawn-try-linux-x64-sws-dbg"
+  }
+  builders {
     name: "buildbucket/luci.dawn.try/dawn-try-linux-x64-sws-rel"
   }
   builders {
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci/luci-scheduler.cfg
index 3350197..9e8d299 100644
--- a/infra/config/global/generated/luci/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci/luci-scheduler.cfg
@@ -115,6 +115,16 @@
   }
 }
 job {
+  id: "dawn-linux-x64-builder-dbg"
+  realm: "ci"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-linux-x64-builder-dbg"
+  }
+}
+job {
   id: "dawn-linux-x64-builder-rel"
   realm: "ci"
   schedule: "triggered"
@@ -125,6 +135,16 @@
   }
 }
 job {
+  id: "dawn-linux-x64-fuzz-dbg"
+  realm: "ci"
+  schedule: "triggered"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-linux-x64-fuzz-dbg"
+  }
+}
+job {
   id: "dawn-linux-x64-fuzz-rel"
   realm: "ci"
   schedule: "triggered"
@@ -135,6 +155,15 @@
   }
 }
 job {
+  id: "dawn-linux-x64-sws-dbg"
+  realm: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "dawn-linux-x64-sws-dbg"
+  }
+}
+job {
   id: "dawn-linux-x64-sws-rel"
   realm: "ci"
   buildbucket {
@@ -255,7 +284,9 @@
   triggers: "cmake-mac-rel"
   triggers: "cmake-win-msvc-dbg-x64"
   triggers: "cmake-win-msvc-rel-x64"
+  triggers: "dawn-linux-x64-builder-dbg"
   triggers: "dawn-linux-x64-builder-rel"
+  triggers: "dawn-linux-x64-fuzz-dbg"
   triggers: "dawn-linux-x64-fuzz-rel"
   triggers: "linux-clang-dbg-x64"
   triggers: "linux-clang-dbg-x86"
diff --git a/infra/config/global/generated/luci/realms.cfg b/infra/config/global/generated/luci/realms.cfg
index f9af9ed..fa5b6eb 100644
--- a/infra/config/global/generated/luci/realms.cfg
+++ b/infra/config/global/generated/luci/realms.cfg
@@ -73,6 +73,7 @@
     conditions {
       restrict {
         attribute: "scheduler.job.name"
+        values: "dawn-linux-x64-sws-dbg"
         values: "dawn-linux-x64-sws-rel"
       }
     }
diff --git a/infra/config/global/gn_args.star b/infra/config/global/gn_args.star
index 9d41664..901fd52 100644
--- a/infra/config/global/gn_args.star
+++ b/infra/config/global/gn_args.star
@@ -65,6 +65,13 @@
 )
 
 gn_args.config(
+    name = "debug",
+    args = {
+        "is_debug": True,
+    },
+)
+
+gn_args.config(
     name = "libfuzzer",
     args = {
         "use_libfuzzer": True,
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index 1bd21ae..f64d69b 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -50,8 +50,45 @@
 )
 
 ci.builder(
+    name = "dawn-linux-x64-builder-dbg",
+    description_html = "Compile debug Dawn test binaries for Linux/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.LINUX,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "dawn_node_bindings",
+            "dawn_swiftshader",
+            "linux_clang",
+            "component",
+            "debug",
+            "x64",
+        ],
+    ),
+    cores = 8,
+    os = os.LINUX_DEFAULT,
+    console_view_entry = consoles.console_view_entry(
+        category = "linux|build|clang|dbg",
+        short_name = "x64",
+    ),
+)
+
+ci.builder(
     name = "dawn-linux-x64-builder-rel",
-    description_html = "Compiles Dawn test binaries for Linux/x64",
+    description_html = "Compiles release Dawn test binaries for Linux/x64",
     schedule = "triggered",
     builder_spec = builder_config.builder_spec(
         gclient_config = builder_config.gclient_config(
@@ -87,8 +124,41 @@
 )
 
 ci.builder(
+    name = "dawn-linux-x64-fuzz-dbg",
+    description_html = "Compiles and runs debug Dawn binaries for 'tools/run fuzz' for Linux/x64",
+    schedule = "triggered",
+    builder_spec = builder_config.builder_spec(
+        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.LINUX,
+        ),
+    ),
+    gn_args = gn_args.config(
+        configs = [
+            "libfuzzer",
+            "linux_clang",
+            "non_component",
+            "debug",
+            "x64",
+        ],
+    ),
+    cores = 8,
+    os = os.LINUX_DEFAULT,
+    console_view_entry = consoles.console_view_entry(
+        category = "linux|build|clang|dbg|fuzz",
+        short_name = "x64",
+    ),
+)
+
+ci.builder(
     name = "dawn-linux-x64-fuzz-rel",
-    description_html = "Compiles and runs Dawn binaries for 'tools/run fuzz' for Linux/x64",
+    description_html = "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/x64",
     schedule = "triggered",
     builder_spec = builder_config.builder_spec(
         gclient_config = builder_config.gclient_config(
@@ -120,8 +190,32 @@
 )
 
 ci.thin_tester(
+    name = "dawn-linux-x64-sws-dbg",
+    description_html = "Tests debug Dawn on Linux/x64 with SwiftShader",
+    parent = "dawn-linux-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.LINUX,
+        ),
+        run_tests_serially = True,
+    ),
+    console_view_entry = consoles.console_view_entry(
+        category = "linux|test|clang|dbg|x64",
+        short_name = "sws",
+    ),
+)
+
+ci.thin_tester(
     name = "dawn-linux-x64-sws-rel",
-    description_html = "Tests Dawn on Linux/x64 with SwiftShader",
+    description_html = "Tests release Dawn on Linux/x64 with SwiftShader",
     parent = "dawn-linux-x64-builder-rel",
     builder_spec = builder_config.builder_spec(
         execution_mode = builder_config.execution_mode.TEST,
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star
index a2613d9..3fdca68 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -51,7 +51,7 @@
 
 try_.builder(
     name = "dawn-cq-linux-x64-rel",
-    description_html = "Tests Dawn on Linux/x64 on multiple hardware configs. Blocks CL submission",
+    description_html = "Tests release Dawn on Linux/x64 on multiple hardware configs. Blocks CL submission",
     max_concurrent_builds = 3,
     os = os.LINUX_DEFAULT,
     ssd = None,
@@ -67,7 +67,7 @@
 
 try_.builder(
     name = "dawn-cq-linux-x64-fuzz-rel",
-    description_html = "Compiles and runs Dawn binaries for 'tools/run fuzz' for Linux/x64. Blocks CL submission.",
+    description_html = "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/x64. Blocks CL submission.",
     max_concurrent_builds = 3,
     os = os.LINUX_DEFAULT,
     ssd = None,
@@ -92,8 +92,18 @@
     )
 
 dawn_linux_manual_builder(
+    name = "dawn-try-linux-x64-sws-dbg",
+    description_html = "Tests debug Dawn on Linux/x64 with SwiftShader. Manual only.",
+    mirrors = [
+        "ci/dawn-linux-x64-builder-dbg",
+        "ci/dawn-linux-x64-sws-dbg",
+    ],
+    gn_args = "ci/dawn-linux-x64-builder-dbg",
+)
+
+dawn_linux_manual_builder(
     name = "dawn-try-linux-x64-sws-rel",
-    description_html = "Tests Dawn on Linux/x64 with SwiftShader. Manual only.",
+    description_html = "Tests release Dawn on Linux/x64 with SwiftShader. Manual only.",
     mirrors = [
         "ci/dawn-linux-x64-builder-rel",
         "ci/dawn-linux-x64-sws-rel",
@@ -102,8 +112,17 @@
 )
 
 dawn_linux_manual_builder(
+    name = "dawn-try-linux-x64-fuzz-dbg",
+    description_html = "Runs debug Dawn fuzz tests on Linux/x64. Manual only.",
+    mirrors = [
+        "ci/dawn-linux-x64-fuzz-dbg",
+    ],
+    gn_args = "ci/dawn-linux-x64-fuzz-dbg",
+)
+
+dawn_linux_manual_builder(
     name = "dawn-try-linux-x64-fuzz-rel",
-    description_html = "Runs Dawn fuzz tests on Linux/x64. Manual only.",
+    description_html = "Runs release Dawn fuzz tests on Linux/x64. Manual only.",
     mirrors = [
         "ci/dawn-linux-x64-fuzz-rel",
     ],
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index df011d8..e52b9c7 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -1,6 +1,7 @@
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "dawn-linux-x64-fuzz-dbg": {},
   "dawn-linux-x64-fuzz-rel": {
     "isolated_scripts": [
       {
@@ -26,6 +27,7 @@
       }
     ]
   },
+  "dawn-linux-x64-sws-dbg": {},
   "dawn-linux-x64-sws-rel": {
     "gtest_tests": [
       {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index c27c504..280edbf 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -6,6 +6,16 @@
       'swarming_containment_auto',
     ],
     'machines': {
+      'dawn-linux-x64-fuzz-dbg': {
+        'os_type': 'linux',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'linux-jammy',
+          'x86-64',
+        ],
+        'test_suites': {},
+      },
       'dawn-linux-x64-fuzz-rel': {
         'os_type': 'linux',
         'mixins': [
@@ -18,6 +28,15 @@
           'isolated_scripts': 'tint_fuzzer_corpus_tests',
         },
       },
+      'dawn-linux-x64-sws-dbg': {
+        'os_type': 'linux',
+        'mixins': [
+          'gpu-swarming-pool',
+          'no_gpu',
+          'linux-jammy',
+          'x86-64',
+        ],
+      },
       'dawn-linux-x64-sws-rel': {
         'os_type': 'linux',
         'mixins': [