Skip to content

Commit cc99d98

Browse files
remyoudomphengremyoudompheng
committed
vulkan: implement specialized MMV kernels for IQ2 quantizations
1 parent 07820ef commit cc99d98

File tree

6 files changed

+275
-2
lines changed

6 files changed

+275
-2
lines changed

‎ggml/src/ggml-vulkan/vulkan-shaders/dequant_iq2_s.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void main() {
2929
uint qs = data_a[ib].qs[4 * ib32 + l];
3030
const uint8_t sign = data_a[ib].qs[QUANT_K / 8 + 4 * ib32 + l];
3131
qs |= (qh << (8 - 2 * l)) & 0x300;
32-
const uvec2 grid = iq2s_grid[qs & 511];
32+
const uvec2 grid = iq2s_grid[qs];
3333
const u8vec4 grid0 = unpack8(grid.x);
3434
const u8vec4 grid1 = unpack8(grid.y);
3535
data_b[b_idx + 8 * l + 0] = D_TYPE(db[l/2] * grid0.x * ((sign & 1) != 0 ? -1.0 : 1.0));

‎ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_s.comp

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
#version 450
2+
#extension GL_EXT_shader_explicit_arithmetic_types_int32 : require
3+
4+
#include "mul_mat_vec_base.comp"
5+
6+
layout(local_size_x_id = 0, local_size_y = 1, local_size_z = 1) in;
7+
8+
FLOAT_TYPE temp[NUM_COLS][NUM_ROWS];
9+
10+
void calc_superblock(const uint a_offset, const uint b_offset, const uint itid, const uint i, const uint num_blocks_per_row, const uint first_row, const uint num_rows) {
11+
const uint y_idx = i * QUANT_K + 16 * itid;
12+
const uint nibble_shift = 4 * (itid & 1);
13+
const uint ib32 = itid / 2; // 0..7
14+
15+
uint ibi = a_offset / QUANT_K + first_row * num_blocks_per_row + i;
16+
[[unroll]] for (uint n = 0; n < num_rows; ++n) {
17+
const float d = float(data_a[ibi].d);
18+
const uint scale = (data_a[ibi].scales[ib32] >> nibble_shift) & 0xF;
19+
const float db = d * (0.5 + scale) * 0.25;
20+
21+
const uint qh = data_a[ibi].qh[ib32];
22+
const u8vec2 qs16 = unpack8(data_a_packed16[ibi].qs[itid]);
23+
const u8vec2 sign16 = unpack8(data_a_packed16[ibi].qs[QUANT_K / 16 + itid]);
24+
[[unroll]] for (uint l = 0; l < 2; ++l) {
25+
const uint8_t sign = sign16[l];
26+
const uint qs = qs16[l] | ((qh << (8 - nibble_shift - 2 * l)) & 0x300);
27+
const uvec2 grid = iq2s_grid[qs];
28+
const vec4 grid0 = vec4(unpack8(grid.x));
29+
const vec4 grid1 = vec4(unpack8(grid.y));
30+
31+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
32+
vec4 b0 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 0]);
33+
vec4 b4 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 1]);
34+
35+
FLOAT_TYPE sum =
36+
fma(FLOAT_TYPE(b0.x), FLOAT_TYPE((sign & 1) != 0 ? -grid0.x : grid0.x),
37+
fma(FLOAT_TYPE(b0.y), FLOAT_TYPE((sign & 2) != 0 ? -grid0.y : grid0.y),
38+
fma(FLOAT_TYPE(b0.z), FLOAT_TYPE((sign & 4) != 0 ? -grid0.z : grid0.z),
39+
fma(FLOAT_TYPE(b0.w), FLOAT_TYPE((sign & 8) != 0 ? -grid0.w : grid0.w),
40+
fma(FLOAT_TYPE(b4.x), FLOAT_TYPE((sign & 16) != 0 ? -grid1.x : grid1.x),
41+
fma(FLOAT_TYPE(b4.y), FLOAT_TYPE((sign & 32) != 0 ? -grid1.y : grid1.y),
42+
fma(FLOAT_TYPE(b4.z), FLOAT_TYPE((sign & 64) != 0 ? -grid1.z : grid1.z),
43+
fma(FLOAT_TYPE(b4.w), FLOAT_TYPE((sign & 128) != 0 ? -grid1.w : grid1.w),
44+
FLOAT_TYPE(0.0)))))))));
45+
temp[j][n] = fma(db, sum, temp[j][n]);
46+
}
47+
}
48+
ibi += num_blocks_per_row;
49+
}
50+
}
51+
52+
void compute_outputs(const uint32_t first_row, const uint32_t num_rows) {
53+
uint a_offset, b_offset, d_offset;
54+
get_offsets(a_offset, b_offset, d_offset);
55+
56+
const uint num_blocks_per_row = p.ncols / QUANT_K;
57+
58+
// 16 threads are used to process each block
59+
const uint blocks_per_wg = gl_WorkGroupSize.x/16;
60+
const uint tid = gl_LocalInvocationID.x;
61+
const uint itid = tid % 16; // 0...15
62+
const uint ix = tid / 16;
63+
64+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
65+
[[unroll]] for (uint i = 0; i < NUM_ROWS; ++i) {
66+
temp[j][i] = FLOAT_TYPE(0);
67+
}
68+
}
69+
70+
[[unroll]] for (uint i = ix; i < num_blocks_per_row; i += blocks_per_wg)
71+
calc_superblock(a_offset, b_offset, itid, i, num_blocks_per_row, first_row, num_rows);
72+
73+
reduce_result(temp, d_offset, first_row, num_rows, tid);
74+
}
75+
76+
void main() {
77+
const uint first_row = NUM_ROWS * (gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z);
78+
79+
init_iq_shmem(gl_WorkGroupSize);
80+
81+
// do NUM_ROWS at a time, unless there aren't enough remaining rows
82+
if (first_row + NUM_ROWS <= p.stride_d) {
83+
compute_outputs(first_row, NUM_ROWS);
84+
} else {
85+
if (first_row >= p.stride_d) {
86+
return;
87+
}
88+
compute_outputs(first_row, p.stride_d - first_row);
89+
}
90+
}

