Add gn_v2 Linux/x86/Release/SwS builders
Adds the following gn_v2 CI builders and their manual trybot mirrors:
* dawn-linux-x86-builder-dbg
* dawn-linux-x86-fuzz-rel
* dawn-linux-x86-sws-rel
These is identical to the x64 versions which already exist except for
the different number of target bits and the fact that x86 builders do
not build/test the WebGPU CTS with Node.
Tests will be enabled in a follow-up CL.
Bug: 385317083
Change-Id: I8d87ca34af450a969fd66aa2606ffa748bb3ed4a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/261875
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/builders/ci/dawn-linux-x86-builder-rel/gn-args.json b/infra/config/global/generated/builders/ci/dawn-linux-x86-builder-rel/gn-args.json
new file mode 100644
index 0000000..2b9b125
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-linux-x86-builder-rel/gn-args.json
@@ -0,0 +1,20 @@
+{
+ "gn_args": {
+ "dawn_enable_d3d12": false,
+ "dawn_use_swiftshader": true,
+ "is_clang": true,
+ "is_component_build": true,
+ "is_debug": false,
+ "target_cpu": "x86",
+ "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-x86-fuzz-rel/gn-args.json b/infra/config/global/generated/builders/ci/dawn-linux-x86-fuzz-rel/gn-args.json
new file mode 100644
index 0000000..fb96eeb
--- /dev/null
+++ b/infra/config/global/generated/builders/ci/dawn-linux-x86-fuzz-rel/gn-args.json
@@ -0,0 +1,20 @@
+{
+ "gn_args": {
+ "dawn_enable_d3d12": false,
+ "is_clang": true,
+ "is_component_build": false,
+ "is_debug": false,
+ "target_cpu": "x86",
+ "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 cc15ebe..02bec1e 100644
--- a/infra/config/global/generated/builders/gn_args_locations.json
+++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -3,7 +3,9 @@
"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"
+ "dawn-linux-x64-fuzz-rel": "ci/dawn-linux-x64-fuzz-rel/gn-args.json",
+ "dawn-linux-x86-builder-rel": "ci/dawn-linux-x86-builder-rel/gn-args.json",
+ "dawn-linux-x86-fuzz-rel": "ci/dawn-linux-x86-fuzz-rel/gn-args.json"
},
"try": {
"dawn-cq-linux-x64-fuzz-rel": "try/dawn-cq-linux-x64-fuzz-rel/gn-args.json",
@@ -11,6 +13,8 @@
"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"
+ "dawn-try-linux-x64-sws-rel": "try/dawn-try-linux-x64-sws-rel/gn-args.json",
+ "dawn-try-linux-x86-fuzz-rel": "try/dawn-try-linux-x86-fuzz-rel/gn-args.json",
+ "dawn-try-linux-x86-sws-rel": "try/dawn-try-linux-x86-sws-rel/gn-args.json"
}
}
\ No newline at end of file
diff --git a/infra/config/global/generated/builders/try/dawn-try-linux-x86-fuzz-rel/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-linux-x86-fuzz-rel/gn-args.json
new file mode 100644
index 0000000..fb96eeb
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-linux-x86-fuzz-rel/gn-args.json
@@ -0,0 +1,20 @@
+{
+ "gn_args": {
+ "dawn_enable_d3d12": false,
+ "is_clang": true,
+ "is_component_build": false,
+ "is_debug": false,
+ "target_cpu": "x86",
+ "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-x86-sws-rel/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-linux-x86-sws-rel/gn-args.json
new file mode 100644
index 0000000..2b9b125
--- /dev/null
+++ b/infra/config/global/generated/builders/try/dawn-try-linux-x86-sws-rel/gn-args.json
@@ -0,0 +1,20 @@
+{
+ "gn_args": {
+ "dawn_enable_d3d12": false,
+ "dawn_use_swiftshader": true,
+ "is_clang": true,
+ "is_component_build": true,
+ "is_debug": false,
+ "target_cpu": "x86",
+ "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 17551b5..cd65cd6 100644
--- a/infra/config/global/generated/luci/commit-queue.cfg
+++ b/infra/config/global/generated/luci/commit-queue.cfg
@@ -528,6 +528,16 @@
disable_reuse_footers: "Include-Ci-Only-Tests"
}
builders {
+ name: "dawn/try/dawn-try-linux-x86-fuzz-rel"
+ includable_only: true
+ disable_reuse_footers: "Include-Ci-Only-Tests"
+ }
+ builders {
+ name: "dawn/try/dawn-try-linux-x86-sws-rel"
+ includable_only: true
+ disable_reuse_footers: "Include-Ci-Only-Tests"
+ }
+ builders {
name: "dawn/try/linux-clang-dbg-x64"
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 c0ca0e8..73c125c 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -1769,6 +1769,463 @@
}
}
builders {
+ name: "dawn-linux-x86-builder-rel"
+ 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-x86-builder-rel/gn-args.json"'
+ ' ],'
+ ' "builder_db": {'
+ ' "entries": ['
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' }'
+ ' }'
+ ' },'
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' },'
+ ' "parent": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-builder-rel",'
+ ' "project": "dawn"'
+ ' },'
+ ' "run_tests_serially": true'
+ ' }'
+ ' }'
+ ' ]'
+ ' },'
+ ' "builder_ids": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-builder-rel",'
+ ' "project": "dawn"'
+ ' }'
+ ' ],'
+ ' "builder_ids_in_scope_for_testing": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-sws-rel",'
+ ' "project": "dawn"'
+ ' }'
+ ' ],'
+ ' "mirroring_builder_group_and_names": ['
+ ' {'
+ ' "builder": "dawn-try-linux-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 Linux/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-linux-x86-sws-rel\">dawn-try-linux-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-linux-x86-fuzz-rel"
+ 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-x86-fuzz-rel/gn-args.json"'
+ ' ],'
+ ' "builder_db": {'
+ ' "entries": ['
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-fuzz-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' }'
+ ' }'
+ ' }'
+ ' ]'
+ ' },'
+ ' "builder_ids": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-fuzz-rel",'
+ ' "project": "dawn"'
+ ' }'
+ ' ],'
+ ' "mirroring_builder_group_and_names": ['
+ ' {'
+ ' "builder": "dawn-try-linux-x86-fuzz-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 and runs release Dawn binaries for 'tools/run fuzz' for Linux/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-linux-x86-fuzz-rel\">dawn-try-linux-x86-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-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-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' }'
+ ' }'
+ ' },'
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' },'
+ ' "parent": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-builder-rel",'
+ ' "project": "dawn"'
+ ' },'
+ ' "run_tests_serially": true'
+ ' }'
+ ' }'
+ ' ]'
+ ' },'
+ ' "builder_ids": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-sws-rel",'
+ ' "project": "dawn"'
+ ' }'
+ ' ],'
+ ' "mirroring_builder_group_and_names": ['
+ ' {'
+ ' "builder": "dawn-try-linux-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 Linux/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-linux-x86-sws-rel\">dawn-try-linux-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: "linux-clang-dbg-x64"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
@@ -3812,6 +4269,294 @@
max_concurrent_builds: 1
}
builders {
+ name: "dawn-try-linux-x86-fuzz-rel"
+ 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-x86-fuzz-rel/gn-args.json"'
+ ' ],'
+ ' "builder_db": {'
+ ' "entries": ['
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-fuzz-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' }'
+ ' }'
+ ' }'
+ ' ]'
+ ' },'
+ ' "builder_ids": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-fuzz-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: "Runs release Dawn fuzz tests on Linux/x86. 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-x86-fuzz-rel\">dawn-linux-x86-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-x86-sws-rel"
+ 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-x86-sws-rel/gn-args.json"'
+ ' ],'
+ ' "builder_db": {'
+ ' "entries": ['
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' }'
+ ' }'
+ ' },'
+ ' {'
+ ' "builder_id": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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": "linux"'
+ ' },'
+ ' "legacy_gclient_config": {'
+ ' "config": "dawn"'
+ ' },'
+ ' "parent": {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-builder-rel",'
+ ' "project": "dawn"'
+ ' },'
+ ' "run_tests_serially": true'
+ ' }'
+ ' }'
+ ' ]'
+ ' },'
+ ' "builder_ids": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-x86-builder-rel",'
+ ' "project": "dawn"'
+ ' }'
+ ' ],'
+ ' "builder_ids_in_scope_for_testing": ['
+ ' {'
+ ' "bucket": "ci",'
+ ' "builder": "dawn-linux-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 Linux/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-linux-x86-builder-rel\">dawn-linux-x86-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-linux-x86-sws-rel\">dawn-linux-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: "linux-clang-dbg-x64"
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 f0f789a..2d2b16d 100644
--- a/infra/config/global/generated/luci/luci-milo.cfg
+++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -36,11 +36,21 @@
short_name: "x64"
}
builders {
+ name: "buildbucket/luci.dawn.ci/dawn-linux-x86-builder-rel"
+ category: "linux|build|clang|rel"
+ short_name: "x86"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/dawn-linux-x64-fuzz-rel"
category: "linux|build|clang|rel|fuzz"
short_name: "x64"
}
builders {
+ name: "buildbucket/luci.dawn.ci/dawn-linux-x86-fuzz-rel"
+ category: "linux|build|clang|rel|fuzz"
+ short_name: "x86"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64"
category: "linux|clang|dbg"
short_name: "x64"
@@ -96,6 +106,11 @@
short_name: "sws"
}
builders {
+ name: "buildbucket/luci.dawn.ci/dawn-linux-x86-sws-rel"
+ category: "linux|test|clang|rel|x86"
+ short_name: "sws"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/cmake-mac-dbg"
category: "mac"
short_name: "dbg"
@@ -208,6 +223,12 @@
name: "buildbucket/luci.dawn.try/dawn-try-linux-x64-sws-rel"
}
builders {
+ name: "buildbucket/luci.dawn.try/dawn-try-linux-x86-fuzz-rel"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/dawn-try-linux-x86-sws-rel"
+ }
+ builders {
name: "buildbucket/luci.dawn.try/linux-clang-dbg-x64"
}
builders {
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci/luci-scheduler.cfg
index 9e8d299..8385d29 100644
--- a/infra/config/global/generated/luci/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci/luci-scheduler.cfg
@@ -173,6 +173,35 @@
}
}
job {
+ id: "dawn-linux-x86-builder-rel"
+ realm: "ci"
+ schedule: "triggered"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "dawn-linux-x86-builder-rel"
+ }
+}
+job {
+ id: "dawn-linux-x86-fuzz-rel"
+ realm: "ci"
+ schedule: "triggered"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "dawn-linux-x86-fuzz-rel"
+ }
+}
+job {
+ id: "dawn-linux-x86-sws-rel"
+ realm: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
+ builder: "dawn-linux-x86-sws-rel"
+ }
+}
+job {
id: "linux-clang-dbg-x64"
realm: "ci"
buildbucket {
@@ -288,6 +317,8 @@
triggers: "dawn-linux-x64-builder-rel"
triggers: "dawn-linux-x64-fuzz-dbg"
triggers: "dawn-linux-x64-fuzz-rel"
+ triggers: "dawn-linux-x86-builder-rel"
+ triggers: "dawn-linux-x86-fuzz-rel"
triggers: "linux-clang-dbg-x64"
triggers: "linux-clang-dbg-x86"
triggers: "linux-clang-rel-x86"
diff --git a/infra/config/global/generated/luci/realms.cfg b/infra/config/global/generated/luci/realms.cfg
index fa5b6eb..b5ce5db 100644
--- a/infra/config/global/generated/luci/realms.cfg
+++ b/infra/config/global/generated/luci/realms.cfg
@@ -75,6 +75,7 @@
attribute: "scheduler.job.name"
values: "dawn-linux-x64-sws-dbg"
values: "dawn-linux-x64-sws-rel"
+ values: "dawn-linux-x86-sws-rel"
}
}
}
diff --git a/infra/config/global/gn_args.star b/infra/config/global/gn_args.star
index 901fd52..b4b226a 100644
--- a/infra/config/global/gn_args.star
+++ b/infra/config/global/gn_args.star
@@ -186,3 +186,10 @@
"target_cpu": "x64",
},
)
+
+gn_args.config(
+ name = "x86",
+ args = {
+ "target_cpu": "x86",
+ },
+)
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index f64d69b..ea0b1e7 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -157,6 +157,41 @@
)
ci.builder(
+ name = "dawn-linux-x86-builder-rel",
+ description_html = "Compiles release Dawn test binaries for Linux/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
+ # Linux/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.LINUX,
+ ),
+ ),
+ gn_args = gn_args.config(
+ configs = [
+ "dawn_swiftshader",
+ "linux_clang",
+ "component",
+ "release",
+ "x86",
+ ],
+ ),
+ cores = 8,
+ os = os.LINUX_DEFAULT,
+ console_view_entry = consoles.console_view_entry(
+ category = "linux|build|clang|rel",
+ short_name = "x86",
+ ),
+)
+
+ci.builder(
name = "dawn-linux-x64-fuzz-rel",
description_html = "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/x64",
schedule = "triggered",
@@ -189,6 +224,39 @@
),
)
+ci.builder(
+ name = "dawn-linux-x86-fuzz-rel",
+ description_html = "Compiles and runs release Dawn binaries for 'tools/run fuzz' for Linux/x86",
+ 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.RELEASE,
+ target_arch = builder_config.target_arch.INTEL,
+ target_bits = 32,
+ target_platform = builder_config.target_platform.LINUX,
+ ),
+ ),
+ gn_args = gn_args.config(
+ configs = [
+ "libfuzzer",
+ "linux_clang",
+ "non_component",
+ "release",
+ "x86",
+ ],
+ ),
+ cores = 8,
+ os = os.LINUX_DEFAULT,
+ console_view_entry = consoles.console_view_entry(
+ category = "linux|build|clang|rel|fuzz",
+ short_name = "x86",
+ ),
+)
+
ci.thin_tester(
name = "dawn-linux-x64-sws-dbg",
description_html = "Tests debug Dawn on Linux/x64 with SwiftShader",
@@ -236,3 +304,27 @@
short_name = "sws",
),
)
+
+ci.thin_tester(
+ name = "dawn-linux-x86-sws-rel",
+ description_html = "Tests release Dawn on Linux/x86 with SwiftShader",
+ parent = "dawn-linux-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.LINUX,
+ ),
+ run_tests_serially = True,
+ ),
+ console_view_entry = consoles.console_view_entry(
+ category = "linux|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 3fdca68..7ea8321 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -128,3 +128,22 @@
],
gn_args = "ci/dawn-linux-x64-fuzz-rel",
)
+
+dawn_linux_manual_builder(
+ name = "dawn-try-linux-x86-sws-rel",
+ description_html = "Tests release Dawn on Linux/x86 with SwiftShader. Manual only.",
+ mirrors = [
+ "ci/dawn-linux-x86-builder-rel",
+ "ci/dawn-linux-x86-sws-rel",
+ ],
+ gn_args = "ci/dawn-linux-x86-builder-rel",
+)
+
+dawn_linux_manual_builder(
+ name = "dawn-try-linux-x86-fuzz-rel",
+ description_html = "Runs release Dawn fuzz tests on Linux/x86. Manual only.",
+ mirrors = [
+ "ci/dawn-linux-x86-fuzz-rel",
+ ],
+ gn_args = "ci/dawn-linux-x86-fuzz-rel",
+)
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index e52b9c7..4489a05 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -161,5 +161,7 @@
"test_id_prefix": "ninja://scripts/dawn_node_cts:dawn_node_cts/"
}
]
- }
+ },
+ "dawn-linux-x86-fuzz-rel": {},
+ "dawn-linux-x86-sws-rel": {}
}
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 280edbf..7d705bc 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -50,6 +50,26 @@
'isolated_scripts': 'dawn_node_cts_sws_tests',
},
},
+ 'dawn-linux-x86-fuzz-rel': {
+ 'os_type': 'linux',
+ 'mixins': [
+ 'gpu-swarming-pool',
+ 'no_gpu',
+ 'linux-jammy',
+ 'x86-64',
+ ],
+ 'test_suites': {},
+ },
+ 'dawn-linux-x86-sws-rel': {
+ 'os_type': 'linux',
+ 'mixins': [
+ 'gpu-swarming-pool',
+ 'no_gpu',
+ 'linux-jammy',
+ 'x86-64',
+ ],
+ 'test_suites': {},
+ },
},
},
]
