Update All and Concrete type names (#3464)

This CL updates some of the type exports to remove the `All` modifier and adds `Concrete` to a few exports for consistency.
gpuweb · Mar 7, 2024 · 485e411 · 485e411
1 parent adaa479
commit 485e411
Show file tree

Hide file tree

Showing 31 changed files with 195 additions and 195 deletions.
diff --git a/src/resources/cache/hashes.json b/src/resources/cache/hashes.json
@@ -1,110 +1,110 @@
 {
-  "webgpu/shader/execution/binary/af_addition.bin": "1a138e40",
-  "webgpu/shader/execution/binary/af_logical.bin": "2a334d4b",
-  "webgpu/shader/execution/binary/af_division.bin": "801a63d2",
-  "webgpu/shader/execution/binary/af_matrix_addition.bin": "d392437a",
-  "webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "8a56ca30",
-  "webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "3b36edc4",
-  "webgpu/shader/execution/binary/af_matrix_subtraction.bin": "c2a167d1",
-  "webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "3bdd724b",
-  "webgpu/shader/execution/binary/af_multiplication.bin": "af6472be",
-  "webgpu/shader/execution/binary/af_remainder.bin": "582570bc",
-  "webgpu/shader/execution/binary/af_subtraction.bin": "65e85cff",
-  "webgpu/shader/execution/binary/ai_arithmetic.bin": "3876accd",
-  "webgpu/shader/execution/binary/f16_addition.bin": "12057229",
-  "webgpu/shader/execution/binary/f16_logical.bin": "b6ee9faf",
-  "webgpu/shader/execution/binary/f16_division.bin": "9f3479f0",
-  "webgpu/shader/execution/binary/f16_matrix_addition.bin": "a19f6dc5",
-  "webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "be7786cc",
-  "webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "afbc3dd2",
-  "webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "84f6917",
-  "webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "9036e4da",
-  "webgpu/shader/execution/binary/f16_multiplication.bin": "946528a5",
-  "webgpu/shader/execution/binary/f16_remainder.bin": "6e7cb89",
-  "webgpu/shader/execution/binary/f16_subtraction.bin": "55fe509d",
-  "webgpu/shader/execution/binary/f32_addition.bin": "3d2058bb",
-  "webgpu/shader/execution/binary/f32_logical.bin": "390ba598",
-  "webgpu/shader/execution/binary/f32_division.bin": "73fa9316",
-  "webgpu/shader/execution/binary/f32_matrix_addition.bin": "afb0e609",
-  "webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "745cb3d9",
-  "webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "1fa39b30",
-  "webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "a0b386f7",
-  "webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "89c1eca2",
-  "webgpu/shader/execution/binary/f32_multiplication.bin": "712f02a6",
-  "webgpu/shader/execution/binary/f32_remainder.bin": "8304c08d",
-  "webgpu/shader/execution/binary/f32_subtraction.bin": "ccdf094f",
-  "webgpu/shader/execution/binary/i32_arithmetic.bin": "8a775ab8",
-  "webgpu/shader/execution/binary/i32_comparison.bin": "dd37b753",
-  "webgpu/shader/execution/binary/u32_arithmetic.bin": "c3781404",
-  "webgpu/shader/execution/binary/u32_comparison.bin": "bed8f168",
-  "webgpu/shader/execution/abs.bin": "61e06f54",
-  "webgpu/shader/execution/acos.bin": "1402a723",
-  "webgpu/shader/execution/acosh.bin": "828c987f",
-  "webgpu/shader/execution/asin.bin": "557d3d3f",
-  "webgpu/shader/execution/asinh.bin": "be348f39",
-  "webgpu/shader/execution/atan.bin": "963520fc",
-  "webgpu/shader/execution/atan2.bin": "a912218b",
-  "webgpu/shader/execution/atanh.bin": "f46f32cc",
-  "webgpu/shader/execution/bitcast.bin": "44bd25ea",
-  "webgpu/shader/execution/ceil.bin": "7debbc4c",
-  "webgpu/shader/execution/clamp.bin": "26d3bfb",
-  "webgpu/shader/execution/cos.bin": "a64fea9a",
-  "webgpu/shader/execution/cosh.bin": "dfd5945e",
-  "webgpu/shader/execution/cross.bin": "4835bc3a",
-  "webgpu/shader/execution/degrees.bin": "528e631e",
-  "webgpu/shader/execution/determinant.bin": "e3866c2b",
-  "webgpu/shader/execution/distance.bin": "4d015170",
-  "webgpu/shader/execution/dot.bin": "c67a6363",
-  "webgpu/shader/execution/exp.bin": "c483696",
-  "webgpu/shader/execution/exp2.bin": "b248fa4b",
-  "webgpu/shader/execution/faceForward.bin": "429078d0",
-  "webgpu/shader/execution/floor.bin": "2f4fb64b",
-  "webgpu/shader/execution/fma.bin": "8cf2c018",
-  "webgpu/shader/execution/fract.bin": "4fe1141d",
-  "webgpu/shader/execution/frexp.bin": "38dd5724",
-  "webgpu/shader/execution/inverseSqrt.bin": "b010463d",
-  "webgpu/shader/execution/ldexp.bin": "94762c6c",
-  "webgpu/shader/execution/length.bin": "9007cea7",
-  "webgpu/shader/execution/log.bin": "8918d035",
-  "webgpu/shader/execution/log2.bin": "55ab0d73",
-  "webgpu/shader/execution/max.bin": "ea6871eb",
-  "webgpu/shader/execution/min.bin": "da3976b4",
-  "webgpu/shader/execution/mix.bin": "716aa87b",
-  "webgpu/shader/execution/modf.bin": "97fb95d0",
-  "webgpu/shader/execution/normalize.bin": "b4b3d66d",
-  "webgpu/shader/execution/pack2x16float.bin": "65dca45b",
-  "webgpu/shader/execution/pow.bin": "9c93c51e",
-  "webgpu/shader/execution/quantizeToF16.bin": "9bba3a59",
-  "webgpu/shader/execution/radians.bin": "31835823",
-  "webgpu/shader/execution/reflect.bin": "cef377fe",
-  "webgpu/shader/execution/refract.bin": "6a72b15f",
-  "webgpu/shader/execution/round.bin": "eb65ff2d",
-  "webgpu/shader/execution/saturate.bin": "6be2db42",
-  "webgpu/shader/execution/sign.bin": "6c0ac68f",
-  "webgpu/shader/execution/sin.bin": "6548201",
-  "webgpu/shader/execution/sinh.bin": "df389ed",
-  "webgpu/shader/execution/smoothstep.bin": "90af9360",
-  "webgpu/shader/execution/sqrt.bin": "37f1d81b",
-  "webgpu/shader/execution/step.bin": "a2a1103e",
-  "webgpu/shader/execution/tan.bin": "db82969",
-  "webgpu/shader/execution/tanh.bin": "9469a1c6",
-  "webgpu/shader/execution/transpose.bin": "51d503cb",
-  "webgpu/shader/execution/trunc.bin": "c5e6ed27",
-  "webgpu/shader/execution/unpack2x16float.bin": "a4812794",
-  "webgpu/shader/execution/unpack2x16snorm.bin": "48982cdb",
-  "webgpu/shader/execution/unpack2x16unorm.bin": "8a52d694",
-  "webgpu/shader/execution/unpack4x8snorm.bin": "de64f4f",
-  "webgpu/shader/execution/unpack4x8unorm.bin": "42074fbd",
-  "webgpu/shader/execution/unary/af_arithmetic.bin": "677d6662",
-  "webgpu/shader/execution/unary/af_assignment.bin": "9035f5c0",
-  "webgpu/shader/execution/unary/ai_arithmetic.bin": "62304038",
-  "webgpu/shader/execution/unary/ai_assignment.bin": "d0ecdfb1",
-  "webgpu/shader/execution/unary/bool_conversion.bin": "9df31641",
-  "webgpu/shader/execution/unary/f16_arithmetic.bin": "55060b95",
-  "webgpu/shader/execution/unary/f16_conversion.bin": "2a471445",
-  "webgpu/shader/execution/unary/f32_arithmetic.bin": "de075203",
-  "webgpu/shader/execution/unary/f32_conversion.bin": "8c96deed",
-  "webgpu/shader/execution/unary/i32_arithmetic.bin": "11e8bb3",
-  "webgpu/shader/execution/unary/i32_conversion.bin": "a3062e7d",
-  "webgpu/shader/execution/unary/u32_conversion.bin": "c1c5240c"
+  "webgpu/shader/execution/binary/af_addition.bin": "1843098d",
+  "webgpu/shader/execution/binary/af_logical.bin": "1382526e",
+  "webgpu/shader/execution/binary/af_division.bin": "e0262a88",
+  "webgpu/shader/execution/binary/af_matrix_addition.bin": "1e39ddea",
+  "webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "dd6bc727",
+  "webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "fb15115",
+  "webgpu/shader/execution/binary/af_matrix_subtraction.bin": "d7ba7836",
+  "webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "5a23b6cc",
+  "webgpu/shader/execution/binary/af_multiplication.bin": "e6a5c5e4",
+  "webgpu/shader/execution/binary/af_remainder.bin": "e063382c",
+  "webgpu/shader/execution/binary/af_subtraction.bin": "d43eb5af",
+  "webgpu/shader/execution/binary/ai_arithmetic.bin": "2d6a0f7e",
+  "webgpu/shader/execution/binary/f16_addition.bin": "3346b4bd",
+  "webgpu/shader/execution/binary/f16_logical.bin": "b0bfe351",
+  "webgpu/shader/execution/binary/f16_division.bin": "db83c0cc",
+  "webgpu/shader/execution/binary/f16_matrix_addition.bin": "882f40bb",
+  "webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "cfc4cb6",
+  "webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "b2344dc1",
+  "webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "1822ca",
+  "webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "f5529ab4",
+  "webgpu/shader/execution/binary/f16_multiplication.bin": "9ea35453",
+  "webgpu/shader/execution/binary/f16_remainder.bin": "39fe22c1",
+  "webgpu/shader/execution/binary/f16_subtraction.bin": "d65e2e11",
+  "webgpu/shader/execution/binary/f32_addition.bin": "e2576a3b",
+  "webgpu/shader/execution/binary/f32_logical.bin": "a4e17c69",
+  "webgpu/shader/execution/binary/f32_division.bin": "24a41b78",
+  "webgpu/shader/execution/binary/f32_matrix_addition.bin": "4af13f54",
+  "webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "ffe9e80b",
+  "webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "1eb1789c",
+  "webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "e2694b78",
+  "webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "bbf90",
+  "webgpu/shader/execution/binary/f32_multiplication.bin": "63f63b02",
+  "webgpu/shader/execution/binary/f32_remainder.bin": "6a44daa2",
+  "webgpu/shader/execution/binary/f32_subtraction.bin": "a6240f28",
+  "webgpu/shader/execution/binary/i32_arithmetic.bin": "6fee3e4e",
+  "webgpu/shader/execution/binary/i32_comparison.bin": "788881cd",
+  "webgpu/shader/execution/binary/u32_arithmetic.bin": "23da1ed8",
+  "webgpu/shader/execution/binary/u32_comparison.bin": "8ab2e08c",
+  "webgpu/shader/execution/abs.bin": "19017bb1",
+  "webgpu/shader/execution/acos.bin": "9dd5c222",
+  "webgpu/shader/execution/acosh.bin": "c5b7a2b9",
+  "webgpu/shader/execution/asin.bin": "998df766",
+  "webgpu/shader/execution/asinh.bin": "ace06d5a",
+  "webgpu/shader/execution/atan.bin": "b94c5065",
+  "webgpu/shader/execution/atan2.bin": "a2c19388",
+  "webgpu/shader/execution/atanh.bin": "f726651b",
+  "webgpu/shader/execution/bitcast.bin": "81370da9",
+  "webgpu/shader/execution/ceil.bin": "f6fda5fa",
+  "webgpu/shader/execution/clamp.bin": "47a17327",
+  "webgpu/shader/execution/cos.bin": "6b63dc60",
+  "webgpu/shader/execution/cosh.bin": "8fe08827",
+  "webgpu/shader/execution/cross.bin": "2ef763e5",
+  "webgpu/shader/execution/degrees.bin": "c30f7423",
+  "webgpu/shader/execution/determinant.bin": "4dedfa96",
+  "webgpu/shader/execution/distance.bin": "9b71fb94",
+  "webgpu/shader/execution/dot.bin": "db15b119",
+  "webgpu/shader/execution/exp.bin": "65c5d3ab",
+  "webgpu/shader/execution/exp2.bin": "6e7766a1",
+  "webgpu/shader/execution/faceForward.bin": "282fbba6",
+  "webgpu/shader/execution/floor.bin": "dce512dd",
+  "webgpu/shader/execution/fma.bin": "21d0a25e",
+  "webgpu/shader/execution/fract.bin": "82f96adc",
+  "webgpu/shader/execution/frexp.bin": "a41c87a4",
+  "webgpu/shader/execution/inverseSqrt.bin": "ec953eb3",
+  "webgpu/shader/execution/ldexp.bin": "fcfd6224",
+  "webgpu/shader/execution/length.bin": "4da1998f",
+  "webgpu/shader/execution/log.bin": "d99e6690",
+  "webgpu/shader/execution/log2.bin": "4f7644b3",
+  "webgpu/shader/execution/max.bin": "f8bc9388",
+  "webgpu/shader/execution/min.bin": "7b1b016c",
+  "webgpu/shader/execution/mix.bin": "7b257d9c",
+  "webgpu/shader/execution/modf.bin": "fa632cd1",
+  "webgpu/shader/execution/normalize.bin": "ace99215",
+  "webgpu/shader/execution/pack2x16float.bin": "6ef332cb",
+  "webgpu/shader/execution/pow.bin": "7c042e04",
+  "webgpu/shader/execution/quantizeToF16.bin": "7fd41be3",
+  "webgpu/shader/execution/radians.bin": "3e3aae03",
+  "webgpu/shader/execution/reflect.bin": "c75fc3e0",
+  "webgpu/shader/execution/refract.bin": "8455f497",
+  "webgpu/shader/execution/round.bin": "95773d03",
+  "webgpu/shader/execution/saturate.bin": "e2d02ac5",
+  "webgpu/shader/execution/sign.bin": "9c56fda6",
+  "webgpu/shader/execution/sin.bin": "7256a0d6",
+  "webgpu/shader/execution/sinh.bin": "593345a9",
+  "webgpu/shader/execution/smoothstep.bin": "5064d00b",
+  "webgpu/shader/execution/sqrt.bin": "601a4fbc",
+  "webgpu/shader/execution/step.bin": "5596f86a",
+  "webgpu/shader/execution/tan.bin": "ba7975c1",
+  "webgpu/shader/execution/tanh.bin": "cac48441",
+  "webgpu/shader/execution/transpose.bin": "e5d5b2a9",
+  "webgpu/shader/execution/trunc.bin": "95811ca",
+  "webgpu/shader/execution/unpack2x16float.bin": "9995d9a7",
+  "webgpu/shader/execution/unpack2x16snorm.bin": "a4c1d0b4",
+  "webgpu/shader/execution/unpack2x16unorm.bin": "7b130e1f",
+  "webgpu/shader/execution/unpack4x8snorm.bin": "9879686e",
+  "webgpu/shader/execution/unpack4x8unorm.bin": "727028f2",
+  "webgpu/shader/execution/unary/af_arithmetic.bin": "4894a2dc",
+  "webgpu/shader/execution/unary/af_assignment.bin": "b4c538d5",
+  "webgpu/shader/execution/unary/ai_arithmetic.bin": "3272cb52",
+  "webgpu/shader/execution/unary/ai_assignment.bin": "c2877676",
+  "webgpu/shader/execution/unary/bool_conversion.bin": "97ef95b3",
+  "webgpu/shader/execution/unary/f16_arithmetic.bin": "86b56801",
+  "webgpu/shader/execution/unary/f16_conversion.bin": "5cf66fac",
+  "webgpu/shader/execution/unary/f32_arithmetic.bin": "c7b8416",
+  "webgpu/shader/execution/unary/f32_conversion.bin": "b0af00cd",
+  "webgpu/shader/execution/unary/i32_arithmetic.bin": "b2d016ce",
+  "webgpu/shader/execution/unary/i32_conversion.bin": "ca9cd82d",
+  "webgpu/shader/execution/unary/u32_conversion.bin": "40797b79"
 }
diff --git a/src/webgpu/shader/validation/expression/call/builtin/acos.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/acos.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { absBigInt } from '../../../../../util/math.js';
@@ -67,7 +67,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
   });
 
 // f32 is included here to confirm that validation is failing due to a type issue and not something else.
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/acosh.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/acosh.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   TypeAbstractInt,
   kConvertableToFloatScalarsAndVectors,
   TypeAbstractFloat,
@@ -70,7 +70,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord(kAllConcreteIntegerScalarsAndVectors);
+const kIntegerArgumentTypes = objectsToRecord(kConcreteIntegerScalarsAndVectors);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/asin.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/asin.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { absBigInt } from '../../../../../util/math.js';
@@ -66,7 +66,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/asinh.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/asinh.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
   TypeAbstractFloat,
 } from '../../../../../util/conversion.js';
@@ -72,7 +72,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/atan.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/atan.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { ShaderValidationTest } from '../../../shader_validation_test.js';
@@ -63,7 +63,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/atan2.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/atan2.spec.ts
@@ -11,8 +11,8 @@ import {
   Vector,
   VectorType,
   elementType,
-  kAllFloatScalarsAndVectors,
-  kAllConcreteIntegerScalarsAndVectors,
+  kFloatScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { isRepresentable } from '../../../../../util/floating_point.js';
 import { ShaderValidationTest } from '../../../shader_validation_test.js';
@@ -28,7 +28,7 @@ import {
 
 export const g = makeTestGroup(ShaderValidationTest);
 
-const kValuesTypes = objectsToRecord(kAllFloatScalarsAndVectors);
+const kValuesTypes = objectsToRecord(kFloatScalarsAndVectors);
 
 g.test('values')
   .desc(
@@ -75,7 +75,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument_y')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/atanh.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/atanh.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { absBigInt } from '../../../../../util/math.js';
@@ -66,7 +66,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() rejec
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/ceil.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/ceil.spec.ts
@@ -9,7 +9,7 @@ import {
   TypeF16,
   TypeF32,
   elementType,
-  kAllConcreteIntegerScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
   kConvertableToFloatScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { ShaderValidationTest } from '../../../shader_validation_test.js';
@@ -55,7 +55,7 @@ Validates that constant evaluation and override evaluation of ${builtin}() never
     );
   });
 
-const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kAllConcreteIntegerScalarsAndVectors]);
+const kIntegerArgumentTypes = objectsToRecord([TypeF32, ...kConcreteIntegerScalarsAndVectors]);
 
 g.test('integer_argument')
   .desc(

diff --git a/src/webgpu/shader/validation/expression/call/builtin/clamp.spec.ts b/src/webgpu/shader/validation/expression/call/builtin/clamp.spec.ts
@@ -8,8 +8,8 @@ import { keysOf, objectsToRecord } from '../../../../../../common/util/data_tabl
 import {
   TypeF16,
   elementType,
-  kAllFloatScalarsAndVectors,
-  kAllConcreteIntegerScalarsAndVectors,
+  kFloatScalarsAndVectors,
+  kConcreteIntegerScalarsAndVectors,
 } from '../../../../../util/conversion.js';
 import { ShaderValidationTest } from '../../../shader_validation_test.js';
 
@@ -23,8 +23,8 @@ import {
 export const g = makeTestGroup(ShaderValidationTest);
 
 const kValuesTypes = objectsToRecord([
-  ...kAllFloatScalarsAndVectors,
-  ...kAllConcreteIntegerScalarsAndVectors,
+  ...kFloatScalarsAndVectors,
+  ...kConcreteIntegerScalarsAndVectors,
 ]);
 
 g.test('values')