1 files changed, 14 insertions, 47 deletions
diff --git a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/floor.spec.ts b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/floor.spec.ts
index 873a6772c3..26cffe5d10 100644
--- a/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/floor.spec.ts
+++ b/dom/webgpu/tests/cts/checkout/src/webgpu/shader/execution/expression/call/builtin/floor.spec.ts
@@ -1,7 +1,7 @@
 export const description = `
 Execution tests for the 'floor' builtin function
 
-S is AbstractFloat, f32, f16
+S is abstract-float, f32, f16
 T is S or vecN<S>
 @const fn floor(e: T ) -> T
 Returns the floor of e. Component-wise when T is a vector.
@@ -9,54 +9,14 @@ Returns the floor of e. Component-wise when T is a vector.
 
 import { makeTestGroup } from '../../../../../../common/framework/test_group.js';
 import { GPUTest } from '../../../../../gpu_test.js';
-import { TypeF32, TypeF16, TypeAbstractFloat } from '../../../../../util/conversion.js';
-import { FP } from '../../../../../util/floating_point.js';
-import { fullF32Range, fullF16Range, fullF64Range } 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 './floor.cache.js';
 
 export const g = makeTestGroup(GPUTest);
 
-const kSmallMagnitudeTestValues = [0.1, 0.9, 1.0, 1.1, 1.9, -0.1, -0.9, -1.0, -1.1, -1.9];
-
-export const d = makeCaseCache('floor', {
-  f32: () => {
-    return FP.f32.generateScalarToIntervalCases(
-      [
-        ...kSmallMagnitudeTestValues,
-        ...fullF32Range(),
-        0x8000_0000, // https://github.com/gpuweb/cts/issues/2766
-      ],
-      'unfiltered',
-      FP.f32.floorInterval
-    );
-  },
-  f16: () => {
-    return FP.f16.generateScalarToIntervalCases(
-      [
-        ...kSmallMagnitudeTestValues,
-        ...fullF16Range(),
-        0x8000, // https://github.com/gpuweb/cts/issues/2766
-      ],
-      'unfiltered',
-      FP.f16.floorInterval
-    );
-  },
-  abstract: () => {
-    return FP.abstract.generateScalarToIntervalCases(
-      [
-        ...kSmallMagnitudeTestValues,
-        ...fullF64Range(),
-        0x8000_0000_0000_0000, // https://github.com/gpuweb/cts/issues/2766
-      ],
-      'unfiltered',
-      FP.abstract.floorInterval
-    );
-  },
-});
-
 g.test('abstract_float')
   .specURL('https://www.w3.org/TR/WGSL/#float-builtin-functions')
   .desc(`abstract float tests`)
@@ -67,7 +27,14 @@ g.test('abstract_float')
   )
   .fn(async t => {
     const cases = await d.get('abstract');
-    await run(t, abstractBuiltin('floor'), [TypeAbstractFloat], TypeAbstractFloat, t.params, cases);
+    await run(
+      t,
+      abstractFloatBuiltin('floor'),
+      [Type.abstractFloat],
+      Type.abstractFloat,
+      t.params,
+      cases
+    );
   });
 
 g.test('f32')
@@ -78,7 +45,7 @@ g.test('f32')
   )
   .fn(async t => {
     const cases = await d.get('f32');
-    await run(t, builtin('floor'), [TypeF32], TypeF32, t.params, cases);
+    await run(t, builtin('floor'), [Type.f32], Type.f32, t.params, cases);
   });
 
 g.test('f16')
@@ -92,5 +59,5 @@ g.test('f16')
   })
   .fn(async t => {
     const cases = await d.get('f16');
-    await run(t, builtin('floor'), [TypeF16], TypeF16, t.params, cases);
+    await run(t, builtin('floor'), [Type.f16], Type.f16, t.params, cases);
   });