Bug 2025939 - test(webgpu): update CTS to 9726cfe2893834c4bb42b435638c4e7362f4c258 r=#webgpu-reviewers

`webgpu:shader,validation,extension,readonly_and_readwrite_storage_textures:var_decl:*` regressed on platform(s) that expose the `readonly_and_readwrite_storage_textures` WGSL feature, but this was expected (see [gpuweb/cts#4567](gpuweb/cts#4567)). Follow-up work is already under way for this at [gpuweb/cts#4612](gpuweb/cts#4612).

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

Author: ErichDonGubler

dom/webgpu/tests/cts/checkout/src/webgpu/capability_info.ts

@@ -982,6 +982,7 @@ export const kKnownWGSLLanguageFeatures = [
   'subgroup_uniformity',
   'swizzle_assignment',
   'linear_indexing',
+  'texture_formats_tier1',
 ] as const;
 
 export type WGSLLanguageFeature = (typeof kKnownWGSLLanguageFeatures)[number];

dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts

@@ -277,16 +277,18 @@ g.test('inputs')
                       localIndex,
                       output[globalOffset + kLocalIndexOffset]
                     ) ||
-                    expectEqual(
-                      'global_index',
-                      globalLinearIndex,
-                      output[globalOffset + kGlobalIndexOffset]
-                    ) ||
-                    expectEqual(
-                      'group_index',
-                      groupLinearIndex,
-                      output[globalOffset + kGroupIndexOffset]
-                    );
+                    (linear_indexing &&
+                      expectEqual(
+                        'global_index',
+                        globalLinearIndex,
+                        output[globalOffset + kGlobalIndexOffset]
+                      )) ||
+                    (linear_indexing &&
+                      expectEqual(
+                        'group_index',
+                        groupLinearIndex,
+                        output[globalOffset + kGroupIndexOffset]
+                      ));
                   if (error) {
                     return error;
                   }

dom/webgpu/tests/cts/checkout/src/webgpu/shader/validation/extension/readonly_and_readwrite_storage_textures.spec.ts

@@ -3,16 +3,25 @@ Validation tests for the readonly_and_readwrite_storage_textures language featur
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { kPossibleStorageTextureFormats } from '../../../format_info.js';
+import { hasFeature } from '../../../../common/util/util.js';
+import {
+  kPossibleStorageTextureFormats,
+  kTextureFormatsTier1EnablesStorageReadOnlyWriteOnly,
+} from '../../../format_info.js';
 import { ShaderValidationTest } from '../shader_validation_test.js';
 
 export const g = makeTestGroup(ShaderValidationTest);
 
-const kFeatureName = 'readonly_and_readwrite_storage_textures';
+const kAccessModeFeatureName = 'readonly_and_readwrite_storage_textures';
+const kTier1FeatureName = 'texture_formats_tier1';
+const kTier1DeviceFeatureName = 'texture-formats-tier1';
 
 g.test('var_decl')
   .desc(
-    `Checks that the read and read_write access modes are only allowed with the language feature present`
+    `Checks that the read and read_write access modes are only allowed with the language feature present
+
+    TODO(https://github.com/gpuweb/cts/issues/4612): Stop checking the device feature
+    `
   )
   .paramsSubcasesOnly(u =>
     u
@@ -28,9 +37,26 @@ g.test('var_decl')
   .fn(t => {
     const { type, format, access } = t.params;
 
+    let valid = true;
+    if (access !== 'write') {
+      valid &&= t.hasLanguageFeature(kAccessModeFeatureName);
+    }
+
+    if (kTextureFormatsTier1EnablesStorageReadOnlyWriteOnly.indexOf(format) >= 0) {
+      // Even though some of these formats do not support read-write access
+      // without the tier2 adapter feature, their validity in WGSL should
+      // depend only on the language feature for tier1.
+
+      // However, because the language feature is new, also check the device
+      // feature. MAINTENANCE_TODO(https://github.com/gpuweb/cts/issues/4612):
+      // Stop doing this; make `if` body unconditional
+      if (!hasFeature(t.device.features, kTier1DeviceFeatureName)) {
+        valid &&= t.hasLanguageFeature(kTier1FeatureName);
+      }
+    }
+
     const source = `@group(0) @binding(0) var t : ${type}<${format}, ${access}>;`;
-    const requiresFeature = access !== 'write';
-    t.expectCompileResult(t.hasLanguageFeature(kFeatureName) || !requiresFeature, source);
+    t.expectCompileResult(valid, source);
   });
 
 g.test('textureBarrier')
@@ -39,7 +65,7 @@ g.test('textureBarrier')
   )
   .fn(t => {
     t.expectCompileResult(
-      t.hasLanguageFeature(kFeatureName),
+      t.hasLanguageFeature(kAccessModeFeatureName),
       `
         @workgroup_size(1) @compute fn main() {
             textureBarrier();

dom/webgpu/tests/cts/checkout/src/webgpu/shader/validation/shader_io/builtins.spec.ts

@@ -423,9 +423,6 @@ g.test('reuse_builtin_name')
   )
   .fn(t => {
     let code = '';
-    if (t.params.enable) {
-      code += `enable ${t.params.enable};\n`;
-    }
     if (t.params.use === 'alias') {
       code += `alias ${t.params.name} = i32;`;
     } else if (t.params.use === `struct`) {
@@ -437,8 +434,7 @@ g.test('reuse_builtin_name')
     } else if (t.params.use === `function-var`) {
       code += `fn test() { let ${t.params.name} = 1; }`;
     }
-    const expect = t.params.requires === undefined || t.hasLanguageFeature(t.params.requires);
-    t.expectCompileResult(expect, code);
+    t.expectCompileResult(true, code);
   });
 
 const kTests = {

dom/webgpu/tests/cts/checkout/tools/gen_version

@@ -14,7 +14,7 @@ if (!fs.existsSync(myself)) {
   process.exit(1);
 }
 
-const version = '5ca78e5515baa2e2c6681f1b2dae2926cc8884d7';
+const version = '9726cfe2893834c4bb42b435638c4e7362f4c258';
 
 fs.mkdirSync('./gen/common/internal', { recursive: true });
 // This will be copied into the various other build directories.

dom/webgpu/tests/cts/moz.yaml

@@ -8,8 +8,8 @@ origin:
   name: WebGPU CTS
   description: WebGPU Compliance Test Suite
   url: https://gpuweb.github.io/cts/
-  release: 5ca78e5515baa2e2c6681f1b2dae2926cc8884d7 (2026-03-17T15:43:35Z).
-  revision: 5ca78e5515baa2e2c6681f1b2dae2926cc8884d7
+  release: 9726cfe2893834c4bb42b435638c4e7362f4c258 (2026-03-20T18:30:29Z).
+  revision: 9726cfe2893834c4bb42b435638c4e7362f4c258
   license: ['BSD-3-Clause']
 
 updatebot:

testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/execution/shader_io/compute_builtins/cts.https.html.ini

@@ -1,76 +1,51 @@
 [cts.https.html?q=webgpu:shader,execution,shader_io,compute_builtins:inputs:*]
-  implementation-status: backlog
   [:method="mixed";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="mixed";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="mixed";dispatch="direct";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="mixed";dispatch="direct";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="mixed";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="mixed";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="mixed";dispatch="indirect";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="mixed";dispatch="indirect";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="param";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="param";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="param";dispatch="direct";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="param";dispatch="direct";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="param";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="param";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="param";dispatch="indirect";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="param";dispatch="indirect";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="struct";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="struct";dispatch="direct";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="struct";dispatch="direct";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="struct";dispatch="direct";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="struct";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
   [:method="struct";dispatch="indirect";groupSize={"x":1,"y":1,"z":1};numGroups={"x":8,"y":4,"z":2}]
-    expected: FAIL
 
   [:method="struct";dispatch="indirect";groupSize={"x":3,"y":7,"z":5};numGroups={"x":13,"y":9,"z":11}]
-    expected: FAIL
 
   [:method="struct";dispatch="indirect";groupSize={"x":8,"y":4,"z":2};numGroups={"x":1,"y":1,"z":1}]
-    expected: FAIL
 
 
 [cts.https.html?q=webgpu:shader,execution,shader_io,compute_builtins:num_subgroups:*]

testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/extension/readonly_and_readwrite_storage_textures/cts.https.html.ini

@@ -3,8 +3,6 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,extension,readonly_and_readwrite_storage_textures:var_decl:*]
-  implementation-status:
-    if os == "linux": backlog
+  implementation-status: backlog
   [:]
-    expected:
-      if os == "linux": FAIL
+    expected: FAIL

testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/parse/requires/cts.https.html.ini

@@ -47,6 +47,8 @@
 
   [:feature="texture_and_sampler_let"]
 
+  [:feature="texture_formats_tier1"]
+
   [:feature="uniform_buffer_standard_layout"]
 
   [:feature="unrestricted_pointer_parameters"]

testing/web-platform/mozilla/meta/webgpu/cts/webgpu/shader/validation/shader_io/builtins/cts.https.html.ini

@@ -103,7 +103,6 @@
 
 
 [cts.https.html?q=webgpu:shader,validation,shader_io,builtins:reuse_builtin_name:*]
-  implementation-status: backlog
   [:name="clip_distances";stage="vertex";io="out";type="array%3Cf32,1%3E";enable="clip_distances";use="alias"]
 
   [:name="clip_distances";stage="vertex";io="out";type="array%3Cf32,1%3E";enable="clip_distances";use="function"]
@@ -215,19 +214,14 @@
   [:name="global_invocation_id";stage="compute";io="in";type="vec3%3Cu32%3E";use="struct"]
 
   [:name="global_invocation_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="alias"]
-    expected: FAIL
 
   [:name="global_invocation_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="function"]
-    expected: FAIL
 
   [:name="global_invocation_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="function-var"]
-    expected: FAIL
 
   [:name="global_invocation_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="module-var"]
-    expected: FAIL
 
   [:name="global_invocation_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="struct"]
-    expected: FAIL
 
   [:name="instance_index";stage="vertex";io="in";type="u32";use="alias"]
 
@@ -410,19 +404,14 @@
   [:name="workgroup_id";stage="compute";io="in";type="vec3%3Cu32%3E";use="struct"]
 
   [:name="workgroup_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="alias"]
-    expected: FAIL
 
   [:name="workgroup_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="function"]
-    expected: FAIL
 
   [:name="workgroup_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="function-var"]
-    expected: FAIL
 
   [:name="workgroup_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="module-var"]
-    expected: FAIL
 
   [:name="workgroup_index";stage="compute";io="in";type="u32";requires="linear_indexing";use="struct"]
-    expected: FAIL
 
 
 [cts.https.html?q=webgpu:shader,validation,shader_io,builtins:stage_inout:*]