Skip to content

Commit bbbf5ec

Browse files
authored
vulkan: handle large sizes for get_rows (ggml-org#15686)
1 parent c37052a commit bbbf5ec

File tree

3 files changed

+46
-25
lines changed

3 files changed

+46
-25
lines changed

ggml/src/ggml-vulkan/ggml-vulkan.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7849,6 +7849,8 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
78497849
break;
78507850
case GGML_OP_GET_ROWS:
78517851
elements = { (uint32_t)ne00, (uint32_t)ne10, (uint32_t)(ne11 * ne12) };
7852+
elements[1] = std::min(elements[1], ctx->device->properties.limits.maxComputeWorkGroupCount[1]);
7853+
elements[2] = std::min(elements[2], ctx->device->properties.limits.maxComputeWorkGroupCount[2]);
78527854
break;
78537855
case GGML_OP_ARGSORT:
78547856
elements = { (uint32_t)ne00, (uint32_t)ggml_nrows(src0), 1 };

ggml/src/ggml-vulkan/vulkan-shaders/get_rows.comp

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,36 @@ layout(local_size_x = 512, local_size_y = 1, local_size_z = 1) in;
77

88
void main() {
99
const uint i00 = gl_GlobalInvocationID.x;
10-
const uint i10 = gl_GlobalInvocationID.y;
11-
const uint i11 = (gl_GlobalInvocationID.z)/p.ne12;
12-
const uint i12 = (gl_GlobalInvocationID.z)%p.ne12;
1310

1411
if (i00 >= p.ne00) {
1512
return;
1613
}
1714

18-
const uint i01 = data_b[get_boffset() + i10*p.nb10 + i11*p.nb11 + i12*p.nb12];
15+
uint gid_z = gl_GlobalInvocationID.z;
16+
while (gid_z < p.ne11 * p.ne12) {
17+
uint gid_y = gl_GlobalInvocationID.y;
18+
while (gid_y < p.ne10) {
19+
const uint i10 = gid_y;
20+
const uint i11 = gid_z / p.ne12;
21+
const uint i12 = gid_z % p.ne12;
1922

20-
const uint a_offset = get_aoffset() + i01*p.nb01 + i11*p.nb02 + i12*p.nb03;
21-
const uint d_offset = get_doffset() + i10*p.nb21 + i11*p.nb22 + i12*p.nb23;
23+
const uint i01 = data_b[get_boffset() + i10*p.nb10 + i11*p.nb11 + i12*p.nb12];
24+
25+
const uint a_offset = get_aoffset() + i01*p.nb01 + i11*p.nb02 + i12*p.nb03;
26+
const uint d_offset = get_doffset() + i10*p.nb21 + i11*p.nb22 + i12*p.nb23;
2227

2328
#if defined(DATA_A_BF16)
24-
FLOAT_TYPE v = FLOAT_TYPE(bf16_to_fp32(data_a[a_offset + i00]));
29+
FLOAT_TYPE v = FLOAT_TYPE(bf16_to_fp32(data_a[a_offset + i00]));
2530
#else
26-
FLOAT_TYPE v = FLOAT_TYPE(data_a[a_offset + i00]);
31+
FLOAT_TYPE v = FLOAT_TYPE(data_a[a_offset + i00]);
2732
#endif
2833
#ifndef OPTIMIZATION_ERROR_WORKAROUND
29-
data_d[d_offset + i00] = D_TYPE(v);
34+
data_d[d_offset + i00] = D_TYPE(v);
3035
#else
31-
data_d[d_offset + i00] = D_TYPE(v);
36+
data_d[d_offset + i00] = D_TYPE(v);
3237
#endif
38+
gid_y += gl_WorkGroupSize.y * gl_NumWorkGroups.y;
39+
}
40+
gid_z += gl_WorkGroupSize.z * gl_NumWorkGroups.z;
41+
}
3342
}

ggml/src/ggml-vulkan/vulkan-shaders/get_rows_quant.comp

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ layout(local_size_x = 512, local_size_y = 1, local_size_z = 1) in;
1010

1111
void main() {
1212
const uint i00 = (gl_GlobalInvocationID.x)*2;
13-
const uint i10 = gl_GlobalInvocationID.y;
14-
const uint i11 = (gl_GlobalInvocationID.z)/p.ne12;
15-
const uint i12 = (gl_GlobalInvocationID.z)%p.ne12;
1613

1714
#ifdef NEEDS_INIT_IQ_SHMEM
1815
init_iq_shmem(gl_WorkGroupSize);
@@ -22,20 +19,33 @@ void main() {
2219
return;
2320
}
2421

25-
const uint i01 = data_b[i10*p.nb10 + i11*p.nb11 + i12*p.nb12];
22+
uint gid_z = gl_GlobalInvocationID.z;
23+
while (gid_z < p.ne11 * p.ne12) {
24+
uint gid_y = gl_GlobalInvocationID.y;
25+
while (gid_y < p.ne10) {
26+
const uint i10 = gid_y;
27+
const uint i11 = gid_z / p.ne12;
28+
const uint i12 = gid_z % p.ne12;
2629

27-
const uint a_offset = i01*p.nb01 + i11*p.nb02 + i12*p.nb03;
28-
const uint d_offset = i10*p.nb21 + i11*p.nb22 + i12*p.nb23;
30+
const uint i01 = data_b[i10*p.nb10 + i11*p.nb11 + i12*p.nb12];
2931

30-
const uint ib = a_offset + i00/QUANT_K; // block index
31-
const uint iqs = (i00%QUANT_K)/QUANT_R; // quant index
32-
const uint iybs = i00 - i00%QUANT_K; // dst block start index
33-
const uint y_offset = QUANT_R == 1 ? 1 : QUANT_K/2;
32+
const uint a_offset = i01*p.nb01 + i11*p.nb02 + i12*p.nb03;
33+
const uint d_offset = i10*p.nb21 + i11*p.nb22 + i12*p.nb23;
3434

35-
vec2 v = dequantize(ib, iqs, 0);
36-
const vec2 dm = get_dm(ib, 0);
37-
v = v * dm.x + dm.y;
35+
const uint ib = a_offset + i00/QUANT_K; // block index
36+
const uint iqs = (i00%QUANT_K)/QUANT_R; // quant index
37+
const uint iybs = i00 - i00%QUANT_K; // dst block start index
38+
const uint y_offset = QUANT_R == 1 ? 1 : QUANT_K/2;
3839

39-
data_d[d_offset + iybs + iqs ] = D_TYPE(v.x);
40-
data_d[d_offset + iybs + iqs + y_offset] = D_TYPE(v.y);
40+
vec2 v = dequantize(ib, iqs, 0);
41+
const vec2 dm = get_dm(ib, 0);
42+
v = v * dm.x + dm.y;
43+
44+
data_d[d_offset + iybs + iqs ] = D_TYPE(v.x);
45+
data_d[d_offset + iybs + iqs + y_offset] = D_TYPE(v.y);
46+
47+
gid_y += gl_WorkGroupSize.y * gl_NumWorkGroups.y;
48+
}
49+
gid_z += gl_WorkGroupSize.z * gl_NumWorkGroups.z;
50+
}
4151
}

0 commit comments

Comments
 (0)