Enable Linux/NVIDIA GTX 1660 tests Enables gtests on the Linux/NVIDIA GTX 1660 config that are equivalent to the Dawn tests run on the Chromium builders. Bug: 452406604 Change-Id: Ib5fa08121f8175c941d58b0d554f2262b18f6849 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/271514 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> 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 99a9c08..23677cd 100644 --- a/infra/specs/ci.json +++ b/infra/specs/ci.json
@@ -477,7 +477,181 @@ } ] }, - "dawn-linux-x64-nvidia-gtx1660-rel": {}, + "dawn-linux-x64-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", + "--no-xvfb" + ], + "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": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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-toggles=skip_validation", + "--use-gpu-in-tests", + "--exclusive-device-type-preference=discrete,integrated", + "--test-launcher-retry-limit=0", + "--test-launcher-batch-limit=512", + "--no-xvfb" + ], + "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": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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", + "--no-xvfb" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "name": "dawn_end2end_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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", + "--no-xvfb" + ], + "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": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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", + "--no-xvfb" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "name": "dawn_end2end_wire_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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", + "--no-xvfb" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "name": "dawn_perf_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "gpu": "10de:2184-535.183.01", + "os": "Ubuntu-22.04", + "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-linux-x64-sws-clusterfuzz": { "gtest_tests": [ {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index fb1330e..178a940 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -63,7 +63,9 @@ 'mixins': [ 'linux_nvidia_gtx_1660_stable', ], - 'test_suites': {}, + 'test_suites': { + 'gtest_tests': 'real_hardware_common_gtests', + }, }, 'dawn-linux-x64-sws-clusterfuzz': { 'os_type': 'linux',