Skip to content

Commit ae23132

Browse files
committed
Alphabetize RVV elementwise entries in cmake/bzl lists
Move f32-velu, f32-vgelu, f32-vapproxgelu entries from end of PROD/NON_PROD lists to alphabetical positions to avoid merge conflicts with other RVV PRs.
1 parent d3121ea commit ae23132

2 files changed

Lines changed: 40 additions & 40 deletions

File tree

cmake/gen/rvv_microkernels.cmake

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ SET(PROD_RVV_MICROKERNEL_SRCS
4343
src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c
4444
src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c
4545
src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c
46+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c
4647
src/f32-vbinary/gen/f32-vadd-rvv-u8v.c
4748
src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c
4849
src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c
@@ -69,6 +70,8 @@ SET(PROD_RVV_MICROKERNEL_SRCS
6970
src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c
7071
src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c
7172
src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c
73+
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c
74+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c
7275
src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c
7376
src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c
7477
src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c
@@ -143,9 +146,6 @@ SET(PROD_RVV_MICROKERNEL_SRCS
143146
src/x32-transposec/gen/x32-transposec-8x8-rvv.c
144147
src/x32-transposec/gen/x32-transposec-16x8-rvv.c
145148
src/x32-transposec/gen/x32-transposec-32x8-rvv.c
146-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c
147-
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c
148-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c)
149149

150150
SET(NON_PROD_RVV_MICROKERNEL_SRCS
151151
src/f32-conv-hwc2chw/f32-conv-hwc2chw-3x3s2p1c3x2v-rvv-1x1.c
@@ -201,6 +201,13 @@ SET(NON_PROD_RVV_MICROKERNEL_SRCS
201201
src/f32-spmm/gen/f32-spmm-4vx1-minmax-rvv.c
202202
src/f32-spmm/gen/f32-spmm-4vx2-minmax-rvv.c
203203
src/f32-spmm/gen/f32-spmm-8vx4-minmax-rvv.c
204+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u1v.c
205+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u2v.c
206+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u8v.c
207+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u1v.c
208+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u2v.c
209+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u4v.c
210+
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u8v.c
204211
src/f32-vbinary/gen/f32-vadd-rvv-u4v.c
205212
src/f32-vbinary/gen/f32-vaddc-rvv-u4v.c
206213
src/f32-vbinary/gen/f32-vdiv-rvv-u4v.c
@@ -234,6 +241,16 @@ SET(NON_PROD_RVV_MICROKERNEL_SRCS
234241
src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u1v.c
235242
src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u2v.c
236243
src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u4v.c
244+
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u1v.c
245+
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u2v.c
246+
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u8v.c
247+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u1v.c
248+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u2v.c
249+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u8v.c
250+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u1v.c
251+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u2v.c
252+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u4v.c
253+
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u8v.c
237254
src/f32-vhswish/gen/f32-vhswish-rvv-u1v.c
238255
src/f32-vhswish/gen/f32-vhswish-rvv-u2v.c
239256
src/f32-vhswish/gen/f32-vhswish-rvv-u8v.c
@@ -337,22 +354,5 @@ SET(NON_PROD_RVV_MICROKERNEL_SRCS
337354
src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u2.c
338355
src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u4.c
339356
src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u8.c
340-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u1v.c
341-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u2v.c
342-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u8v.c
343-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u1v.c
344-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u2v.c
345-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u4v.c
346-
src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u8v.c
347-
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u1v.c
348-
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u2v.c
349-
src/f32-velu/gen/f32-velu-rvv-rr2-p6-u8v.c
350-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u1v.c
351-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u2v.c
352-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u8v.c
353-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u1v.c
354-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u2v.c
355-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u4v.c
356-
src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u8v.c)
357357

358358
SET(ALL_RVV_MICROKERNEL_SRCS ${PROD_RVV_MICROKERNEL_SRCS} + ${NON_PROD_RVV_MICROKERNEL_SRCS})

gen/rvv_microkernels.bzl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ PROD_RVV_MICROKERNEL_SRCS = [
3939
"src/f32-spmm/gen/f32-spmm-4vx4-minmax-rvv.c",
4040
"src/f32-spmm/gen/f32-spmm-8vx1-minmax-rvv.c",
4141
"src/f32-spmm/gen/f32-spmm-8vx2-minmax-rvv.c",
42+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c",
4243
"src/f32-vbinary/gen/f32-vadd-rvv-u8v.c",
4344
"src/f32-vbinary/gen/f32-vaddc-rvv-u8v.c",
4445
"src/f32-vbinary/gen/f32-vdiv-rvv-u8v.c",
@@ -65,6 +66,8 @@ PROD_RVV_MICROKERNEL_SRCS = [
6566
"src/f32-vcopysign/gen/f32-vrcopysignc-rvv-u8v.c",
6667
"src/f32-vcos/gen/f32-vcos-rvv-rational-5-4-div-u8v.c",
6768
"src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u8v.c",
69+
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c",
70+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c",
6871
"src/f32-vhswish/gen/f32-vhswish-rvv-u4v.c",
6972
"src/f32-vlog/gen/f32-vlog-rvv-rational-3-3-div-u8v.c",
7073
"src/f32-vlrelu/gen/f32-vlrelu-rvv-u4v.c",
@@ -139,9 +142,6 @@ PROD_RVV_MICROKERNEL_SRCS = [
139142
"src/x32-transposec/gen/x32-transposec-8x8-rvv.c",
140143
"src/x32-transposec/gen/x32-transposec-16x8-rvv.c",
141144
"src/x32-transposec/gen/x32-transposec-32x8-rvv.c",
142-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u4v.c",
143-
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u4v.c",
144-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u4v.c",
145145
]
146146

147147
NON_PROD_RVV_MICROKERNEL_SRCS = [
@@ -198,6 +198,13 @@ NON_PROD_RVV_MICROKERNEL_SRCS = [
198198
"src/f32-spmm/gen/f32-spmm-4vx1-minmax-rvv.c",
199199
"src/f32-spmm/gen/f32-spmm-4vx2-minmax-rvv.c",
200200
"src/f32-spmm/gen/f32-spmm-8vx4-minmax-rvv.c",
201+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u1v.c",
202+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u2v.c",
203+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u8v.c",
204+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u1v.c",
205+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u2v.c",
206+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u4v.c",
207+
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u8v.c",
201208
"src/f32-vbinary/gen/f32-vadd-rvv-u4v.c",
202209
"src/f32-vbinary/gen/f32-vaddc-rvv-u4v.c",
203210
"src/f32-vbinary/gen/f32-vdiv-rvv-u4v.c",
@@ -231,6 +238,16 @@ NON_PROD_RVV_MICROKERNEL_SRCS = [
231238
"src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u1v.c",
232239
"src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u2v.c",
233240
"src/f32-vexp/gen/f32-vexp-rvv-rational-3-2-div-u4v.c",
241+
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u1v.c",
242+
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u2v.c",
243+
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u8v.c",
244+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u1v.c",
245+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u2v.c",
246+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u8v.c",
247+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u1v.c",
248+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u2v.c",
249+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u4v.c",
250+
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u8v.c",
234251
"src/f32-vhswish/gen/f32-vhswish-rvv-u1v.c",
235252
"src/f32-vhswish/gen/f32-vhswish-rvv-u2v.c",
236253
"src/f32-vhswish/gen/f32-vhswish-rvv-u8v.c",
@@ -334,23 +351,6 @@ NON_PROD_RVV_MICROKERNEL_SRCS = [
334351
"src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u2.c",
335352
"src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u4.c",
336353
"src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u8.c",
337-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u1v.c",
338-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u2v.c",
339-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-div-u8v.c",
340-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u1v.c",
341-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u2v.c",
342-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u4v.c",
343-
"src/f32-vapproxgelu/gen/f32-vapproxgelu-rvv-rational-12-10-nr-u8v.c",
344-
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u1v.c",
345-
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u2v.c",
346-
"src/f32-velu/gen/f32-velu-rvv-rr2-p6-u8v.c",
347-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u1v.c",
348-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u2v.c",
349-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-div-u8v.c",
350-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u1v.c",
351-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u2v.c",
352-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u4v.c",
353-
"src/f32-vgelu/gen/f32-vgelu-rvv-rational-12-10-nr-u8v.c",
354354
]
355355

356356
ALL_RVV_MICROKERNEL_SRCS = PROD_RVV_MICROKERNEL_SRCS + NON_PROD_RVV_MICROKERNEL_SRCS

0 commit comments

Comments
 (0)