From a7bc8ec1f107a95a18cfcdbd5c47721abfa75cb9 Mon Sep 17 00:00:00 2001 From: gxw Date: Tue, 10 Aug 2021 16:42:57 +0800 Subject: [PATCH] Delete the macro instruction "li" and use "li.d" instead Change-Id: Icff7981e2eb7df29ba5af1f8eb5be8443c67450f --- kernel/loongarch64/asum.S | 2 +- kernel/loongarch64/cnrm2.S | 2 +- kernel/loongarch64/copy.S | 2 +- kernel/loongarch64/dot.S | 2 +- kernel/loongarch64/gemv_n.S | 4 ++-- kernel/loongarch64/gemv_t.S | 2 +- kernel/loongarch64/iamax.S | 12 ++++++------ kernel/loongarch64/iamin.S | 12 ++++++------ kernel/loongarch64/izamax.S | 12 ++++++------ kernel/loongarch64/izamin.S | 12 ++++++------ kernel/loongarch64/scal.S | 2 +- kernel/loongarch64/snrm2.S | 2 +- kernel/loongarch64/swap.S | 2 +- kernel/loongarch64/zcopy.S | 2 +- kernel/loongarch64/zdot.S | 2 +- kernel/loongarch64/zgemv_n.S | 4 ++-- kernel/loongarch64/zgemv_t.S | 2 +- kernel/loongarch64/zscal.S | 2 +- 18 files changed, 40 insertions(+), 40 deletions(-) diff --git a/kernel/loongarch64/asum.S b/kernel/loongarch64/asum.S index e4c717085..7d21ce038 100644 --- a/kernel/loongarch64/asum.S +++ b/kernel/loongarch64/asum.S @@ -54,7 +54,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MTC s1, $r0 MTC s2, $r0 slli.d INCX, INCX, BASE_SHIFT - li TEMP, SIZE + li.d TEMP, SIZE bge $r0, N, .L999 srai.d I, N, 3 bne INCX, TEMP, .L20 diff --git a/kernel/loongarch64/cnrm2.S b/kernel/loongarch64/cnrm2.S index c4b2555d3..9d27987e1 100644 --- a/kernel/loongarch64/cnrm2.S +++ b/kernel/loongarch64/cnrm2.S @@ -57,7 +57,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif movgr2fr.d s1, $r0 - li TEMP, 2 * SIZE + li.d TEMP, 2 * SIZE fmov.d s2, s1 bge $r0, N, .L999 slli.d INCX, INCX, ZBASE_SHIFT diff --git a/kernel/loongarch64/copy.S b/kernel/loongarch64/copy.S index 28b7bce4c..3156f60b8 100644 --- a/kernel/loongarch64/copy.S +++ b/kernel/loongarch64/copy.S @@ -52,7 +52,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCY, 0(INCY) #endif - li TEMP, SIZE + li.d TEMP, SIZE NOP slli.d INCX, INCX, BASE_SHIFT bge $r0, N, .L999 diff --git a/kernel/loongarch64/dot.S b/kernel/loongarch64/dot.S index 4fcd569c8..1e4c81a02 100644 --- a/kernel/loongarch64/dot.S +++ b/kernel/loongarch64/dot.S @@ -57,7 +57,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MTC s1, $r0 MTC s2, $r0 slli.d INCX, INCX, BASE_SHIFT - li TEMP, SIZE + li.d TEMP, SIZE slli.d INCY, INCY, BASE_SHIFT bge $r0, N, .L999 srai.d I, N, 3 diff --git a/kernel/loongarch64/gemv_n.S b/kernel/loongarch64/gemv_n.S index 334a2991f..9ab43ae19 100644 --- a/kernel/loongarch64/gemv_n.S +++ b/kernel/loongarch64/gemv_n.S @@ -91,7 +91,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bge $r0, M, .L999 slli.d INCY, INCY, BASE_SHIFT bge $r0, N, .L999 - li I, SIZE + li.d I, SIZE move YORIG, Y beq INCY, I, .L10 srai.d I, M, 2 @@ -472,7 +472,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .align 3 .L900: - li YORIG, SIZE + li.d YORIG, SIZE srai.d I, M, 2 beq INCY, YORIG, .L999 move XX, BUFFER diff --git a/kernel/loongarch64/gemv_t.S b/kernel/loongarch64/gemv_t.S index 19333ed4a..af4232769 100644 --- a/kernel/loongarch64/gemv_t.S +++ b/kernel/loongarch64/gemv_t.S @@ -88,7 +88,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bge $r0, M, .L999 slli.d INCY, INCY, BASE_SHIFT bge $r0, N, .L999 - li I, SIZE + li.d I, SIZE move XORIG, X beq INCX, I, .L10 srai.d I, M, 2 diff --git a/kernel/loongarch64/iamax.S b/kernel/loongarch64/iamax.S index 0f9e1bc59..31b1a9e57 100644 --- a/kernel/loongarch64/iamax.S +++ b/kernel/loongarch64/iamax.S @@ -62,24 +62,24 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCX, 0(INCX) #endif - li x1, 0 + li.d x1, 0 bge $r0, N, .L999 slli.d INCX, INCX, BASE_SHIFT bge $r0, INCX, .L999 LD a1, X, 0 * SIZE addi.d N, N, -1 - li x1, 1 + li.d x1, 1 bge $r0, N, .L999 FABS s1, a1 add.d X, X, INCX FABS s2, a1 - li x2, 1 + li.d x2, 1 FABS s3, a1 srai.d I, N, 3 FABS s4, a1 - li x3, 1 - li TEMP, 2 - li x4, 1 + li.d x3, 1 + li.d TEMP, 2 + li.d x4, 1 bge $r0, I, .L15 LD a1, X, 0 * SIZE add.d X, X, INCX diff --git a/kernel/loongarch64/iamin.S b/kernel/loongarch64/iamin.S index 7751a9d03..9364b9725 100644 --- a/kernel/loongarch64/iamin.S +++ b/kernel/loongarch64/iamin.S @@ -62,24 +62,24 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCX, 0(INCX) #endif - li x1, 0 + li.d x1, 0 bge $r0, N, .L999 slli.d INCX, INCX, BASE_SHIFT bge $r0, INCX, .L999 LD a1, X, 0 * SIZE addi.d N, N, -1 - li x1, 1 + li.d x1, 1 bge $r0, N, .L999 FABS s1, a1 add.d X, X, INCX FABS s2, a1 - li x2, 1 + li.d x2, 1 FABS s3, a1 srai.d I, N, 3 FABS s4, a1 - li x3, 1 - li TEMP, 2 - li x4, 1 + li.d x3, 1 + li.d TEMP, 2 + li.d x4, 1 bge $r0, I, .L15 LD a1, X, 0 * SIZE add.d X, X, INCX diff --git a/kernel/loongarch64/izamax.S b/kernel/loongarch64/izamax.S index 6d7cb9e30..8d3ae529e 100644 --- a/kernel/loongarch64/izamax.S +++ b/kernel/loongarch64/izamax.S @@ -66,7 +66,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCX, 0(INCX) #endif - li x1, 0 + li.d x1, 0 bge $r0, N, .L999 slli.d INCX, INCX, ZBASE_SHIFT bge $r0, INCX, .L999 @@ -79,14 +79,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ADD s3, t1, t2 ADD s4, t1, t2 addi.d N, N, -1 - li x1, 1 + li.d x1, 1 bge $r0, N, .L999 add.d X, X, INCX - li x2, 1 + li.d x2, 1 srai.d I, N, 2 - li x3, 1 - li TEMP, 2 - li x4, 1 + li.d x3, 1 + li.d TEMP, 2 + li.d x4, 1 bge $r0, I, .L15 LD a1, X, 0 * SIZE LD a2, X, 1 * SIZE diff --git a/kernel/loongarch64/izamin.S b/kernel/loongarch64/izamin.S index 998927985..38a109c21 100644 --- a/kernel/loongarch64/izamin.S +++ b/kernel/loongarch64/izamin.S @@ -66,7 +66,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCX, 0(INCX) #endif - li x1, 0 + li.d x1, 0 bge $r0, N, .L999 slli.d INCX, INCX, ZBASE_SHIFT bge $r0, INCX, .L999 @@ -79,14 +79,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ADD s3, t1, t2 ADD s4, t1, t2 addi.d N, N, -1 - li x1, 1 + li.d x1, 1 bge $r0, N, .L999 add.d X, X, INCX - li x2, 1 + li.d x2, 1 srai.d I, N, 2 - li x3, 1 - li TEMP, 2 - li x4, 1 + li.d x3, 1 + li.d TEMP, 2 + li.d x4, 1 bge $r0, I, .L15 LD a1, X, 0 * SIZE LD a2, X, 1 * SIZE diff --git a/kernel/loongarch64/scal.S b/kernel/loongarch64/scal.S index 7399e57b3..566bce6cb 100644 --- a/kernel/loongarch64/scal.S +++ b/kernel/loongarch64/scal.S @@ -52,7 +52,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PROLOGUE - li TEMP, SIZE + li.d TEMP, SIZE MTC a1, $r0 slli.d INCX, INCX, BASE_SHIFT bge $r0, N, .L999 diff --git a/kernel/loongarch64/snrm2.S b/kernel/loongarch64/snrm2.S index 14b62cfe7..57c21a017 100644 --- a/kernel/loongarch64/snrm2.S +++ b/kernel/loongarch64/snrm2.S @@ -57,7 +57,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif movgr2fr.d s1, $r0 - li TEMP, SIZE + li.d TEMP, SIZE fmov.d s2, s1 bge $r0, N, .L999 slli.d INCX, INCX, BASE_SHIFT diff --git a/kernel/loongarch64/swap.S b/kernel/loongarch64/swap.S index c9d8f7fc1..4578a8d54 100644 --- a/kernel/loongarch64/swap.S +++ b/kernel/loongarch64/swap.S @@ -58,7 +58,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PROLOGUE - li TEMP, SIZE + li.d TEMP, SIZE slli.d INCX, INCX, BASE_SHIFT bge $r0, N, .L999 slli.d INCY, INCY, BASE_SHIFT diff --git a/kernel/loongarch64/zcopy.S b/kernel/loongarch64/zcopy.S index 3fbe56074..0f480ca85 100644 --- a/kernel/loongarch64/zcopy.S +++ b/kernel/loongarch64/zcopy.S @@ -53,7 +53,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LDINT INCY, 0(INCY) #endif - li TEMP, 2 * SIZE + li.d TEMP, 2 * SIZE NOP slli.d INCX, INCX, ZBASE_SHIFT bge $r0, N, .L999 diff --git a/kernel/loongarch64/zdot.S b/kernel/loongarch64/zdot.S index 087c3845f..81ac19fbd 100644 --- a/kernel/loongarch64/zdot.S +++ b/kernel/loongarch64/zdot.S @@ -62,7 +62,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MOV s3, s2 MOV s4, s3 slli.d INCX, INCX, ZBASE_SHIFT - li TEMP, 2 * SIZE + li.d TEMP, 2 * SIZE slli.d INCY, INCY, ZBASE_SHIFT bge $r0, N, .L999 srai.d I, N, 2 diff --git a/kernel/loongarch64/zgemv_n.S b/kernel/loongarch64/zgemv_n.S index 0cc49c789..d995ce86b 100644 --- a/kernel/loongarch64/zgemv_n.S +++ b/kernel/loongarch64/zgemv_n.S @@ -123,7 +123,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bge $r0, M, .L999 slli.d INCY, INCY, ZBASE_SHIFT bge $r0, N, .L999 - li I, 2 * SIZE + li.d I, 2 * SIZE move YORIG, Y beq INCY, I, .L10 srai.d I, M, 2 @@ -576,7 +576,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .align 3 .L900: - li YORIG, 2 * SIZE + li.d YORIG, 2 * SIZE srai.d I, M, 2 beq INCY, YORIG, .L999 move XX, BUFFER diff --git a/kernel/loongarch64/zgemv_t.S b/kernel/loongarch64/zgemv_t.S index 85a9a0c0d..841823e1c 100644 --- a/kernel/loongarch64/zgemv_t.S +++ b/kernel/loongarch64/zgemv_t.S @@ -116,7 +116,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bge $r0, M, .L999 slli.d INCY, INCY, ZBASE_SHIFT bge $r0, N, .L999 - li I, 2 * SIZE + li.d I, 2 * SIZE move XORIG, X beq INCX, I, .L10 srai.d I, M, 2 diff --git a/kernel/loongarch64/zscal.S b/kernel/loongarch64/zscal.S index fe53ed713..a12e527a5 100644 --- a/kernel/loongarch64/zscal.S +++ b/kernel/loongarch64/zscal.S @@ -52,7 +52,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PROLOGUE - li TEMP, 2 * SIZE + li.d TEMP, 2 * SIZE MTC a1, $r0 slli.d INCX, INCX, ZBASE_SHIFT bge $r0, N, .L999