1 files changed, 15 insertions, 51 deletions

diff --git a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/unary/af_assignment.spec.ts b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/unary/af_assignment.spec.ts
index 141d87d0f2..001c47e117 100644
--- a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/unary/af_assignment.spec.ts
+++ b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/unary/af_assignment.spec.ts
@@ -4,20 +4,17 @@ Execution Tests for assignment of AbstractFloats
 
 import { makeTestGroup } from '../../../../../common/framework/test_group.js';
 import { GPUTest } from '../../../../gpu_test.js';
-import { kValue } from '../../../../util/constants.js';
-import { abstractFloat, TypeAbstractFloat, TypeF16, TypeF32 } from '../../../../util/conversion.js';
-import { FP } from '../../../../util/floating_point.js';
-import { filteredF64Range, fullF64Range, isSubnormalNumberF64 } from '../../../../util/math.js';
-import { reinterpretU64AsF64 } from '../../../../util/reinterpret.js';
-import { makeCaseCache } from '../case_cache.js';
+import { Type } from '../../../../util/conversion.js';
 import {
+  ShaderBuilder,
   abstractFloatShaderBuilder,
   basicExpressionBuilder,
   onlyConstInputSource,
   run,
-  ShaderBuilder,
 } from '../expression.js';
 
+import { d } from './af_assignment.cache.js';
+
 function concrete_assignment(): ShaderBuilder {
   return basicExpressionBuilder(value => `${value}`);
 }
@@ -28,47 +25,6 @@ function abstract_assignment(): ShaderBuilder {
 
 export const g = makeTestGroup(GPUTest);
 
-export const d = makeCaseCache('unary/af_assignment', {
-  abstract: () => {
-    const inputs = [
-      // Values that are useful for debugging the underlying framework/shader code, since it cannot be directly unit tested.
-      0,
-      0.5,
-      0.5,
-      1,
-      -1,
-      reinterpretU64AsF64(0x7000_0000_0000_0001n), // smallest magnitude negative subnormal with non-zero mantissa
-      reinterpretU64AsF64(0x0000_0000_0000_0001n), // smallest magnitude positive subnormal with non-zero mantissa
-      reinterpretU64AsF64(0x600a_aaaa_5555_5555n), // negative subnormal with obvious pattern
-      reinterpretU64AsF64(0x000a_aaaa_5555_5555n), // positive subnormal with obvious pattern
-      reinterpretU64AsF64(0x0010_0000_0000_0001n), // smallest magnitude negative normal with non-zero mantissa
-      reinterpretU64AsF64(0x0010_0000_0000_0001n), // smallest magnitude positive normal with non-zero mantissa
-      reinterpretU64AsF64(0xf555_5555_aaaa_aaaan), // negative normal with obvious pattern
-      reinterpretU64AsF64(0x5555_5555_aaaa_aaaan), // positive normal with obvious pattern
-      reinterpretU64AsF64(0xffef_ffff_ffff_ffffn), // largest magnitude negative normal
-      reinterpretU64AsF64(0x7fef_ffff_ffff_ffffn), // largest magnitude positive normal
-      // WebGPU implementation stressing values
-      ...fullF64Range(),
-    ];
-    return inputs.map(f => {
-      return {
-        input: abstractFloat(f),
-        expected: isSubnormalNumberF64(f) ? abstractFloat(0) : abstractFloat(f),
-      };
-    });
-  },
-  f32: () => {
-    return filteredF64Range(kValue.f32.negative.min, kValue.f32.positive.max).map(f => {
-      return { input: abstractFloat(f), expected: FP.f32.correctlyRoundedInterval(f) };
-    });
-  },
-  f16: () => {
-    return filteredF64Range(kValue.f16.negative.min, kValue.f16.positive.max).map(f => {
-      return { input: abstractFloat(f), expected: FP.f16.correctlyRoundedInterval(f) };
-    });
-  },
-});
-
 g.test('abstract')
   .specURL('https://www.w3.org/TR/WGSL/#floating-point-conversion')
   .desc(
@@ -79,7 +35,15 @@ testing that extracting abstract floats works
   .params(u => u.combine('inputSource', onlyConstInputSource))
   .fn(async t => {
     const cases = await d.get('abstract');
-    await run(t, abstract_assignment(), [TypeAbstractFloat], TypeAbstractFloat, t.params, cases, 1);
+    await run(
+      t,
+      abstract_assignment(),
+      [Type.abstractFloat],
+      Type.abstractFloat,
+      t.params,
+      cases,
+      1
+    );
   });
 
 g.test('f32')
@@ -92,7 +56,7 @@ concretizing to f32
   .params(u => u.combine('inputSource', onlyConstInputSource))
   .fn(async t => {
     const cases = await d.get('f32');
-    await run(t, concrete_assignment(), [TypeAbstractFloat], TypeF32, t.params, cases);
+    await run(t, concrete_assignment(), [Type.abstractFloat], Type.f32, t.params, cases);
   });
 
 g.test('f16')
@@ -108,5 +72,5 @@ concretizing to f16
   .params(u => u.combine('inputSource', onlyConstInputSource))
   .fn(async t => {
     const cases = await d.get('f16');
-    await run(t, concrete_assignment(), [TypeAbstractFloat], TypeF16, t.params, cases);
+    await run(t, concrete_assignment(), [Type.abstractFloat], Type.f16, t.params, cases);
   });