Fixed missing guards when selecting optimal repack type for Q4_K

Alcpz · Alcpz · commit 0b456659e6d6 · 2025-10-23T11:02:00.000+01:00
Signed-off-by: Alberto Cabrera &lt;alberto.cabrera@liquid.ai&gt;
diff --git a/ggml/src/ggml-cpu/repack.cpp b/ggml/src/ggml-cpu/repack.cpp
@@ -1846,8 +1846,11 @@ static const ggml::cpu::tensor_traits * ggml_repack_get_optimal_repack_type(cons
             if (cur->ne[1] % 8 == 0) {
                 return &q4_K_8x8_q8_K;
             }
-        } else if (ggml_cpu_has_neon() && ggml_cpu_has_matmul_int8()) {
-            return &q4_K_8x8_q8_K;
+        }
+        if (ggml_cpu_has_neon() && ggml_cpu_has_matmul_int8() && ggml_cpu_has_dotprod()) {
+            if (cur->ne[1] % 8 == 0) {
+                return &q4_K_8x8_q8_K;
+            }
         }
     } else if (cur->type == GGML_TYPE_Q2_K) {
         if (ggml_cpu_has_avx512()) {

Original file line number	Diff line number	Diff line change
`@@ -1846,8 +1846,11 @@ static const ggml::cpu::tensor_traits * ggml_repack_get_optimal_repack_type(cons`
`1846`	`1846`	`if (cur->ne[1] % 8 == 0) {`
`1847`	`1847`	`return &q4_K_8x8_q8_K;`
`1848`	`1848`	`}`
`1849`		`- } else if (ggml_cpu_has_neon() && ggml_cpu_has_matmul_int8()) {`
`1850`		`- return &q4_K_8x8_q8_K;`
	`1849`	`+ }`
	`1850`	`+ if (ggml_cpu_has_neon() && ggml_cpu_has_matmul_int8() && ggml_cpu_has_dotprod()) {`
	`1851`	`+ if (cur->ne[1] % 8 == 0) {`
	`1852`	`+ return &q4_K_8x8_q8_K;`
	`1853`	`+ }`
`1851`	`1854`	`}`
`1852`	`1855`	`} else if (cur->type == GGML_TYPE_Q2_K) {`
`1853`	`1856`	`if (ggml_cpu_has_avx512()) {`