Add Win/x86/Intel UHD 630 tester Adds a CI tester for the Windows/x86/Intel UHD 630 config and its trybot mirror. Tests will be enabled in a follow-up CL. Bug: 452406604 Change-Id: I3aaaa2d9a7f7d3e2febecc1ed98325b0293910ba Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/270855 Auto-Submit: Brian Sheedy <bsheedy@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/config/global/generated/builders/gn_args_locations.json b/infra/config/global/generated/builders/gn_args_locations.json index bb9a0e7..7d8cb0d 100644 --- a/infra/config/global/generated/builders/gn_args_locations.json +++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -58,6 +58,7 @@ "dawn-try-win-x64-sws-msvc-dbg": "try/dawn-try-win-x64-sws-msvc-dbg/gn-args.json", "dawn-try-win-x64-sws-msvc-rel": "try/dawn-try-win-x64-sws-msvc-rel/gn-args.json", "dawn-try-win-x64-sws-rel": "try/dawn-try-win-x64-sws-rel/gn-args.json", + "dawn-try-win-x86-intel-uhd630-rel": "try/dawn-try-win-x86-intel-uhd630-rel/gn-args.json", "dawn-try-win-x86-nvidia-gtx1660-rel": "try/dawn-try-win-x86-nvidia-gtx1660-rel/gn-args.json", "dawn-try-win-x86-sws-dbg": "try/dawn-try-win-x86-sws-dbg/gn-args.json", "dawn-try-win-x86-sws-rel": "try/dawn-try-win-x86-sws-rel/gn-args.json"
diff --git a/infra/config/global/generated/builders/try/dawn-try-win-x86-intel-uhd630-rel/gn-args.json b/infra/config/global/generated/builders/try/dawn-try-win-x86-intel-uhd630-rel/gn-args.json new file mode 100644 index 0000000..0cca9e4 --- /dev/null +++ b/infra/config/global/generated/builders/try/dawn-try-win-x86-intel-uhd630-rel/gn-args.json
@@ -0,0 +1,19 @@ +{ + "gn_args": { + "dawn_use_swiftshader": true, + "is_clang": true, + "is_component_build": true, + "is_debug": false, + "target_cpu": "x86", + "target_os": "win", + "tint_build_hlsl_writer": true, + "tint_build_msl_writer": true, + "tint_build_spv_reader": true, + "tint_build_spv_writer": true, + "tint_build_wgsl_reader": true, + "tint_build_wgsl_writer": true, + "use_reclient": false, + "use_remoteexec": true, + "use_siso": true + } +} \ No newline at end of file
diff --git a/infra/config/global/generated/luci/commit-queue.cfg b/infra/config/global/generated/luci/commit-queue.cfg index bac2a67..9e39e54 100644 --- a/infra/config/global/generated/luci/commit-queue.cfg +++ b/infra/config/global/generated/luci/commit-queue.cfg
@@ -1121,6 +1121,11 @@ disable_reuse_footers: "Include-Ci-Only-Tests" } builders { + name: "dawn/try/dawn-try-win-x86-intel-uhd630-rel" + includable_only: true + disable_reuse_footers: "Include-Ci-Only-Tests" + } + builders { name: "dawn/try/dawn-try-win-x86-nvidia-gtx1660-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 ca52c58..f4a2bd7 100644 --- a/infra/config/global/generated/luci/cr-buildbucket.cfg +++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -6761,6 +6761,33 @@ ' {' ' "builder_id": {' ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' },' + ' "builder_spec": {' + ' "builder_group": "ci",' + ' "execution_mode": "TEST",' + ' "legacy_chromium_config": {' + ' "build_config": "Release",' + ' "config": "dawn_base",' + ' "target_arch": "intel",' + ' "target_bits": 32,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' },' + ' "parent": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' },' + ' "run_tests_serially": true' + ' }' + ' },' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' ' "builder": "dawn-win-x86-nvidia-gtx1660-rel",' ' "project": "dawn"' ' },' @@ -6824,6 +6851,11 @@ ' "builder_ids_in_scope_for_testing": [' ' {' ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' },' + ' {' + ' "bucket": "ci",' ' "builder": "dawn-win-x86-nvidia-gtx1660-rel",' ' "project": "dawn"' ' },' @@ -6839,6 +6871,10 @@ ' "group": "try"' ' },' ' {' + ' "builder": "dawn-try-win-x86-intel-uhd630-rel",' + ' "group": "try"' + ' },' + ' {' ' "builder": "dawn-try-win-x86-nvidia-gtx1660-rel",' ' "group": "try"' ' },' @@ -6902,7 +6938,7 @@ use_invocation_timestamp: true } } - description_html: "Compiles release Dawn test binaries for Windows/x86<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-cq-win-x86-rel\">dawn-cq-win-x86-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-nvidia-gtx1660-rel\">dawn-try-win-x86-nvidia-gtx1660-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-rel\">dawn-try-win-x86-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>" + description_html: "Compiles release Dawn test binaries for Windows/x86<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-cq-win-x86-rel\">dawn-cq-win-x86-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-intel-uhd630-rel\">dawn-try-win-x86-intel-uhd630-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-nvidia-gtx1660-rel\">dawn-try-win-x86-nvidia-gtx1660-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-sws-rel\">dawn-try-win-x86-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>" shadow_builder_adjustments { service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" properties: @@ -6942,6 +6978,155 @@ } } builders { + name: "dawn-win-x86-intel-uhd630-rel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cores:2" + dimensions: "os:Ubuntu-22.04" + dimensions: "pool:luci.chromium.gpu.ci" + dimensions: "ssd:0" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$build/chromium_tests_builder_config": {' + ' "builder_config": {' + ' "builder_db": {' + ' "entries": [' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' },' + ' "builder_spec": {' + ' "builder_group": "ci",' + ' "execution_mode": "COMPILE_AND_TEST",' + ' "legacy_chromium_config": {' + ' "build_config": "Release",' + ' "config": "dawn_base",' + ' "target_arch": "intel",' + ' "target_bits": 32,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' }' + ' }' + ' },' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' },' + ' "builder_spec": {' + ' "builder_group": "ci",' + ' "execution_mode": "TEST",' + ' "legacy_chromium_config": {' + ' "build_config": "Release",' + ' "config": "dawn_base",' + ' "target_arch": "intel",' + ' "target_bits": 32,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' },' + ' "parent": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' },' + ' "run_tests_serially": true' + ' }' + ' }' + ' ]' + ' },' + ' "builder_ids": [' + ' {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' }' + ' ],' + ' "mirroring_builder_group_and_names": [' + ' {' + ' "builder": "dawn-try-win-x86-intel-uhd630-rel",' + ' "group": "try"' + ' }' + ' ]' + ' }' + ' },' + ' "builder_group": "ci",' + ' "recipe": "dawn/gn_v2"' + '}' + build_numbers: YES + service_account: "dawn-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "chromium.use_per_builder_build_dir_name" + value: 100 + } + resultdb { + enable: true + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "ci_test_results" + test_results {} + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "gpu_ci_test_results" + test_results { + predicate { + test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+" + } + } + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "blink_web_tests_ci_test_results" + test_results { + predicate { + test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)" + } + } + } + history_options { + use_invocation_timestamp: true + } + } + description_html: "Tests release Dawn on Windows/x86 on Intel CPUs w/ UHD 630 GPUs<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x86-intel-uhd630-rel\">dawn-try-win-x86-intel-uhd630-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a>" + shadow_builder_adjustments { + service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + contact_team_email: "chrome-gpu-infra@google.com" + custom_metric_definitions { + name: "/chrome/infra/browser/builds/cached_count" + predicates: "has(build.output.properties.is_cached)" + predicates: "string(build.output.properties.is_cached) == \"true\"" + } + custom_metric_definitions { + name: "/chrome/infra/browser/builds/ran_tests_retry_shard_count" + predicates: "has(build.output.properties.ran_tests_retry_shard)" + } + custom_metric_definitions { + name: "/chrome/infra/browser/builds/ran_tests_without_patch_count" + predicates: "has(build.output.properties.ran_tests_without_patch)" + } + custom_metric_definitions { + name: "/chrome/infra/browser/builds/uncached_count" + predicates: "has(build.output.properties.is_cached)" + predicates: "string(build.output.properties.is_cached) == \"false\"" + } + } + builders { name: "dawn-win-x86-nvidia-gtx1660-rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -14061,6 +14246,167 @@ max_concurrent_builds: 1 } builders { + name: "dawn-try-win-x86-intel-uhd630-rel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows-10" + dimensions: "pool:luci.chromium.gpu.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$build/chromium_tests_builder_config": {' + ' "builder_config": {' + ' "additional_exclusions": [' + ' "infra/config/generated/builders/try/dawn-try-win-x86-intel-uhd630-rel/gn-args.json"' + ' ],' + ' "builder_db": {' + ' "entries": [' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' },' + ' "builder_spec": {' + ' "builder_group": "ci",' + ' "execution_mode": "COMPILE_AND_TEST",' + ' "legacy_chromium_config": {' + ' "build_config": "Release",' + ' "config": "dawn_base",' + ' "target_arch": "intel",' + ' "target_bits": 32,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' }' + ' }' + ' },' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' },' + ' "builder_spec": {' + ' "builder_group": "ci",' + ' "execution_mode": "TEST",' + ' "legacy_chromium_config": {' + ' "build_config": "Release",' + ' "config": "dawn_base",' + ' "target_arch": "intel",' + ' "target_bits": 32,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' },' + ' "parent": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' },' + ' "run_tests_serially": true' + ' }' + ' }' + ' ]' + ' },' + ' "builder_ids": [' + ' {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-builder-rel",' + ' "project": "dawn"' + ' }' + ' ],' + ' "builder_ids_in_scope_for_testing": [' + ' {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x86-intel-uhd630-rel",' + ' "project": "dawn"' + ' }' + ' ]' + ' }' + ' },' + ' "$build/siso": {' + ' "configs": [' + ' "builder"' + ' ],' + ' "enable_cloud_monitoring": true,' + ' "enable_cloud_profiler": true,' + ' "enable_cloud_trace": true,' + ' "experiments": [],' + ' "metrics_project": "chromium-reclient-metrics",' + ' "project": "rbe-chromium-untrusted",' + ' "remote_jobs": 250' + ' },' + ' "builder_group": "try",' + ' "recipe": "dawn/gn_v2_trybot"' + '}' + build_numbers: YES + service_account: "dawn-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "chromium.use_per_builder_build_dir_name" + value: 100 + } + resultdb { + enable: true + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "try_test_results" + test_results {} + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "gpu_try_test_results" + test_results { + predicate { + test_id_regexp: "ninja://(chrome|content)/test:telemetry_gpu_integration_test[^/]*/.+" + } + } + } + bq_exports { + project: "chrome-luci-data" + dataset: "chromium" + table: "blink_web_tests_try_test_results" + test_results { + predicate { + test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*_wpt_tests/.+)|(ninja://[^/]*headless_shell_wpt/.+)" + } + } + } + history_options { + use_invocation_timestamp: true + } + } + description_html: "Tests release Dawn on Windows/x86 on Intel CPUs w/ UHD 630. Manual only.<br/>This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-builder-rel\">dawn-win-x86-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x86-intel-uhd630-rel\">dawn-win-x86-intel-uhd630-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-win-x86-nvidia-gtx1660-rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1"
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci/luci-milo.cfg index 9cf8ff1..b8516d8 100644 --- a/infra/config/global/generated/luci/luci-milo.cfg +++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -241,6 +241,11 @@ short_name: "1660" } builders { + name: "buildbucket/luci.dawn.ci/dawn-win-x86-intel-uhd630-rel" + category: "win|test|clang|rel|x86" + short_name: "630" + } + builders { name: "buildbucket/luci.dawn.ci/dawn-win-x86-sws-rel" category: "win|test|clang|rel|x86" short_name: "sws" @@ -404,6 +409,9 @@ name: "buildbucket/luci.dawn.try/dawn-try-win-x64-sws-rel" } builders { + name: "buildbucket/luci.dawn.try/dawn-try-win-x86-intel-uhd630-rel" + } + builders { name: "buildbucket/luci.dawn.try/dawn-try-win-x86-nvidia-gtx1660-rel" } builders {
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci/luci-scheduler.cfg index f775be5..9b571e2 100644 --- a/infra/config/global/generated/luci/luci-scheduler.cfg +++ b/infra/config/global/generated/luci/luci-scheduler.cfg
@@ -438,6 +438,15 @@ } } job { + id: "dawn-win-x86-intel-uhd630-rel" + realm: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "dawn-win-x86-intel-uhd630-rel" + } +} +job { id: "dawn-win-x86-nvidia-gtx1660-rel" realm: "ci" buildbucket {
diff --git a/infra/config/global/generated/luci/realms.cfg b/infra/config/global/generated/luci/realms.cfg index 82d27d9..11dbd04 100644 --- a/infra/config/global/generated/luci/realms.cfg +++ b/infra/config/global/generated/luci/realms.cfg
@@ -90,6 +90,7 @@ values: "dawn-win-x64-sws-msvc-dbg" values: "dawn-win-x64-sws-msvc-rel" values: "dawn-win-x64-sws-rel" + values: "dawn-win-x86-intel-uhd630-rel" values: "dawn-win-x86-nvidia-gtx1660-rel" values: "dawn-win-x86-sws-dbg" values: "dawn-win-x86-sws-rel"
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star index 01bccce..d8a1bfb 100644 --- a/infra/config/global/gn_standalone_ci.star +++ b/infra/config/global/gn_standalone_ci.star
@@ -1116,6 +1116,30 @@ ) ci.thin_tester( + name = "dawn-win-x86-intel-uhd630-rel", + description_html = "Tests release Dawn on Windows/x86 on Intel CPUs w/ UHD 630 GPUs", + parent = "dawn-win-x86-builder-rel", + builder_spec = builder_config.builder_spec( + execution_mode = builder_config.execution_mode.TEST, + gclient_config = builder_config.gclient_config( + config = "dawn", + ), + chromium_config = builder_config.chromium_config( + config = "dawn_base", + build_config = builder_config.build_config.RELEASE, + target_arch = builder_config.target_arch.INTEL, + target_bits = 32, + target_platform = builder_config.target_platform.WIN, + ), + run_tests_serially = True, + ), + console_view_entry = consoles.console_view_entry( + category = "win|test|clang|rel|x86", + short_name = "630", + ), +) + +ci.thin_tester( name = "dawn-win-x86-nvidia-gtx1660-rel", description_html = "Tests release Dawn on Windows/x86 on NVIDIA GTX 1660 GPUs", parent = "dawn-win-x86-builder-rel",
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star index 174a015..360cffc 100644 --- a/infra/config/global/gn_standalone_try.star +++ b/infra/config/global/gn_standalone_try.star
@@ -521,6 +521,16 @@ ) dawn_win_manual_builder( + name = "dawn-try-win-x86-intel-uhd630-rel", + description_html = "Tests release Dawn on Windows/x86 on Intel CPUs w/ UHD 630. Manual only.", + mirrors = [ + "ci/dawn-win-x86-builder-rel", + "ci/dawn-win-x86-intel-uhd630-rel", + ], + gn_args = "ci/dawn-win-x86-builder-rel", +) + +dawn_win_manual_builder( name = "dawn-try-win-x86-nvidia-gtx1660-rel", description_html = "Tests release Dawn on Windows/x86 on NVIDIA GTX 1660 GPUs. Manual only.", mirrors = [
diff --git a/infra/specs/ci.json b/infra/specs/ci.json index 283ffd0..7810e69 100644 --- a/infra/specs/ci.json +++ b/infra/specs/ci.json
@@ -3544,6 +3544,7 @@ "default" ] }, + "dawn-win-x86-intel-uhd630-rel": {}, "dawn-win-x86-nvidia-gtx1660-rel": { "gtest_tests": [ {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index 7314413..465b3ec 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -317,6 +317,13 @@ 'default', ], }, + 'dawn-win-x86-intel-uhd630-rel': { + 'os_type': 'win', + 'mixins': [ + 'win10_intel_uhd_630_stable', + ], + 'test_suites': {}, + }, 'dawn-win-x86-nvidia-gtx1660-rel': { 'os_type': 'win', 'mixins': [