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

Remove subgroups f16 enable from cts ("subgroups_f16") #4083

Merged
merged 6 commits into from
Dec 11, 2024
Merged

Remove subgroups f16 enable from cts ("subgroups_f16") #4083

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb20a7e
Full removal of subgroups_f16 enable
Dec 5, 2024
2d074b5
Merge branch 'gpuweb:main' into remove_subgroups_f16_enable_from_cts
petermcneeleychromium Dec 9, 2024
6b420d4
Subgroup f16 pass
Dec 11, 2024
52a18eb
Add back f16 enable for subgroup f16 tests
Dec 11, 2024
4762b76
Merge branch 'main' into remove_subgroups_f16_enable_from_cts
petermcneeleychromium Dec 11, 2024
74d9db3
minor formatting fix
Dec 11, 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
3 changes: 1 addition & 2 deletions src/webgpu/shader/execution/expression/call/builtin/quadBroadcast.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ g.test('data_types')
const features: GPUFeatureName[] = ['subgroups' as GPUFeatureName];
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -119,7 +118,7 @@ g.test('data_types')
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
3 changes: 1 addition & 2 deletions src/webgpu/shader/execution/expression/call/builtin/quadSwap.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ g.test('data_types')
const features: GPUFeatureName[] = ['subgroups' as GPUFeatureName];
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -141,7 +140,7 @@ g.test('data_types')
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
4 changes: 1 addition & 3 deletions src/webgpu/shader/execution/expression/call/builtin/subgroupAdd.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ and limit the number of permutations needed to calculate the final result.`
const features: GPUFeatureName[] = ['subgroups' as GPUFeatureName];
if (t.params.type === 'f16') {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand Down Expand Up @@ -170,7 +169,6 @@ TODO: support vec3 types.
const type = kDataTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand All @@ -183,7 +181,7 @@ TODO: support vec3 types.
const scalarType = scalarTypeOf(type);
let enables = 'enable subgroups;\n';
if (type.requiresF16()) {
enables += 'enable f16;\nenable subgroups_f16;\n';
enables += 'enable f16;\n';
}

const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];
Expand Down
3 changes: 1 addition & 2 deletions src/webgpu/shader/execution/expression/call/builtin/subgroupBroadcast.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ g.test('data_types')
const type = kDataTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand All @@ -119,7 +118,7 @@ g.test('data_types')
const type = kDataTypes[t.params.type];
let enables = 'enable subgroups;\n';
if (type.requiresF16()) {
enables += 'enable f16;\nenable subgroups_f16;\n';
enables += 'enable f16;\n';
}

const broadcast =
Expand Down
4 changes: 1 addition & 3 deletions src/webgpu/shader/execution/expression/call/builtin/subgroupMul.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ and limit the number of permutations needed to calculate the final result.`
const features: GPUFeatureName[] = ['subgroups' as GPUFeatureName];
if (t.params.type === 'f16') {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand Down Expand Up @@ -188,7 +187,6 @@ TODO: support vec3 types.
const type = kDataTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand All @@ -201,7 +199,7 @@ TODO: support vec3 types.
const scalarType = scalarTypeOf(type);
let enables = 'enable subgroups;\n';
if (type.requiresF16()) {
enables += 'enable f16;\nenable subgroups_f16;\n';
enables += 'enable f16;\n';
}

const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];
Expand Down
3 changes: 1 addition & 2 deletions src/webgpu/shader/execution/expression/call/builtin/subgroupShuffle.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,6 @@ g.test('data_types')
const features: GPUFeatureName[] = ['subgroups' as GPUFeatureName];
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -748,7 +747,7 @@ g.test('data_types')
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
2 changes: 1 addition & 1 deletion src/webgpu/shader/execution/expression/call/builtin/subgroup_util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export async function runAccuracyTest(
const val1 = range[prng.uniformInt(numVals)];
const val2 = range[prng.uniformInt(numVals)];

const extraEnables = type === 'f16' ? `enable f16;\nenable subgroups_f16;` : ``;
const extraEnables = type === 'f16' ? `enable f16;` : ``;
const wgsl = `
enable subgroups;
${extraEnables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/quadBroadcast.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ g.test('data_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -94,7 +93,7 @@ g.test('data_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -130,7 +129,6 @@ g.test('return_type')
const dataType = kArgumentTypes[t.params.dataType];
const retType = kArgumentTypes[t.params.retType];
if (dataType.requiresF16() || retType.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -140,7 +138,7 @@ g.test('return_type')
const retType = kArgumentTypes[t.params.retType];
let enables = `enable subgroups;\n`;
if (dataType.requiresF16() || retType.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/quadSwap.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,14 @@ g.test('data_type')
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
.fn(t => {
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -134,7 +133,6 @@ g.test('return_type')
const paramType = kTypes[t.params.paramType];
if (retType.requiresF16() || paramType.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand All @@ -143,7 +141,7 @@ g.test('return_type')
const paramType = kTypes[t.params.paramType];
let enables = `enable subgroups;\n`;
if (retType.requiresF16() || paramType.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupAdd.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ g.test('data_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -88,7 +87,7 @@ g.test('data_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -126,7 +125,6 @@ g.test('return_type')
const dataType = kArgumentTypes[t.params.dataType];
const retType = kArgumentTypes[t.params.retType];
if (dataType.requiresF16() || retType.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -136,7 +134,7 @@ g.test('return_type')
const retType = kArgumentTypes[t.params.retType];
let enables = `enable subgroups;\n`;
if (dataType.requiresF16() || retType.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupAnyAll.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,14 @@ g.test('data_type')
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
.fn(t => {
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -126,15 +125,14 @@ g.test('return_type')
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
.fn(t => {
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupBallot.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ g.test('data_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -89,7 +88,7 @@ g.test('data_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand All @@ -114,7 +113,6 @@ g.test('return_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -123,7 +121,7 @@ g.test('return_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupBitwise.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,14 @@ g.test('data_type')
const type = kTypes[t.params.type];
if (type.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
.fn(t => {
const type = kTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -135,7 +134,6 @@ g.test('return_type')
const paramType = kTypes[t.params.paramType];
if (retType.requiresF16() || paramType.requiresF16()) {
features.push('shader-f16');
features.push('subgroups-f16' as GPUFeatureName);
}
t.selectDeviceOrSkipTestCase(features);
})
Expand All @@ -144,7 +142,7 @@ g.test('return_type')
const paramType = kTypes[t.params.paramType];
let enables = `enable subgroups;\n`;
if (retType.requiresF16() || paramType.requiresF16()) {
enables += `enable f16;\nenable subgroups_f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupBroadcast.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ g.test('data_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -94,7 +93,7 @@ g.test('data_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -130,7 +129,6 @@ g.test('return_type')
const dataType = kArgumentTypes[t.params.dataType];
const retType = kArgumentTypes[t.params.retType];
if (dataType.requiresF16() || retType.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -140,7 +138,7 @@ g.test('return_type')
const retType = kArgumentTypes[t.params.retType];
let enables = `enable subgroups;\n`;
if (dataType.requiresF16() || retType.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
6 changes: 2 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/subgroupBroadcastFirst.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ g.test('data_type')
const features = ['subgroups' as GPUFeatureName];
const type = kArgumentTypes[t.params.type];
if (type.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -89,7 +88,7 @@ g.test('data_type')
const type = kArgumentTypes[t.params.type];
let enables = `enable subgroups;\n`;
if (type.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down Expand Up @@ -125,7 +124,6 @@ g.test('return_type')
const dataType = kArgumentTypes[t.params.dataType];
const retType = kArgumentTypes[t.params.retType];
if (dataType.requiresF16() || retType.requiresF16()) {
features.push('subgroups-f16' as GPUFeatureName);
features.push('shader-f16');
}
t.selectDeviceOrSkipTestCase(features);
Expand All @@ -135,7 +133,7 @@ g.test('return_type')
const retType = kArgumentTypes[t.params.retType];
let enables = `enable subgroups;\n`;
if (dataType.requiresF16() || retType.requiresF16()) {
enables += `enable subgroups_f16;\nenable f16;`;
enables += `enable f16;`;
}
const wgsl = `
${enables}
Expand Down
Loading
Loading