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

Compat: update maxXXXInYYYStage tests #4168

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Compat: update maxXXXInYYYStage tests #4168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e0ebcc
Compat: update maxXXXInYYYStage tests
greggman Jan 31, 2025
ec04d2b
address comments
greggman Jan 31, 2025
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
44 changes: 24 additions & 20 deletions src/webgpu/api/validation/capability_checks/limits/limit_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,42 +1275,46 @@ export function testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(
| 'maxStorageTexturesInVertexStage',
dependentLimitName: 'maxStorageBuffersPerShaderStage' | 'maxStorageTexturesPerShaderStage'
) {
g.test(`validate,${dependentLimitName}`)
g.test(`auto_upgrades_per_stage,${dependentLimitName}`)
.desc(
`Test that adapter.limit.${limit} and requiredLimits.${limit} must be <= ${dependentLimitName}`
`Test that
* adapter.limit.${limit} < adapter.limit.${dependentLimitName}
* requiredLimits.${limit} auto-upgrades device.limits.${dependentLimitName}
`
)
.params(u => u.combine('useMax', [true, false] as const)) // true case should not reject.
.fn(async t => {
const { useMax } = t.params;
const { adapterLimit: maximumLimit, adapter } = t;

const dependentLimit = adapter.limits[dependentLimitName]!;
t.expect(
maximumLimit <= dependentLimit,
`maximumLimit(${maximumLimit}) is <= adapter.limits.${dependentLimitName}(${dependentLimit})`
);
{
const dependentLimit = adapter.limits[dependentLimitName]!;
t.expect(
maximumLimit <= dependentLimit,
`maximumLimit(${maximumLimit}) is <= adapter.limits.${dependentLimitName}(${dependentLimit})`
);
}

const dependentEffectiveLimits = useMax
? dependentLimit
: t.getDefaultLimit(dependentLimitName);
const shouldReject = maximumLimit > dependentEffectiveLimits;
t.debug(
`${limit}(${maximumLimit}) > ${dependentLimitName}(${dependentEffectiveLimits}) shouldReject: ${shouldReject}`
);
const shouldReject = false;
const device = await t.requestDeviceWithLimits(
adapter,
{
[limit]: maximumLimit,
...(useMax && {
[dependentLimitName]: dependentLimit,
}),
},
shouldReject
);

{
const dependentLimit = device!.limits[dependentLimitName]!;
const actualLimit = device!.limits[limit]!;
t.expect(
dependentLimit >= actualLimit,
`device.limits.${dependentLimitName}(${dependentLimit}) is >= adapter.limits.${limit}(${actualLimit})`
);
}

device?.destroy();
});

g.test(`auto_upgrade,${dependentLimitName}`)
g.test(`auto_upgraded_from_per_stage,${dependentLimitName}`)
.desc(
`Test that adapter.limit.${limit} is automatically upgraded to ${dependentLimitName} except in compat.`
)
Expand Down
19 changes: 5 additions & 14 deletions src/webgpu/api/validation/capability_checks/limits/maxStorageBuffersInFragmentStage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,15 @@ import {
} from './limit_utils.js';

const limit = 'maxStorageBuffersInFragmentStage';
const dependentLimitName = 'maxStorageBuffersPerShaderStage';

const kExtraLimits: LimitsRequest = {
maxBindingsPerBindGroup: 'adapterLimit',
maxBindGroups: 'adapterLimit',
[dependentLimitName]: 'adapterLimit',
};

export const { g, description } = makeLimitTestGroup(limit, {
// MAINTAINANCE_TODO: remove once this limit is required.
limitOptional: true,
limitCheckFn(t, device, { actualLimit }) {
if (!t.isCompatibility) {
const expectedLimit = device.limits[dependentLimitName];
t.expect(
actualLimit === expectedLimit,
`expected actual actualLimit: ${actualLimit} to equal ${dependentLimitName}: ${expectedLimit}`
);
return true;
}
return false;
},
});

function createBindGroupLayout(
Expand Down Expand Up @@ -208,4 +195,8 @@ g.test('createPipeline,at_over')
);
});

testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(g, limit, dependentLimitName);
testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(
g,
limit,
'maxStorageBuffersPerShaderStage'
);
19 changes: 5 additions & 14 deletions src/webgpu/api/validation/capability_checks/limits/maxStorageBuffersInVertexStage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,15 @@ import {
} from './limit_utils.js';

const limit = 'maxStorageBuffersInVertexStage';
const dependentLimitName = 'maxStorageBuffersPerShaderStage';

const kExtraLimits: LimitsRequest = {
maxBindingsPerBindGroup: 'adapterLimit',
maxBindGroups: 'adapterLimit',
[dependentLimitName]: 'adapterLimit',
};

export const { g, description } = makeLimitTestGroup(limit, {
// MAINTAINANCE_TODO: remove once this limit is required.
limitOptional: true,
limitCheckFn(t, device, { actualLimit }) {
if (!t.isCompatibility) {
const expectedLimit = device.limits[dependentLimitName];
t.expect(
actualLimit === expectedLimit,
`expected actual actualLimit: ${actualLimit} to equal ${dependentLimitName}: ${expectedLimit}`
);
return true;
}
return false;
},
});

function createBindGroupLayout(
Expand Down Expand Up @@ -199,4 +186,8 @@ g.test('createPipeline,at_over')
);
});

testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(g, limit, dependentLimitName);
testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(
g,
limit,
'maxStorageBuffersPerShaderStage'
);
19 changes: 5 additions & 14 deletions src/webgpu/api/validation/capability_checks/limits/maxStorageTexturesInFragmentStage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,15 @@ import {
} from './limit_utils.js';

const limit = 'maxStorageTexturesInFragmentStage';
const dependentLimitName = 'maxStorageTexturesPerShaderStage';

const kExtraLimits: LimitsRequest = {
maxBindingsPerBindGroup: 'adapterLimit',
maxBindGroups: 'adapterLimit',
[dependentLimitName]: 'adapterLimit',
};

export const { g, description } = makeLimitTestGroup(limit, {
// MAINTAINANCE_TODO: remove once this limit is required.
limitOptional: true,
limitCheckFn(t, device, { actualLimit }) {
if (!t.isCompatibility) {
const expectedLimit = device.limits[dependentLimitName];
t.expect(
actualLimit === expectedLimit,
`expected actual actualLimit: ${actualLimit} to equal ${dependentLimitName}: ${expectedLimit}`
);
return true;
}
return false;
},
});

function createBindGroupLayout(
Expand Down Expand Up @@ -209,4 +196,8 @@ g.test('createPipeline,at_over')
);
});

testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(g, limit, dependentLimitName);
testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(
g,
limit,
'maxStorageTexturesPerShaderStage'
);
19 changes: 5 additions & 14 deletions src/webgpu/api/validation/capability_checks/limits/maxStorageTexturesInVertexStage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,15 @@ import {
} from './limit_utils.js';

const limit = 'maxStorageTexturesInVertexStage';
const dependentLimitName = 'maxStorageTexturesPerShaderStage';

const kExtraLimits: LimitsRequest = {
maxBindingsPerBindGroup: 'adapterLimit',
maxBindGroups: 'adapterLimit',
[dependentLimitName]: 'adapterLimit',
};

export const { g, description } = makeLimitTestGroup(limit, {
// MAINTAINANCE_TODO: remove once this limit is required.
limitOptional: true,
limitCheckFn(t, device, { actualLimit }) {
if (!t.isCompatibility) {
const expectedLimit = device.limits[dependentLimitName];
t.expect(
actualLimit === expectedLimit,
`expected actual actualLimit: ${actualLimit} to equal ${dependentLimitName}: ${expectedLimit}`
);
return true;
}
return false;
},
});

function createBindGroupLayout(
Expand Down Expand Up @@ -199,4 +186,8 @@ g.test('createPipeline,at_over')
);
});

testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(g, limit, dependentLimitName);
testMaxStorageXXXInYYYStageDeviceCreationWithDependentLimit(
g,
limit,
'maxStorageTexturesPerShaderStage'
);