‎ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_xs.comp

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#version 450
2+
#extension GL_EXT_shader_explicit_arithmetic_types_int32 : require
3+
4+
#include "mul_mat_vec_base.comp"
5+
6+
layout(local_size_x_id = 0, local_size_y = 1, local_size_z = 1) in;
7+
8+
FLOAT_TYPE temp[NUM_COLS][NUM_ROWS];
9+
10+
void calc_superblock(const uint a_offset, const uint b_offset, const uint itid, const uint i, const uint num_blocks_per_row, const uint first_row, const uint num_rows) {
11+
const uint y_idx = i * QUANT_K + 16 * itid;
12+
const uint nibble_shift = 4 * (itid & 1);
13+
const uint ib32 = itid / 2; // 0..7
14+
15+
uint ibi = a_offset / QUANT_K + first_row * num_blocks_per_row + i;
16+
[[unroll]] for (uint n = 0; n < num_rows; ++n) {
17+
const float d = float(data_a[ibi].d);
18+
const uint scale = (data_a[ibi].scales[ib32] >> nibble_shift) & 0xF;
19+
const float db = d * (0.5 + scale) * 0.25;
20+
21+
[[unroll]] for (uint l = 0; l < 2; ++l) {
22+
const uint qs = data_a[ibi].qs[2 * itid + l];
23+
const uint sign = qs >> 9;
24+
const uint sign7 = bitCount(sign);
25+
const vec4 grid0 = vec4(unpack8(iq2xs_grid[qs & 511].x));
26+
const vec4 grid1 = vec4(unpack8(iq2xs_grid[qs & 511].y));
27+
28+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
29+
vec4 b0 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 0]);
30+
vec4 b4 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 1]);
31+
32+
FLOAT_TYPE sum =
33+
fma(FLOAT_TYPE(b0.x), FLOAT_TYPE((sign & 1) != 0 ? -grid0.x : grid0.x),
34+
fma(FLOAT_TYPE(b0.y), FLOAT_TYPE((sign & 2) != 0 ? -grid0.y : grid0.y),
35+
fma(FLOAT_TYPE(b0.z), FLOAT_TYPE((sign & 4) != 0 ? -grid0.z : grid0.z),
36+
fma(FLOAT_TYPE(b0.w), FLOAT_TYPE((sign & 8) != 0 ? -grid0.w : grid0.w),
37+
fma(FLOAT_TYPE(b4.x), FLOAT_TYPE((sign & 16) != 0 ? -grid1.x : grid1.x),
38+
fma(FLOAT_TYPE(b4.y), FLOAT_TYPE((sign & 32) != 0 ? -grid1.y : grid1.y),
39+
fma(FLOAT_TYPE(b4.z), FLOAT_TYPE((sign & 64) != 0 ? -grid1.z : grid1.z),
40+
fma(FLOAT_TYPE(b4.w), FLOAT_TYPE((sign7 & 1) != 0 ? -grid1.w : grid1.w),
41+
FLOAT_TYPE(0.0)))))))));
42+
temp[j][n] = fma(db, sum, temp[j][n]);
43+
}
44+
}
45+
ibi += num_blocks_per_row;
46+
}
47+
}
48+
49+
void compute_outputs(const uint32_t first_row, const uint32_t num_rows) {
50+
uint a_offset, b_offset, d_offset;
51+
get_offsets(a_offset, b_offset, d_offset);
52+
53+
const uint num_blocks_per_row = p.ncols / QUANT_K;
54+
55+
// 16 threads are used to process each block
56+
const uint blocks_per_wg = gl_WorkGroupSize.x/16;
57+
const uint tid = gl_LocalInvocationID.x;
58+
const uint itid = tid % 16; // 0...15
59+
const uint ix = tid / 16;
60+
61+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
62+
[[unroll]] for (uint i = 0; i < NUM_ROWS; ++i) {
63+
temp[j][i] = FLOAT_TYPE(0);
64+
}
65+
}
66+
67+
[[unroll]] for (uint i = ix; i < num_blocks_per_row; i += blocks_per_wg)
68+
calc_superblock(a_offset, b_offset, itid, i, num_blocks_per_row, first_row, num_rows);
69+
70+
reduce_result(temp, d_offset, first_row, num_rows, tid);
71+
}
72+
73+
void main() {
74+
const uint first_row = NUM_ROWS * (gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z);
75+
76+
init_iq_shmem(gl_WorkGroupSize);
77+
78+
// do NUM_ROWS at a time, unless there aren't enough remaining rows
79+
if (first_row + NUM_ROWS <= p.stride_d) {
80+
compute_outputs(first_row, NUM_ROWS);
81+
} else {
82+
if (first_row >= p.stride_d) {
83+
return;
84+
}
85+
compute_outputs(first_row, p.stride_d - first_row);
86+
}
87+
}

