[llvm] [RISC] Rename the P extensions srx/slx tests and add fshl/fshr intrinsic tests. NFC (PR #180984)

Craig Topper via llvm-commits llvm-commits at lists.llvm.org
Wed Feb 11 10:15:38 PST 2026


https://github.com/topperc created https://github.com/llvm/llvm-project/pull/180984

I plan to change to the i64 shift lowering on RV32 to use vnsrl/vnsra instead of srx. Only fshr will use srx.

>From 8ac27ec43c4c31ce7a492ece38b6dc9a8f10a43c Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Wed, 11 Feb 2026 10:10:31 -0800
Subject: [PATCH] [RISC] Rename the P extensions srx/slx tests and add
 fshl/fshr intrinsic tests. NFC

I plan to change to the i64 shift lowering on RV32 to use vnsrl/vnsra
instead of srx. Only fshr will use srx.
---
 llvm/test/CodeGen/RISCV/rv32p.ll | 88 ++++++++++++++++++++++++++++----
 llvm/test/CodeGen/RISCV/rv64p.ll | 82 ++++++++++++++++++++++++++---
 2 files changed, 152 insertions(+), 18 deletions(-)

diff --git a/llvm/test/CodeGen/RISCV/rv32p.ll b/llvm/test/CodeGen/RISCV/rv32p.ll
index e4d4c68109dea..99d9636f847bb 100644
--- a/llvm/test/CodeGen/RISCV/rv32p.ll
+++ b/llvm/test/CodeGen/RISCV/rv32p.ll
@@ -312,10 +312,10 @@ define i32 @cls_i32_knownbits_no_overestimate(i32 signext %x) {
   %d = sub i32 %c, 1
   %e = or i32 %d, 16
   ret i32 %e
- }
+}
 
