Skip to content

Commit aa0c461

Browse files
authored
vulkan: fix failing dequant shaders (#15862)
* vulkan: fix failing dequant shaders * add missing const
1 parent b9c9c9f commit aa0c461

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
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/dequant_iq2_xxs.comp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ void main() {
3333
[[unroll]] for (uint l = 0; l < 4; ++l) {
3434
const uint sign7 = bitfieldExtract(signscale, 7 * int(l), 7);
3535
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];
3738
const u8vec4 grid0 = unpack8(grid.x);
3839
const u8vec4 grid1 = unpack8(grid.y);
3940
data_b[b_idx + 8 * l + 0] = D_TYPE(db * grid0.x * ((sign8 & 1) != 0 ? -1.0 : 1.0));

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ void main() {
2222
const uint b_idx = 256 * ib + 32 * is;
2323

2424
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));
2626

2727
// We must produce 32 values using 4 sign bytes, 1 qh byte, 8 qs bytes.
2828
uint qh = data_a[ib].qh[is];
2929
[[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]);
3435
data_b[b_idx + 4 * l + 0] = D_TYPE(db * grid.x * ((signs & 1) != 0 ? -1.0 : 1.0));
3536
data_b[b_idx + 4 * l + 1] = D_TYPE(db * grid.y * ((signs & 2) != 0 ? -1.0 : 1.0));
3637
data_b[b_idx + 4 * l + 2] = D_TYPE(db * grid.z * ((signs & 4) != 0 ? -1.0 : 1.0));

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ void main() {
3535
const uint sign7 = bitfieldExtract(signscale, 7 * int(l), 7);
3636
// Restore parity bit.
3737
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]);
4042
data_b[b_idx + 8 * l + 0] = D_TYPE(db * grid0.x * ((sign8 & 1) != 0 ? -1.0 : 1.0));
4143
data_b[b_idx + 8 * l + 1] = D_TYPE(db * grid0.y * ((sign8 & 2) != 0 ? -1.0 : 1.0));
4244
data_b[b_idx + 8 * l + 2] = D_TYPE(db * grid0.z * ((sign8 & 4) != 0 ? -1.0 : 1.0));

0 commit comments

Comments
 (0)