‎ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_iq2_xxs.comp

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
#version 450
2+
#extension GL_EXT_shader_explicit_arithmetic_types_int32 : require
3+
4+
#include "mul_mat_vec_base.comp"
5+
6+
layout(local_size_x_id = 0, local_size_y = 1, local_size_z = 1) in;
7+
8+
FLOAT_TYPE temp[NUM_COLS][NUM_ROWS];
9+
10+
void calc_superblock(const uint a_offset, const uint b_offset, const uint itid, const uint i, const uint num_blocks_per_row, const uint first_row, const uint num_rows) {
11+
const uint y_idx = i * QUANT_K + 16 * itid;
12+
const uint ib32 = itid / 2; // 0..7
13+
14+
uint ibi = a_offset / QUANT_K + first_row * num_blocks_per_row + i;
15+
[[unroll]] for (uint n = 0; n < num_rows; ++n) {
16+
const float d = float(data_a[ibi].d);
17+
const uint signscale = pack32(u16vec2(
18+
data_a_packed16[ibi].qs[4 * ib32 + 2],
19+
data_a_packed16[ibi].qs[4 * ib32 + 3]));
20+
const float db = d * 0.25 * (0.5 + (signscale >> 28));
21+
[[unroll]] for (uint l = 0; l < 2; ++l) {
22+
const uint qs = data_a[ibi].qs[8 * ib32 + 2 * (itid & 1) + l];
23+
const uint sign = bitfieldExtract(signscale, 7 * int(2 * (itid & 1) + l), 7);
24+
const uint sign7 = bitCount(sign);
25+
const vec4 grid0 = vec4(unpack8(iq2xxs_grid[qs].x));
26+
const vec4 grid1 = vec4(unpack8(iq2xxs_grid[qs].y));
27+
28+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
29+
const vec4 b0 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 0]);
30+
const vec4 b4 = vec4(data_b_v4[(j*p.batch_stride_b + b_offset + y_idx) / 4 + 2*l + 1]);
31+
32+
FLOAT_TYPE sum =
33+
fma(FLOAT_TYPE(b0.x), FLOAT_TYPE((sign & 1) != 0 ? -grid0.x : grid0.x),
34+
fma(FLOAT_TYPE(b0.y), FLOAT_TYPE((sign & 2) != 0 ? -grid0.y : grid0.y),
35+
fma(FLOAT_TYPE(b0.z), FLOAT_TYPE((sign & 4) != 0 ? -grid0.z : grid0.z),
36+
fma(FLOAT_TYPE(b0.w), FLOAT_TYPE((sign & 8) != 0 ? -grid0.w : grid0.w),
37+
fma(FLOAT_TYPE(b4.x), FLOAT_TYPE((sign & 16) != 0 ? -grid1.x : grid1.x),
38+
fma(FLOAT_TYPE(b4.y), FLOAT_TYPE((sign & 32) != 0 ? -grid1.y : grid1.y),
39+
fma(FLOAT_TYPE(b4.z), FLOAT_TYPE((sign & 64) != 0 ? -grid1.z : grid1.z),
40+
fma(FLOAT_TYPE(b4.w), FLOAT_TYPE((sign7 & 1) != 0 ? -grid1.w : grid1.w),
41+
FLOAT_TYPE(0.0)))))))));
42+
temp[j][n] = fma(db, sum, temp[j][n]);
43+
}
44+
}
45+
ibi += num_blocks_per_row;
46+
}
47+
}
48+
49+
void compute_outputs(const uint32_t first_row, const uint32_t num_rows) {
50+
uint a_offset, b_offset, d_offset;
51+
get_offsets(a_offset, b_offset, d_offset);
52+
53+
const uint num_blocks_per_row = p.ncols / QUANT_K;
54+
55+
// 16 threads are used to process each block
56+
const uint blocks_per_wg = gl_WorkGroupSize.x/16;
57+
const uint tid = gl_LocalInvocationID.x;
58+
const uint itid = tid % 16; // 0...15
59+
const uint ix = tid / 16;
60+
61+
[[unroll]] for (uint j = 0; j < NUM_COLS; ++j) {
62+
[[unroll]] for (uint i = 0; i < NUM_ROWS; ++i) {
63+
temp[j][i] = FLOAT_TYPE(0);
64+
}
65+
}
66+
67+
[[unroll]] for (uint i = ix; i < num_blocks_per_row; i += blocks_per_wg)
68+
calc_superblock(a_offset, b_offset, itid, i, num_blocks_per_row, first_row, num_rows);
69+
70+
reduce_result(temp, d_offset, first_row, num_rows, tid);
71+
}
72+
73+
void main() {
74+
const uint first_row = NUM_ROWS * (gl_WorkGroupID.x + gl_NumWorkGroups.x * gl_WorkGroupID.z);
75+
76+
init_iq_shmem(gl_WorkGroupSize);
77+
78+
// do NUM_ROWS at a time, unless there aren't enough remaining rows
79+
if (first_row + NUM_ROWS <= p.stride_d) {
80+
compute_outputs(first_row, NUM_ROWS);
81+
} else {
82+
if (first_row >= p.stride_d) {
83+
return;
84+
}
85+
compute_outputs(first_row, p.stride_d - first_row);
86+
}
87+
}

