vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add cpuid check for avx-vnni

Browse source
This commit is contained in:
slaren 2024-12-01 14:57:12 +01:00
parent b14b9bf692
commit 6d78e0f335
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ggml/src/ggml-backend-reg.cpp
View file

@ -505,7 +505,6 @@ static ggml_backend_reg_t ggml_backend_load_best(const char * name, bool silent)
}
void ggml_backend_load_all() {
ggml_backend_load_best("amx", true);
ggml_backend_load_best("blas", true);
ggml_backend_load_best("cann", true);
ggml_backend_load_best("cuda", true);

4
ggml/src/ggml-cpu/cpu-feats-x86.cpp
View file

@ -76,6 +76,7 @@ struct cpuid_x86 {
bool AVX512_VNNI(void) { return f_7_ecx[11]; }
bool AVX512_FP16(void) { return f_7_edx[23]; }
bool AVX512_BF16(void) { return f_7_1_eax[5]; }
bool AVX_VNNI(void) { return f_7_1_eax[4]; }
bool AMX_TILE(void) { return f_7_edx[24]; }
bool AMX_INT8(void) { return f_7_edx[25]; }
@ -265,6 +266,7 @@ static int ggml_backend_cpu_x86_score() {
if (ggml_cpu_has_ssse3() && !is.SSSE3()) { return 0; }
if (ggml_cpu_has_sse3() && !is.SSE3()) { return 0; }
if (ggml_cpu_has_avx() && !is.AVX()) { return 0; }
if (ggml_cpu_has_avx_vnni() && !is.AVX_VNNI()) { return 0; }
if (ggml_cpu_has_avx2() && !is.AVX2()) { return 0; }
if (ggml_cpu_has_avx512() && !is.AVX512F()) { return 0; }
if (ggml_cpu_has_avx512_vbmi() && !is.AVX512_VBMI()) { return 0; }
@ -279,8 +281,8 @@ static int ggml_backend_cpu_x86_score() {
score += ggml_cpu_has_f16c () * 1<<1;
score += ggml_cpu_has_ssse3 () * 1<<2;
score += ggml_cpu_has_sse3 () * 1<<3;
// score += ggml_cpu_has_avx_vnni () * 1<<4; // not used
score += ggml_cpu_has_avx () * 1<<5;
score += ggml_cpu_has_avx_vnni () * 1<<4;
score += ggml_cpu_has_avx2 () * 1<<6;
score += ggml_cpu_has_avx512 () * 1<<7;
// score += ggml_cpu_has_avx512_vbmi() * 1<<8; // not used