Skip to content

Commit eada2a7

Browse files
committed
iiq1_m: slightly faster ARM_NEON dot product
10.5 t/s -> 11.65 t/s
1 parent 205b919 commit eada2a7

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

ggml-quants.c

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9765,8 +9765,8 @@ void ggml_vec_dot_iq1_m_q8_K (int n, float * restrict s, size_t bs, const void
97659765

97669766
const int8x8_t minus1 = vdup_n_s8(-1);
97679767
const int8x8_t plus1 = vdup_n_s8(+1);
9768-
const int32x4_t mask = vdupq_n_s32(0x7);
9769-
const int32x4_t mone = vdupq_n_s32(1);
9768+
const int32x4_t mask = vdupq_n_s32(0x7);
9769+
const int32x4_t mone = vdupq_n_s32(1);
97709770
const int32x4_t mzero = vdupq_n_s32(0);
97719771

97729772
ggml_int8x16x4_t q1b;
@@ -9803,6 +9803,7 @@ void ggml_vec_dot_iq1_m_q8_K (int n, float * restrict s, size_t bs, const void
98039803

98049804
const int32x4_t p1 = vpaddq_s32(ggml_vdotq_s32(mzero, q1b.val[0], q8b.val[0]), ggml_vdotq_s32(mzero, q1b.val[1], q8b.val[1]));
98059805
const int32x4_t p2 = vpaddq_s32(ggml_vdotq_s32(mzero, q1b.val[2], q8b.val[2]), ggml_vdotq_s32(mzero, q1b.val[3], q8b.val[3]));
9806+
const int32x4_t p12 = vpaddq_s32(p1, p2);
98069807

98079808
delta.val[0] = vcombine_s8(qh[0] & 0x08 ? minus1 : plus1, qh[0] & 0x80 ? minus1 : plus1);
98089809
delta.val[1] = vcombine_s8(qh[1] & 0x08 ? minus1 : plus1, qh[1] & 0x80 ? minus1 : plus1);
@@ -9811,16 +9812,13 @@ void ggml_vec_dot_iq1_m_q8_K (int n, float * restrict s, size_t bs, const void
98119812

98129813
const int32x4_t p3 = vpaddq_s32(ggml_vdotq_s32(mzero, delta.val[0], q8b.val[0]), ggml_vdotq_s32(mzero, delta.val[1], q8b.val[1]));
98139814
const int32x4_t p4 = vpaddq_s32(ggml_vdotq_s32(mzero, delta.val[2], q8b.val[2]), ggml_vdotq_s32(mzero, delta.val[3], q8b.val[3]));
9815+
const int32x4_t p34 = vpaddq_s32(p3, p4);
98149816

9815-
int32x4_t scale1 = vcombine_s32(vdup_n_s32(sc[ib/2] >> 0), vdup_n_s32(sc[ib/2] >> 3));
9816-
int32x4_t scale2 = vcombine_s32(vdup_n_s32(sc[ib/2] >> 6), vdup_n_s32(sc[ib/2] >> 9));
9817-
scale1 = vaddq_s32(vshlq_n_s32(vandq_s32(scale1, mask), 1), mone);
9818-
scale2 = vaddq_s32(vshlq_n_s32(vandq_s32(scale2, mask), 1), mone);
9817+
int32x4_t scales_4 = {sc[ib/2] >> 0, sc[ib/2] >> 3, sc[ib/2] >> 6, sc[ib/2] >> 9};
9818+
scales_4 = vaddq_s32(vshlq_n_s32(vandq_s32(scales_4, mask), 1), mone);
98199819

9820-
sumi1 = vmlaq_s32(sumi1, scale1, p1);
9821-
sumi1 = vmlaq_s32(sumi1, scale2, p2);
9822-
sumi2 = vmlaq_s32(sumi2, scale1, p3);
9823-
sumi2 = vmlaq_s32(sumi2, scale2, p4);
9820+
sumi1 = vmlaq_s32(sumi1, scales_4, p12);
9821+
sumi2 = vmlaq_s32(sumi2, scales_4, p34);
98249822

98259823
qs += 8; qh += 4;
98269824

0 commit comments

Comments
 (0)