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

Fix device_pool refactor #3469

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Fix device_pool refactor #3469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 23 deletions src/webgpu/util/device_pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FeaturesNotSupported extends Error {}
export class TestOOMedShouldAttemptGC extends Error {}

export class DevicePool {
private holders: 'uninitialized' | 'failed' | DescriptorToHolderMap = 'uninitialized';
private holders = new DescriptorToHolderMap();

async requestAdapter(recorder: TestCaseRecorder) {
const gpu = getGPU(recorder);
Expand All @@ -36,28 +36,7 @@ export class DevicePool {
adapter: GPUAdapter,
descriptor?: UncanonicalizedDeviceDescriptor
): Promise<DeviceProvider> {
let holder;
if (this.holders === 'uninitialized') {
this.holders = new DescriptorToHolderMap();
}

let errorMessage = '';
if (this.holders !== 'failed') {
try {
holder = await this.holders.getOrCreate(adapter, descriptor);
} catch (ex) {
this.holders = 'failed';
if (ex instanceof Error) {
errorMessage = ` with ${ex.name} "${ex.message}"`;
}
}
}

assert(
this.holders !== 'failed',
`WebGPU device failed to initialize${errorMessage}; not retrying`
);
assert(!!holder);
const holder = await this.holders.getOrCreate(adapter, descriptor);
assert(holder.state === 'free', 'Device was in use on DevicePool.acquire');
holder.state = 'acquired';
holder.beginTestScope();
Expand Down
Loading