ggml-cpu: refactor repack, format

Author: taimur-10x

ggml/src/ggml-cpu/arch-fallback.h

@@ -36,8 +36,6 @@
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -49,14 +47,8 @@
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -68,74 +60,38 @@
 #define ggml_gemm_q6_K_8x8_q8_K_generic   ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM) || defined(_M_ARM64)
 // repack.cpp
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
 #define ggml_gemv_q2_K_8x8_q8_K_generic ggml_gemv_q2_K_8x8_q8_K
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
 #define ggml_gemm_q2_K_8x8_q8_K_generic ggml_gemm_q2_K_8x8_q8_K
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
 #elif defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || defined(_M_X64)
 // repack.cpp
 #define ggml_quantize_mat_q8_0_4x4_generic ggml_quantize_mat_q8_0_4x4
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_K_8x4_q8_K_generic ggml_gemv_q4_K_8x4_q8_K
 #define ggml_gemv_q5_K_8x8_q8_K_generic ggml_gemv_q5_K_8x8_q8_K
 #define ggml_gemv_q6_K_8x4_q8_K_generic ggml_gemv_q6_K_8x4_q8_K
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_K_8x4_q8_K_generic ggml_gemm_q4_K_8x4_q8_K
 #define ggml_gemm_q5_K_8x8_q8_K_generic ggml_gemm_q5_K_8x8_q8_K
 #define ggml_gemm_q6_K_8x4_q8_K_generic ggml_gemm_q6_K_8x4_q8_K
 #define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #elif defined(__POWERPC__) || defined(__powerpc__)
 // ref: https://github.com/ggml-org/llama.cpp/pull/14146#issuecomment-2972561679
 // quants.c
@@ -148,8 +104,6 @@
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -161,14 +115,8 @@
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -180,14 +128,8 @@
 #define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #elif defined(__loongarch64)
 // quants.c
 #define quantize_row_q8_K_generic quantize_row_q8_K
@@ -200,8 +142,6 @@
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -213,14 +153,8 @@
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -232,14 +166,8 @@
 #define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #elif defined(__riscv)
 // quants.c
 #define quantize_row_q8_K_generic quantize_row_q8_K
@@ -304,8 +232,6 @@
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -317,14 +243,8 @@
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -336,14 +256,8 @@
 #define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #elif defined(__wasm__)
 // quants.c
 #define ggml_vec_dot_q4_1_q8_1_generic ggml_vec_dot_q4_1_q8_1
@@ -364,8 +278,6 @@
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
-#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
-#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
 #define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
 #define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
 #define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -377,14 +289,8 @@
 #define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
 #define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
 #define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
-#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
-#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
-#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
-#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
-#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
-#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
-#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
-#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
+#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
+#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
 #define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
 #define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
 #define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -396,12 +302,6 @@
 #define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
 #define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
 #define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
-#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
-#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
-#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
-#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
-#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
-#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
-#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
-#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
+#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
+#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
 #endif