From 299b8187f89f39cbdcb2df5144afa96d99af91e0 Mon Sep 17 00:00:00 2001
From: yuyang <96557710+yuyang-ok@users.noreply.github.com>
Date: Sat, 21 Jan 2023 01:53:54 +0800
Subject: [PATCH] fix issue 5525. (#5603)

* fix issue 5525.

* reg alloc changed.
---
 cranelift/codegen/src/isa/riscv64/inst.isle          |  2 +-
 .../filetests/filetests/isa/riscv64/extend-op.clif   | 12 ++++++------
 .../filetests/filetests/runtests/issue5525.clif      | 12 ++++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 cranelift/filetests/filetests/runtests/issue5525.clif

diff --git a/cranelift/codegen/src/isa/riscv64/inst.isle b/cranelift/codegen/src/isa/riscv64/inst.isle
index 31fdad31a9..2031cf924a 100644
--- a/cranelift/codegen/src/isa/riscv64/inst.isle
+++ b/cranelift/codegen/src/isa/riscv64/inst.isle
@@ -1028,7 +1028,7 @@
     ((tmp Reg (gen_extend r $true from_bits 64))
       (tmp2 Reg (alu_rrr (AluOPRRR.Slt) tmp (zero_reg)))
       (high Reg (gen_extend tmp2 $true 1 64)))
-    (value_regs (gen_move2 r $I64 $I64) high)))
+    (value_regs (gen_move2 tmp $I64 $I64) high)))
 
 
 ;;;; for I128 unsigned extend.
diff --git a/cranelift/filetests/filetests/isa/riscv64/extend-op.clif b/cranelift/filetests/filetests/isa/riscv64/extend-op.clif
index 595ef6a8d1..9dfc4f2c4b 100644
--- a/cranelift/filetests/filetests/isa/riscv64/extend-op.clif
+++ b/cranelift/filetests/filetests/isa/riscv64/extend-op.clif
@@ -66,8 +66,8 @@ block0(v0: i32):
 }
 
 ; block0:
-;   sext.w t2,a0
-;   slt a1,t2,zero
+;   sext.w a0,a0
+;   slt a1,a0,zero
 ;   sext.b1 a1,a1
 ;   ret
 
@@ -89,8 +89,8 @@ block0(v0: i16):
 }
 
 ; block0:
-;   sext.h t2,a0
-;   slt a1,t2,zero
+;   sext.h a0,a0
+;   slt a1,a0,zero
 ;   sext.b1 a1,a1
 ;   ret
 
@@ -112,8 +112,8 @@ block0(v0: i8):
 }
 
 ; block0:
-;   sext.b t2,a0
-;   slt a1,t2,zero
+;   sext.b a0,a0
+;   slt a1,a0,zero
 ;   sext.b1 a1,a1
 ;   ret
 
diff --git a/cranelift/filetests/filetests/runtests/issue5525.clif b/cranelift/filetests/filetests/runtests/issue5525.clif
new file mode 100644
index 0000000000..1b34da2cb8
--- /dev/null
+++ b/cranelift/filetests/filetests/runtests/issue5525.clif
@@ -0,0 +1,12 @@
+test interpret
+test run
+target riscv64
+
+function %a(i16) -> i128 system_v {
+block0(v0: i16):
+    v1 = rotl v0, v0
+    v2 = sextend.i128 v1
+    return v2
+}
+
+; run: %a(-32718) == 202
\ No newline at end of file