Skip to content

Commit 320e2d9

Browse files
author
Kwok Cheung Yeung
committed
Replace original RISC-V ZVL kernels with new kernels
The original kernels have been deleted with this commit.
1 parent 65108ac commit 320e2d9

10 files changed

Lines changed: 25 additions & 8148 deletions

‎kernel/riscv64/KERNEL.RISCV64_ZVL128B‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ DGEMVTKERNEL = gemv_t_rvv.c
9595
CGEMVTKERNEL = zgemv_t_rvv.c
9696
ZGEMVTKERNEL = zgemv_t_rvv.c
9797

98-
SGEMMKERNEL = sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N)_zvl128b.c
98+
SGEMMKERNEL = sgemm_kernel_zvl128b.c
9999
ifneq ($(filter $(SGEMM_UNROLL_N),4 8 16),)
100100
SGEMMONCOPY = gemm_ncopy_$(SGEMM_UNROLL_N)_rvv.c
101-
SGEMMOTCOPY = gemm_tcopy_$(SGEMM_UNROLL_N)_rvv.c
101+
SGEMMOTCOPY = gemm_tcopy_$(SGEMM_UNROLL_N)_rvv_max.c
102102
else
103103
SGEMMONCOPY = ../generic/gemm_ncopy_$(SGEMM_UNROLL_N).c
104104
SGEMMOTCOPY = ../generic/gemm_tcopy_$(SGEMM_UNROLL_N).c
@@ -109,7 +109,7 @@ SGEMMOTCOPYOBJ = sgemm_otcopy$(TSUFFIX).$(SUFFIX)
109109
ifneq ($(SGEMM_UNROLL_M), $(SGEMM_UNROLL_N))
110110
ifneq ($(filter $(SGEMM_UNROLL_M),4 8 16),)
111111
SGEMMINCOPY = gemm_ncopy_$(SGEMM_UNROLL_M)_rvv.c
112-
SGEMMITCOPY = gemm_tcopy_$(SGEMM_UNROLL_M)_rvv.c
112+
SGEMMITCOPY = gemm_tcopy_$(SGEMM_UNROLL_M)_rvv_max.c
113113
else
114114
SGEMMINCOPY = ../generic/gemm_ncopy_$(SGEMM_UNROLL_M).c
115115
SGEMMITCOPY = ../generic/gemm_tcopy_$(SGEMM_UNROLL_M).c
@@ -118,10 +118,10 @@ SGEMMINCOPYOBJ = sgemm_incopy$(TSUFFIX).$(SUFFIX)
118118
SGEMMITCOPYOBJ = sgemm_itcopy$(TSUFFIX).$(SUFFIX)
119119
endif
120120

121-
DGEMMKERNEL = dgemm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_zvl128b.c
121+
DGEMMKERNEL = dgemm_kernel_zvl128b.c
122122
DGEMMONCOPY = ../generic/gemm_ncopy_$(DGEMM_UNROLL_N).c
123123
ifneq ($(filter $(DGEMM_UNROLL_N),4 8 16),)
124-
DGEMMOTCOPY = gemm_tcopy_$(DGEMM_UNROLL_N)_rvv.c
124+
DGEMMOTCOPY = gemm_tcopy_$(DGEMM_UNROLL_N)_rvv_max.c
125125
else
126126
DGEMMOTCOPY = ../generic/gemm_tcopy_$(DGEMM_UNROLL_N).c
127127
endif
@@ -131,36 +131,36 @@ DGEMMOTCOPYOBJ = dgemm_otcopy$(TSUFFIX).$(SUFFIX)
131131
ifneq ($(DGEMM_UNROLL_M), $(DGEMM_UNROLL_N))
132132
DGEMMINCOPY = ../generic/gemm_ncopy_$(DGEMM_UNROLL_M).c
133133
ifneq ($(filter $(DGEMM_UNROLL_M),4 8 16),)
134-
DGEMMITCOPY = gemm_tcopy_$(DGEMM_UNROLL_M)_rvv.c
134+
DGEMMITCOPY = gemm_tcopy_$(DGEMM_UNROLL_M)_rvv_max.c
135135
else
136136
DGEMMITCOPY = ../generic/gemm_tcopy_$(DGEMM_UNROLL_M).c
137137
endif
138138
DGEMMINCOPYOBJ = dgemm_incopy$(TSUFFIX).$(SUFFIX)
139139
DGEMMITCOPYOBJ = dgemm_itcopy$(TSUFFIX).$(SUFFIX)
140140
endif
141141

