1 files changed, 12 insertions, 73 deletions
diff --git a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/transpose.spec.ts b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/transpose.spec.ts
index 6fd4887f35..7a96906cfa 100644
--- a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/transpose.spec.ts
+++ b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/transpose.spec.ts
@@ -1,82 +1,21 @@
 export const description = `
 Execution tests for the 'transpose' builtin function
 
-T is AbstractFloat, f32, or f16
+T is abstract-float, f32, or f16
 @const transpose(e: matRxC<T> ) -> matCxR<T>
 Returns the transpose of e.
 `;
 
 import { makeTestGroup } from '../../../../../../common/framework/test_group.js';
 import { GPUTest } from '../../../../../gpu_test.js';
-import { TypeAbstractFloat, TypeF16, TypeF32, TypeMat } from '../../../../../util/conversion.js';
-import { FP } from '../../../../../util/floating_point.js';
-import {
-  sparseMatrixF16Range,
-  sparseMatrixF32Range,
-  sparseMatrixF64Range,
-} from '../../../../../util/math.js';
-import { makeCaseCache } from '../../case_cache.js';
+import { Type } from '../../../../../util/conversion.js';
 import { allInputSources, onlyConstInputSource, run } from '../../expression.js';
 
-import { abstractBuiltin, builtin } from './builtin.js';
+import { abstractFloatBuiltin, builtin } from './builtin.js';
+import { d } from './transpose.cache.js';
 
 export const g = makeTestGroup(GPUTest);
 
-// Cases: f32_matCxR_[non_]const
-const f32_cases = ([2, 3, 4] as const)
-  .flatMap(cols =>
-    ([2, 3, 4] as const).flatMap(rows =>
-      ([true, false] as const).map(nonConst => ({
-        [`f32_mat${cols}x${rows}_${nonConst ? 'non_const' : 'const'}`]: () => {
-          return FP.f32.generateMatrixToMatrixCases(
-            sparseMatrixF32Range(cols, rows),
-            nonConst ? 'unfiltered' : 'finite',
-            FP.f32.transposeInterval
-          );
-        },
-      }))
-    )
-  )
-  .reduce((a, b) => ({ ...a, ...b }), {});
-
-// Cases: f16_matCxR_[non_]const
-const f16_cases = ([2, 3, 4] as const)
-  .flatMap(cols =>
-    ([2, 3, 4] as const).flatMap(rows =>
-      ([true, false] as const).map(nonConst => ({
-        [`f16_mat${cols}x${rows}_${nonConst ? 'non_const' : 'const'}`]: () => {
-          return FP.f16.generateMatrixToMatrixCases(
-            sparseMatrixF16Range(cols, rows),
-            nonConst ? 'unfiltered' : 'finite',
-            FP.f16.transposeInterval
-          );
-        },
-      }))
-    )
-  )
-  .reduce((a, b) => ({ ...a, ...b }), {});
-
-// Cases: abstract_matCxR
-const abstract_cases = ([2, 3, 4] as const)
-  .flatMap(cols =>
-    ([2, 3, 4] as const).map(rows => ({
-      [`abstract_mat${cols}x${rows}`]: () => {
-        return FP.abstract.generateMatrixToMatrixCases(
-          sparseMatrixF64Range(cols, rows),
-          'finite',
-          FP.abstract.transposeInterval
-        );
-      },
-    }))
-  )
-  .reduce((a, b) => ({ ...a, ...b }), {});
-
-export const d = makeCaseCache('transpose', {
-  ...f32_cases,
-  ...f16_cases,
-  ...abstract_cases,
-});
-
 g.test('abstract_float')
   .specURL('https://www.w3.org/TR/WGSL/#matrix-builtin-functions')
   .desc(`abstract float tests`)
@@ -89,12 +28,12 @@ g.test('abstract_float')
   .fn(async t => {
     const cols = t.params.cols;
     const rows = t.params.rows;
-    const cases = await d.get(`abstract_mat${cols}x${rows}`);
+    const cases = await d.get(`abstract_mat${cols}x${rows}_const`);
     await run(
       t,
-      abstractBuiltin('transpose'),
-      [TypeMat(cols, rows, TypeAbstractFloat)],
-      TypeMat(rows, cols, TypeAbstractFloat),
+      abstractFloatBuiltin('transpose'),
+      [Type.mat(cols, rows, Type.abstractFloat)],
+      Type.mat(rows, cols, Type.abstractFloat),
       t.params,
       cases
     );
@@ -120,8 +59,8 @@ g.test('f32')
     await run(
       t,
       builtin('transpose'),
-      [TypeMat(cols, rows, TypeF32)],
-      TypeMat(rows, cols, TypeF32),
+      [Type.mat(cols, rows, Type.f32)],
+      Type.mat(rows, cols, Type.f32),
       t.params,
       cases
     );
@@ -150,8 +89,8 @@ g.test('f16')
     await run(
       t,
       builtin('transpose'),
-      [TypeMat(cols, rows, TypeF16)],
-      TypeMat(rows, cols, TypeF16),
+      [Type.mat(cols, rows, Type.f16)],
+      Type.mat(rows, cols, Type.f16),
       t.params,
       cases
     );