Add WebGPU CTS to Dawn Android bots as CI only
Bug: 1363409
Change-Id: I72848dd718b202d8595653183df3c6513eef6bf7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4545949
Commit-Queue: Austin Eng <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1148859}
diff --git a/testing/buildbot/chromium.dawn.json b/testing/buildbot/chromium.dawn.json
index 5fe34f0..0dc47bee 100644
--- a/testing/buildbot/chromium.dawn.json
+++ b/testing/buildbot/chromium.dawn.json
@@ -101,7 +101,89 @@
"test_id_prefix": "ninja://third_party/dawn/src/dawn/tests:dawn_end2end_tests/"
}
],
- "isolated_scripts": []
+ "isolated_scripts": [
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "R",
+ "device_os_type": "userdebug",
+ "device_type": "flame",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ },
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--enable-dawn-backend-validation",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_with_validation_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "R",
+ "device_os_type": "userdebug",
+ "device_type": "flame",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ }
+ ]
},
"Dawn Android arm Release (Pixel 4)": {
"gtest_tests": [
@@ -203,7 +285,89 @@
"test_id_prefix": "ninja://third_party/dawn/src/dawn/tests:dawn_end2end_tests/"
}
],
- "isolated_scripts": []
+ "isolated_scripts": [
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "R",
+ "device_os_type": "userdebug",
+ "device_type": "flame",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ },
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--enable-dawn-backend-validation",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_with_validation_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "R",
+ "device_os_type": "userdebug",
+ "device_type": "flame",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ }
+ ]
},
"Dawn Android arm64 DEPS Release (Pixel 6)": {
"gtest_tests": [
@@ -305,7 +469,89 @@
"test_id_prefix": "ninja://third_party/dawn/src/dawn/tests:dawn_end2end_tests/"
}
],
- "isolated_scripts": []
+ "isolated_scripts": [
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "TP1A.220624.021",
+ "device_os_type": "userdebug",
+ "device_type": "oriole",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ },
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--enable-dawn-backend-validation",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_with_validation_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "TP1A.220624.021",
+ "device_os_type": "userdebug",
+ "device_type": "oriole",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ }
+ ]
},
"Dawn Android arm64 Release (Pixel 6)": {
"gtest_tests": [
@@ -407,7 +653,89 @@
"test_id_prefix": "ninja://third_party/dawn/src/dawn/tests:dawn_end2end_tests/"
}
],
- "isolated_scripts": []
+ "isolated_scripts": [
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "TP1A.220624.021",
+ "device_os_type": "userdebug",
+ "device_type": "oriole",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ },
+ {
+ "args": [
+ "webgpu_cts",
+ "--show-stdout",
+ "--browser=android-chromium",
+ "--passthrough",
+ "-v",
+ "--stable-jobs",
+ "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
+ "--enable-dawn-backend-validation",
+ "--use-webgpu-power-preference=default-high-performance",
+ "--jobs=1"
+ ],
+ "ci_only": true,
+ "isolate_name": "telemetry_gpu_integration_test_android_chrome",
+ "merge": {
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "name": "webgpu_cts_with_validation_tests",
+ "resultdb": {
+ "enable": true,
+ "has_native_resultdb_integration": true
+ },
+ "should_retry_with_patch": false,
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_os": "TP1A.220624.021",
+ "device_os_type": "userdebug",
+ "device_type": "oriole",
+ "os": "Android",
+ "pool": "chromium.tests.gpu"
+ }
+ ],
+ "idempotent": false,
+ "service_account": "[email protected]",
+ "shards": 36
+ },
+ "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
+ }
+ ]
},
"Dawn Linux TSAN Release": {
"gtest_tests": [
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 2d258db..a6b878b 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -4425,15 +4425,19 @@
],
},
'webgpu_cts_tests': {
- 'remove_from': [
- # TODO(crbug.com/1363409): Enable these once they're shown to work on
- # Android.
- 'Dawn Android arm DEPS Release (Pixel 4)',
- 'Dawn Android arm Release (Pixel 4)',
- 'Dawn Android arm64 DEPS Release (Pixel 6)',
- 'Dawn Android arm64 Release (Pixel 6)',
- ],
'modifications': {
+ 'Dawn Android arm DEPS Release (Pixel 4)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm Release (Pixel 4)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm64 DEPS Release (Pixel 6)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm64 Release (Pixel 6)': {
+ 'ci_only': True,
+ },
'Dawn Mac x64 DEPS Release (AMD)': {
'ci_only': True,
},
@@ -4488,12 +4492,6 @@
},
'webgpu_cts_with_validation_tests': {
'remove_from': [
- # TODO(crbug.com/1363409): Enable these once they're shown to work on
- # Android.
- 'Dawn Android arm DEPS Release (Pixel 4)',
- 'Dawn Android arm Release (Pixel 4)',
- 'Dawn Android arm64 DEPS Release (Pixel 6)',
- 'Dawn Android arm64 Release (Pixel 6)',
# Remove from bots where capacity is constrained.
'Dawn Win10 x64 DEPS Release (Intel)',
'Dawn Win10 x64 Release (Intel)',
@@ -4509,6 +4507,18 @@
'win10-code-coverage',
],
'modifications': {
+ 'Dawn Android arm DEPS Release (Pixel 4)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm Release (Pixel 4)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm64 DEPS Release (Pixel 6)': {
+ 'ci_only': True,
+ },
+ 'Dawn Android arm64 Release (Pixel 6)': {
+ 'ci_only': True,
+ },
# ci_only for bots where capacity is constrained.
'Dawn Linux x64 DEPS Release (Intel UHD 630)': {
'ci_only': True,
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 0785d5d..55ddfc8 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -2716,6 +2716,9 @@
'swarming': {
'shards': 14,
},
+ 'android_swarming': {
+ 'shards': 36,
+ },
},
'webgpu_cts_with_validation': {
'args': [
@@ -2728,6 +2731,9 @@
'swarming': {
'shards': 14,
},
+ 'android_swarming': {
+ 'shards': 36,
+ },
'telemetry_test_name': 'webgpu_cts',
},
},
