From b73e8cc29fbd6073397bf92b1b4ae494c96a34f7 Mon Sep 17 00:00:00 2001 From: Antonio Maiorano Date: Mon, 12 Feb 2024 14:25:19 -0500 Subject: [PATCH] Add missing types to indirection expression tests (#3384) Add bool, u32, and f16 to tests. --- .../expression/unary/indirection.spec.ts | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/webgpu/shader/execution/expression/unary/indirection.spec.ts b/src/webgpu/shader/execution/expression/unary/indirection.spec.ts index 0574df57c4e1..795b07deea42 100644 --- a/src/webgpu/shader/execution/expression/unary/indirection.spec.ts +++ b/src/webgpu/shader/execution/expression/unary/indirection.spec.ts @@ -48,10 +48,15 @@ Pointer expression dereference. u .combine('inputSource', allButConstInputSource) .combine('vectorize', [undefined, 2, 3, 4] as const) - .combine('scalarType', ['u32', 'i32', 'f32'] as ScalarKind[]) + .combine('scalarType', ['bool', 'u32', 'i32', 'f32', 'f16'] as ScalarKind[]) .combine('derefType', keysOf(kDerefCases)) .filter(p => !kDerefCases[p.derefType].requires_pointer_composite_access) ) + .beforeAllSubcases(t => { + if (t.params.scalarType === 'f16') { + t.selectDeviceOrSkipTestCase({ requiredFeatures: ['shader-f16'] }); + } + }) .fn(async t => { const ty = scalarType(t.params.scalarType); const cases = sparseScalarF32Range().map(e => { @@ -83,9 +88,14 @@ Pointer expression dereference as lhs of index accessor expression u .combine('inputSource', allButConstInputSource) .combine('vectorize', [undefined, 2, 3, 4] as const) - .combine('scalarType', ['i32', 'f32'] as ScalarKind[]) + .combine('scalarType', ['bool', 'u32', 'i32', 'f32', 'f16'] as ScalarKind[]) .combine('derefType', keysOf(kDerefCases)) ) + .beforeAllSubcases(t => { + if (t.params.scalarType === 'f16') { + t.selectDeviceOrSkipTestCase({ requiredFeatures: ['shader-f16'] }); + } + }) .fn(async t => { if ( kDerefCases[t.params.derefType].requires_pointer_composite_access && @@ -124,9 +134,14 @@ Pointer expression dereference as lhs of member accessor expression u .combine('inputSource', allButConstInputSource) .combine('vectorize', [undefined, 2, 3, 4] as const) - .combine('scalarType', ['i32', 'f32'] as ScalarKind[]) + .combine('scalarType', ['bool', 'u32', 'i32', 'f32', 'f16'] as ScalarKind[]) .combine('derefType', keysOf(kDerefCases)) ) + .beforeAllSubcases(t => { + if (t.params.scalarType === 'f16') { + t.selectDeviceOrSkipTestCase({ requiredFeatures: ['shader-f16'] }); + } + }) .fn(async t => { if ( kDerefCases[t.params.derefType].requires_pointer_composite_access &&