Refactor src/webpgu/api/validation/encoding and a few extra (gpuweb#4273)

Issue gpuweb#4181
Issue gpuweb#4178

Note: For copyTextureToTexture:texture_format_compatibility it was
not at all clear to me why it was choosing textures with features.
AFAICT that was testing almost nothing. Refactored it.

Author: greggman

src/webgpu/api/validation/encoding/beginComputePass.spec.ts

@@ -4,9 +4,9 @@ Tests for validation in beginComputePass and GPUComputePassDescriptor as its opt
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
 import { kQueryTypes } from '../../../capability_info.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   tryComputePass(success: boolean, descriptor: GPUComputePassDescriptor): void {
     const encoder = this.device.createCommandEncoder();
     const computePass = encoder.beginComputePass(descriptor);
@@ -31,11 +31,9 @@ g.test('timestampWrites,query_set_type')
     u //
       .combine('queryType', kQueryTypes)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceForQueryTypeOrSkipTestCase(['timestamp', t.params.queryType]);
-  })
   .fn(t => {
     const { queryType } = t.params;
+    t.skipIfDeviceDoesNotSupportQueryType(queryType);
 
     const isValid = queryType === 'timestamp';
 
@@ -55,10 +53,8 @@ g.test('timestampWrites,query_set_type')
 g.test('timestampWrites,invalid_query_set')
   .desc(`Tests that timestampWrite that has an invalid query set generates a validation error.`)
   .params(u => u.combine('querySetState', ['valid', 'invalid'] as const))
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-  })
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { querySetState } = t.params;
 
     const querySet = t.createQuerySetWithState(querySetState, {
@@ -88,10 +84,8 @@ g.test('timestampWrites,query_index')
       .combine('beginningOfPassWriteIndex', [undefined, 0, 1, 2, 3] as const)
       .combine('endOfPassWriteIndex', [undefined, 0, 1, 2, 3] as const)
   )
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-  })
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { beginningOfPassWriteIndex, endOfPassWriteIndex } = t.params;
 
     const querySetCount = 2;
@@ -121,11 +115,9 @@ g.test('timestamp_query_set,device_mismatch')
   `
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-    t.selectMismatchedDeviceOrSkipTestCase('timestamp-query');
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
 

src/webgpu/api/validation/encoding/beginRenderPass.spec.ts

@@ -22,9 +22,9 @@ Notes:
 `;
 
 import { makeTestGroup } from '../../../../common/framework/test_group.js';
-import { ValidationTest } from '../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('color_attachments,device_mismatch')
   .desc(
@@ -62,9 +62,7 @@ g.test('color_attachments,device_mismatch')
       target1Mismatched: true,
     },
   ])
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { view0Mismatched, target0Mismatched, view1Mismatched, target1Mismatched } = t.params;
     const mismatched = view0Mismatched || target0Mismatched || view1Mismatched || target1Mismatched;
@@ -111,9 +109,7 @@ g.test('depth_stencil_attachment,device_mismatch')
     'Tests beginRenderPass cannot be called with a depth stencil attachment whose texture view is created from another device'
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
 
