Enable Win/x86/NVIDIA tests
Enables gtests on the Win/x86/NVIDIA GTX 1660 config that are equivalent
to the Dawn tests run on the Chromium builders.
Bug: 452406604
Change-Id: I3e8aa9bead5f42a3fd2fa53ddf40f2961a69292c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/270154
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
diff --git a/infra/specs/ci.json b/infra/specs/ci.json
index 9eb8d5e..b8d0798 100644
--- a/infra/specs/ci.json
+++ b/infra/specs/ci.json
@@ -3544,7 +3544,247 @@
"default"
]
},
- "dawn-win-x86-nvidia-gtx1660-rel": {},
+ "dawn-win-x86-nvidia-gtx1660-rel": {
+ "gtest_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"
+ },
+ "name": "dawn_end2end_implicit_sync_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_no_dxc_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_no_dxc_validation_layers_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_skip_validation_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_validation_layers_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_end2end_wire_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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"
+ },
+ "name": "dawn_perf_tests",
+ "resultdb": {
+ "result_format": "gtest_json"
+ },
+ "swarming": {
+ "containment_type": "AUTO",
+ "dimensions": {
+ "display_attached": "1",
+ "gpu": "10de:2184-31.0.15.4601",
+ "os": "Windows-10-19045",
+ "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-x86-sws-dbg": {
"gtest_tests": [
{
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index f22a887..7314413 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -322,7 +322,9 @@
'mixins': [
'win10_nvidia_gtx_1660_stable',
],
- 'test_suites': {},
+ 'test_suites': {
+ 'gtest_tests': 'real_hardware_win_gtests',
+ },
},
'dawn-win-x86-sws-dbg': {
'os_type': 'win',
