From ba953d6e21bec1a3c47bdb0ecabb49bfd1cc8c28 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Fri, 5 May 2023 17:12:58 +0300 Subject: [PATCH] ggml : simplify scalar dot --- ggml.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ggml.c b/ggml.c index ed8616d59..4b165a2f0 100644 --- a/ggml.c +++ b/ggml.c @@ -2363,15 +2363,13 @@ static void ggml_vec_dot_q4_0_q8_0(const int n, float * restrict s, const void * float sumf = 0.0; for (int i = 0; i < nb; i++) { - const int8_t * py = y[i].qs; - int sumi = 0; for (int j = 0; j < qk/2; ++j) { const int v0 = (x[i].qs[j] & 0xf) - 8; const int v1 = (x[i].qs[j] >> 4) - 8; - sumi += (v0 * py[j]) + (v1 * py[j + qk/2]); + sumi += (v0 * y[i].qs[j]) + (v1 * y[i].qs[j + qk/2]); } sumf += (x[i].d*y[i].d)*sumi; @@ -2487,15 +2485,13 @@ static void ggml_vec_dot_q4_1_q8_1(const int n, float * restrict s, const void * float sumf = 0.0; for (int i = 0; i < nb; i++) { - const int8_t * py = y[i].qs; - int sumi = 0; for (int j = 0; j < qk/2; ++j) { const int v0 = (x[i].qs[j] & 0xf); const int v1 = (x[i].qs[j] >> 4); - sumi += (v0 * py[j]) + (v1 * py[j + qk/2]); + sumi += (v0 * y[i].qs[j]) + (v1 * y[i].qs[j + qk/2]); } sumf += (x[i].d*y[i].d)*sumi + x[i].m*(y[i].s0 + y[i].s1); @@ -2821,8 +2817,6 @@ static void ggml_vec_dot_q5_0_q8_0(const int n, float * restrict s, const void * float sumf = 0.0; for (int i = 0; i < nb; i++) { - const int8_t * py = y[i].qs; - uint32_t qh; memcpy(&qh, x[i].qh, sizeof(qh)); @@ -2835,7 +2829,7 @@ static void ggml_vec_dot_q5_0_q8_0(const int n, float * restrict s, const void * const int32_t x0 = ((x[i].qs[j] & 0xf) | xh_0) - 16; const int32_t x1 = ((x[i].qs[j] >> 4) | xh_1) - 16; - sumi += (x0 * py[j]) + (x1 * py[j + qk/2]); + sumi += (x0 * y[i].qs[j]) + (x1 * y[i].qs[j + qk/2]); } sumf += (GGML_FP16_TO_FP32(x[i].d)*y[i].d)*sumi; @@ -3016,8 +3010,6 @@ static void ggml_vec_dot_q5_1_q8_1(const int n, float * restrict s, const void * float sumf = 0.0; for (int i = 0; i < nb; i++) { - const int8_t * py = y[i].qs; - uint32_t qh; memcpy(&qh, x[i].qh, sizeof(qh)); @@ -3030,7 +3022,7 @@ static void ggml_vec_dot_q5_1_q8_1(const int n, float * restrict s, const void * const int32_t x0 = (x[i].qs[j] & 0xF) | xh_0; const int32_t x1 = (x[i].qs[j] >> 4) | xh_1; - sumi += (x0 * py[j]) + (x1 * py[j + qk/2]); + sumi += (x0 * y[i].qs[j]) + (x1 * y[i].qs[j + qk/2]); } sumf += (GGML_FP16_TO_FP32(x[i].d)*y[i].d)*sumi + GGML_FP16_TO_FP32(x[i].m)*(y[i].s0 + y[i].s1);