‎ggml/src/ggml-vulkan/vulkan-shaders/types.comp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,14 @@ struct block_iq2_s
753753
uint8_t scales[QUANT_K_IQ2_S/32];
754754
};
755755

756+
struct block_iq2_s_packed16
757+
{
758+
float16_t d;
759+
uint16_t qs[QUANT_K_IQ2_S/8];
760+
uint16_t qh[QUANT_K_IQ2_S/64];
761+
uint16_t scales[QUANT_K_IQ2_S/64];
762+
};
763+
756764
#if defined(DATA_A_IQ2_S)
757765

758766
const uvec2 iq2s_grid_const[1024] = {
@@ -1028,6 +1036,7 @@ void init_iq_shmem(uvec3 wgsize)
10281036
#define QUANT_K QUANT_K_IQ2_S
10291037
#define QUANT_R QUANT_R_IQ2_S
10301038
#define A_TYPE block_iq2_s
1039+
#define A_TYPE_PACKED16 block_iq2_s_packed16
10311040
#endif
10321041

10331042
#define QUANT_K_IQ3_XXS 256

‎ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void process_shaders() {
396396
for (const auto& tname : type_names) {
397397
// mul mat vec
398398
std::string data_a_key = "DATA_A_" + to_uppercase(tname);
399-
std::string shader = (string_ends_with(tname, "_k") || string_starts_with(tname, "iq1_")) ? "mul_mat_vec_" + tname + ".comp" : "mul_mat_vec.comp";
399+
std::string shader = (string_ends_with(tname, "_k") || string_starts_with(tname, "iq1_") || string_starts_with(tname, "iq2_")) ? "mul_mat_vec_" + tname + ".comp" : "mul_mat_vec.comp";
400400

401401
string_to_spv("mul_mat_vec_" + tname + "_f32_f32", shader, merge_maps(base_dict, {{data_a_key, "1"}, {"B_TYPE", "float"}, {"B_TYPE_VEC2", "vec2"}, {"B_TYPE_VEC4", "vec4"}, {"D_TYPE", "float"}}));
402402
string_to_spv("mul_mat_vec_" + tname + "_f16_f32", shader, merge_maps(base_dict, {{data_a_key, "1"}, {"B_TYPE", "float16_t"}, {"B_TYPE_VEC2", "f16vec2"}, {"B_TYPE_VEC4", "f16vec4"}, {"D_TYPE", "float"}}));

0 commit comments

Comments
 (0)