File tree Expand file tree Collapse file tree 4 files changed +13
-9
lines changed
ggml/src/ggml-vulkan/vulkan-shaders Expand file tree Collapse file tree 4 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ void main() {
29
29
uint qs = data_a[ib].qs[4 * ib32 + l];
30
30
const uint8_t sign = data_a[ib].qs[QUANT_K / 8 + 4 * ib32 + l];
31
31
qs |= (qh << (8 - 2 * l)) & 0x300;
32
- const uvec2 grid = iq2s_grid[qs & 511 ];
32
+ const uvec2 grid = iq2s_grid[qs];
33
33
const u8vec4 grid0 = unpack8(grid.x);
34
34
const u8vec4 grid1 = unpack8(grid.y);
35
35
data_b[b_idx + 8 * l + 0] = D_TYPE(db[l/2] * grid0.x * ((sign & 1) != 0 ? -1.0 : 1.0));
Original file line number Diff line number Diff line change @@ -33,7 +33,8 @@ void main() {
33
33
[[unroll]] for (uint l = 0; l < 4; ++l) {
34
34
const uint sign7 = bitfieldExtract(signscale, 7 * int(l), 7);
35
35
const uint sign8 = sign7 | (bitCount(sign7) << 7); // parity bit
36
- const uvec2 grid = iq2xxs_grid[data_a[ib].qs[8 * is + l]];
36
+ const uint qs = data_a[ib].qs[8 * is + l];
37
+ const uvec2 grid = iq2xxs_grid[qs];
37
38
const u8vec4 grid0 = unpack8(grid.x);
38
39
const u8vec4 grid1 = unpack8(grid.y);
39
40
data_b[b_idx + 8 * l + 0] = D_TYPE(db * grid0.x * ((sign8 & 1) != 0 ? -1.0 : 1.0));
Original file line number Diff line number Diff line change @@ -22,15 +22,16 @@ void main() {
22
22
const uint b_idx = 256 * ib + 32 * is;
23
23
24
24
const float d = float(data_a[ib].d);
25
- const float db = d * (1 + 2 * ((data_a[ib].scales[is] >> (4 * (is % 2))) & 0xf));
25
+ const float db = d * (1 + 2 * ((data_a[ib].scales[is / 2 ] >> (4 * (is % 2))) & 0xf));
26
26
27
27
// We must produce 32 values using 4 sign bytes, 1 qh byte, 8 qs bytes.
28
28
uint qh = data_a[ib].qh[is];
29
29
[[unroll]] for (uint l = 0; l < 8; ++l) {
30
- uint qs = data_a[ib].qs[8 * is + l];
31
- uint gidx = qs | ((qh << (8 - l)) & 256);
32
- uint8_t signs = data_a[ib].signs[8 * is + l / 2] >> (4 * (l & 1));
33
- u8vec4 grid = unpack8(iq3s_grid[gidx]);
30
+ const uint iqs = 8 * is + l;
31
+ const uint qs = data_a[ib].qs[iqs];
32
+ const uint gidx = qs | ((qh << (8 - l)) & 256);
33
+ const uint8_t signs = data_a[ib].signs[iqs / 2] >> (4 * (l & 1));
34
+ const u8vec4 grid = unpack8(iq3s_grid[gidx]);
34
35
data_b[b_idx + 4 * l + 0] = D_TYPE(db * grid.x * ((signs & 1) != 0 ? -1.0 : 1.0));
35
36
data_b[b_idx + 4 * l + 1] = D_TYPE(db * grid.y * ((signs & 2) != 0 ? -1.0 : 1.0));
36
37
data_b[b_idx + 4 * l + 2] = D_TYPE(db * grid.z * ((signs & 4) != 0 ? -1.0 : 1.0));
Original file line number Diff line number Diff line change @@ -35,8 +35,10 @@ void main() {
35
35
const uint sign7 = bitfieldExtract(signscale, 7 * int(l), 7);
36
36
// Restore parity bit.
37
37
const uint sign8 = sign7 | (bitCount(sign7) << 7);
38
- const u8vec4 grid0 = unpack8(iq3xxs_grid[data_a[ib].qs[8 * is + 2 * l]]);
39
- const u8vec4 grid1 = unpack8(iq3xxs_grid[data_a[ib].qs[8 * is + 2 * l + 1]]);
38
+ const uint qs0 = data_a[ib].qs[8 * is + 2 * l];
39
+ const uint qs1 = data_a[ib].qs[8 * is + 2 * l + 1];
40
+ const u8vec4 grid0 = unpack8(iq3xxs_grid[qs0]);
41
+ const u8vec4 grid1 = unpack8(iq3xxs_grid[qs1]);
40
42
data_b[b_idx + 8 * l + 0] = D_TYPE(db * grid0.x * ((sign8 & 1) != 0 ? -1.0 : 1.0));
41
43
data_b[b_idx + 8 * l + 1] = D_TYPE(db * grid0.y * ((sign8 & 2) != 0 ? -1.0 : 1.0));
42
44
data_b[b_idx + 8 * l + 2] = D_TYPE(db * grid0.z * ((sign8 & 4) != 0 ? -1.0 : 1.0));
You can’t perform that action at this time.
0 commit comments