Bug 2004624 - test(webgpu): update CTS to f7d27f91423683338da291a4a8bdb10dabebb42d r=webgpu-reviewers,nical

Notable "regressions":

- The immediate data API proposal has been added to CTS. This shouldn't be failing, and will receive some follow-up (see [`gpuweb`#5480](gpuweb/gpuweb#5480)), but actually implementing this feature is tracked in <https://bugzilla.mozilla.org/show_bug.cgi?id=2005059>.
- In similar fashion, the transient textures proposal has been added to CTS, and shouldn't be failing. Follow-up to implement it is being tracked in <https://bugzilla.mozilla.org/show_bug.cgi?id=2005061>.

Differential Revision: https://phabricator.services.mozilla.com/D275409

Author: ErichDonGubler

dom/webgpu/tests/cts/checkout/package-lock.json

@@ -50,7 +50,7 @@
     "@types/w3c-image-capture": "^1.0.10",
     "@typescript-eslint/eslint-plugin": "^6.9.1",
     "@typescript-eslint/parser": "^6.9.1",
-    "@webgpu/types": "^0.1.66",
+    "@webgpu/types": "^0.1.67",
     "ansi-colors": "4.1.3",
     "babel-plugin-add-header-comment": "^1.0.3",
     "babel-plugin-const-enum": "^1.2.0",

dom/webgpu/tests/cts/checkout/package.json

@@ -0,0 +1,69 @@
+export const description = `
+Test for shader uniformity code snippet generation.
+`;
+
+import { makeTestGroup } from '../common/framework/test_group.js';
+import { specToCode } from '../webgpu/shader/validation/uniformity/snippet.js';
+
+import { UnitTest } from './unit_test.js';
+
+class F extends UnitTest {
+  test(spec: string, expect: string): void {
+    const got = specToCode(spec);
+    this.expect(
+      expect === got,
+      `
+expected: ${expect}
+got:      ${got}`
+    );
+  }
+}
+
+export const g = makeTestGroup(F);
+
+g.test('strings').fn(t => {
+  t.test(
+    'loop-end',
+    `  loop {
+  }
+`
+  ),
+    t.test(
+      'loop-cond-break-op',
+      `  loop {
+    if <cond> {break;}
+    <op>
+  }
+`
+    ),
+    t.test(
+      'for-unif-always-return-op',
+      `  for (;<uniform_cond>;) {
+    return;
+    <op>
+  }
+`
+    ),
+    t.test(
+      'loop-op-continuing-cond-break',
+      `  loop {
+    <op>
+    continuing {
+      break if <cond>;
+    }
+  }
+`
+    ),
+    t.test(
+      // This is the case suggested in https://github.com/gpuweb/cts/pull/4477#issuecomment-3408419425
+      'loop-always-return-continuing-cond-break-end-op',
+      `  loop {
+    return;
+    continuing {
+      break if <cond>;
+    }
+  }
+  <op>
+`
+    );
+});

dom/webgpu/tests/cts/checkout/src/unittests/uniformity_snippet.spec.ts

@@ -23,6 +23,7 @@ import {
   kTextureViewDimensions,
   sampledAndStorageBindingEntries,
   texBindingTypeInfo,
+  IsValidTransientAttachmentUsage,
 } from '../../capability_info.js';
 import { GPUConst } from '../../constants.js';
 import { kPossibleStorageTextureFormats, kRegularTextureFormats } from '../../format_info.js';
@@ -199,6 +200,13 @@ g.test('texture_binding_must_have_correct_usage')
       .combine('usage', kTextureUsages)
       .unless(({ entry, usage }) => {
         const info = texBindingTypeInfo(entry);
+        // TRANSIENT_ATTACHMENT is only valid when combined with RENDER_ATTACHMENT, so skip.
+        if (
+          usage === GPUConst.TextureUsage.TRANSIENT_ATTACHMENT &&
+          info.resource !== 'sampledTexMS'
+        ) {
+          return true;
+        }
         // Can't create the texture for this (usage=STORAGE_BINDING and sampleCount=4), so skip.
         return usage === GPUConst.TextureUsage.STORAGE_BINDING && info.resource === 'sampledTexMS';
       })
@@ -781,6 +789,13 @@ g.test('storage_texture,usage')
       // a combined usage.
       .combine('usage0', kTextureUsages)
       .combine('usage1', kTextureUsages)
+      .unless(({ usage0, usage1 }) => {
+        const usage = usage0 | usage1;
+        return (
+          (usage & GPUConst.TextureUsage.TRANSIENT_ATTACHMENT) !== 0 &&
+          !IsValidTransientAttachmentUsage(usage)
+        );
+      })
   )
   .fn(t => {
     const { usage0, usage1 } = t.params;
@@ -1212,6 +1227,13 @@ g.test('external_texture,texture_view,usage')
       // a combined usage.
       .combine('usage0', kTextureUsages)
       .combine('usage1', kTextureUsages)
+      .unless(({ usage0, usage1 }) => {
+        const usage = usage0 | usage1;
+        return (
+          (usage & GPUConst.TextureUsage.TRANSIENT_ATTACHMENT) !== 0 &&
+          !IsValidTransientAttachmentUsage(usage)
+        );
+      })
   )
   .fn(t => {
     const { usage0, usage1 } = t.params;

dom/webgpu/tests/cts/checkout/src/webgpu/api/validation/createBindGroup.spec.ts

@@ -3,7 +3,11 @@ export const description = `createTexture validation tests.`;
 import { AllFeaturesMaxLimitsGPUTest } from '../.././gpu_test.js';
 import { makeTestGroup } from '../../../common/framework/test_group.js';
 import { assert, makeValueTestVariant } from '../../../common/util/util.js';
-import { kTextureDimensions, kTextureUsages } from '../../capability_info.js';
+import {
+  kTextureDimensions,
+  kTextureUsages,
+  IsValidTransientAttachmentUsage,
+} from '../../capability_info.js';
 import { GPUConst } from '../../constants.js';
 import {
   kAllTextureFormats,
@@ -343,7 +347,11 @@ g.test('sampleCount,valid_sampleCount_with_other_parameter_varies')
               dimension !== '2d')) ||
           ((usage & GPUConst.TextureUsage.STORAGE_BINDING) !== 0 &&
             !isTextureFormatPossiblyStorageReadable(format)) ||
-          (mipLevelCount !== 1 && dimension === '1d')
+          (mipLevelCount !== 1 && dimension === '1d') ||
+          ((usage & GPUConst.TextureUsage.TRANSIENT_ATTACHMENT) !== 0 &&
+            usage !==
+              (GPUConst.TextureUsage.RENDER_ATTACHMENT |
+                GPUConst.TextureUsage.TRANSIENT_ATTACHMENT))
         );
       })
   )
