Skip to content
Open
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
22 changes: 11 additions & 11 deletions packages/runntime/src/core/kernels/attention/attn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ function makeAttnKernel(elem: Elem = F32_ELEM) {
return;
}
const h = idx % C.qHeads;
const row = d.u32(idx / C.qHeads); // explicit integer division
const kvh = d.u32(h / d.u32(C.qHeads / C.kvHeads));
const row = std.intdiv(idx, C.qHeads);
const kvh = std.intdiv(h, std.intdiv(C.qHeads, C.kvHeads));
const hd = C.headDim;
const qWidth = C.qHeads * hd;
const kvWidth = C.kvHeads * hd;
Expand Down Expand Up @@ -346,8 +346,8 @@ function makeAttnRowsKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM) {
return;
}
const h = gid.x % qHeads;
const row = d.u32(gid.x / qHeads); // explicit integer division
const kvh = d.u32(h / group);
const row = std.intdiv(gid.x, qHeads);
const kvh = std.intdiv(h, group);
const qBase = row * qStride + h * hd;
const qPos = D.qPosOffset + row;

Expand Down Expand Up @@ -441,8 +441,8 @@ function makeAttnRowsSplitKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM) {
return;
}
const h = gid.x % qHeads;
const row = d.u32(gid.x / qHeads); // explicit integer division
const kvh = d.u32(h / group);
const row = std.intdiv(gid.x, qHeads);
const kvh = std.intdiv(h, group);
const qBase = row * qStride + h * hd;
const qPos = D.qPosOffset + row;

Expand Down Expand Up @@ -484,7 +484,7 @@ function makeAttnRowsSplitKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM) {

// The max guard keeps chunkLen ≥ 1, so the arithmetic cannot wrap.
const range = end - lo + 1;
const chunkLen = std.max(d.u32((range + D.chunks - 1) / D.chunks), 1);
const chunkLen = std.max(std.intdiv(range + D.chunks - 1, D.chunks), 1);
const sliceLo = lo + gid.y * chunkLen;
const sliceEnd = std.min(sliceLo + chunkLen - 1, end);

Expand Down Expand Up @@ -547,8 +547,8 @@ function makeAttnRowsSubgroupSplitKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM)
const D = S.$.dims;
const lane = lid.x;
const h = wid.x % qHeads;
const row = d.u32(wid.x / qHeads); // explicit integer division
const kvh = d.u32(h / group);
const row = std.intdiv(wid.x, qHeads);
const kvh = std.intdiv(h, group);
const qBase = row * qStride + h * hd;
const qPos = D.qPosOffset + row;

Expand Down Expand Up @@ -598,7 +598,7 @@ function makeAttnRowsSubgroupSplitKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM)
}

const range = end - lo + 1;
const chunkLen = std.max(d.u32((range + D.chunks - 1) / D.chunks), 1);
const chunkLen = std.max(std.intdiv(range + D.chunks - 1, D.chunks), 1);
const sliceLo = lo + wid.y * chunkLen;
const sliceEnd = std.min(sliceLo + chunkLen - 1, end);

Expand Down Expand Up @@ -683,7 +683,7 @@ function makeAttnMergeKernel(cfg: AttnGeoCfg, elem: Elem = F32_ELEM) {
return;
}
const h = gid.x % qHeads;
const row = d.u32(gid.x / qHeads); // explicit integer division
const row = std.intdiv(gid.x, qHeads);
const stride = 2 + hd;
const rowBase = (row * qHeads + h) * D.chunks;

