Skip to content
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

Add more uniformity tests #3269

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Add more uniformity tests #3269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a73f4
Add more uniformity tests
alan-baker Jan 16, 2024
09d7d0e
Distinguish tests
alan-baker Jan 16, 2024
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
1 change: 1 addition & 0 deletions src/webgpu/capability_info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ export const kKnownWGSLLanguageFeatures = [
'readonly_and_readwrite_storage_textures',
'packed_4x8_integer_dot_product',
'unrestricted_pointer_parameters',
'pointer_composite_access',
] as const;

export type WGSLLanguageFeature = (typeof kKnownWGSLLanguageFeatures)[number];
187 changes: 184 additions & 3 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 @@ -367,7 +367,14 @@ function generatePointerCheck(check: string): string {
}
}

const kPointerCases = {
interface PointerCase {
code: string;
check: 'address' | 'contents';
uniform: boolean | 'never';
needs_deref_sugar?: boolean;
}

const kPointerCases: Record<string, PointerCase> = {
address_uniform_literal: {
code: `let ptr = &wg_array[0];`,
check: `address`,
Expand Down Expand Up @@ -585,6 +592,168 @@ const kPointerCases = {
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref1: {
code: `*&func_scalar = uniform_value;
let test_val = func_scalar;`,
check: `contents`,
uniform: true,
},
contents_lhs_ref_pointer_deref1a: {
code: `*&func_scalar = nonuniform_value;
let test_val = func_scalar;`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref2: {
code: `*&(func_array[nonuniform_value]) = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref2a: {
code: `(func_array[nonuniform_value]) = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref3: {
code: `*&(func_array[needs_uniform(uniform_value)]) = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: true,
},
contents_lhs_ref_pointer_deref3a: {
code: `*&(func_array[needs_uniform(nonuniform_value)]) = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: 'never',
},
contents_lhs_ref_pointer_deref4: {
code: `*&((*&(func_struct.x[uniform_value])).x[uniform_value].x[uniform_value]) = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: true,
},
contents_lhs_ref_pointer_deref4a: {
code: `*&((*&(func_struct.x[uniform_value])).x[uniform_value].x[uniform_value]) = nonuniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref4b: {
code: `*&((*&(func_struct.x[uniform_value])).x[uniform_value].x[nonuniform_value]) = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref4c: {
code: `*&((*&(func_struct.x[uniform_value])).x[nonuniform_value]).x[uniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref4d: {
code: `*&((*&(func_struct.x[nonuniform_value])).x[uniform_value].x)[uniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
},
contents_lhs_ref_pointer_deref4e: {
code: `*&((*&(func_struct.x[uniform_value])).x[needs_uniform(nonuniform_value)].x[uniform_value]) = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: 'never',
},

// The following cases require the 'pointer_composite_access' language feature.
contents_lhs_pointer_deref2: {
code: `(&func_array)[nonuniform_value] = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref2a: {
code: `(&func_array)[nonuniform_value] = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These last two cases look identical? Maybe the first was meant to be a uniform case?

contents_lhs_pointer_deref3: {
code: `(&func_array)[needs_uniform(uniform_value)] = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: true,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref3a: {
code: `(&func_array)[needs_uniform(nonuniform_value)] = uniform_value;
let test_val = func_array[0];`,
check: `contents`,
uniform: 'never',
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4: {
code: `(&((&(func_struct.x[uniform_value])).x[uniform_value]).x)[uniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: true,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4a: {
code: `(&((&(func_struct.x[uniform_value])).x[uniform_value]).x)[uniform_value] = nonuniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4b: {
code: `(&((&(func_struct.x[uniform_value])).x)[uniform_value]).x[nonuniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4c: {
code: `(&((&(func_struct.x[uniform_value])).x[nonuniform_value]).x)[uniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4d: {
code: `(&((&(func_struct.x[nonuniform_value])).x[uniform_value]).x)[uniform_value] = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_lhs_pointer_deref4e: {
code: `(&((&(func_struct.x[uniform_value])).x)[needs_uniform(nonuniform_value)].x[uniform_value]) = uniform_value;
let test_val = func_struct.x[0].x[0].x[0];`,
check: `contents`,
uniform: 'never',
needs_deref_sugar: true,
},
contents_rhs_pointer_deref1: {
code: `let test_val = (&func_array)[uniform_value];`,
check: `contents`,
uniform: true,
needs_deref_sugar: true,
},
contents_rhs_pointer_deref1a: {
code: `let test_val = (&func_array)[nonuniform_value];`,
check: `contents`,
uniform: false,
needs_deref_sugar: true,
},
contents_rhs_pointer_deref2: {
code: `let test_val = (&func_array)[needs_uniform(nonuniform_value)];`,
check: `contents`,
uniform: `never`,
needs_deref_sugar: true,
},
};

g.test('pointers')
Expand Down Expand Up @@ -612,6 +781,13 @@ var<storage> uniform_value : u32;
@group(0) @binding(1)
var<storage, read_write> nonuniform_value : u32;

fn needs_uniform(val : u32) -> u32{
if val == 0 {
workgroupBarrier();
}
return val;
}

@compute @workgroup_size(16, 1, 1)
fn main(@builtin(local_invocation_id) lid : vec3<u32>,
@builtin(global_invocation_id) gid : vec3<u32>) {
Expand All @@ -627,11 +803,16 @@ fn main(@builtin(local_invocation_id) lid : vec3<u32>,
`
${generatePointerCheck(testcase.check)}
}`;
if (!testcase.uniform) {

if (testcase.needs_deref_sugar === true) {
t.skipIfLanguageFeatureNotSupported('pointer_composite_access');
}
// Explicitly check false to distinguish from never.
if (testcase.uniform === false) {
const without_check = code + `}\n`;
t.expectCompileResult(true, without_check);
}
t.expectCompileResult(testcase.uniform, with_check);
t.expectCompileResult(testcase.uniform === true, with_check);
});

function expectedUniformity(uniform: string, init: string): boolean {
Expand Down