[js/webgpu] run test on chrome instead of chrome canary for webgpu (#15902)

### Description
webgpu is released in chrome v113. No longer to use chrome canary in
test cli
This commit is contained in:
Yulong Wang 2023-05-12 15:47:59 -07:00 committed by GitHub
parent 143551092f
commit 9328a0f955
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 26 deletions

View file

@ -91,12 +91,12 @@ module.exports = function (config) {
listenAddress,
customLaunchers: {
ChromeTest: {
base: 'ChromeHeadless',
base: 'Chrome',
flags: ['--enable-features=SharedArrayBuffer']
},
ChromePerf: {
base: 'Chrome',
flags: ['--window-size=1,1', '--enable-features=SharedArrayBuffer']
ChromeTestHeadless: {
base: 'ChromeHeadless',
flags: ['--enable-features=SharedArrayBuffer']
},
ChromeDebug: {
debug: true,
@ -105,38 +105,33 @@ module.exports = function (config) {
ChromeCanaryTest: {
base: 'ChromeCanary',
flags: [
'--window-size=1,1',
'--enable-features=SharedArrayBuffer',
'--enable-unsafe-webgpu',
'--enable-experimental-web-platform-features'
]
},
ChromeCanaryProfileTest: {
base: 'ChromeCanary',
flags: [
'--window-size=1,1',
'--enable-features=SharedArrayBuffer',
'--enable-unsafe-webgpu',
'--disable-dawn-features=disallow_unsafe_apis'
]
},
ChromeCanaryDebug: {
debug: true,
base: 'ChromeCanary',
flags: [
'--remote-debugging-port=9333',
'--enable-features=SharedArrayBuffer',
'--enable-unsafe-webgpu',
'--enable-experimental-web-platform-features'
]
},
ChromeCanaryProfileDebug: {
ChromeWebGpuProfileTest: {
base: 'Chrome',
flags: [
'--window-size=1,1',
'--enable-features=SharedArrayBuffer',
'--disable-dawn-features=disallow_unsafe_apis'
]
},
ChromeWebGpuProfileDebug: {
debug: true,
base: 'ChromeCanary',
base: 'Chrome',
flags: [
'--remote-debugging-port=9333',
'--enable-features=SharedArrayBuffer',
'--enable-unsafe-webgpu',
'--disable-dawn-features=disallow_unsafe_apis',
]
},

View file

@ -362,10 +362,14 @@ export function parseTestRunnerCliArgs(cmdlineArgs: string[]): TestRunnerCliArgs
// Option: -b=<...>, --backend=<...>
const browserBackends = ['webgl', 'webgpu', 'wasm', 'xnnpack', 'webnn'];
// TODO: remove this when Chrome support WebGPU or WebNN.
// we need this for now because Chrome does not support webgpu and webnn yet,
// TODO: remove this when Chrome support WebNN.
// we need this for now because Chrome does not support webnn yet,
// and ChromeCanary is not in CI.
const defaultBrowserBackends = ['webgl', /* 'webgpu', */ 'wasm', 'xnnpack' /*, 'webnn'*/];
// TODO: web CI is still using chrome v112, where WebGPU is not available yet.
// re-enable webgpu after CI upgraded chrome to v113.
// const defaultBrowserBackends = ['webgl', 'webgpu', 'wasm', 'xnnpack' /*, 'webnn'*/];
const defaultBrowserBackends = ['webgl' /*, 'webgpu' */, 'wasm', 'xnnpack' /*, 'webnn'*/];
const nodejsBackends = ['cpu', 'wasm'];
const backendArgs = args.backend || args.b;
const backend = (typeof backendArgs !== 'string') ? (env === 'node' ? nodejsBackends : defaultBrowserBackends) :

View file

@ -593,9 +593,9 @@ async function main() {
if (webgpu) {
switch (mode) {
case 'debug':
return profile ? 'ChromeCanaryProfileDebug' : 'ChromeCanaryDebug';
return profile ? 'ChromeWebGpuProfileDebug' : 'ChromeDebug';
default:
return profile ? 'ChromeCanaryProfileTest' : 'ChromeCanaryDebug';
return profile ? 'ChromeWebGpuProfileTest' : 'ChromeTest';
}
} else if (webnn) {
switch (mode) {
@ -609,9 +609,9 @@ async function main() {
case 'debug':
return 'ChromeDebug';
case 'perf':
return 'ChromePerf';
default:
return 'ChromeTest';
default:
return 'ChromeTestHeadless';
}
}
}