Roll WebGPU CTS

Reviewed upstream.

TBR: cwallez@chromium.org
Change-Id: I1bac1e7abd7f5b8e932bad6c6a591311178f239c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975999Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726472}

third_party/blink/web_tests/external/wpt/webgpu/cts.html

@@ -68,6 +68,7 @@
 <meta name=variant content='?q=cts:command_buffer/render/storeop:'>
 <meta name=variant content='?q=cts:examples:'>
 <meta name=variant content='?q=cts:fences:'>
+<meta name=variant content='?q=cts:resource_init/sampled_texture_clear:'>
 <meta name=variant content='?q=cts:validation/createBindGroup:'>
 <meta name=variant content='?q=cts:validation/createBindGroupLayout:'>
 <meta name=variant content='?q=cts:validation/createPipelineLayout:'>

third_party/blink/web_tests/external/wpt/webgpu/framework/util/index.js

@@ -16,6 +16,9 @@ export function rejectOnTimeout(ms, msg) {
     }, ms);
   });
 }
+export function raceWithRejectOnTimeout(p, ms, msg) {
+  return Promise.race([p, rejectOnTimeout(ms, msg)]);
+}
 export function objectEquals(x, y) {
   if (typeof x !== 'object' || typeof y !== 'object') return x === y;
   if (x === null || y === null) return x === y;

third_party/blink/web_tests/external/wpt/webgpu/framework/version.js

 // AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
 
-export const version = 'e114192747a54f34157eb65754e037701fbdf98b';
+export const version = '70754155a0bca2c24e3e3c249bab9ee3dd765a26';

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/buffers/create_mapped.spec.js

@@ -15,13 +15,4 @@ g.test('createBufferMapped', async t => {
   t.checkMapWrite(buffer, arrayBuffer, size);
 }).params(pcombine(poptions('size', [12, 512 * 1024]), //
 pbool('mappable')));
-g.test('createBufferMappedAsync', async t => {
-  const size = t.params.size;
-  const [buffer, arrayBuffer] = await t.device.createBufferMappedAsync({
-    size,
-    usage: GPUBufferUsage.COPY_SRC | (t.params.mappable ? GPUBufferUsage.MAP_WRITE : 0)
-  });
-  t.checkMapWrite(buffer, arrayBuffer, size);
-}).params(pcombine(poptions('size', [12, 512 * 1024]), //
-pbool('mappable')));
 //# sourceMappingURL=create_mapped.spec.js.map
\ No newline at end of file

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/buffers/map.spec.js

@@ -41,13 +41,4 @@ g.test('createBufferMapped', async t => {
   t.checkMapWrite(buffer, arrayBuffer, size);
 }).params(pcombine(poptions('size', [12, 512 * 1024]), //
 pbool('mappable')));
-g.test('createBufferMappedAsync', async t => {
-  const size = t.params.size;
-  const [buffer, arrayBuffer] = await t.device.createBufferMappedAsync({
-    size,
-    usage: GPUBufferUsage.COPY_SRC | (t.params.mappable ? GPUBufferUsage.MAP_WRITE : 0)
-  });
-  t.checkMapWrite(buffer, arrayBuffer, size);
-}).params(pcombine(poptions('size', [12, 512 * 1024]), //
-pbool('mappable')));
 //# sourceMappingURL=map.spec.js.map
\ No newline at end of file

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/buffers/map_detach.spec.js

@@ -3,7 +3,7 @@
 **/
 
 export const description = ``;
-import { TestGroup, pbool, pcombine } from '../../../framework/index.js';
+import { TestGroup } from '../../../framework/index.js';
 import { GPUTest } from '../gpu_test.js';
 
 class F extends GPUTest {
@@ -61,7 +61,7 @@ g.test('create mapped', async t => {
     size: 4,
     usage: GPUBufferUsage.MAP_WRITE
   };
-  const [buffer, arrayBuffer] = t.params.async ? await t.device.createBufferMappedAsync(desc) : t.device.createBufferMapped(desc);
+  const [buffer, arrayBuffer] = t.device.createBufferMapped(desc);
   const view = new Uint8Array(arrayBuffer);
   t.expect(arrayBuffer.byteLength === 4);
   t.expect(view.length === 4);
@@ -69,8 +69,7 @@ g.test('create mapped', async t => {
   if (t.params.destroy) buffer.destroy();
   t.expect(arrayBuffer.byteLength === 0, 'ArrayBuffer should be detached');
   t.expect(view.byteLength === 0, 'ArrayBufferView should be detached');
-}).params(pcombine(pbool('async'), //
-[{
+}).params([{
   unmap: true,
   destroy: false
 }, {
@@ -79,5 +78,5 @@ g.test('create mapped', async t => {
 }, {
   unmap: true,
   destroy: true
-}]));
+}]);
 //# sourceMappingURL=map_detach.spec.js.map
\ No newline at end of file

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/buffers/map_oom.spec.js

@@ -27,7 +27,4 @@ g.test('createBufferMapped', async t => {
     t.device.createBufferMapped(getBufferDesc());
   });
 });
-g.test('createBufferAsync', async t => {
-  t.shouldReject('RangeError', t.device.createBufferMappedAsync(getBufferDesc()));
-});
 //# sourceMappingURL=map_oom.spec.js.map
\ No newline at end of file

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/fences.spec.js

@@ -4,7 +4,7 @@
 
 export const description = ``;
 import { attemptGarbageCollection } from '../../framework/collect_garbage.js';
-import { TestGroup } from '../../framework/index.js';
+import { TestGroup, raceWithRejectOnTimeout } from '../../framework/index.js';
 import { GPUTest } from './gpu_test.js';
 export const g = new TestGroup(GPUTest);
 g.test('initial/no descriptor', t => {
@@ -96,6 +96,15 @@ g.test('wait/many/parallel', async t => {
 
   await Promise.all(promises);
   t.expect(fence.getCompletedValue() === 20);
+}); // Test onCompletion promise resolves within a time limit.
+
+g.test('wait/resolves within timeout', t => {
+  const fence = t.queue.createFence();
+  t.queue.signal(fence, 2);
+  return raceWithRejectOnTimeout((async () => {
+    await fence.onCompletion(2);
+    t.expect(fence.getCompletedValue() === 2);
+  })(), 100, 'The fence has not been resolved within time limit.');
 }); // Test dropping references to the fence and onCompletion promise does not crash.
 
 g.test('drop/fence and promise', t => {

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/index.js

@@ -61,6 +61,10 @@ export const listing = [
     "path": "fences",
     "description": ""
   },
+  {
+    "path": "resource_init/sampled_texture_clear",
+    "description": "computePass test that sampled texture is cleared"
+  },
   {
     "path": "validation/createBindGroup",
     "description": "createBindGroup validation tests."

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js

+/**
+* AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
+**/
+
+export const description = `
+computePass test that sampled texture is cleared`;
+import { TestGroup } from '../../../framework/index.js';
+import { GPUTest } from '../gpu_test.js';
+export const g = new TestGroup(GPUTest);
+g.test('compute pass test that sampled texture is cleared', async t => {
+  const texture = t.device.createTexture({
+    size: {
+      width: 256,
+      height: 256,
+      depth: 1
+    },
+    format: 'r8unorm',
+    usage: GPUTextureUsage.SAMPLED
+  });
+  const bufferTex = t.device.createBuffer({
+    size: 4 * 256 * 256,
+    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
+  });
+  const sampler = t.device.createSampler();
+  const bindGroupLayout = t.device.createBindGroupLayout({
+    bindings: [{
+      binding: 0,
+      visibility: GPUShaderStage.COMPUTE,
+      type: 'sampled-texture'
+    }, {
+      binding: 1,
+      visibility: GPUShaderStage.COMPUTE,
+      type: 'storage-buffer'
+    }, {
+      binding: 2,
+      visibility: GPUShaderStage.COMPUTE,
+      type: 'sampler'
+    }]
+  }); // create compute pipeline
+
+  const computeModule = t.device.createShaderModule({
+    code:
+    /* GLSL(
+     *       'compute',
+     *       `#version 450
+     *       layout(binding = 0) uniform texture2D sampleTex;
+     *       layout(std430, binding = 1) buffer BufferTex {
+     *          vec4 result;
+     *       } bufferTex;
+     *       layout(binding = 2) uniform sampler sampler0;
+     *       void main() {
+     *          bufferTex.result =
+     *                texelFetch(sampler2D(sampleTex, sampler0), ivec2(0,0), 0);
+     *       }`
+     *     )
+     */
+    new Uint32Array([119734787, 66304, 524295, 29, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 8, 1717990722, 1700033125, 120, 327686, 8, 0, 1970496882, 29804, 327685, 10, 1717990754, 1700033125, 120, 327685, 15, 1886216563, 1700029804, 120, 327685, 19, 1886216563, 812803436, 0, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 0, 262215, 10, 33, 1, 262215, 15, 34, 0, 262215, 15, 33, 0, 262215, 19, 34, 0, 262215, 19, 33, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 12, 8, 262203, 9, 10, 12, 262165, 11, 32, 1, 262187, 11, 12, 0, 589849, 13, 6, 1, 0, 0, 0, 1, 0, 262176, 14, 0, 13, 262203, 14, 15, 0, 131098, 17, 262176, 18, 0, 17, 262203, 18, 19, 0, 196635, 21, 13, 262167, 23, 11, 2, 327724, 23, 24, 12, 12, 262176, 27, 12, 7, 327734, 2, 4, 0, 3, 131320, 5, 262205, 13, 16, 15, 262205, 17, 20, 19, 327766, 21, 22, 16, 20, 262244, 13, 25, 22, 458847, 7, 26, 25, 24, 2, 12, 327745, 27, 28, 10, 12, 196670, 28, 26, 65789, 65592])
+  });
+  const pipelineLayout = t.device.createPipelineLayout({
+    bindGroupLayouts: [bindGroupLayout]
+  });
+  const computePipeline = t.device.createComputePipeline({
+    computeStage: {
+      module: computeModule,
+      entryPoint: 'main'
+    },
+    layout: pipelineLayout
+  }); // create bindgroup
+
+  const bindGroup = t.device.createBindGroup({
+    layout: bindGroupLayout,
+    bindings: [{
+      binding: 0,
+      resource: texture.createView()
+    }, {
+      binding: 1,
+      resource: {
+        buffer: bufferTex,
+        offset: 0,
+        size: 4 * 256 * 256
+      }
+    }, {
+      binding: 2,
+      resource: sampler
+    }]
+  }); // encode the pass and submit
+
+  const encoder = t.device.createCommandEncoder();
+  const pass = encoder.beginComputePass();
+  pass.setPipeline(computePipeline);
+  pass.setBindGroup(0, bindGroup);
+  pass.dispatch(256, 256, 1);
+  pass.endPass();
+  const commands = encoder.finish();
+  t.device.defaultQueue.submit([commands]);
+  await t.expectContents(bufferTex, new Uint32Array([0]));
+});
+//# sourceMappingURL=sampled_texture_clear.spec.js.map
\ No newline at end of file

third_party/blink/web_tests/external/wpt/webgpu/suites/cts/validation/error_scope.spec.js

@@ -8,7 +8,7 @@ export const description = `
 error scope validation tests.
 `;
 import { getGPU } from '../../../framework/gpu/implementation.js';
-import { Fixture, TestGroup, rejectOnTimeout } from '../../../framework/index.js';
+import { Fixture, TestGroup, raceWithRejectOnTimeout } from '../../../framework/index.js';
 
 class F extends Fixture {
   constructor(...args) {
@@ -51,7 +51,7 @@ class F extends Fixture {
         });
       });
       fn();
-      return Promise.race([promise, rejectOnTimeout(TIMEOUT_IN_MS, 'Timeout occurred waiting for uncaptured error')]);
+      return raceWithRejectOnTimeout(promise, TIMEOUT_IN_MS, 'Timeout occurred waiting for uncaptured error');
     });
   }
 

third_party/blink/web_tests/wpt_internal/webgpu/cts.html

@@ -41,7 +41,6 @@
 <meta name=variant content='?worker=0&q=cts:buffers/map_oom:mapWriteAsync='>
 <meta name=variant content='?worker=0&q=cts:buffers/map_oom:mapReadAsync='>
 <meta name=variant content='?worker=0&q=cts:buffers/map_oom:createBufferMapped~'>
-<meta name=variant content='?worker=0&q=cts:buffers/map_oom:createBufferAsync~'>
 <meta name=variant content='?worker=0&q=cts:canvas/context_creation:'>
 <meta name=variant content='?worker=0&q=cts:command_buffer/basic:'>
 <meta name=variant content='?worker=0&q=cts:command_buffer/compute/basic:'>
@@ -148,7 +147,6 @@
 <meta name=variant content='?worker=1&q=cts:buffers/map_oom:mapWriteAsync='>
 <meta name=variant content='?worker=1&q=cts:buffers/map_oom:mapReadAsync='>
 <meta name=variant content='?worker=1&q=cts:buffers/map_oom:createBufferMapped~'>
-<meta name=variant content='?worker=1&q=cts:buffers/map_oom:createBufferAsync~'>
 <meta name=variant content='?worker=1&q=cts:canvas/context_creation:'>
 <meta name=variant content='?worker=1&q=cts:command_buffer/basic:'>
 <meta name=variant content='?worker=1&q=cts:command_buffer/compute/basic:'>