Add Win/AMD RX 5500 XT to CQ Adds the Windows 11/AMD RX 5500 XT tester to the builders mirrored by the Win/x64 CQ builder. The CI tester has been green since tests were enabled except for some TimestampQueryTests flakes which have already been suppressed. Bug: 492507959 Change-Id: Iae0203540e0dbd422a9745af928f275c8a7b7b0b Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/302657 Auto-Submit: Brian Sheedy <bsheedy@google.com> Reviewed-by: Jonathan Lee <jonathanjlee@google.com> Commit-Queue: Jonathan Lee <jonathanjlee@google.com> Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/config/global/generated/builders/try/dawn-cq-win-x64-rel/targets/ci.json b/infra/config/global/generated/builders/try/dawn-cq-win-x64-rel/targets/ci.json index a711277..f36e0ae 100644 --- a/infra/config/global/generated/builders/try/dawn-cq-win-x64-rel/targets/ci.json +++ b/infra/config/global/generated/builders/try/dawn-cq-win-x64-rel/targets/ci.json
@@ -1,4 +1,293 @@ { + "dawn-win-x64-amd-rx5500xt-rel": { + "gtest_tests": [ + { + "args": [ + "--check-capture-replay", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_capture_replay_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--enable-implicit-device-sync", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_implicit_sync_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--disable-toggles=use_dxc", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_no_dxc_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--disable-toggles=use_dxc", + "--enable-backend-validation", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_no_dxc_validation_layers_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--enable-toggles=skip_validation", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_skip_validation_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--enable-backend-validation", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_validation_layers_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 3 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--use-wire", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--gtest_filter=-*WebGPU_WebGPU_backend_on*" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests/", + "module_scheme": "gtest", + "name": "dawn_end2end_wire_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 2 + }, + "test": "dawn_end2end_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_end2end_tests/" + }, + { + "args": [ + "--test-launcher-print-test-stdio=always", + "--test-launcher-jobs=1", + "--test-launcher-retry-limit=0", + "--override-steps=1" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_perf_tests/", + "module_scheme": "gtest", + "name": "dawn_perf_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "display_attached": "1", + "gpu": "1002:7340-32.0.21037.1004", + "os": "Windows-11-26100", + "pool": "chromium.tests.gpu" + }, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "dawn_perf_tests", + "test_id_prefix": "ninja://src/dawn/tests:dawn_perf_tests/" + } + ] + }, "dawn-win-x64-builder-rel": { "additional_compile_targets": [ "default"
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg index fe8bf30..bed8f7f 100644 --- a/infra/config/global/generated/luci/cr-buildbucket.cfg +++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -6212,6 +6212,10 @@ ' ],' ' "mirroring_builder_group_and_names": [' ' {' + ' "builder": "dawn-cq-win-x64-rel",' + ' "group": "try"' + ' },' + ' {' ' "builder": "dawn-try-win-x64-amd-rx5500xt-rel",' ' "group": "try"' ' }' @@ -6262,7 +6266,7 @@ use_invocation_timestamp: true } } - description_html: "Tests release Dawn on Windows/x64 on AMD RX 5500 XT 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-x64-amd-rx5500xt-rel\">dawn-try-win-x64-amd-rx5500xt-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 Windows/x64 on AMD RX 5500 XT 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-cq-win-x64-rel\">dawn-cq-win-x64-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/try/dawn-try-win-x64-amd-rx5500xt-rel\">dawn-try-win-x64-amd-rx5500xt-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" } @@ -13899,6 +13903,33 @@ ' {' ' "builder_id": {' ' "bucket": "ci",' + ' "builder": "dawn-win-x64-amd-rx5500xt-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": 64,' + ' "target_platform": "win"' + ' },' + ' "legacy_gclient_config": {' + ' "config": "dawn"' + ' },' + ' "parent": {' + ' "bucket": "ci",' + ' "builder": "dawn-win-x64-builder-rel",' + ' "project": "dawn"' + ' },' + ' "run_tests_serially": true' + ' }' + ' },' + ' {' + ' "builder_id": {' + ' "bucket": "ci",' ' "builder": "dawn-win-x64-builder-rel",' ' "project": "dawn"' ' },' @@ -14013,6 +14044,11 @@ ' "builder_ids_in_scope_for_testing": [' ' {' ' "bucket": "ci",' + ' "builder": "dawn-win-x64-amd-rx5500xt-rel",' + ' "project": "dawn"' + ' },' + ' {' + ' "bucket": "ci",' ' "builder": "dawn-win-x64-intel-uhd630-rel",' ' "project": "dawn"' ' },' @@ -14083,7 +14119,7 @@ use_invocation_timestamp: true } } - description_html: "Tests release Dawn on Win/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-win-x64-builder-rel\">dawn-win-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-intel-uhd630-rel\">dawn-win-x64-intel-uhd630-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-nvidia-gtx1660-rel\">dawn-win-x64-nvidia-gtx1660-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-sws-rel\">dawn-win-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a><br/><h3>NOTE: This builder only runs 3 max concurrent builds.</h3>" + description_html: "Tests release Dawn on Win/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-win-x64-amd-rx5500xt-rel\">dawn-win-x64-amd-rx5500xt-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-builder-rel\">dawn-win-x64-builder-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-intel-uhd630-rel\">dawn-win-x64-intel-uhd630-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-nvidia-gtx1660-rel\">dawn-win-x64-nvidia-gtx1660-rel</a></li><li><a href=\"https://ci.chromium.org/p/dawn/builders/ci/dawn-win-x64-sws-rel\">dawn-win-x64-sws-rel</a></li></ul><br/>Builder owner: <a href=mailto:chrome-gpu-infra@google.com>chrome-gpu-infra@google.com</a><br/><h3>NOTE: This builder only runs 3 max concurrent builds.</h3>" contact_team_email: "chrome-gpu-infra@google.com" custom_metric_definitions { name: "/chrome/infra/browser/builds/cached_count"
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star index 222a6a6..d56ee95 100644 --- a/infra/config/global/gn_standalone_try.star +++ b/infra/config/global/gn_standalone_try.star
@@ -259,6 +259,7 @@ description_html = "Tests release Dawn on Win/x64 on multiple hardware configs. Blocks CL submission", mirrors = [ "ci/dawn-win-x64-builder-rel", + "ci/dawn-win-x64-amd-rx5500xt-rel", "ci/dawn-win-x64-intel-uhd630-rel", # TODO(crbug.com/458768121): Add the UHD 770 config when capacity has # recovered.