Reland "Simplify device selection" with fix (#1386)

REVERT AGAIN IF THIS CAUSES BREAKAGE

* Revert "Revert "Simplify device selection" and dependent commits (#1384)"

This reverts commit 0a1288f.

* Free DeviceHolder even on TestFailedButDeviceReusable

src/common/framework/fixture.ts

@@ -32,9 +32,20 @@ export class SubcaseBatchState {
     return this._params;
   }
 
-  /** @internal MAINTENANCE_TODO: Make this not visible to test code? */
+  /**
+   * Runs before the `.before()` function.
+   * @internal MAINTENANCE_TODO: Make this not visible to test code?
+   */
   async init() {}
-  /** @internal MAINTENANCE_TODO: Make this not visible to test code? */
+  /**
+   * Runs between the `.before()` function and the subcases.
+   * @internal MAINTENANCE_TODO: Make this not visible to test code?
+   */
+  async postInit() {}
+  /**
+   * Runs after all subcases finish.
+   * @internal MAINTENANCE_TODO: Make this not visible to test code?
+   */
   async finalize() {}
 }
 

src/common/internal/test_group.ts

@@ -497,6 +497,7 @@ class RunCaseSpecific implements RunCase {
         if (this.beforeFn) {
           await this.beforeFn(sharedState);
         }
+        await sharedState.postInit();
 
         let allPreviousSubcasesFinalizedPromise: Promise<void> = Promise.resolve();
         if (this.subcases) {

src/common/util/util.ts

@@ -117,6 +117,17 @@ export function raceWithRejectOnTimeout<T>(p: Promise<T>, ms: number, msg: strin
   return Promise.race([p, timeoutPromise]) as Promise<T>;
 }
 
+/**
+ * Returns a `Promise.reject()`, but also registers a dummy `.catch()` handler so it doesn't count
+ * as an uncaught promise rejection in the runtime.
+ */
+export function rejectWithoutUncaught<T>(err: unknown): Promise<T> {
+  const p = Promise.reject(err);
+  // Suppress uncaught promise rejection.
+  p.catch(() => {});
+  return p;
+}
+
 /**
  * Makes a copy of a JS `object`, with the keys reordered into sorted order.
  */

src/webgpu/api/operation/command_buffer/copyTextureToTexture.spec.ts

@@ -778,9 +778,9 @@ g.test('color_textures,compressed,non_array')
       .combine('srcCopyLevel', [0, 2])
       .combine('dstCopyLevel', [0, 2])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { srcFormat, dstFormat } = t.params;
-    await t.selectDeviceOrSkipTestCase([
+    t.selectDeviceOrSkipTestCase([
       kTextureFormatInfo[srcFormat].feature,
       kTextureFormatInfo[dstFormat].feature,
     ]);
@@ -932,10 +932,10 @@ g.test('color_textures,compressed,array')
       .combine('srcCopyLevel', [0, 2])
       .combine('dstCopyLevel', [0, 2])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { srcFormat, dstFormat } = t.params;
 
-    await t.selectDeviceOrSkipTestCase([
+    t.selectDeviceOrSkipTestCase([
       kTextureFormatInfo[srcFormat].feature,
       kTextureFormatInfo[dstFormat].feature,
     ]);
@@ -1116,9 +1116,9 @@ g.test('copy_depth_stencil')
         );
       })
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format } = t.params;
-    await t.selectDeviceForTextureFormatOrSkipTestCase(format);
+    t.selectDeviceForTextureFormatOrSkipTestCase(format);
   })
   .fn(async t => {
     const {

src/webgpu/api/operation/command_buffer/image_copy.spec.ts

@@ -1287,9 +1287,9 @@ bytes in copy works for every format.
         return kRowsPerImageAndBytesPerRowParams.copySizes;
       })
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {
@@ -1383,9 +1383,9 @@ works for every format with 2d and 2d-array textures.
       .combine('copyDepth', kOffsetsAndSizesParams.copyDepth) // 2d and 2d-array textures
       .unless(p => p.dimension === '1d' && p.copyDepth !== 1)
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {
@@ -1462,9 +1462,9 @@ for all formats. We pass origin and copyExtent as [number, number, number].`
       .combine('coordinateToTest', [0, 1, 2] as const)
       .unless(p => p.dimension === '1d' && p.coordinateToTest !== 0)
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {
@@ -1661,9 +1661,9 @@ TODO: Make a variant for depth-stencil formats.
       ])
       .expand('textureSize', generateTestTextureSizes)
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {
@@ -1828,9 +1828,9 @@ aspect and copyTextureToBuffer() with depth aspect.
       })
       .combine('mipLevel', [0, 2])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {
@@ -1919,9 +1919,9 @@ copyTextureToBuffer() with depth aspect.
       .combine('copyDepth', kOffsetsAndSizesParams.copyDepth)
       .combine('mipLevel', [0, 2])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {

src/webgpu/api/operation/render_pipeline/pipeline_output_targets.spec.ts

@@ -151,9 +151,9 @@ g.test('color,attachments')
       .combine('attachmentCount', [2, 3, 4])
       .expand('emptyAttachmentId', p => range(p.attachmentCount, i => i))
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const { format, attachmentCount, emptyAttachmentId } = t.params;
@@ -254,9 +254,9 @@ g.test('color,component_count')
       .combine('componentCount', [1, 2, 3, 4])
       .filter(x => x.componentCount >= kTexelRepresentationInfo[x.format].componentOrder.length)
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const { format, componentCount } = t.params;
@@ -459,9 +459,9 @@ The attachment has a load value of [1, 0, 0, 1]
       ] as const)
       .filter(x => x.output.length >= kTexelRepresentationInfo[x.format].componentOrder.length)
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
-    await t.selectDeviceOrSkipTestCase(info.feature);
+    t.selectDeviceOrSkipTestCase(info.feature);
   })
   .fn(async t => {
     const {

src/webgpu/api/operation/rendering/depth.spec.ts

@@ -76,8 +76,8 @@ g.test('depth_compare_func')
         { depthCompare: 'always', depthClearValue: 0.0, _expected: triangleColor },
       ] as const)
   )
-  .beforeAllSubcases(async t => {
-    await t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
+  .beforeAllSubcases(t => {
+    t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
   })
   .fn(async t => {
     const { depthCompare, depthClearValue, _expected, format } = t.params;

src/webgpu/api/operation/rendering/depth_clip_clamp.spec.ts

@@ -41,10 +41,10 @@ have unexpected values then get drawn to the color buffer, which is later checke
       .combine('writeDepth', [false, true])
       .combine('multisampled', [false, true])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
 
-    await t.selectDeviceOrSkipTestCase([
+    t.selectDeviceOrSkipTestCase([
       t.params.unclippedDepth ? 'depth-clip-control' : undefined,
       info.feature,
     ]);
@@ -354,10 +354,10 @@ to be empty.`
       .combine('unclippedDepth', [false, true])
       .combine('multisampled', [false, true])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const info = kTextureFormatInfo[t.params.format];
 
-    await t.selectDeviceOrSkipTestCase([
+    t.selectDeviceOrSkipTestCase([
       t.params.unclippedDepth ? 'depth-clip-control' : undefined,
       info.feature,
     ]);

src/webgpu/api/operation/rendering/draw.spec.ts

@@ -50,9 +50,9 @@ Params:
       .expand('index_buffer_offset', p => (p.indexed ? ([0, 16] as const) : [undefined]))
       .expand('base_vertex', p => (p.indexed ? ([0, 9] as const) : [undefined]))
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     if (t.params.first_instance > 0 && t.params.indirect) {
-      await t.selectDeviceOrSkipTestCase('indirect-first-instance');
+      t.selectDeviceOrSkipTestCase('indirect-first-instance');
     }
   })
   .fn(async t => {

src/webgpu/api/operation/resource_init/texture_zero.spec.ts

@@ -577,8 +577,8 @@ export const g = makeTestGroup(TextureZeroInitTest);
 
 g.test('uninitialized_texture_is_zero')
   .params(kTestParams)
-  .beforeAllSubcases(async t => {
-    await t.selectDeviceOrSkipTestCase(kTextureFormatInfo[t.params.format].feature);
+  .beforeAllSubcases(t => {
+    t.selectDeviceOrSkipTestCase(kTextureFormatInfo[t.params.format].feature);
   })
   .fn(async t => {
     const usage = getRequiredTextureUsage(

src/webgpu/api/validation/attachment_compatibility.spec.ts

@@ -275,9 +275,9 @@ g.test('render_pass_and_bundle,depth_format')
         filterFormatsByFeature(bundleFeature, kDepthStencilAttachmentFormats)
       )
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { passFeature, bundleFeature } = t.params;
-    await t.selectDeviceOrSkipTestCase([passFeature, bundleFeature]);
+    t.selectDeviceOrSkipTestCase([passFeature, bundleFeature]);
   })
   .fn(async t => {
     const { passFormat, bundleFormat } = t.params;
@@ -431,9 +431,9 @@ Test that the depth attachment format in render passes or bundles match the pipe
         filterFormatsByFeature(pipelineFormatFeature, kDepthStencilAttachmentFormats)
       )
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { encoderFormatFeature, pipelineFormatFeature } = t.params;
-    await t.selectDeviceOrSkipTestCase([encoderFormatFeature, pipelineFormatFeature]);
+    t.selectDeviceOrSkipTestCase([encoderFormatFeature, pipelineFormatFeature]);
   })
   .fn(async t => {
     const { encoderType, encoderFormat, pipelineFormat } = t.params;
@@ -503,8 +503,8 @@ Test that the depth stencil read only state in render passes or bundles is compa
         return true;
       })
   )
-  .beforeAllSubcases(async t => {
-    await t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
+  .beforeAllSubcases(t => {
+    t.selectDeviceForTextureFormatOrSkipTestCase(t.params.format);
   })
   .fn(async t => {
     const {

src/webgpu/api/validation/capability_checks/features/query_types.spec.ts

@@ -25,15 +25,15 @@ As of this writing, the spec needs to be fixed as well.
       .combine('type', ['occlusion', 'timestamp'] as const)
       .combine('timestampQueryEnable', [false, true])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { timestampQueryEnable } = t.params;
 
     const requiredFeatures: GPUFeatureName[] = [];
     if (timestampQueryEnable) {
       requiredFeatures.push('timestamp-query');
     }
 
-    await t.selectDeviceOrSkipTestCase({ requiredFeatures });
+    t.selectDeviceOrSkipTestCase({ requiredFeatures });
   })
   .fn(async t => {
     const { type, timestampQueryEnable } = t.params;

src/webgpu/api/validation/capability_checks/features/texture_formats.spec.ts

@@ -30,12 +30,12 @@ g.test('texture_descriptor')
   .params(u =>
     u.combine('format', kOptionalTextureFormats).combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {
@@ -66,12 +66,12 @@ g.test('storage_texture_binding_layout')
       .filter(t => kTextureFormatInfo[t.format].storage)
       .combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {
@@ -107,12 +107,12 @@ g.test('color_target_state')
       .filter(t => kTextureFormatInfo[t.format].renderable && kTextureFormatInfo[t.format].color)
       .combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {
@@ -162,12 +162,12 @@ g.test('depth_stencil_state')
       )
       .combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {
@@ -218,12 +218,12 @@ g.test('render_bundle_encoder_descriptor_color_format')
       .filter(t => kTextureFormatInfo[t.format].renderable && kTextureFormatInfo[t.format].color)
       .combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {
@@ -253,12 +253,12 @@ g.test('render_bundle_encoder_descriptor_depth_stencil_format')
       )
       .combine('enable_required_feature', [true, false])
   )
-  .beforeAllSubcases(async t => {
+  .beforeAllSubcases(t => {
     const { format, enable_required_feature } = t.params;
 
     const formatInfo = kTextureFormatInfo[format];
     if (enable_required_feature) {
-      await t.selectDeviceOrSkipTestCase(formatInfo.feature);
+      t.selectDeviceOrSkipTestCase(formatInfo.feature);
     }
   })
   .fn(async t => {