Skip to content

Commit 28e07aa

Browse files
taimur-10xtaimur-10x
committed
ggml-cpu: refactor repack, format
1 parent 0d9caad commit 28e07aa

2 files changed

Lines changed: 263 additions & 233 deletions

File tree

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

Lines changed: 24 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
3737
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
3838
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
39-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
40-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
4139
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
4240
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
4341
#define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -48,14 +46,8 @@
4846
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
4947
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
5048
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
51-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
52-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
53-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
54-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
55-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
56-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
57-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
58-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
49+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
50+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
5951
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
6052
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
6153
#define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -66,72 +58,36 @@
6658
# define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
6759
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
6860
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
69-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
70-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
71-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
72-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
73-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
74-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
75-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
76-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
61+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
62+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
7763
#elif defined(__aarch64__) || defined(__arm__) || defined(_M_ARM) || defined(_M_ARM64)
7864
// repack.cpp
7965
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
8066
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
8167
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
8268
#define ggml_gemv_q2_K_8x8_q8_K_generic ggml_gemv_q2_K_8x8_q8_K
83-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
84-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
85-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
86-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
87-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
88-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
89-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
90-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
9169
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
9270
#define ggml_gemm_q2_K_8x8_q8_K_generic ggml_gemm_q2_K_8x8_q8_K
93-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
94-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
95-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
96-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
97-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
98-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
99-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
100-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
10171
#elif defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || defined(_M_X64)
10272
// repack.cpp
10373
#define ggml_quantize_mat_q8_0_4x4_generic ggml_quantize_mat_q8_0_4x4
10474
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
105-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
106-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
10775
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
10876
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
10977
#define ggml_gemv_q4_K_8x4_q8_K_generic ggml_gemv_q4_K_8x4_q8_K
11078
#define ggml_gemv_q5_K_8x8_q8_K_generic ggml_gemv_q5_K_8x8_q8_K
11179
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
11280
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
113-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
114-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
115-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
116-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
117-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
118-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
119-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
120-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
81+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
82+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
12183
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
12284
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
12385
#define ggml_gemm_q4_K_8x4_q8_K_generic ggml_gemm_q4_K_8x4_q8_K
12486
#define ggml_gemm_q5_K_8x8_q8_K_generic ggml_gemm_q5_K_8x8_q8_K
12587
#define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
12688
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
127-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
128-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
129-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
130-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
131-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
132-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
133-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
134-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
89+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
90+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
13591
#elif defined(__POWERPC__) || defined(__powerpc__)
13692
// ref: https://github.com/ggml-org/llama.cpp/pull/14146#issuecomment-2972561679
13793
// quants.c
@@ -144,8 +100,6 @@
144100
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
145101
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
146102
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
147-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
148-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
149103
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
150104
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
151105
#define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -156,14 +110,8 @@
156110
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
157111
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
158112
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
159-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
160-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
161-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
162-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
163-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
164-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
165-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
166-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
113+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
114+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
167115
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
168116
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
169117
#define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -174,14 +122,8 @@
174122
#define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
175123
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
176124
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
177-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
178-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
179-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
180-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
181-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
182-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
183-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
184-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
125+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
126+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
185127
#elif defined(__loongarch64)
186128
// quants.c
187129
#define quantize_row_q8_K_generic quantize_row_q8_K
@@ -194,8 +136,6 @@
194136
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
195137
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
196138
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
197-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
198-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
199139
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
200140
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
201141
#define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -206,14 +146,8 @@
206146
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
207147
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
208148
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
209-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
210-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
211-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
212-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
213-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
214-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
215-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
216-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
149+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
150+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
217151
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
218152
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
219153
#define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -224,14 +158,8 @@
224158
#define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
225159
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
226160
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
227-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
228-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
229-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
230-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
231-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
232-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
233-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
234-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
161+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
162+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
235163
#elif defined(__riscv)
236164
// quants.c
237165
#define quantize_row_q8_K_generic quantize_row_q8_K
@@ -294,8 +222,6 @@
294222
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
295223
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
296224
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
297-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
298-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
299225
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
300226
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
301227
#define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -306,14 +232,8 @@
306232
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
307233
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
308234
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
309-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
310-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
311-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
312-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
313-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
314-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
315-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
316-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
235+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
236+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
317237
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
318238
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
319239
#define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -324,14 +244,8 @@
324244
#define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
325245
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
326246
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
327-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
328-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
329-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
330-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
331-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
332-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
333-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
334-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
247+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
248+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
335249
#elif defined(__wasm__)
336250
// quants.c
337251
#define ggml_vec_dot_q4_1_q8_1_generic ggml_vec_dot_q4_1_q8_1
@@ -352,8 +266,6 @@
352266
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
353267
#define ggml_quantize_mat_q8_K_4x4_generic ggml_quantize_mat_q8_K_4x4
354268
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8
355-
#define ggml_repack_mat_f16_7x1_generic ggml_repack_mat_f16_7x1
356-
#define ggml_repack_mat_f32_7x1_generic ggml_repack_mat_f32_7x1
357269
#define ggml_gemv_q4_0_4x4_q8_0_generic ggml_gemv_q4_0_4x4_q8_0
358270
#define ggml_gemv_q4_0_4x8_q8_0_generic ggml_gemv_q4_0_4x8_q8_0
359271
#define ggml_gemv_q4_0_8x8_q8_0_generic ggml_gemv_q4_0_8x8_q8_0
@@ -364,14 +276,8 @@
364276
#define ggml_gemv_q6_K_8x8_q8_K_generic ggml_gemv_q6_K_8x8_q8_K
365277
#define ggml_gemv_iq4_nl_4x4_q8_0_generic ggml_gemv_iq4_nl_4x4_q8_0
366278
#define ggml_gemv_iq4_nl_8x8_q8_0_generic ggml_gemv_iq4_nl_8x8_q8_0
367-
#define ggml_gemv_f16_1x16_f16_generic ggml_gemv_f16_1x16_f16
368-
#define ggml_gemv_f16_1x32_f16_generic ggml_gemv_f16_1x32_f16
369-
#define ggml_gemv_f16_1x64_f16_generic ggml_gemv_f16_1x64_f16
370-
#define ggml_gemv_f16_1x128_f16_generic ggml_gemv_f16_1x128_f16
371-
#define ggml_gemv_f32_1x16_f32_generic ggml_gemv_f32_1x16_f32
372-
#define ggml_gemv_f32_1x32_f32_generic ggml_gemv_f32_1x32_f32
373-
#define ggml_gemv_f32_1x64_f32_generic ggml_gemv_f32_1x64_f32
374-
#define ggml_gemv_f32_1x128_f32_generic ggml_gemv_f32_1x128_f32
279+
#define ggml_gemv_q8_0_4x4_q8_0_generic ggml_gemv_q8_0_4x4_q8_0
280+
#define ggml_gemv_q8_0_4x8_q8_0_generic ggml_gemv_q8_0_4x8_q8_0
375281
#define ggml_gemm_q4_0_4x4_q8_0_generic ggml_gemm_q4_0_4x4_q8_0
376282
#define ggml_gemm_q4_0_4x8_q8_0_generic ggml_gemm_q4_0_4x8_q8_0
377283
#define ggml_gemm_q4_0_8x8_q8_0_generic ggml_gemm_q4_0_8x8_q8_0
@@ -382,12 +288,6 @@
382288
#define ggml_gemm_q6_K_8x8_q8_K_generic ggml_gemm_q6_K_8x8_q8_K
383289
#define ggml_gemm_iq4_nl_4x4_q8_0_generic ggml_gemm_iq4_nl_4x4_q8_0
384290
#define ggml_gemm_iq4_nl_8x8_q8_0_generic ggml_gemm_iq4_nl_8x8_q8_0
385-
#define ggml_gemm_f16_7x1x16_f16_generic ggml_gemm_f16_7x1x16_f16
386-
#define ggml_gemm_f16_7x1x32_f16_generic ggml_gemm_f16_7x1x32_f16
387-
#define ggml_gemm_f16_7x1x64_f16_generic ggml_gemm_f16_7x1x64_f16
388-
#define ggml_gemm_f16_7x1x128_f16_generic ggml_gemm_f16_7x1x128_f16
389-
#define ggml_gemm_f32_7x1x16_f32_generic ggml_gemm_f32_7x1x16_f32
390-
#define ggml_gemm_f32_7x1x32_f32_generic ggml_gemm_f32_7x1x32_f32
391-
#define ggml_gemm_f32_7x1x64_f32_generic ggml_gemm_f32_7x1x64_f32
392-
#define ggml_gemm_f32_7x1x128_f32_generic ggml_gemm_f32_7x1x128_f32
291+
#define ggml_gemm_q8_0_4x4_q8_0_generic ggml_gemm_q8_0_4x4_q8_0
292+
#define ggml_gemm_q8_0_4x8_q8_0_generic ggml_gemm_q8_0_4x8_q8_0
393293
#endif

0 commit comments

Comments
 (0)