142-
CGEMMKERNEL = cgemm_kernel_$(CGEMM_UNROLL_M)x$(CGEMM_UNROLL_N)_zvl128b.c
142+
CGEMMKERNEL = cgemm_kernel_zvl128b.c
143143
CGEMMONCOPY = ../generic/zgemm_ncopy_$(CGEMM_UNROLL_N).c
144-
CGEMMOTCOPY = ../generic/zgemm_tcopy_$(CGEMM_UNROLL_N).c
144+
CGEMMOTCOPY = zgemm_tcopy_$(CGEMM_UNROLL_N)_rvv_max.c
145145
CGEMMONCOPYOBJ = cgemm_oncopy$(TSUFFIX).$(SUFFIX)
146146
CGEMMOTCOPYOBJ = cgemm_otcopy$(TSUFFIX).$(SUFFIX)
147147

148148
ifneq ($(CGEMM_UNROLL_M), $(CGEMM_UNROLL_N))
149149
CGEMMINCOPY = ../generic/zgemm_ncopy_$(CGEMM_UNROLL_M).c
150-
CGEMMITCOPY = ../generic/zgemm_tcopy_$(CGEMM_UNROLL_M).c
150+
CGEMMITCOPY = zgemm_tcopy_$(CGEMM_UNROLL_M)_rvv_max.c
151151
CGEMMINCOPYOBJ = cgemm_incopy$(TSUFFIX).$(SUFFIX)
152152
CGEMMITCOPYOBJ = cgemm_itcopy$(TSUFFIX).$(SUFFIX)
153153
endif
154154

155-
ZGEMMKERNEL = zgemm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N)_zvl128b.c
155+
ZGEMMKERNEL = zgemm_kernel_zvl128b.c
156156
ZGEMMONCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_N).c
157-
ZGEMMOTCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_N).c
157+
ZGEMMOTCOPY = zgemm_tcopy_$(ZGEMM_UNROLL_N)_rvv_max.c
158158
ZGEMMONCOPYOBJ = zgemm_oncopy$(TSUFFIX).$(SUFFIX)
159159
ZGEMMOTCOPYOBJ = zgemm_otcopy$(TSUFFIX).$(SUFFIX)
160160

161161
ifneq ($(ZGEMM_UNROLL_M), $(ZGEMM_UNROLL_N))
162162
ZGEMMINCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_M).c
163-
ZGEMMITCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_M).c
163+
ZGEMMITCOPY = zgemm_tcopy_$(ZGEMM_UNROLL_M)_rvv_max.c
164164
ZGEMMINCOPYOBJ = zgemm_incopy$(TSUFFIX).$(SUFFIX)
165165
ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX)
166166
endif

‎kernel/riscv64/KERNEL.RISCV64_ZVL256B‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ DTRMMKERNEL = dtrmm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_zvl256b.c
9595
CTRMMKERNEL = ctrmm_kernel_$(CGEMM_UNROLL_M)x$(CGEMM_UNROLL_N)_zvl256b.c
9696
ZTRMMKERNEL = ztrmm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N)_zvl256b.c
9797

98-
SGEMMKERNEL = sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N)_zvl256b.c
98+
SGEMMKERNEL = sgemm_kernel_zvl256b.c
9999
ifneq ($(filter $(SGEMM_UNROLL_N),4 8 16),)
100100
SGEMMONCOPY = gemm_ncopy_$(SGEMM_UNROLL_N)_rvv.c
101-
SGEMMOTCOPY = gemm_tcopy_$(SGEMM_UNROLL_N)_rvv.c
101+
SGEMMOTCOPY = gemm_tcopy_$(SGEMM_UNROLL_N)_rvv_max.c
102102
else
103103
SGEMMONCOPY = ../generic/gemm_ncopy_$(SGEMM_UNROLL_N).c
104104
SGEMMOTCOPY = ../generic/gemm_tcopy_$(SGEMM_UNROLL_N).c
@@ -108,7 +108,7 @@ SGEMMOTCOPYOBJ = sgemm_otcopy$(TSUFFIX).$(SUFFIX)
108108
ifneq ($(SGEMM_UNROLL_M), $(SGEMM_UNROLL_N))
109109
ifneq ($(filter $(SGEMM_UNROLL_M),4 8 16),)
110110
SGEMMINCOPY = gemm_ncopy_$(SGEMM_UNROLL_M)_rvv.c
111-
SGEMMITCOPY = gemm_tcopy_$(SGEMM_UNROLL_M)_rvv.c
111+
SGEMMITCOPY = gemm_tcopy_$(SGEMM_UNROLL_M)_rvv_max.c
112112
else
113113
SGEMMINCOPY = ../generic/gemm_ncopy_$(SGEMM_UNROLL_M).c
114114
SGEMMITCOPY = ../generic/gemm_tcopy_$(SGEMM_UNROLL_M).c
@@ -117,48 +117,49 @@ SGEMMINCOPYOBJ = sgemm_incopy$(TSUFFIX).$(SUFFIX)
117117
SGEMMITCOPYOBJ = sgemm_itcopy$(TSUFFIX).$(SUFFIX)
118118
endif
119119

