Skip to content

webgpu: Remove isVectorA check #7233

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
merged 2 commits into from
Jan 5, 2023
Merged

webgpu: Remove isVectorA check #7233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d108d4c
webgpu: Remove isVectorA check
qjia7 Jan 4, 2023
d8161ba
Merge branch 'master' into matmul_vector_matrix
qjia7 Jan 5, 2023
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
14 changes: 6 additions & 8 deletions tfjs-backend-webgpu/src/matmul_packed_webgpu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const calculateResultSnippet =
export function makeMatMulPackedVec4Source(
workPerThread: number[], workgroupSize: [number, number, number],
transposeA = false, tileInner = 32, splitK = false, splitedDimInner = 32,
isVectorA = false, broadcastBatch = false): string {
broadcastBatch = false): string {
const tileAOuter = workgroupSize[1] * workPerThread[1];
const tileBOuter = workgroupSize[0] * workPerThread[0];
const tileAWidth = transposeA ? tileAOuter : tileInner;
Expand Down Expand Up @@ -172,10 +172,10 @@ export function makeMatMulPackedVec4Source(

${main()} {
let localRow = i32(localId.y);
let tileRow = ${isVectorA ? '0' : `localRow * ${rowPerThread}`};
let tileRow = localRow * ${rowPerThread};
let tileCol = i32(localId.x);

let globalRow = ${isVectorA ? '0' : `i32(globalId.y) * ${rowPerThread}`};
let globalRow = i32(globalId.y) * ${rowPerThread};
let globalCol = i32(globalId.x);
let batch = ${splitK ? '0' : 'i32(globalId.z)'};
let batchA = ${
Expand Down Expand Up @@ -314,8 +314,7 @@ export function makeMatMulPackedSource(
var BCached : array<f32, ${colPerThread}>;
for (var k = 0; k < ${tileInner}; k++) {
for (var inner = 0; inner < ${colPerThread}; inner++) {
BCached[inner] = mm_Bsub[k][localCol + inner * ${
workgroupSize[0]}];
BCached[inner] = mm_Bsub[k][localCol + inner * ${workgroupSize[0]}];
}
for (var innerRow = 0; innerRow < ${rowPerThread}; innerRow++) {
let ACached = ${
Expand All @@ -333,8 +332,7 @@ export function makeMatMulPackedSource(
for (var innerRow = 0; innerRow < ${rowPerThread}; innerRow++) {
let gRow = globalRowStart + localRow + innerRow * ${workgroupSize[1]};
for (var innerCol = 0; innerCol < ${colPerThread}; innerCol++) {
let gCol = globalColStart + localCol + innerCol * ${
workgroupSize[0]};
let gCol = globalColStart + localCol + innerCol * ${workgroupSize[0]};
mm_write(batch, gRow, gCol, acc[innerRow][innerCol]);
}
}
Expand Down Expand Up @@ -599,7 +597,7 @@ export class MatMulPackedProgram implements WebGPUProgram {
this.isVec4 ?
makeMatMulPackedVec4Source(
this.elementsPerThread, this.workgroupSize, this.transposeA,
this.tileInner, false, null, this.isVectorA, true) :
this.tileInner, false, null, true) :
(this.isVectorA ? makeVectorMatrixProductSource(
this.workgroupSize, this.transposeA) :
makeMatMulPackedSource(
Expand Down