Skip to content

Commit d15e0a0

Browse files
committed
LoongArch64: Fixed compilation issues when enable DYNAMIC_ARCH
1 parent e2ca22f commit d15e0a0

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

kernel/loongarch64/dgemv_n_8_lasx.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
341341
fmadd.d $f10, $f12, $f2, $f10
342342
.endm
343343

344-
.macro DGEMV_N XW:req, X_8:req, X_4:req, X_2:req, X_1:req, Y_8:req, Y_4:req, Y_1:req
344+
.macro DGEMV_N_LASX XW:req, X_8:req, X_4:req, X_2:req, X_1:req, Y_8:req, Y_4:req, Y_1:req
345345
PTR_SRLI J, N, 3
346346
beqz J, .L_\XW\()_N_7
347347
PTR_SLLI K_LDA, LDA, 3
@@ -541,13 +541,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
541541
.hword .L_GAP_1_0 - .L_GAP_TABLE
542542
.hword .L_GAP_1_1 - .L_GAP_TABLE
543543
.L_GAP_0_0: /* if (inc_x == 1) && (incy == 1) */
544-
DGEMV_N GAP_0_0, X_8, X_4, X_2, X_1, Y_8, Y_4, Y_1
544+
DGEMV_N_LASX GAP_0_0, X_8, X_4, X_2, X_1, Y_8, Y_4, Y_1
545545
.L_GAP_0_1: /* if (inc_x == 1) && (incy != 1) */
546-
DGEMV_N GAP_0_1, X_8, X_4, X_2, X_1, Y_8_GAP, Y_4_GAP, Y_1
546+
DGEMV_N_LASX GAP_0_1, X_8, X_4, X_2, X_1, Y_8_GAP, Y_4_GAP, Y_1
547547
.L_GAP_1_0: /* if (inc_x != 1) && (incy == 1) */
548-
DGEMV_N GAP_1_0, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8, Y_4, Y_1
548+
DGEMV_N_LASX GAP_1_0, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8, Y_4, Y_1
549549
.L_GAP_1_1: /* if (inc_x != 1) && (incy != 1) */
550-
DGEMV_N GAP_1_1, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8_GAP, Y_4_GAP, Y_1
550+
DGEMV_N_LASX GAP_1_1, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8_GAP, Y_4_GAP, Y_1
551551
.L_END:
552552
pop_if_used 17 + 7, 24 + 4
553553
jirl $r0, $r1, 0x0

kernel/loongarch64/dgemv_t_8_lasx.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
220220
GMADD xvf, d, TP0, A0, X0, TP0, TP1, A2, X0, TP1
221221
.endm
222222

223-
.macro DGEMV_T XW:req X8:req, X4:req
223+
.macro DGEMV_T_LASX XW:req X8:req, X4:req
224224
PTR_SRLI J, N, 3
225225
beqz J, .L_\XW\()_N_7
226226
PTR_SLLI K_LDA, LDA, 3
@@ -472,9 +472,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
472472
.hword .L_GAP_0 - .L_GAP_TABLE
473473
.hword .L_GAP_1 - .L_GAP_TABLE
474474
.L_GAP_0: /* if (incx == 1) */
475-
DGEMV_T GAP_0, X8, X4
475+
DGEMV_T_LASX GAP_0, X8, X4
476476
.L_GAP_1: /* if (incx != 1) */
477-
DGEMV_T GAP_1, X8_GAP, X4_GAP
477+
DGEMV_T_LASX GAP_1, X8_GAP, X4_GAP
478478
.L_END:
479479
pop_if_used 17 + 8, 24 + 3
480480
jirl $r0, $r1, 0x0

kernel/loongarch64/sgemv_n_8_lasx.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
274274
GST f, s, Y0_F, Y, 0
275275
.endm
276276

277-
.macro SGEMV_N XW:req, X_8:req, X_4:req, X_2:req, X_1:req, Y_8:req, Y_4:req, Y_1:req
277+
.macro SGEMV_N_LASX XW:req, X_8:req, X_4:req, X_2:req, X_1:req, Y_8:req, Y_4:req, Y_1:req
278278
PTR_SRLI J, N, 3
279279
beqz J, .L_\XW\()_N_7
280280
PTR_SLLI K_LDA, LDA, 3
@@ -450,13 +450,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
450450
.hword .L_GAP_1_0 - .L_GAP_TABLE
451451
.hword .L_GAP_1_1 - .L_GAP_TABLE
452452
.L_GAP_0_0: /* if (inc_x == 1) && (incy == 1) */
453-
SGEMV_N GAP_0_0, X_8, X_4, X_2, X_1, Y_8, Y_4, Y_1
453+
SGEMV_N_LASX GAP_0_0, X_8, X_4, X_2, X_1, Y_8, Y_4, Y_1
454454
.L_GAP_0_1: /* if (inc_x == 1) && (incy != 1) */
455-
SGEMV_N GAP_0_1, X_8, X_4, X_2, X_1, Y_8_GAP, Y_4_GAP, Y_1
455+
SGEMV_N_LASX GAP_0_1, X_8, X_4, X_2, X_1, Y_8_GAP, Y_4_GAP, Y_1
456456
.L_GAP_1_0: /* if (inc_x != 1) && (incy == 1) */
457-
SGEMV_N GAP_1_0, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8, Y_4, Y_1
457+
SGEMV_N_LASX GAP_1_0, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8, Y_4, Y_1
458458
.L_GAP_1_1: /* if (inc_x != 1) && (incy != 1) */
459-
SGEMV_N GAP_1_1, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8_GAP, Y_4_GAP, Y_1
459+
SGEMV_N_LASX GAP_1_1, X_8_GAP, X_4_GAP, X_2_GAP, X_1, Y_8_GAP, Y_4_GAP, Y_1
460460
.L_END:
461461
pop_if_used 17 + 7, 19
462462
jirl $r0, $r1, 0x0

kernel/loongarch64/sgemv_t_8_lasx.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
160160
GMADD xvf, s, TP0, A0, X0, TP0, TP1, A1, X0, TP1
161161
.endm
162162

163-
.macro SGEMV_T XW:req X8:req, X4:req
163+
.macro SGEMV_T_LASX XW:req X8:req, X4:req
164164
PTR_SRLI J, N, 3
165165
beqz J, .L_\XW\()_N_7
166166
PTR_SLLI K_LDA, LDA, 3
@@ -396,9 +396,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
396396
.hword .L_GAP_0 - .L_GAP_TABLE
397397
.hword .L_GAP_1 - .L_GAP_TABLE
398398
.L_GAP_0: /* if (incx == 1) */
399-
SGEMV_T GAP_0, X8, X4
399+
SGEMV_T_LASX GAP_0, X8, X4
400400
.L_GAP_1: /* if (incx != 1) */
401-
SGEMV_T GAP_1, X8_GAP, X4_GAP
401+
SGEMV_T_LASX GAP_1, X8_GAP, X4_GAP
402402
.L_END:
403403
pop_if_used 17 + 8, 18
404404
jirl $r0, $r1, 0x0

lapack/laswp/loongarch64/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
TOPDIR = ../../..
22
include ../../../Makefile.system
33

4+
ifeq ($(DYNAMIC_ARCH), 1)
5+
LASWP = ../generic/laswp_k_4.c
6+
ZLASWP = ../generic/zlaswp_k_4.c
7+
endif
8+
49
ifndef LASWP
510
LASWP = ../generic/laswp_k.c
611
endif

0 commit comments

Comments
 (0)