Expand Down
10 changes: 5 additions & 5 deletions packages/runntime/src/core/kernels/attention/attnDecode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ function makeAttnDecodeKernel(cfg: AttnDecodeCfg, elem: Elem) {
const tid = lid.x;
const slot = flatWorkgroupId(wid);
const h = slot % qHeads;
const row = d.u32(slot / qHeads);
const kvh = d.u32(h / group);
const row = std.intdiv(slot, qHeads);
const kvh = std.intdiv(h, group);
const qBase = row * qWidth + h * hd;
const qPos = D.qPosOffset + row;

Expand Down Expand Up @@ -280,8 +280,8 @@ function makeAttnDecodeSplitKernel(cfg: AttnDecodeCfg, elem: Elem) {
const tid = lid.x;
const chunkSlot = flatWorkgroupId(wid);
const chunk = chunkSlot % D.chunks;
const h = d.u32(chunkSlot / D.chunks);
const kvh = d.u32(h / group);
const h = std.intdiv(chunkSlot, D.chunks);
const kvh = std.intdiv(h, group);
const qBase = h * hd; // qLen = 1 → row 0
const qPos = D.qPosOffset;

Expand All @@ -306,7 +306,7 @@ function makeAttnDecodeSplitKernel(cfg: AttnDecodeCfg, elem: Elem) {
const end = std.min(qPos + windowRight, D.kvLen - 1);
const range = end + 1 - std.min(lo, end + 1); // 0 when the band is empty
// A floor of 1 keeps `myLo + chunkLen − 1` from wrapping.
const chunkLen = std.max(d.u32((range + D.chunks - 1) / D.chunks), 1);
const chunkLen = std.max(std.intdiv(range + D.chunks - 1, D.chunks), 1);
const myLo = lo + chunk * chunkLen;
const myEnd = std.min(myLo + chunkLen - 1, end);
for (let j = myLo + tid; j <= myEnd; j += WORKGROUP_SIZE) {
Expand Down
6 changes: 3 additions & 3 deletions packages/runntime/src/core/kernels/attention/rope.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import tgpu, { d } from 'typegpu';
import tgpu, { d, std } from 'typegpu';
import type { TgpuRoot } from 'typegpu';
import {
type F32Buffer,
Expand Down Expand Up @@ -49,12 +49,12 @@ function makeRopeVariant(elem: Elem) {
'use gpu';
const D = layout.$.dims;
const C = config.$;
const pairs = d.u32(C.cols / 2);
const pairs = std.intdiv(C.cols, 2);
const idx = flatIndex(gid);
if (idx >= D.rows * pairs) {
return;
}
const row = d.u32(idx / pairs);
const row = std.intdiv(idx, pairs);
const col0 = (idx % pairs) * 2;
const dcol = col0 % C.headDim; // table column (pair-duplicated: d == d+1)
const c = layout.$.cos[row * C.headDim + dcol]!;
Expand Down
2 changes: 1 addition & 1 deletion packages/runntime/src/core/kernels/conv/conv1d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function makeConv1dVariant(elem: Elem) {
if (idx >= tOut * C.c4c) {
return;
}
const frame = d.u32(idx / C.c4c);
const frame = std.intdiv(idx, C.c4c);
const ch0 = (idx % C.c4c) * 4;
const windowStart = frame * C.stride; // in padded coordinates

Expand Down
12 changes: 6 additions & 6 deletions packages/runntime/src/core/kernels/conv/convTranspose2d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ function makeConvTranspose2dKernel(cfg: ConvTranspose2dCfg, elem: Elem) {
return;
}
const wo = idx % wOut;
const ho = d.u32(idx / wOut) % hOut;
const co = d.u32(idx / (wOut * hOut));
const hi = d.u32(ho / k); // explicit integer division (codebase convention)
const wi = d.u32(wo / k);
const ho = std.intdiv(idx, wOut) % hOut;
const co = std.intdiv(idx, wOut * hOut);
const hi = std.intdiv(ho, k);
const wi = std.intdiv(wo, k);
const di = ho % k;
const dj = wo % k;
const rowBase = (co * k * k + di * k + dj) * cIn;
const xPix = hi * dims.w + wi;
const plane = dims.h * dims.w;
let acc = d.f32(0);
if (paired) {
const wordBase = d.u32(rowBase / 2); // rowBase is even when cIn is
const wordBase = std.intdiv(rowBase, 2); // rowBase is even when cIn is
for (const c2 of std.range(cIn / 2)) {
const pair = std.unpack2x16float(layout.$.w[wordBase + c2]!);
const xb = 2 * c2 * plane + xPix;
Expand All @@ -78,7 +78,7 @@ function makeConvTranspose2dKernel(cfg: ConvTranspose2dCfg, elem: Elem) {
} else {
for (const ci of std.range(cIn)) {
const flat = rowBase + ci;
const pair = std.unpack2x16float(layout.$.w[d.u32(flat / 2)]!);
const pair = std.unpack2x16float(layout.$.w[std.intdiv(flat, 2)]!);
const wv = std.select(pair.x, pair.y, flat % 2 === 1);
acc += wv * d.f32(layout.$.x[ci * plane + xPix]!);
}
Expand Down
Loading