Skip to content

ggml : riscv: add 128-bit RVV support #12530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggerganov merged 4 commits into from
Mar 27, 2025
Merged

ggml : riscv: add 128-bit RVV support #12530

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fac0d0
ggml : add 128-bit RVV support
xctan Mar 21, 2025
de8387e
ggml : revert to old RVV 256+ q2_K, q3_K, q4_K, q6_K impl
xctan Mar 21, 2025
0b43956
remove trailing whitespaces
xctan Mar 23, 2025
d1cac3d
restructure vector length selection code
xctan Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
restructure vector length selection code
  • Loading branch information
@xctan
xctan committed Mar 25, 2025
commit d1cac3da9ca6be1a02885830db0278d213f93b6d
51 changes: 40 additions & 11 deletions ggml/src/ggml-cpu/ggml-cpu-quants.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5108,12 +5108,15 @@ void ggml_vec_dot_q2_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi

#elif defined __riscv_v_intrinsic

const int vector_length = __riscv_vlenb() * 8;
float sumf = 0;

if (__riscv_vlenb() >= 32) {
uint8_t temp_01[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
uint8_t temp_01[32] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
uint8_t atmp[16];

switch (vector_length) {
case 256:
for (int i = 0; i < nb; ++i) {
const uint8_t * q2 = x[i].qs;
const int8_t * q8 = y[i].qs;
Expand Down Expand Up @@ -5188,8 +5191,8 @@ void ggml_vec_dot_q2_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi

sumf += dall * isum;
}
} else if (__riscv_vlenb() == 16) {
uint8_t atmp[16];
break;
case 128:
for (int i = 0; i < nb; ++i) {
const uint8_t * q2 = x[i].qs;
const int8_t * q8 = y[i].qs;
Expand Down Expand Up @@ -5277,6 +5280,10 @@ void ggml_vec_dot_q2_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi

sumf += dall * isum;
}
break;
default:
assert(false && "Unsupported vector length");
break;
}

*s = sumf;
Expand Down Expand Up @@ -6141,8 +6148,11 @@ void ggml_vec_dot_q3_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
uint32_t aux[3];
uint32_t utmp[4];

const int vector_length = __riscv_vlenb() * 8;
float sumf = 0;
if (__riscv_vlenb() >= 32) {

switch (vector_length) {
case 256:
for (int i = 0; i < nb; ++i) {

const uint8_t * GGML_RESTRICT q3 = x[i].qs;
Expand Down Expand Up @@ -6234,7 +6244,8 @@ void ggml_vec_dot_q3_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
sumf += d*sum_t;

}
} else if (__riscv_vlenb() == 16) {
break;
case 128:
for (int i = 0; i < nb; ++i) {
const uint8_t * restrict q3 = x[i].qs;
const uint8_t * restrict qh = x[i].hmask;
Expand Down Expand Up @@ -6348,6 +6359,10 @@ void ggml_vec_dot_q3_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
const float d = GGML_FP16_TO_FP32(x[i].d) * y[i].d;
sumf += d * isum;
}
break;
default:
assert(false && "Unsupported vector length");
break;
}

*s = sumf;
Expand Down Expand Up @@ -7065,9 +7080,11 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
const uint8_t * scales = (const uint8_t*)&utmp[0];
const uint8_t * mins = (const uint8_t*)&utmp[2];

const int vector_length = __riscv_vlenb() * 8;
float sumf = 0;

if (__riscv_vlenb() >= 32) {
switch (vector_length) {
case 256:
for (int i = 0; i < nb; ++i) {

size_t vl = 8;
Expand Down Expand Up @@ -7130,7 +7147,8 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
sumf += d*(sum_1 + sum_2);

}
} else if (__riscv_vlenb() == 16) {
break;
case 128:
for (int i = 0; i < nb; ++i) {
const float d = y[i].d * GGML_FP16_TO_FP32(x[i].d);
const float dmin = y[i].d * GGML_FP16_TO_FP32(x[i].dmin);
Expand Down Expand Up @@ -7233,6 +7251,10 @@ void ggml_vec_dot_q4_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi

sumf += d * sumi;
}
break;
default:
assert(false && "Unsupported vector length");
break;
}

*s = sumf;
Expand Down Expand Up @@ -8912,9 +8934,11 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi

#elif defined __riscv_v_intrinsic

const int vector_length = __riscv_vlenb() * 8;
float sumf = 0;

if (__riscv_vlenb() >= 32) {
switch (vector_length) {
case 256:
for (int i = 0; i < nb; ++i) {

const float d = GGML_FP16_TO_FP32(x[i].d) * y[i].d;
Expand Down Expand Up @@ -8994,7 +9018,8 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
sumf += d * sum_t;

}
} else if (__riscv_vlenb() == 16) {
break;
case 128:
for (int i = 0; i < nb; ++i) {

const float d = GGML_FP16_TO_FP32(x[i].d) * y[i].d;
Expand Down Expand Up @@ -9067,6 +9092,10 @@ void ggml_vec_dot_q6_K_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const voi
sumf += d * sum_t;

}
break;
default:
assert(false && "Unsupported vector length");
break;
}

*s = sumf;
Expand Down
Loading