root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-30 13:24:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sycl : try to fix after IQ1_S changes

Browse Source
This commit is contained in:
Georgi Gerganov 2024-03-11 13:31:49 +02:00
parent caa106d4e0
commit 77d586f534
No known key found for this signature in database
GPG Key ID: BF970631944C16B7
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ggml-sycl.cpp
View File

@ -3514,8 +3514,8 @@ static_assert(sizeof(block_iq3_s) == sizeof(ggml_fp16_t) + 13*(QK_K/32) + IQ3S_N
#define QI1_S (QK_K / (4*QR1_S)) #define QI1_S (QK_K / (4*QR1_S))
typedef struct { typedef struct {
sycl::half d; sycl::half d;
uint8_t qs[QK_K/8]; uint8_t qs[QK_K/8];
uint8_t scales[QK_K/16]; uint16_t qh[QK_K/32];
} block_iq1_s; } block_iq1_s;
static_assert(sizeof(block_iq1_s) == sizeof(ggml_fp16_t) + QK_K/8 + QK_K/16, "wrong iq1_s block size/padding"); static_assert(sizeof(block_iq1_s) == sizeof(ggml_fp16_t) + QK_K/8 + QK_K/16, "wrong iq1_s block size/padding");
@ -4894,7 +4894,6 @@ static void dequantize_block_iq1_s(const void * __restrict__ vx, dst_t * __restr
const uint64_t *iq1s_grid, const uint64_t *iq1s_grid,
const uint8_t *ksigns_iq2xs, const uint8_t *ksigns_iq2xs,
const uint8_t *kmask_iq2xs) { const uint8_t *kmask_iq2xs) {
const int i = item_ct1.get_group(2); const int i = item_ct1.get_group(2);
const block_iq1_s * x = (const block_iq1_s *) vx; const block_iq1_s * x = (const block_iq1_s *) vx;
@ -4903,11 +4902,15 @@ static void dequantize_block_iq1_s(const void * __restrict__ vx, dst_t * __restr
const int il = tid/8; // 0...3 const int il = tid/8; // 0...3
const int ib = tid%8; // 0...7 const int ib = tid%8; // 0...7
dst_t * y = yy + i*QK_K + 32*ib + 8*il; dst_t * y = yy + i*QK_K + 32*ib + 8*il;
const int i8 = 4*ib+il; const uint8_t * qs = x[i].qs + 8*ib;
uint8_t h = x[i].scales[i8/2] >> 4*(i8%2); const uint8_t * grid1 = (const uint8_t *)(iq1s_grid + qs[2*il+0]);
const int8_t * grid = (const int8_t *)(iq1s_grid + (x[i].qs[i8] | ((h & 8) << 5))); const uint8_t * grid2 = (const uint8_t *)(iq1s_grid + qs[2*il+1]);
const float d = (float)x[i].d * (2*(h & 7) + 1); const float d = (float)x[i].d * (2*((x[i].qh[ib] >> 12) & 0xf) + 1);
for (int j = 0; j < 8; ++j) y[j] = d * grid[j]; const uint8_t signs = ksigns_iq2xs[(x[i].qh[ib] >> 3*il) & 7];
for (int j = 0; j < 4; ++j) {
y[j+0] = d * grid1[j] * (signs & kmask_iq2xs[j+0] ? -1.f : 1.f);
y[j+4] = d * grid2[j] * (signs & kmask_iq2xs[j+4] ? -1.f : 1.f);
}
#else #else
assert(false); assert(false);
#endif #endif
@ -7808,23 +7811,22 @@ vec_dot_iq1_s_q8_1(const void *__restrict__ vbq,
const block_iq1_s * bq1 = (const block_iq1_s *) vbq; const block_iq1_s * bq1 = (const block_iq1_s *) vbq;
const int ib32 = iqs; const int ib32 = iqs;
int sumi1 = 0, sumi2 = 0, sumi3 = 0, sumi4 = 0; const uint8_t * qs = bq1->qs + 4*ib32;
const uint8_t h1 = bq1->scales[2*ib32+0]; const int8_t * q8 = bq8_1[ib32].qs;
const uint8_t h2 = bq1->scales[2*ib32+1]; int sumi = 0;
const int * q8 = (const int *)bq8_1[ib32].qs; for (int l = 0; l < 4; ++l) {
const int * grid1 = (const int *)(iq1s_grid + (bq1->qs[4*ib32+0] | ((h1 & 0x08) << 5))); const uint32_t * grid = (const uint32_t *)(iq1s_grid + qs[l]);
const int * grid2 = (const int *)(iq1s_grid + (bq1->qs[4*ib32+1] | ((h1 & 0x80) << 1))); const uint32_t * signs = (const uint32_t *)(ksigns64 + (qs[l] >> 8));
const int * grid3 = (const int *)(iq1s_grid + (bq1->qs[4*ib32+2] | ((h2 & 0x08) << 5))); const int grid_l = dpct::vectorized_binary<sycl::uchar4>(
const int * grid4 = (const int *)(iq1s_grid + (bq1->qs[4*ib32+3] | ((h2 & 0x80) << 1))); grid[0] ^ signs[0], signs[0], std::minus<>());
for (int j = 0; j < 2; ++j) { const int grid_h = dpct::vectorized_binary<sycl::uchar4>(
sumi1 = dpct::dp4a(q8[j+0], grid1[j], sumi1); grid[1] ^ signs[1], signs[1], std::minus<>());
sumi2 = dpct::dp4a(q8[j+2], grid2[j], sumi2); sumi = dpct::dp4a(grid_l, *((int *)q8 + 0), sumi);
sumi3 = dpct::dp4a(q8[j+4], grid3[j], sumi3); sumi = dpct::dp4a(grid_h, *((int *)q8 + 1), sumi);
sumi4 = dpct::dp4a(q8[j+6], grid4[j], sumi4); q8 += 8;
} }
const float d = (float)bq1->d * bq8_1[ib32].ds[0]; const float d = (float)bq1->d * bq8_1[ib32].ds[0] * 0.25f;
return d * (sumi1 * (2*(h1 & 7) + 1) + sumi2 * (2*((h1 >> 4) & 7) + 1) + return d * sumi;
sumi3 * (2*(h2 & 7) + 1) + sumi4 * (2*((h2 >> 4) & 7) + 1));
#else #else
assert(false); assert(false);
return 0.f; return 0.f;