Skip to content

[WebGPU] This PR fixes the webgpu runtime when there is no pod params #14685

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

Merged
MasterJH5574 merged 1 commit into from
Apr 21, 2023
Merged

[WebGPU] This PR fixes the webgpu runtime when there is no pod params #14685

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
78 changes: 39 additions & 39 deletions web/src/webgpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,15 +542,13 @@ export class WebGPUContext {

assert(paramWriteAccess.length == bufferArgIndices.length);
// POD arguments are pass in the end
if (podArgIndices.length != 0) {
layoutEntries.push({
binding: bufferArgIndices.length,
visibility: GPUShaderStage.COMPUTE,
buffer : {
type: "uniform"
}
});
}
layoutEntries.push({
binding: bufferArgIndices.length,
visibility: GPUShaderStage.COMPUTE,
buffer : {
type: "uniform"
}
});

const bindGroupLayout = this.device.createBindGroupLayout({
entries: layoutEntries
Expand Down Expand Up @@ -615,38 +613,36 @@ export class WebGPUContext {
}

// push pod buffer
if (podArgIndices.length != 0) {
const sizeOfI32 = 4;
const podArgBuffer = this.getPodArgsBuffer((podArgIndices.length + 1) * sizeOfI32);
const i32View = new Int32Array(podArgIndices.length + 1);
const u32View = new Uint32Array(i32View.buffer);
const f32View = new Float32Array(i32View.buffer);

for (let i = 0; i < podArgIndices.length; ++i) {
const value = args[podArgIndices[i]];
const dtype = finfo.arg_types[podArgIndices[i]];
if (dtype.startsWith("int")) {
i32View[i] = value;
} else if (dtype.startsWith("uint")) {
u32View[i] = value;
} else if (dtype.startsWith("float")) {
f32View[i] = value;
} else {
throw Error("Unknown pod dtype " + dtype);
}
const sizeOfI32 = 4;
const podArgBuffer = this.getPodArgsBuffer((podArgIndices.length + 1) * sizeOfI32);
const i32View = new Int32Array(podArgIndices.length + 1);
const u32View = new Uint32Array(i32View.buffer);
const f32View = new Float32Array(i32View.buffer);

for (let i = 0; i < podArgIndices.length; ++i) {
const value = args[podArgIndices[i]];
const dtype = finfo.arg_types[podArgIndices[i]];
if (dtype.startsWith("int")) {
i32View[i] = value;
} else if (dtype.startsWith("uint")) {
u32View[i] = value;
} else if (dtype.startsWith("float")) {
f32View[i] = value;
} else {
throw Error("Unknown pod dtype " + dtype);
}
// always pass in dim z launching grid size in
u32View[podArgIndices.length] = packDimX;
this.device.queue.writeBuffer(podArgBuffer, 0, i32View.buffer);

bindGroupEntries.push({
binding: bufferArgIndices.length,
resource: {
buffer: podArgBuffer,
size: i32View.buffer.byteLength
}
});
}
// always pass in dim z launching grid size in
u32View[podArgIndices.length] = packDimX;
this.device.queue.writeBuffer(podArgBuffer, 0, i32View.buffer);

bindGroupEntries.push({
binding: bufferArgIndices.length,
resource: {
buffer: podArgBuffer,
size: i32View.buffer.byteLength
}
});

compute.setBindGroup(0, this.device.createBindGroup({
layout: bindGroupLayout,
Expand Down Expand Up @@ -749,6 +745,10 @@ export class WebGPUContext {

// DeviceAPI
private deviceAllocDataSpace(nbytes: number): GPUPointer {
// allocate 0 bytes buffer as 1 bytes buffer.
if (nbytes == 0) {
nbytes = 1;
}
const buffer = this.device.createBuffer({
size: nbytes,
usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST,
Expand Down