@@ -1008,6 +1016,13 @@ g.test('texture_usage')
       .filter(({ dimension, format }) =>
         textureFormatAndDimensionPossiblyCompatible(dimension, format)
       )
+      .unless(({ usage0, usage1 }) => {
+        const usage = usage0 | usage1;
+        return (
+          (usage & GPUConst.TextureUsage.TRANSIENT_ATTACHMENT) !== 0 &&
+          !IsValidTransientAttachmentUsage(usage)
+        );
+      })
   )
   .fn(t => {
     const { dimension, format, usage0, usage1 } = t.params;
@@ -1037,6 +1052,11 @@ g.test('texture_usage')
       if (isColorTextureFormat(format) && !isTextureFormatColorRenderable(t.device, format))
         success = false;
     }
+    if (usage & GPUTextureUsage.TRANSIENT_ATTACHMENT) {
+      if (usage !== (GPUTextureUsage.RENDER_ATTACHMENT | GPUTextureUsage.TRANSIENT_ATTACHMENT)) {
+        success = false;
+      }
+    }
 
     t.expectValidationError(() => {
       t.createTextureTracked(descriptor);

dom/webgpu/tests/cts/checkout/src/webgpu/api/validation/createTexture.spec.ts

@@ -357,6 +357,13 @@ g.test('texture_view_usage')
       })
       .beginSubcases()
       .combine('textureViewUsage', [0, ...kTextureUsages])
+      .unless(({ textureUsage, textureViewUsage }) => {
+        // TRANSIENT_ATTACHMENT is only valid when combined with RENDER_ATTACHMENT.
+        return (
+          textureUsage === GPUConst.TextureUsage.TRANSIENT_ATTACHMENT ||
+          textureViewUsage === GPUConst.TextureUsage.TRANSIENT_ATTACHMENT
+        );
+      })
   )
   .fn(t => {
     const { format, textureUsage, textureViewUsage } = t.params;
@@ -394,6 +401,10 @@ g.test('texture_view_usage_with_view_format')
       .combine('usage', kTextureUsages)
       .beginSubcases()
       .combine('viewFormat', kAllTextureFormats)
+      .unless(({ usage }) => {
+        // TRANSIENT_ATTACHMENT is only valid when combined with RENDER_ATTACHMENT.
+        return usage === GPUConst.TextureUsage.TRANSIENT_ATTACHMENT;
+      })
   )
   .fn(t => {
     const { textureFormat, viewFormat, usage } = t.params;

dom/webgpu/tests/cts/checkout/src/webgpu/api/validation/createView.spec.ts

@@ -98,6 +98,7 @@ const kRenderPassEncoderCommandInfo: {
   setScissorRect: {},
   setBlendConstant: {},
   setStencilReference: {},
+  setImmediates: {},
   beginOcclusionQuery: {},
   endOcclusionQuery: {},
   executeBundles: {},
@@ -122,6 +123,7 @@ const kRenderBundleEncoderCommandInfo: {
   setBindGroup: {},
   setIndexBuffer: {},
   setVertexBuffer: {},
+  setImmediates: {},
   pushDebugGroup: {},
   popDebugGroup: {},
   insertDebugMarker: {},
@@ -141,6 +143,7 @@ const kComputePassEncoderCommandInfo: {
   setPipeline: {},
   dispatchWorkgroups: {},
   dispatchWorkgroupsIndirect: {},
+  setImmediates: {},
   pushDebugGroup: {},
   popDebugGroup: {},
   insertDebugMarker: {},
@@ -391,6 +394,12 @@ g.test('render_pass_commands')
             renderPass.setStencilReference(0);
           }
           break;
+        case 'setImmediates':
+          {
+            const data = new Uint32Array(1);
+            renderPass.setImmediates(0, data, 0, 1);
+          }
+          break;
         case 'beginOcclusionQuery':
           {
             renderPass.beginOcclusionQuery(0);
@@ -502,6 +511,12 @@ g.test('render_bundle_commands')
             bundleEncoder.setVertexBuffer(1, buffer);
           }
           break;
+        case 'setImmediates':
+          {
+            const data = new Uint32Array(1);
+            bundleEncoder.setImmediates(0, data, 0, 1);
+          }
+          break;
         case 'pushDebugGroup':
           {
             bundleEncoder.pushDebugGroup('group');
@@ -584,6 +599,12 @@ g.test('compute_pass_commands')
             computePass.dispatchWorkgroupsIndirect(indirectBuffer, 0);
           }
           break;
+        case 'setImmediates':
+          {
+            const data = new Uint32Array(1);
+            computePass.setImmediates(0, data, 0, 1);
+          }
+          break;
         case 'pushDebugGroup':
           {
             computePass.pushDebugGroup('group');