Skip to content

Add unary, function, and uniformity tests for WGSL immediate pointers #4677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shaoboyan091 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add unary, function, and uniformity tests for WGSL immediate pointers #4677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b21a60
Add unary expression tests for WGSL immediate pointers
shaoboyan091 Jun 5, 2026
e997f0a
Add function tests for WGSL immediate pointers
shaoboyan091 Jun 5, 2026
05a63dd
Add uniformity tests for WGSL immediate reads
shaoboyan091 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/webgpu/shader/validation/expression/unary/address_of_and_indirection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ Validation tests for unary address-of and indirection (dereference)

import { makeTestGroup } from '../../../../../common/framework/test_group.js';
import { keysOf } from '../../../../../common/util/data_tables.js';
import { skipIfImmediateDataNotSupported } from '../../decl/util.js';
import { ShaderValidationTest } from '../../shader_validation_test.js';

export const g = makeTestGroup(ShaderValidationTest);

const kAddressSpaces = ['function', 'private', 'workgroup', 'uniform', 'storage'];
const kAddressSpaces = ['function', 'private', 'workgroup', 'uniform', 'storage', 'immediate'];
const kAccessModes = ['read', 'read_write'];
const kStorageTypes = ['bool', 'u32', 'i32', 'f32', 'f16'];
const kCompositeTypes = ['array', 'struct', 'vec', 'mat'];
Expand Down Expand Up @@ -49,24 +50,33 @@ g.test('basic')
}
return true;
})
.filter(t => {
if (t.addressSpace !== 'immediate') return true;
return t.storageType !== 'bool';
})
.filter(t => {
// This test does not test composite access
return !kDerefTypes[t.derefType].requires_pointer_composite_access;
})
)
.fn(t => {
if (t.params.addressSpace === 'immediate') {
skipIfImmediateDataNotSupported(t);
}
const isLocal = t.params.addressSpace === 'function';
const deref = kDerefTypes[t.params.derefType];
// Only specify access mode for storage buffers
const commaAccessMode = t.params.addressSpace === 'storage' ? `, ${t.params.accessMode}` : '';
const header =
t.params.addressSpace === 'immediate' ? 'requires immediate_address_space;\n' : '';

let varDecl = '';
if (t.params.addressSpace === 'uniform' || t.params.addressSpace === 'storage') {
varDecl += '@group(0) @binding(0) ';
}
varDecl += `var<${t.params.addressSpace}${commaAccessMode}> a : VarType;`;

const wgsl = `
const wgsl = `${header}
${t.params.storageType === 'f16' ? 'enable f16;' : ''}

alias VarType = ${t.params.storageType};
Expand Down Expand Up @@ -111,20 +121,29 @@ g.test('composite')
}
return true;
})
.filter(t => {
if (t.addressSpace !== 'immediate') return true;
return t.compositeType !== 'array' && t.storageType !== 'bool';
})
)
.fn(t => {
if (t.params.addressSpace === 'immediate') {
skipIfImmediateDataNotSupported(t);
}
const isLocal = t.params.addressSpace === 'function';
const deref = kDerefTypes[t.params.derefType];
// Only specify access mode for storage buffers
const commaAccessMode = t.params.addressSpace === 'storage' ? `, ${t.params.accessMode}` : '';
const header =
t.params.addressSpace === 'immediate' ? 'requires immediate_address_space;\n' : '';

let varDecl = '';
if (t.params.addressSpace === 'uniform' || t.params.addressSpace === 'storage') {
varDecl += '@group(0) @binding(0) ';
}
varDecl += `var<${t.params.addressSpace}${commaAccessMode}> a : VarType;`;

let wgsl = `
let wgsl = `${header}
${t.params.storageType === 'f16' ? 'enable f16;' : ''}`;

switch (t.params.compositeType) {
Expand Down
49 changes: 44 additions & 5 deletions src/webgpu/shader/validation/functions/restrictions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export const description = `Validation tests for function restrictions`;

import { makeTestGroup } from '../../../../common/framework/test_group.js';
import { keysOf } from '../../../../common/util/data_tables.js';
import { skipIfImmediateDataNotSupported } from '../decl/util.js';
import { ShaderValidationTest } from '../shader_validation_test.js';

export const g = makeTestGroup(ShaderValidationTest);
Expand Down Expand Up @@ -274,6 +275,10 @@ const kFunctionParamTypeCases: Record<string, ParamTypeCase> = {
name: `ptr<uniform, host_shareable>`,
valid: 'with_unrestricted_pointer_parameters',
},
ptrImmediate: {
name: `ptr<immediate, u32>`,
valid: 'with_unrestricted_pointer_parameters',
},
ptrWorkgroupAtomic: {
name: `ptr<workgroup, atomic<u32>>`,
valid: 'with_unrestricted_pointer_parameters',
Expand Down Expand Up @@ -304,6 +309,12 @@ const kFunctionParamTypeCases: Record<string, ParamTypeCase> = {
invalid_ptr6: { name: `ptr<private,u32,read_write>`, valid: false }, // Can't specify access mode
invalid_ptr7: { name: `ptr<private,clamp>`, valid: false }, // Invalid store type
invalid_ptr8: { name: `ptr<function, texture_external>`, valid: false }, // non-constructible pointer type
invalid_ptr_immediate_access_read: { name: `ptr<immediate, u32, read>`, valid: false },
invalid_ptr_immediate_access_write: { name: `ptr<immediate, u32, write>`, valid: false },
invalid_ptr_immediate_access_read_write: {
name: `ptr<immediate, u32, read_write>`,
valid: false,
},
};

g.test('function_parameter_types')
Expand All @@ -313,8 +324,20 @@ g.test('function_parameter_types')
.fn(t => {
const testcase = kFunctionParamTypeCases[t.params.case];
const enable = testcase.name === 'f16' ? 'enable f16;' : '';
const needsImmediate = testcase.name.includes('immediate');
if (needsImmediate) {
skipIfImmediateDataNotSupported(t);
}
const immediateRequires = needsImmediate ? 'requires immediate_address_space;' : '';
const unrestrictedRequires =
testcase.valid === 'with_unrestricted_pointer_parameters' &&
t.hasLanguageFeature('unrestricted_pointer_parameters')
? 'requires unrestricted_pointer_parameters;'
: '';
const code = `
${enable}
${immediateRequires}
${unrestrictedRequires}

${kCCommonTypeDecls}

Expand Down Expand Up @@ -504,6 +527,11 @@ const kFunctionParamValueCases: Record<string, ParamValueCase> = {
matches: ['ptr12'],
needsUnrestrictedPointerParameters: true,
},
ptrImmediate: {
value: `&immediate_u32`,
matches: ['ptrImmediate'],
needsUnrestrictedPointerParameters: true,
},
ptrWorkgroupOverrideNoDefault: {
value: `&wg_override_no_default`,
matches: ['ptrWorkgroupOverrideNoDefault'],
Expand Down Expand Up @@ -548,8 +576,23 @@ g.test('function_parameter_matching')
const param = kFunctionParamTypeCases[t.params.decl];
const arg = kFunctionParamValueCases[t.params.arg];
const enable = param.name === 'f16' ? 'enable f16;' : '';
const needsUnrestrictedPointerParameters =
(kFunctionParamTypeCases[t.params.decl].valid === 'with_unrestricted_pointer_parameters' ||
arg.needsUnrestrictedPointerParameters) ??
false;
const needsImmediate = param.name.includes('immediate') || t.params.arg === 'ptrImmediate';
if (needsImmediate) {
skipIfImmediateDataNotSupported(t);
}
const immediateRequires = needsImmediate ? 'requires immediate_address_space;' : '';
const unrestrictedRequires =
needsUnrestrictedPointerParameters && t.hasLanguageFeature('unrestricted_pointer_parameters')
? 'requires unrestricted_pointer_parameters;'
: '';
const code = `
${enable}
${immediateRequires}
${unrestrictedRequires}

${kCCommonTypeDecls}
@group(0) @binding(0)
Expand All @@ -573,6 +616,7 @@ var<storage> ro_host_shareable : host_shareable;
var<storage, read_write> rw_host_shareable : host_shareable;
@group(1) @binding(2)
var<uniform> uniform_host_shareable : host_shareable;
${needsImmediate ? 'var<immediate> immediate_u32 : u32;' : ''}

fn bar(param : ${param.name}) { }

Expand Down Expand Up @@ -638,11 +682,6 @@ fn foo() {
}
`;

const needsUnrestrictedPointerParameters =
(kFunctionParamTypeCases[t.params.decl].valid === 'with_unrestricted_pointer_parameters' ||
arg.needsUnrestrictedPointerParameters) ??
false;

let isValid = parameterMatches(t.params.decl, arg.matches);
if (isValid && needsUnrestrictedPointerParameters) {
isValid = t.hasLanguageFeature('unrestricted_pointer_parameters');
Expand Down
18 changes: 18 additions & 0 deletions src/webgpu/shader/validation/uniformity/uniformity.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { makeTestGroup } from '../../../../common/framework/test_group.js';
import { keysOf } from '../../../../common/util/data_tables.js';
import { unreachable } from '../../../../common/util/util.js';
import { WGSLLanguageFeature } from '../../../capability_info.js';
import { skipIfImmediateDataNotSupported } from '../decl/util.js';
import { ShaderValidationTest } from '../shader_validation_test.js';

import { Snippet, LoopCase, compileShouldSucceed } from './snippet.js';
Expand Down Expand Up @@ -41,6 +42,7 @@ const kConditions = [
{ cond: 'uniform_override', expectation: true },
{ cond: 'uniform_let', expectation: true },
{ cond: 'nonuniform_let', expectation: false },
{ cond: 'uniform_immediate', expectation: true },
{ cond: 'uniform_or', expectation: true },
{ cond: 'nonuniform_or1', expectation: false },
{ cond: 'nonuniform_or2', expectation: false },
Expand Down Expand Up @@ -82,6 +84,9 @@ function generateCondition(condition: string): string {
case 'nonuniform_let': {
return `n_let == 0`;
}
case 'uniform_immediate': {
return `immediate_value == 0u`;
}
case 'uniform_or': {
return `u_let == 0 || uniform_buffer.y > 1`;
}
Expand Down Expand Up @@ -468,8 +473,13 @@ g.test('basics')
if (t.params.op === 'textureBarrier' || t.params.cond.startsWith('storage_texture')) {
t.skipIfLanguageFeatureNotSupported('readonly_and_readwrite_storage_textures');
}
const needsImmediate = t.params.cond === 'uniform_immediate';
if (needsImmediate) {
skipIfImmediateDataNotSupported(t);
}

let code = `
${needsImmediate ? 'requires immediate_address_space;' : ''}
@group(0) @binding(0) var s : sampler;
@group(0) @binding(1) var s_comp : sampler_comparison;
@group(0) @binding(2) var tex : texture_2d<f32>;
Expand All @@ -478,6 +488,7 @@ g.test('basics')
@group(1) @binding(0) var<storage, read> ro_buffer : array<f32, 4>;
@group(1) @binding(1) var<storage, read_write> rw_buffer : array<f32, 4>;
@group(1) @binding(2) var<uniform> uniform_buffer : vec4<f32>;
${needsImmediate ? 'var<immediate> immediate_value : u32;' : ''}

@group(2) @binding(0) var ro_storage_texture : texture_storage_2d<rgba8unorm, read>;
@group(2) @binding(1) var rw_storage_texture : texture_storage_2d<rgba8unorm, read_write>;
Expand Down Expand Up @@ -566,8 +577,14 @@ g.test('basics,subgroups')
.combine('stage', ['compute', 'fragment'] as const)
)
.fn(t => {
const needsImmediate = t.params.cond === 'uniform_immediate';
if (needsImmediate) {
skipIfImmediateDataNotSupported(t);
}

let code = `
enable subgroups;
${needsImmediate ? 'requires immediate_address_space;' : ''}

@group(0) @binding(0) var s : sampler;
@group(0) @binding(1) var s_comp : sampler_comparison;
Expand All @@ -577,6 +594,7 @@ g.test('basics,subgroups')
@group(1) @binding(0) var<storage, read> ro_buffer : array<f32, 4>;
@group(1) @binding(1) var<storage, read_write> rw_buffer : array<f32, 4>;
@group(1) @binding(2) var<uniform> uniform_buffer : vec4<f32>;
${needsImmediate ? 'var<immediate> immediate_value : u32;' : ''}

@group(2) @binding(0) var ro_storage_texture : texture_storage_2d<rgba8unorm, read>;
@group(2) @binding(1) var rw_storage_texture : texture_storage_2d<rgba8unorm, read_write>;
Expand Down
Loading