Enable Mac/AMD 555X tests Enables standard gtests on the 15" AMD Macbook Pro w/ Radeon Pro 555X GPUs config. Bug: 462477380, 452406604 Change-Id: I65c6801d1de22c3eb64ba517e55058645225e352 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/276074 Auto-Submit: Brian Sheedy <bsheedy@google.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/infra/specs/ci.json b/infra/specs/ci.json index 7f91e47..1b787ed 100644 --- a/infra/specs/ci.json +++ b/infra/specs/ci.json
@@ -1953,7 +1953,199 @@ } ] }, - "dawn-mac-x64-amd-555x-rel": {}, + "dawn-mac-x64-amd-555x-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" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests", + "name": "dawn_end2end_implicit_sync_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests", + "name": "dawn_end2end_skip_validation_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests", + "name": "dawn_end2end_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests", + "name": "dawn_end2end_validation_layers_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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" + ], + "merge": { + "script": "//scripts/merge_scripts/true_noop_merge.py" + }, + "module_name": "//src/dawn/tests:dawn_end2end_tests", + "name": "dawn_end2end_wire_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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", + "name": "dawn_perf_tests", + "resultdb": { + "result_format": "gtest_json" + }, + "swarming": { + "containment_type": "AUTO", + "dimensions": { + "cpu": "x86-64", + "display_attached": "1", + "gpu": "1002:67ef", + "hidpi": "1", + "os": "Mac-14.4.1", + "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-mac-x64-builder-dbg": { "additional_compile_targets": [ "default"
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index b108791..b10f9ee 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl
@@ -202,7 +202,9 @@ 'mixins': [ 'mac_retina_amd_555x_gpu_stable', ], - 'test_suites': {}, + 'test_suites': { + 'gtest_tests': 'real_hardware_common_gtests', + }, }, 'dawn-mac-x64-intel-uhd630-rel': { 'os_type': 'mac',