@@ -150,9 +146,7 @@ g.test('occlusion_query_set,device_mismatch')
     'Tests beginRenderPass cannot be called with an occlusion query set created from another device'
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
@@ -175,11 +169,9 @@ g.test('timestamp_query_set,device_mismatch')
   `
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectDeviceOrSkipTestCase(['timestamp-query']);
-    t.selectMismatchedDeviceOrSkipTestCase('timestamp-query');
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
+    t.skipIfDeviceDoesNotSupportQueryType('timestamp');
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
 

src/webgpu/api/validation/encoding/cmds/clearBuffer.spec.ts

@@ -6,9 +6,9 @@ import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { kBufferUsages } from '../../../../capability_info.js';
 import { kResourceStates } from '../../../../gpu_test.js';
 import { kMaxSafeMultipleOf8 } from '../../../../util/math.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   TestClearBuffer(options: {
     buffer: GPUBuffer;
     offset: number | undefined;
@@ -57,9 +57,7 @@ g.test('buffer_state')
 g.test('buffer,device_mismatch')
   .desc(`Tests clearBuffer cannot be called with buffer created from another device.`)
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;

src/webgpu/api/validation/encoding/cmds/compute_pass.spec.ts

@@ -9,9 +9,9 @@ import { makeValueTestVariant } from '../../../../../common/util/util.js';
 import { kBufferUsages } from '../../../../capability_info.js';
 import { GPUConst } from '../../../../constants.js';
 import { kResourceStates, ResourceState } from '../../../../gpu_test.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   createComputePipeline(state: 'valid' | 'invalid'): GPUComputePipeline {
     if (state === 'valid') {
       return this.createNoOpComputePipeline();
@@ -67,9 +67,7 @@ setPipeline should generate an error iff using an 'invalid' pipeline.
 g.test('pipeline,device_mismatch')
   .desc('Tests setPipeline cannot be called with a compute pipeline created from another device')
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
     const sourceDevice = mismatched ? t.mismatchedDevice : t.device;
@@ -193,9 +191,7 @@ g.test('indirect_dispatch_buffer,device_mismatch')
     `Tests dispatchWorkgroupsIndirect cannot be called with an indirect buffer created from another device`
   )
   .paramsSubcasesOnly(u => u.combine('mismatched', [true, false]))
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { mismatched } = t.params;
 

src/webgpu/api/validation/encoding/cmds/copyBufferToBuffer.spec.ts

@@ -27,9 +27,9 @@ import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { kBufferUsages } from '../../../../capability_info.js';
 import { kResourceStates } from '../../../../gpu_test.js';
 import { kMaxSafeMultipleOf8 } from '../../../../util/math.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   TestCopyBufferToBuffer(options: {
     srcBuffer: GPUBuffer;
     srcOffset: number;
@@ -102,9 +102,7 @@ g.test('buffer,device_mismatch')
     { srcMismatched: true, dstMismatched: false },
     { srcMismatched: false, dstMismatched: true },
   ] as const)
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { srcMismatched, dstMismatched } = t.params;
 

src/webgpu/api/validation/encoding/cmds/copyTextureToTexture.spec.ts

@@ -5,19 +5,21 @@ copyTextureToTexture tests.
 import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { kTextureUsages, kTextureDimensions } from '../../../../capability_info.js';
 import {
-  kTextureFormatInfo,
   kAllTextureFormats,
   kCompressedTextureFormats,
   kDepthStencilFormats,
-  kFeaturesForFormats,
-  filterFormatsByFeature,
   textureDimensionAndFormatCompatible,
+  getBlockInfoForTextureFormat,
+  getBaseFormatForTextureFormat,
+  canCopyFromAllAspectsOfTextureFormat,
+  canCopyToAllAspectsOfTextureFormat,
+  ColorTextureFormat,
 } from '../../../../format_info.js';
 import { kResourceStates } from '../../../../gpu_test.js';
 import { align, lcm } from '../../../../util/math.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
-class F extends ValidationTest {
+class F extends AllFeaturesMaxLimitsValidationTest {
   TestCopyTextureToTexture(
     source: GPUTexelCopyTextureInfo,
     destination: GPUTexelCopyTextureInfo,
@@ -45,13 +47,11 @@ class F extends ValidationTest {
     format: GPUTextureFormat,
     mipLevel: number
   ): Required<GPUExtent3DDict> {
+    const { blockWidth, blockHeight } = getBlockInfoForTextureFormat(format);
     const virtualWidthAtLevel = Math.max(textureSize.width >> mipLevel, 1);
     const virtualHeightAtLevel = Math.max(textureSize.height >> mipLevel, 1);
-    const physicalWidthAtLevel = align(virtualWidthAtLevel, kTextureFormatInfo[format].blockWidth);
-    const physicalHeightAtLevel = align(
-      virtualHeightAtLevel,
-      kTextureFormatInfo[format].blockHeight
-    );
+    const physicalWidthAtLevel = align(virtualWidthAtLevel, blockWidth);
+    const physicalHeightAtLevel = align(virtualHeightAtLevel, blockHeight);
 
     switch (dimension) {
       case '1d':
@@ -118,9 +118,7 @@ g.test('texture,device_mismatch')
     { srcMismatched: true, dstMismatched: false },
     { srcMismatched: false, dstMismatched: true },
   ] as const)
-  .beforeAllSubcases(t => {
-    t.selectMismatchedDeviceOrSkipTestCase(undefined);
-  })
+  .beforeAllSubcases(t => t.usesMismatchedDevice())
   .fn(t => {
     const { srcMismatched, dstMismatched } = t.params;
 
@@ -358,28 +356,26 @@ Test the formats of textures in copyTextureToTexture must be copy-compatible.
   )
   .params(u =>
     u
-      .combine('srcFormatFeature', kFeaturesForFormats)
-      .combine('dstFormatFeature', kFeaturesForFormats)
-      .beginSubcases()
-      .expand('srcFormat', ({ srcFormatFeature }) =>
-        filterFormatsByFeature(srcFormatFeature, kAllTextureFormats)
-      )
-      .expand('dstFormat', ({ dstFormatFeature }) =>
-        filterFormatsByFeature(dstFormatFeature, kAllTextureFormats)
-      )
+      .combine('srcFormat', kAllTextureFormats)
+      .filter(t => canCopyFromAllAspectsOfTextureFormat(t.srcFormat))
+      .combine('dstFormat', kAllTextureFormats)
+      .filter(t => canCopyToAllAspectsOfTextureFormat(t.dstFormat))
+      .filter(t => {
+        const srcInfo = getBlockInfoForTextureFormat(t.srcFormat);
+        const dstInfo = getBlockInfoForTextureFormat(t.dstFormat);
+        return (
+          srcInfo.blockWidth === dstInfo.blockWidth && srcInfo.blockHeight === dstInfo.blockHeight
+        );
+      })
   )
-  .beforeAllSubcases(t => {
-    const { srcFormatFeature, dstFormatFeature } = t.params;
-    t.selectDeviceOrSkipTestCase([srcFormatFeature, dstFormatFeature]);
-  })
   .fn(t => {
     const { srcFormat, dstFormat } = t.params;
 
-    t.skipIfTextureFormatNotSupportedDeprecated(srcFormat, dstFormat);
-    t.skipIfCopyTextureToTextureNotSupportedForFormatDeprecated(srcFormat, dstFormat);
+    t.skipIfTextureFormatNotSupported(srcFormat, dstFormat);
+    t.skipIfCopyTextureToTextureNotSupportedForFormat(srcFormat, dstFormat);
 
-    const srcFormatInfo = kTextureFormatInfo[srcFormat];
-    const dstFormatInfo = kTextureFormatInfo[dstFormat];
+    const srcFormatInfo = getBlockInfoForTextureFormat(srcFormat);
+    const dstFormatInfo = getBlockInfoForTextureFormat(dstFormat);
 
     const textureSize = {
       width: lcm(srcFormatInfo.blockWidth, dstFormatInfo.blockWidth),
@@ -400,8 +396,10 @@ Test the formats of textures in copyTextureToTexture must be copy-compatible.
     });
 
     // Allow copy between compatible format textures.
-    const srcBaseFormat = kTextureFormatInfo[srcFormat].baseFormat ?? srcFormat;
-    const dstBaseFormat = kTextureFormatInfo[dstFormat].baseFormat ?? dstFormat;
+    const srcBaseFormat =
+      getBaseFormatForTextureFormat(srcFormat as ColorTextureFormat) ?? srcFormat;
+    const dstBaseFormat =
+      getBaseFormatForTextureFormat(dstFormat as ColorTextureFormat) ?? dstFormat;
     const isSuccess = srcBaseFormat === dstBaseFormat;
 
     t.TestCopyTextureToTexture(
@@ -448,13 +446,10 @@ Note: this is only tested for 2D textures as it is the only dimension compatible
       .combine('srcCopyLevel', [1, 2])
       .combine('dstCopyLevel', [0, 1])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    t.selectDeviceOrSkipTestCase(kTextureFormatInfo[format].feature);
-  })
   .fn(t => {
     const { format, copyBoxOffsets, srcTextureSize, dstTextureSize, srcCopyLevel, dstCopyLevel } =
       t.params;
+    t.skipIfTextureFormatNotSupported(format);
     const kMipLevelCount = 3;
 
     const srcTexture = t.createTextureTracked({
@@ -704,12 +699,9 @@ Test the validations on the member 'aspect' of GPUTexelCopyTextureInfo in CopyTe
       .combine('sourceAspect', ['all', 'depth-only', 'stencil-only'] as const)
       .combine('destinationAspect', ['all', 'depth-only', 'stencil-only'] as const)
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    t.selectDeviceOrSkipTestCase(kTextureFormatInfo[format].feature);
-  })
   .fn(t => {
     const { format, sourceAspect, destinationAspect } = t.params;
+    t.skipIfTextureFormatNotSupported(format);
 
     const kTextureSize = { width: 16, height: 8, depthOrArrayLayers: 1 };
 
@@ -783,14 +775,13 @@ TODO: Express the offsets in "block size" so as to be able to test non-4x4 compr
       .combine('srcCopyLevel', [0, 1, 2])
       .combine('dstCopyLevel', [0, 1, 2])
   )
-  .beforeAllSubcases(t => {
-    const { format } = t.params;
-    t.selectDeviceOrSkipTestCase(kTextureFormatInfo[format].feature);
-    t.skipIfCopyTextureToTextureNotSupportedForFormat(format);
-  })
   .fn(t => {
     const { format, dimension, copyBoxOffsets, srcCopyLevel, dstCopyLevel } = t.params;
-    const { blockWidth, blockHeight } = kTextureFormatInfo[format];
+
+    t.skipIfTextureFormatNotSupported(format);
+    t.skipIfCopyTextureToTextureNotSupportedForFormat(format);
+
+    const { blockWidth, blockHeight } = getBlockInfoForTextureFormat(format);
 
     const kTextureSize = {
       width: 15 * blockWidth,
@@ -840,14 +831,11 @@ TODO: Express the offsets in "block size" so as to be able to test non-4x4 compr
     const copyDepth =
       kTextureSize.depthOrArrayLayers + copyBoxOffsets.depthOrArrayLayers - copyOrigin.z;
 
-    const texelBlockWidth = kTextureFormatInfo[format].blockWidth;
-    const texelBlockHeight = kTextureFormatInfo[format].blockHeight;
-
     const isSuccessForCompressedFormats =
-      copyOrigin.x % texelBlockWidth === 0 &&
-      copyOrigin.y % texelBlockHeight === 0 &&
-      copyWidth % texelBlockWidth === 0 &&
-      copyHeight % texelBlockHeight === 0;
+      copyOrigin.x % blockWidth === 0 &&
+      copyOrigin.y % blockHeight === 0 &&
+      copyWidth % blockWidth === 0 &&
+      copyHeight % blockHeight === 0;
 
     {
       const isSuccess =

src/webgpu/api/validation/encoding/cmds/debug.spec.ts

@@ -15,9 +15,9 @@ Test Coverage:
 
 import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { kEncoderTypes } from '../../../../util/command_buffer_maker.js';
-import { ValidationTest } from '../../validation_test.js';
+import { AllFeaturesMaxLimitsValidationTest } from '../../validation_test.js';
 
-export const g = makeTestGroup(ValidationTest);
+export const g = makeTestGroup(AllFeaturesMaxLimitsValidationTest);
 
 g.test('debug_group_balanced')
   .params(u =>