Skip to content

GitLab

T
tangled
Commit 900d284b authored by Austin Eng's avatar Austin Eng Committed by Commit Bot
Browse files
Options

Add webgpu_blink_web_tests to chromium.dawn DEPS bots 

This enables testing WebGPU from Blink on DEPS Dawn bots.

Bug: 877147
Change-Id: Idb50a32199ded13e308b295496c31418564704a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1517156Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658749}
parent 64f7f8c0
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 3 deletions
testing/buildbot/chromium.dawn.json
View file @ 900d284b
...@@ -69,6 +69,39 @@ ...@@ -69,6 +69,39 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu",
"--no-xvfb"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-ubuntu-stable",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Linux x64 DEPS Release (NVIDIA)": { "Dawn Linux x64 DEPS Release (NVIDIA)": {
...@@ -137,6 +170,39 @@ ...@@ -137,6 +170,39 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu",
"--no-xvfb"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-ubuntu-stable",
"os": "Ubuntu",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Linux x64 Release (Intel HD 630)": { "Dawn Linux x64 Release (Intel HD 630)": {
...@@ -261,6 +327,39 @@ ...@@ -261,6 +327,39 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6821",
"hidpi": "1",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Mac x64 DEPS Release (Intel)": { "Dawn Mac x64 DEPS Release (Intel)": {
...@@ -328,6 +427,38 @@ ...@@ -328,6 +427,38 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:0a2e",
"os": "Mac-10.13.6",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Mac x64 Release (AMD)": { "Dawn Mac x64 Release (AMD)": {
...@@ -450,6 +581,40 @@ ...@@ -450,6 +581,40 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"-t",
"Release_x64",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Win10 x64 DEPS Release (NVIDIA)": { "Dawn Win10 x64 DEPS Release (NVIDIA)": {
...@@ -517,6 +682,40 @@ ...@@ -517,6 +682,40 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"-t",
"Release_x64",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Win10 x64 Release (Intel HD 630)": { "Dawn Win10 x64 Release (Intel HD 630)": {
...@@ -638,6 +837,38 @@ ...@@ -638,6 +837,38 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "intel-hd-630-win10-stable",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Win10 x86 DEPS Release (NVIDIA)": { "Dawn Win10 x86 DEPS Release (NVIDIA)": {
...@@ -705,6 +936,38 @@ ...@@ -705,6 +936,38 @@
}, },
"test": "gl_unittests" "test": "gl_unittests"
} }
],
"isolated_scripts": [
{
"args": [
"--additional-driver-flag",
"--enable-unsafe-webgpu",
"--additional-driver-flag",
"--disable-gpu-sandbox",
"--driver-logging",
"--skipped",
"ignore",
"webgpu"
],
"isolate_name": "blink_web_tests_exparchive",
"merge": {
"args": [
"--verbose"
],
"script": "//third_party/blink/tools/merge_web_test_results.py"
},
"name": "webgpu_blink_web_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "nvidia-quadro-p400-win10-stable",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
}
] ]
}, },
"Dawn Win10 x86 Release (Intel HD 630)": { "Dawn Win10 x86 Release (Intel HD 630)": {
......
testing/buildbot/test_suites.pyl
View file @ 900d284b
...@@ -3550,6 +3550,52 @@ ...@@ -3550,6 +3550,52 @@
}, },
}, },
'gpu_webgpu_integration_isolated_scripts': {
'webgpu_blink_web_tests': {
'name': 'webgpu_blink_web_tests',
'args': [
'--additional-driver-flag', '--enable-unsafe-webgpu',
'--additional-driver-flag', '--disable-gpu-sandbox',
'--driver-logging',
# These tests are skipped by default. Since we run with
# --enable-unsafe-webgpu, ignore the Skip expectation.
'--skipped', 'ignore',
'webgpu',
],
'linux_args': [ '--no-xvfb' ],
'merge': {
'args': [
'--verbose',
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
'isolate_name': 'blink_web_tests_exparchive',
},
},
'gpu_webgpu_integration_win_x64_isolated_scripts': {
'webgpu_blink_web_tests': {
'name': 'webgpu_blink_web_tests',
'args': [
'--additional-driver-flag', '--enable-unsafe-webgpu',
'--additional-driver-flag', '--disable-gpu-sandbox',
'--driver-logging',
# These tests are skipped by default. Since we run with
# --enable-unsafe-webgpu, ignore the Skip expectation.
'--skipped', 'ignore',
'-t', 'Release_x64',
'webgpu',
],
'merge': {
'args': [
'--verbose',
],
'script': '//third_party/blink/tools/merge_web_test_results.py',
},
'isolate_name': 'blink_web_tests_exparchive',
},
},
'gpu_win_intel_specific_telemetry_tests': { 'gpu_win_intel_specific_telemetry_tests': {
'power_measurement_test': { 'power_measurement_test': {
'telemetry_test_name': 'power', 'telemetry_test_name': 'power',
......
testing/buildbot/waterfalls.pyl
View file @ 900d284b
...@@ -1069,6 +1069,7 @@ ...@@ -1069,6 +1069,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Linux x64 DEPS Release (NVIDIA)': { 'Dawn Linux x64 DEPS Release (NVIDIA)': {
...@@ -1079,6 +1080,7 @@ ...@@ -1079,6 +1080,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Linux x64 Release (Intel HD 630)': { 'Dawn Linux x64 Release (Intel HD 630)': {
...@@ -1111,6 +1113,7 @@ ...@@ -1111,6 +1113,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Mac x64 DEPS Release (Intel)': { 'Dawn Mac x64 DEPS Release (Intel)': {
...@@ -1122,6 +1125,7 @@ ...@@ -1122,6 +1125,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Mac x64 Release (AMD)': { 'Dawn Mac x64 Release (AMD)': {
...@@ -1155,6 +1159,7 @@ ...@@ -1155,6 +1159,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_win_x64_isolated_scripts',
}, },
}, },
'Dawn Win10 x64 DEPS Release (NVIDIA)': { 'Dawn Win10 x64 DEPS Release (NVIDIA)': {
...@@ -1165,6 +1170,7 @@ ...@@ -1165,6 +1170,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_win_x64_isolated_scripts',
}, },
}, },
'Dawn Win10 x64 Release (Intel HD 630)': { 'Dawn Win10 x64 Release (Intel HD 630)': {
...@@ -1197,6 +1203,7 @@ ...@@ -1197,6 +1203,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Win10 x86 DEPS Release (NVIDIA)': { 'Dawn Win10 x86 DEPS Release (NVIDIA)': {
...@@ -1207,6 +1214,7 @@ ...@@ -1207,6 +1214,7 @@
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'gpu_dawn_integration_gtests', 'gtest_tests': 'gpu_dawn_integration_gtests',
'isolated_scripts': 'gpu_webgpu_integration_isolated_scripts',
}, },
}, },
'Dawn Win10 x86 Release (Intel HD 630)': { 'Dawn Win10 x86 Release (Intel HD 630)': {
......
third_party/blink/web_tests/webgpu/fence.html
View file @ 900d284b
...@@ -84,7 +84,7 @@ async function testFunction(t) { ...@@ -84,7 +84,7 @@ async function testFunction(t) {
{ {
// Test many calls to signal and wait on fence values one at a time. // Test many calls to signal and wait on fence values one at a time.
const fence = queue.createFence({}); const fence = queue.createFence({});
for (let i = 1; i <= 100; ++i) { for (let i = 1; i <= 20; ++i) {
queue.signal(fence, i); queue.signal(fence, i);
await fence.onCompletion(i); await fence.onCompletion(i);
assert_equals(fence.getCompletedValue(), i); assert_equals(fence.getCompletedValue(), i);
...@@ -94,14 +94,14 @@ async function testFunction(t) { ...@@ -94,14 +94,14 @@ async function testFunction(t) {
// Test many calls to signal and wait on all fence values. // Test many calls to signal and wait on all fence values.
const fence = queue.createFence({}); const fence = queue.createFence({});
const promises = []; const promises = [];
for (let i = 1; i <= 100; ++i) { for (let i = 1; i <= 20; ++i) {
queue.signal(fence, i); queue.signal(fence, i);
promises.push(fence.onCompletion(i).then(() => { promises.push(fence.onCompletion(i).then(() => {
assert_true(fence.getCompletedValue() >= i); assert_true(fence.getCompletedValue() >= i);
})); }));
} }
await Promise.all(promises); await Promise.all(promises);
assert_equals(fence.getCompletedValue(), 100); assert_equals(fence.getCompletedValue(), 20);
} }
{ {
// Test it is illegal to wait on a fence without signaling the value. // Test it is illegal to wait on a fence without signaling the value.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment