Skip to content

Commit

Permalink
Simplify some type constants
Browse files Browse the repository at this point in the history 
This CL adds `kAllScalarsAndVec` and a
`kConvertableToFloatScalarsAndVec` helper types which allow removing a
couple of the combined type helpers.
  • Loading branch information
@dj2
dj2 committed Mar 7, 2024
1 parent 561ab2a commit d508fdd
Show file tree
Hide file tree
Showing 31 changed files with 229 additions and 322 deletions.
216 changes: 108 additions & 108 deletions src/resources/cache/hashes.json
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,110 @@
{
"webgpu/shader/execution/binary/af_addition.bin": "de575056",
"webgpu/shader/execution/binary/af_logical.bin": "dc2105f8",
"webgpu/shader/execution/binary/af_division.bin": "d7e6d98f",
"webgpu/shader/execution/binary/af_matrix_addition.bin": "c215cf6d",
"webgpu/shader/execution/binary/af_matrix_subtraction.bin": "57892276",
"webgpu/shader/execution/binary/af_multiplication.bin": "4c282ac2",
"webgpu/shader/execution/binary/af_remainder.bin": "9fdddf97",
"webgpu/shader/execution/binary/af_subtraction.bin": "a27de3c1",
"webgpu/shader/execution/binary/f16_addition.bin": "ecc2aa17",
"webgpu/shader/execution/binary/f16_logical.bin": "1851f647",
"webgpu/shader/execution/binary/f16_division.bin": "2cfec6de",
"webgpu/shader/execution/binary/f16_matrix_addition.bin": "f5b6ef4f",
"webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "c47070a0",
"webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "30b9d67c",
"webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "46b631ba",
"webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "19e6a937",
"webgpu/shader/execution/binary/f16_multiplication.bin": "8fbfc97c",
"webgpu/shader/execution/binary/f16_remainder.bin": "66cd384c",
"webgpu/shader/execution/binary/f16_subtraction.bin": "8b5fed3d",
"webgpu/shader/execution/binary/f32_addition.bin": "2ef1211a",
"webgpu/shader/execution/binary/f32_logical.bin": "3c97c69d",
"webgpu/shader/execution/binary/f32_division.bin": "2867ef0a",
"webgpu/shader/execution/binary/f32_matrix_addition.bin": "da9390d1",
"webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "2d67296e",
"webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "c79709f5",
"webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "38b7c05f",
"webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "f9b675d7",
"webgpu/shader/execution/binary/f32_multiplication.bin": "bb7ee512",
"webgpu/shader/execution/binary/f32_remainder.bin": "e0d16b8f",
"webgpu/shader/execution/binary/f32_subtraction.bin": "755fc63",
"webgpu/shader/execution/binary/i32_arithmetic.bin": "3c1d6f0f",
"webgpu/shader/execution/binary/i32_comparison.bin": "4759dfea",
"webgpu/shader/execution/binary/u32_arithmetic.bin": "6bf6989d",
"webgpu/shader/execution/binary/u32_comparison.bin": "ca8b140b",
"webgpu/shader/execution/abs.bin": "a79b85f3",
"webgpu/shader/execution/acos.bin": "eed1c72",
"webgpu/shader/execution/acosh.bin": "a1b7dc12",
"webgpu/shader/execution/asin.bin": "fbf69cb0",
"webgpu/shader/execution/asinh.bin": "7b8f7a8",
"webgpu/shader/execution/atan.bin": "250334d8",
"webgpu/shader/execution/atan2.bin": "9df3f787",
"webgpu/shader/execution/atanh.bin": "5c79c30d",
"webgpu/shader/execution/bitcast.bin": "964fdecd",
"webgpu/shader/execution/ceil.bin": "246bf087",
"webgpu/shader/execution/clamp.bin": "3a299eaf",
"webgpu/shader/execution/cos.bin": "d3efc52b",
"webgpu/shader/execution/cosh.bin": "867cbf85",
"webgpu/shader/execution/cross.bin": "a1089567",
"webgpu/shader/execution/degrees.bin": "d1cfaeac",
"webgpu/shader/execution/determinant.bin": "44faf0f8",
"webgpu/shader/execution/distance.bin": "e1191c92",
"webgpu/shader/execution/dot.bin": "242201b",
"webgpu/shader/execution/exp.bin": "e5f97f39",
"webgpu/shader/execution/exp2.bin": "65bd37ec",
"webgpu/shader/execution/faceForward.bin": "ebb6017a",
"webgpu/shader/execution/floor.bin": "a24e0ff8",
"webgpu/shader/execution/fma.bin": "87615a5f",
"webgpu/shader/execution/fract.bin": "eab1b9fa",
"webgpu/shader/execution/frexp.bin": "7dd8033",
"webgpu/shader/execution/inverseSqrt.bin": "356b47c5",
"webgpu/shader/execution/ldexp.bin": "788fdf3e",
"webgpu/shader/execution/length.bin": "69f13c20",
"webgpu/shader/execution/log.bin": "dc9c311c",
"webgpu/shader/execution/log2.bin": "d1a49443",
"webgpu/shader/execution/max.bin": "6750f2eb",
"webgpu/shader/execution/min.bin": "c8200395",
"webgpu/shader/execution/mix.bin": "86c40712",
"webgpu/shader/execution/modf.bin": "50483a83",
"webgpu/shader/execution/normalize.bin": "244a8e05",
"webgpu/shader/execution/pack2x16float.bin": "dcd8656d",
"webgpu/shader/execution/pow.bin": "633c917a",
"webgpu/shader/execution/quantizeToF16.bin": "f6044bd2",
"webgpu/shader/execution/radians.bin": "a90b21ea",
"webgpu/shader/execution/reflect.bin": "670fbba2",
"webgpu/shader/execution/refract.bin": "63b06feb",
"webgpu/shader/execution/round.bin": "d4c09bde",
"webgpu/shader/execution/saturate.bin": "d4f8a4d0",
"webgpu/shader/execution/sign.bin": "57c988b9",
"webgpu/shader/execution/sin.bin": "59aab9f5",
"webgpu/shader/execution/sinh.bin": "3890a90c",
"webgpu/shader/execution/smoothstep.bin": "b695fd45",
"webgpu/shader/execution/sqrt.bin": "9524c93",
"webgpu/shader/execution/step.bin": "b9cc90a4",
"webgpu/shader/execution/tan.bin": "e5792957",
"webgpu/shader/execution/tanh.bin": "ba99c688",
"webgpu/shader/execution/transpose.bin": "83588805",
"webgpu/shader/execution/trunc.bin": "aad5d037",
"webgpu/shader/execution/unpack2x16float.bin": "493cbe7b",
"webgpu/shader/execution/unpack2x16snorm.bin": "fd0b5eb9",
"webgpu/shader/execution/unpack2x16unorm.bin": "f7436a6c",
"webgpu/shader/execution/unpack4x8snorm.bin": "eca842d9",
"webgpu/shader/execution/unpack4x8unorm.bin": "8654f67e",
"webgpu/shader/execution/unary/af_arithmetic.bin": "e05d3c45",
"webgpu/shader/execution/unary/af_assignment.bin": "45da8cfe",
"webgpu/shader/execution/unary/bool_conversion.bin": "dd71f171",
"webgpu/shader/execution/unary/f16_arithmetic.bin": "9c17fdca",
"webgpu/shader/execution/unary/f16_conversion.bin": "c02b6c8",
"webgpu/shader/execution/unary/f32_arithmetic.bin": "feff26f7",
"webgpu/shader/execution/unary/f32_conversion.bin": "f2639f4c",
"webgpu/shader/execution/unary/i32_arithmetic.bin": "c69716e2",
"webgpu/shader/execution/unary/i32_conversion.bin": "83218e69",
"webgpu/shader/execution/unary/u32_conversion.bin": "8f5bad00",
"webgpu/shader/execution/unary/ai_assignment.bin": "c7e6ac33",
"webgpu/shader/execution/binary/ai_arithmetic.bin": "dfcd593a",
"webgpu/shader/execution/unary/ai_arithmetic.bin": "3d27dc97",
"webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "7e551ea1",
"webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "fe7ea65b",
"webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "2a98deaa"
"webgpu/shader/execution/binary/af_addition.bin": "f6b8c7a3",
"webgpu/shader/execution/binary/af_logical.bin": "d97d5423",
"webgpu/shader/execution/binary/af_division.bin": "c0a23e30",
"webgpu/shader/execution/binary/af_matrix_addition.bin": "836fdadd",
"webgpu/shader/execution/binary/af_matrix_subtraction.bin": "c967f638",
"webgpu/shader/execution/binary/af_multiplication.bin": "4096f2d3",
"webgpu/shader/execution/binary/af_remainder.bin": "a3a0d73d",
"webgpu/shader/execution/binary/af_subtraction.bin": "439916d4",
"webgpu/shader/execution/binary/f16_addition.bin": "1d97efbd",
"webgpu/shader/execution/binary/f16_logical.bin": "b96c0fba",
"webgpu/shader/execution/binary/f16_division.bin": "72375b24",
"webgpu/shader/execution/binary/f16_matrix_addition.bin": "7d3ac55b",
"webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "8c677a43",
"webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "a77a4022",
"webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "1675b330",
"webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "d296aaeb",
"webgpu/shader/execution/binary/f16_multiplication.bin": "b73310de",
"webgpu/shader/execution/binary/f16_remainder.bin": "67826a5d",
"webgpu/shader/execution/binary/f16_subtraction.bin": "ae694c3f",
"webgpu/shader/execution/binary/f32_addition.bin": "2b015af2",
"webgpu/shader/execution/binary/f32_logical.bin": "bd92a193",
"webgpu/shader/execution/binary/f32_division.bin": "87969879",
"webgpu/shader/execution/binary/f32_matrix_addition.bin": "366919a9",
"webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "8eaed605",
"webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "a845e9d3",
"webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "525a1bf5",
"webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "c0bac301",
"webgpu/shader/execution/binary/f32_multiplication.bin": "ca19028f",
"webgpu/shader/execution/binary/f32_remainder.bin": "bc218fca",
"webgpu/shader/execution/binary/f32_subtraction.bin": "3df6f329",
"webgpu/shader/execution/binary/i32_arithmetic.bin": "d328867",
"webgpu/shader/execution/binary/i32_comparison.bin": "35670d91",
"webgpu/shader/execution/binary/u32_arithmetic.bin": "15d81411",
"webgpu/shader/execution/binary/u32_comparison.bin": "7c9a5f78",
"webgpu/shader/execution/abs.bin": "f5fe25df",
"webgpu/shader/execution/acos.bin": "d8cf5857",
"webgpu/shader/execution/acosh.bin": "4e8f86c6",
"webgpu/shader/execution/asin.bin": "8517bb78",
"webgpu/shader/execution/asinh.bin": "2671a2e6",
"webgpu/shader/execution/atan.bin": "d298ea1",
"webgpu/shader/execution/atan2.bin": "a98dc214",
"webgpu/shader/execution/atanh.bin": "f3e98b21",
"webgpu/shader/execution/bitcast.bin": "93e273f5",
"webgpu/shader/execution/ceil.bin": "21e50032",
"webgpu/shader/execution/clamp.bin": "98310607",
"webgpu/shader/execution/cos.bin": "4f19f415",
"webgpu/shader/execution/cosh.bin": "6ee3441d",
"webgpu/shader/execution/cross.bin": "f089bd63",
"webgpu/shader/execution/degrees.bin": "6c331a7b",
"webgpu/shader/execution/determinant.bin": "9518dde4",
"webgpu/shader/execution/distance.bin": "d30dbcee",
"webgpu/shader/execution/dot.bin": "8b06fea4",
"webgpu/shader/execution/exp.bin": "7b265d1b",
"webgpu/shader/execution/exp2.bin": "7c76a221",
"webgpu/shader/execution/faceForward.bin": "d43f1e4d",
"webgpu/shader/execution/floor.bin": "b843ea7d",
"webgpu/shader/execution/fma.bin": "b89b3496",
"webgpu/shader/execution/fract.bin": "dc7144da",
"webgpu/shader/execution/frexp.bin": "850b1e99",
"webgpu/shader/execution/inverseSqrt.bin": "61b87194",
"webgpu/shader/execution/ldexp.bin": "658eb70e",
"webgpu/shader/execution/length.bin": "ace4eb28",
"webgpu/shader/execution/log.bin": "963d3635",
"webgpu/shader/execution/log2.bin": "83f483ff",
"webgpu/shader/execution/max.bin": "eaeea5ec",
"webgpu/shader/execution/min.bin": "412cae2f",
"webgpu/shader/execution/mix.bin": "65773bcb",
"webgpu/shader/execution/modf.bin": "ce1ddfaf",
"webgpu/shader/execution/normalize.bin": "ecee5db4",
"webgpu/shader/execution/pack2x16float.bin": "f3a7b6bb",
"webgpu/shader/execution/pow.bin": "613a0e6c",
"webgpu/shader/execution/quantizeToF16.bin": "3433d327",
"webgpu/shader/execution/radians.bin": "96f2c12",
"webgpu/shader/execution/reflect.bin": "56bbbb7b",
"webgpu/shader/execution/refract.bin": "2b70fd66",
"webgpu/shader/execution/round.bin": "2c47b9f5",
"webgpu/shader/execution/saturate.bin": "e3555202",
"webgpu/shader/execution/sign.bin": "75756c6a",
"webgpu/shader/execution/sin.bin": "5a4f3a8b",
"webgpu/shader/execution/sinh.bin": "fa37178d",
"webgpu/shader/execution/smoothstep.bin": "3f5debdb",
"webgpu/shader/execution/sqrt.bin": "4c529e09",
"webgpu/shader/execution/step.bin": "b458b773",
"webgpu/shader/execution/tan.bin": "eb5dc8d8",
"webgpu/shader/execution/tanh.bin": "6b88d26d",
"webgpu/shader/execution/transpose.bin": "bdd82888",
"webgpu/shader/execution/trunc.bin": "b1d5a82f",
"webgpu/shader/execution/unpack2x16float.bin": "f03430bb",
"webgpu/shader/execution/unpack2x16snorm.bin": "9e840eb9",
"webgpu/shader/execution/unpack2x16unorm.bin": "726fac0f",
"webgpu/shader/execution/unpack4x8snorm.bin": "1f5e6f54",
"webgpu/shader/execution/unpack4x8unorm.bin": "8918267e",
"webgpu/shader/execution/unary/af_arithmetic.bin": "741de58c",
"webgpu/shader/execution/unary/af_assignment.bin": "6a2aaeb6",
"webgpu/shader/execution/unary/bool_conversion.bin": "2eadc2b3",
"webgpu/shader/execution/unary/f16_arithmetic.bin": "89aa5484",
"webgpu/shader/execution/unary/f16_conversion.bin": "b7c73364",
"webgpu/shader/execution/unary/f32_arithmetic.bin": "7cad96bf",
"webgpu/shader/execution/unary/f32_conversion.bin": "5b468aa4",
"webgpu/shader/execution/unary/i32_arithmetic.bin": "bed3c1f3",
"webgpu/shader/execution/unary/i32_conversion.bin": "ce4e9dc1",
"webgpu/shader/execution/unary/u32_conversion.bin": "3dbe0092",
"webgpu/shader/execution/unary/ai_assignment.bin": "ba16869",
"webgpu/shader/execution/binary/ai_arithmetic.bin": "64b9b1f0",
"webgpu/shader/execution/unary/ai_arithmetic.bin": "d55aa83c",
"webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "c62320ba",
"webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "836f8d94",
"webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "24aeaaf"
}
Binary file modified src/resources/cache/webgpu/shader/execution/bitcast.bin
View file
Binary file not shown.
12 changes: 2 additions & 10 deletions src/webgpu/shader/validation/expression/call/builtin/abs.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ Validation tests for the ${builtin}() builtin.

import { makeTestGroup } from '../../../../../../common/framework/test_group.js';
import { keysOf, objectsToRecord } from '../../../../../../common/util/data_tables.js';
import {
TypeF16,
elementType,
kAllFloatAndConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
} from '../../../../../util/conversion.js';
import { TypeF16, elementType, kAllScalarsAndVec } from '../../../../../util/conversion.js';
import { ShaderValidationTest } from '../../../shader_validation_test.js';

import {
Expand All @@ -22,10 +17,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatAndConcreteIntegerScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kAllScalarsAndVec);

g.test('values')
.desc(
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/acos.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { absBigInt } from '../../../../../util/math.js';
import { ShaderValidationTest } from '../../../shader_validation_test.js';
Expand All @@ -27,10 +26,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

g.test('values')
.desc(
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/acosh.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
TypeAbstractInt,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
TypeAbstractFloat,
} from '../../../../../util/conversion.js';
import { isRepresentable } from '../../../../../util/floating_point.js';
Expand All @@ -29,10 +28,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

g.test('values')
.desc(
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/asin.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { absBigInt } from '../../../../../util/math.js';
import { ShaderValidationTest } from '../../../shader_validation_test.js';
Expand All @@ -27,10 +26,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

g.test('values')
.desc(
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/asinh.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
TypeAbstractFloat,
} from '../../../../../util/conversion.js';
import { isRepresentable } from '../../../../../util/floating_point.js';
Expand All @@ -29,10 +28,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

const additionalRangeForType = rangeForType(
linearRange(-2000, 2000, 10),
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/atan.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { ShaderValidationTest } from '../../../shader_validation_test.js';

Expand All @@ -26,10 +25,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

g.test('values')
.desc(
Expand Down
8 changes: 2 additions & 6 deletions src/webgpu/shader/validation/expression/call/builtin/atanh.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
TypeF16,
TypeF32,
elementType,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
kAllAbstractIntegerScalarAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { absBigInt } from '../../../../../util/math.js';
import { ShaderValidationTest } from '../../../shader_validation_test.js';
Expand All @@ -27,10 +26,7 @@ import {

export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllAbstractIntegerScalarAndVectors,
...kAllFloatScalarsAndVectors,
]);
const kValuesTypes = objectsToRecord(kConvertableToFloatScalarsAndVec);

g.test('values')
.desc(
Expand Down
Loading

0 comments on commit d508fdd

Please sign in to comment.