-define i64 @slx_i64(i64 %x, i64 %y) {
-; CHECK-LABEL: slx_i64:
+define i64 @sll_i64(i64 %x, i64 %y) {
+; CHECK-LABEL: sll_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    sll a3, a0, a2
 ; CHECK-NEXT:    slx a1, a0, a2
@@ -326,8 +326,8 @@ define i64 @slx_i64(i64 %x, i64 %y) {
   ret i64 %b
 }
 
-define i64 @slxi_i64(i64 %x) {
-; CHECK-LABEL: slxi_i64:
+define i64 @slli_i64(i64 %x) {
+; CHECK-LABEL: slli_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    li a2, 25
 ; CHECK-NEXT:    slx a1, a0, a2
@@ -337,8 +337,9 @@ define i64 @slxi_i64(i64 %x) {
   ret i64 %a
 }
 
-define i64 @srx_i64(i64 %x, i64 %y) {
-; CHECK-LABEL: srx_i64:
+; FIXME: Use nsrl
+define i64 @srl_i64(i64 %x, i64 %y) {
+; CHECK-LABEL: srl_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    srl a3, a1, a2
 ; CHECK-NEXT:    srx a0, a1, a2
@@ -349,9 +350,9 @@ define i64 @srx_i64(i64 %x, i64 %y) {
   ret i64 %b
 }
 
-; FIXME: Using srx instead of slx would avoid the mv.
-define i64 @srxi_i64(i64 %x) {
-; CHECK-LABEL: srxi_i64:
+; FIXME: Use nsrli
+define i64 @srli_i64(i64 %x) {
+; CHECK-LABEL: srli_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    mv a2, a1
 ; CHECK-NEXT:    li a3, 7
@@ -363,6 +364,73 @@ define i64 @srxi_i64(i64 %x) {
   ret i64 %a
 }
 
+; FIXME: Use nsra
+define i64 @sra_i64(i64 %x, i64 %y) {
+; CHECK-LABEL: sra_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    sra a3, a1, a2
+; CHECK-NEXT:    srx a0, a1, a2
+; CHECK-NEXT:    mv a1, a3
+; CHECK-NEXT:    ret
+  %a = and i64 %y, 31
+  %b = ashr i64 %x, %a
+  ret i64 %b
+}
+
+; FIXME: Use nsrai
+define i64 @srai_i64(i64 %x) {
+; CHECK-LABEL: srai_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mv a2, a1
+; CHECK-NEXT:    li a3, 7
+; CHECK-NEXT:    srai a1, a1, 25
+; CHECK-NEXT:    slx a2, a0, a3
+; CHECK-NEXT:    mv a0, a2
+; CHECK-NEXT:    ret
+  %a = ashr i64 %x, 25
+  ret i64 %a
+}
+
+define i32 @slx_i32(i32 %a, i32 %b, i32 %shamt) {
+; CHECK-LABEL: slx_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    slx a0, a1, a2
+; CHECK-NEXT:    ret
+  %1 = tail call i32 @llvm.fshl.i32(i32 %a, i32 %b, i32 %shamt)
+  ret i32 %1
+}
+
+define i32 @slxi_i32(i32 %a, i32 %b) {
+; CHECK-LABEL: slxi_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    li a2, 25
+; CHECK-NEXT:    slx a0, a1, a2
+; CHECK-NEXT:    ret
+  %1 = tail call i32 @llvm.fshl.i32(i32 %a, i32 %b, i32 25)
+  ret i32 %1
+}
+
+define i32 @srx_i32(i32 %a, i32 %b, i32 %shamt) {
+; CHECK-LABEL: srx_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    srx a1, a0, a2
+; CHECK-NEXT:    mv a0, a1
+; CHECK-NEXT:    ret
+  %1 = tail call i32 @llvm.fshr.i32(i32 %a, i32 %b, i32 %shamt)
+  ret i32 %1
+}
+
+define i32 @srxi_i32(i32 %a, i32 %b) {
+; CHECK-LABEL: srxi_i32:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    li a2, 25
+; CHECK-NEXT:    srx a1, a0, a2
+; CHECK-NEXT:    mv a0, a1
+; CHECK-NEXT:    ret
+  %1 = tail call i32 @llvm.fshr.i32(i32 %a, i32 %b, i32 25)
+  ret i32 %1
+}
+
 define i8 @shlsat_i8(i8 %a, i8 %b) {
 ; CHECK-LABEL: shlsat_i8:
 ; CHECK:       # %bb.0:
diff --git a/llvm/test/CodeGen/RISCV/rv64p.ll b/llvm/test/CodeGen/RISCV/rv64p.ll
index 53ca8476034a1..bfb1673046606 100644
--- a/llvm/test/CodeGen/RISCV/rv64p.ll
+++ b/llvm/test/CodeGen/RISCV/rv64p.ll
@@ -330,8 +330,8 @@ define i64 @cls_i64_not_32(i64 %x) {
   ret i64 %f
 }
 
-define i128 @slx_i128(i128 %x, i128 %y) {
-; CHECK-LABEL: slx_i128:
+define i128 @sll_i128(i128 %x, i128 %y) {
+; CHECK-LABEL: sll_i128:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    sll a3, a0, a2
 ; CHECK-NEXT:    slx a1, a0, a2
@@ -342,8 +342,8 @@ define i128 @slx_i128(i128 %x, i128 %y) {
   ret i128 %b
 }
 
-define i128 @slxi_i128(i128 %x) {
-; CHECK-LABEL: slxi_i128:
+define i128 @slli_i128(i128 %x) {
+; CHECK-LABEL: slli_i128:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    li a2, 49
 ; CHECK-NEXT:    slx a1, a0, a2
@@ -353,8 +353,8 @@ define i128 @slxi_i128(i128 %x) {
   ret i128 %a
 }
 
-define i128 @srx_i128(i128 %x, i128 %y) {
-; CHECK-LABEL: srx_i128:
+define i128 @srl_i128(i128 %x, i128 %y) {
+; CHECK-LABEL: srl_i128:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    srl a3, a1, a2
 ; CHECK-NEXT:    srx a0, a1, a2
@@ -366,8 +366,8 @@ define i128 @srx_i128(i128 %x, i128 %y) {
 }
 
 ; FIXME: Using srx instead of slx would avoid the mv.
-define i128 @srxi_i128(i128 %x) {
-; CHECK-LABEL: srxi_i128:
+define i128 @srli_i128(i128 %x) {
+; CHECK-LABEL: srli_i128:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    mv a2, a1
 ; CHECK-NEXT:    li a3, 15
@@ -379,6 +379,72 @@ define i128 @srxi_i128(i128 %x) {
   ret i128 %a
 }
 
+define i128 @sra_i128(i128 %x, i128 %y) {
+; CHECK-LABEL: sra_i128:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    andi a2, a2, 31
+; CHECK-NEXT:    srx a0, a1, a2
+; CHECK-NEXT:    sra a1, a1, a2
+; CHECK-NEXT:    ret
+  %a = and i128 %y, 31
+  %b = ashr i128 %x, %a
+  ret i128 %b
+}
+
+; FIXME: Using srx instead of slx would avoid the mv.
+define i128 @srai_i128(i128 %x) {
+; CHECK-LABEL: srai_i128:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    mv a2, a1
+; CHECK-NEXT:    li a3, 15
+; CHECK-NEXT:    srai a1, a1, 49
+; CHECK-NEXT:    slx a2, a0, a3
+; CHECK-NEXT:    mv a0, a2
+; CHECK-NEXT:    ret
+  %a = ashr i128 %x, 49
+  ret i128 %a
+}
+
+define i64 @slx_i64(i64 %a, i64 %b, i64 %shamt) {
+; CHECK-LABEL: slx_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    slx a0, a1, a2
+; CHECK-NEXT:    ret
+  %1 = tail call i64 @llvm.fshl.i64(i64 %a, i64 %b, i64 %shamt)
+  ret i64 %1
+}
+
+define i64 @slxi_i64(i64 %a, i64 %b) {
+; CHECK-LABEL: slxi_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    li a2, 25
+; CHECK-NEXT:    slx a0, a1, a2
+; CHECK-NEXT:    ret
+  %1 = tail call i64 @llvm.fshl.i64(i64 %a, i64 %b, i64 25)
+  ret i64 %1
+}
+
+define i64 @srx_i64(i64 %a, i64 %b, i64 %shamt) {
+; CHECK-LABEL: srx_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    srx a1, a0, a2
+; CHECK-NEXT:    mv a0, a1
+; CHECK-NEXT:    ret
+  %1 = tail call i64 @llvm.fshr.i64(i64 %a, i64 %b, i64 %shamt)
+  ret i64 %1
+}
+
+define i64 @srxi_i64(i64 %a, i64 %b) {
+; CHECK-LABEL: srxi_i64:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    li a2, 25
+; CHECK-NEXT:    srx a1, a0, a2
+; CHECK-NEXT:    mv a0, a1
+; CHECK-NEXT:    ret
+  %1 = tail call i64 @llvm.fshr.i64(i64 %a, i64 %b, i64 25)
+  ret i64 %1
+}
+
 ; Test bitwise merge: (mask & b) | (~mask & a)
 define i64 @merge_i64(i64 %mask, i64 %a, i64 %b) nounwind {
 ; CHECK-LABEL: merge_i64:



More information about the llvm-commits mailing list