120-
DGEMMKERNEL = dgemm_kernel_$(DGEMM_UNROLL_M)x$(DGEMM_UNROLL_N)_zvl256b.c
120+
DGEMMKERNEL = dgemm_kernel_zvl256b.c
121121
DGEMMONCOPY = ../generic/gemm_ncopy_$(DGEMM_UNROLL_N).c
122122
ifneq ($(filter $(DGEMM_UNROLL_N),4 8 16),)
123-
DGEMMOTCOPY = gemm_tcopy_$(DGEMM_UNROLL_N)_rvv.c
123+
DGEMMOTCOPY = gemm_tcopy_$(DGEMM_UNROLL_N)_rvv_max.c
124124
else
125125
DGEMMOTCOPY = ../generic/gemm_tcopy_$(DGEMM_UNROLL_N).c
126126
endif
127+
127128
DGEMMONCOPYOBJ = dgemm_oncopy$(TSUFFIX).$(SUFFIX)
128129
DGEMMOTCOPYOBJ = dgemm_otcopy$(TSUFFIX).$(SUFFIX)
129130
ifneq ($(DGEMM_UNROLL_M), $(DGEMM_UNROLL_N))
130131
DGEMMINCOPY = ../generic/gemm_ncopy_$(DGEMM_UNROLL_M).c
131132
ifneq ($(filter $(DGEMM_UNROLL_M),4 8 16),)
132-
DGEMMITCOPY = gemm_tcopy_$(DGEMM_UNROLL_M)_rvv.c
133+
DGEMMITCOPY = gemm_tcopy_$(DGEMM_UNROLL_M)_rvv_max.c
133134
else
134135
DGEMMITCOPY = ../generic/gemm_tcopy_$(DGEMM_UNROLL_M).c
135136
endif
136137
DGEMMINCOPYOBJ = dgemm_incopy$(TSUFFIX).$(SUFFIX)
137138
DGEMMITCOPYOBJ = dgemm_itcopy$(TSUFFIX).$(SUFFIX)
138139
endif
139140

140-
CGEMMKERNEL = cgemm_kernel_$(CGEMM_UNROLL_M)x$(CGEMM_UNROLL_N)_zvl256b.c
141+
CGEMMKERNEL = cgemm_kernel_zvl256b.c
141142
CGEMMONCOPY = ../generic/zgemm_ncopy_$(CGEMM_UNROLL_N).c
142-
CGEMMOTCOPY = ../generic/zgemm_tcopy_$(CGEMM_UNROLL_N).c
143+
CGEMMOTCOPY = zgemm_tcopy_$(CGEMM_UNROLL_N)_rvv_max.c
143144
CGEMMONCOPYOBJ = cgemm_oncopy$(TSUFFIX).$(SUFFIX)
144145
CGEMMOTCOPYOBJ = cgemm_otcopy$(TSUFFIX).$(SUFFIX)
145146

146147
ifneq ($(CGEMM_UNROLL_M), $(CGEMM_UNROLL_N))
147148
CGEMMINCOPY = ../generic/zgemm_ncopy_$(CGEMM_UNROLL_M).c
148-
CGEMMITCOPY = ../generic/zgemm_tcopy_$(CGEMM_UNROLL_M).c
149+
CGEMMITCOPY = zgemm_tcopy_$(CGEMM_UNROLL_M)_rvv_max.c
149150
CGEMMINCOPYOBJ = cgemm_incopy$(TSUFFIX).$(SUFFIX)
150151
CGEMMITCOPYOBJ = cgemm_itcopy$(TSUFFIX).$(SUFFIX)
151152
endif
152153

153-
ZGEMMKERNEL = zgemm_kernel_$(ZGEMM_UNROLL_M)x$(ZGEMM_UNROLL_N)_zvl256b.c
154+
ZGEMMKERNEL = zgemm_kernel_zvl256b.c
154155
ZGEMMONCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_N).c
155-
ZGEMMOTCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_N).c
156+
ZGEMMOTCOPY = zgemm_tcopy_$(ZGEMM_UNROLL_N)_rvv_max.c
156157
ZGEMMONCOPYOBJ = zgemm_oncopy$(TSUFFIX).$(SUFFIX)
157158
ZGEMMOTCOPYOBJ = zgemm_otcopy$(TSUFFIX).$(SUFFIX)
158159

159160
ifneq ($(ZGEMM_UNROLL_M), $(ZGEMM_UNROLL_N))
160161
ZGEMMINCOPY = ../generic/zgemm_ncopy_$(ZGEMM_UNROLL_M).c
161-
ZGEMMITCOPY = ../generic/zgemm_tcopy_$(ZGEMM_UNROLL_M).c
162+
ZGEMMITCOPY = zgemm_tcopy_$(ZGEMM_UNROLL_M)_rvv_max.c
162163
ZGEMMINCOPYOBJ = zgemm_incopy$(TSUFFIX).$(SUFFIX)
163164
ZGEMMITCOPYOBJ = zgemm_itcopy$(TSUFFIX).$(SUFFIX)
164165
endif

0 commit comments

Comments
 (0)