Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,7 @@ g.test('fragment')
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
}
const { subgroupMinSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,10 +538,7 @@ g.test('fragment,all_active')
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
const numInputs = t.params.size[0] * t.params.size[1];

interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
}
const { subgroupMinSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -463,11 +463,8 @@ g.test('compute,split')
const testcase = kPredicateCases[t.params.predicate];
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;
for (let size = subgroupMinSize; size <= subgroupMaxSize; size *= 2) {
t.skipIf(!testcase.filter(t.params.id, size), 'Skipping potential undefined behavior');
}
Expand Down Expand Up @@ -696,10 +693,7 @@ g.test('fragment')
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMaxSize: number;
}
const { subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;
t.skipIf(innerTexels < subgroupMaxSize, 'Too few texels to be reliable');

const broadcast =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,7 @@ g.test('compute,each_invocation')
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
const wgThreads = t.params.wgSize[0] * t.params.wgSize[1] * t.params.wgSize[2];

interface SubgroupProperties extends GPUAdapterInfo {
subgroupMaxSize: number;
}
const { subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;
t.skipIf(subgroupMaxSize <= t.params.id, 'No invocation selected');

const wgsl = `
Expand Down Expand Up @@ -332,10 +329,7 @@ g.test('fragment')
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
}
const { subgroupMinSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,7 @@ g.test('fragment')
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
const numInputs = t.params.size[0] * t.params.size[1];

interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
}
const { subgroupMinSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,8 @@ g.test('fragment')
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;
const innerTexels = (t.params.size[0] - 1) * (t.params.size[1] - 1);
t.skipIf(innerTexels < subgroupMinSize, 'Too few texels to be reliable');
t.skipIf(subgroupMaxSize === 4 && t.params.quadIndex !== 0, 'Duplicate test');
Expand Down
14 changes: 4 additions & 10 deletions src/webgpu/shader/execution/shader_io/compute_builtins.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,8 @@ g.test('subgroup_size')
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;

const wgx = t.params.sizes[0];
const wgy = t.params.sizes[1];
Expand Down Expand Up @@ -1183,11 +1180,8 @@ g.test('subgroup_size_attribute')

const { numWorkGroups, numSubgroups } = t.params;

interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;

let atLeastOneSucceeded = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1693,11 +1693,8 @@ g.test('subgroup_size')
)
.fn(async t => {
t.skipIfDeviceDoesNotHaveFeature('subgroups' as GPUFeatureName);
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = t.device.adapterInfo as SubgroupProperties;
const subgroupMinSize = t.device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = t.device.adapterInfo.subgroupMaxSize!;

const fsShader = `
enable subgroups;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,8 @@ g.test('subgroup_size_override_must_be_power_of_2_at_pipeline_creation')
* between subgroupMinSize and subgroupMaxSize inclusive.
*/
async function getValidSubgroupSizes(device: GPUDevice): Promise<number[]> {
interface SubgroupProperties extends GPUAdapterInfo {
subgroupMinSize: number;
subgroupMaxSize: number;
}
const { subgroupMinSize, subgroupMaxSize } = device.adapterInfo as SubgroupProperties;
const subgroupMinSize = device.adapterInfo.subgroupMinSize!;
const subgroupMaxSize = device.adapterInfo.subgroupMaxSize!;
const maxWorkgroupSizeX = device.limits.maxComputeWorkgroupSizeX;

const sizes: number[] = [];
Expand Down
Loading