[llvm] [RISCV] Move NSRL/NSRA isel to tablegen. NFC (PR #181096)
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 11 23:12:39 PST 2026
https://github.com/topperc updated https://github.com/llvm/llvm-project/pull/181096
>From b9c1556880d18d5ab098887930a18001d2703035 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Wed, 11 Feb 2026 23:08:34 -0800
Subject: [PATCH 1/2] [RISCV] Move NSRL/NSRA isel to tablegen.
These nodes produce a single result so we can handle them in
tablegen.
Patch was written by AI but I reviewed it.
---
llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp | 34 ---------------------
llvm/lib/Target/RISCV/RISCVISelDAGToDAG.h | 3 ++
llvm/lib/Target/RISCV/RISCVInstrInfoP.td | 19 ++++++++++++
3 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp
index b7dfd7e243382..db65d6ac1a5df 100644
--- a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp
+++ b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp
@@ -1791,40 +1791,6 @@ void RISCVDAGToDAGISel::Select(SDNode *Node) {
CurDAG->RemoveDeadNode(Node);
return;
}
- case RISCVISD::NSRL:
- case RISCVISD::NSRA: {
- assert(Subtarget->hasStdExtP() && !Subtarget->is64Bit() && VT == MVT::i32 &&
- "Unexpected opcode");
-
- bool IsSRA = Node->getOpcode() == RISCVISD::NSRA;
- SDValue Lo = Node->getOperand(0);
- SDValue Hi = Node->getOperand(1);
- SDValue ShAmt = Node->getOperand(2);
-
- SDValue Ops[] = {
- CurDAG->getTargetConstant(RISCV::GPRPairRegClassID, DL, MVT::i32), Lo,
- CurDAG->getTargetConstant(RISCV::sub_gpr_even, DL, MVT::i32), Hi,
- CurDAG->getTargetConstant(RISCV::sub_gpr_odd, DL, MVT::i32)};
- SDValue Pair = SDValue(CurDAG->getMachineNode(TargetOpcode::REG_SEQUENCE,
- DL, MVT::Untyped, Ops),
- 0);
-
- MachineSDNode *Res;
- if (auto *ShAmtC = dyn_cast<ConstantSDNode>(ShAmt)) {
- unsigned Opc = IsSRA ? RISCV::NSRAI : RISCV::NSRLI;
- Res = CurDAG->getMachineNode(
- Opc, DL, MVT::i32, Pair,
- CurDAG->getTargetConstant(*ShAmtC->getConstantIntValue(), DL,
- MVT::i32));
- } else {
- // NSRL/NSRA only read 6 bits of the shift amount.
- selectShiftMask(ShAmt, 64, ShAmt);
- unsigned Opc = IsSRA ? RISCV::NSRA : RISCV::NSRL;
- Res = CurDAG->getMachineNode(Opc, DL, MVT::i32, Pair, ShAmt);
- }
- ReplaceNode(Node, Res);
- return;
- }
case ISD::LOAD: {
if (tryIndexedLoad(Node))
return;
diff --git a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.h b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.h
index 19ee103af1425..eea041fe23432 100644
--- a/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.h
+++ b/llvm/lib/Target/RISCV/RISCVISelDAGToDAG.h
@@ -89,6 +89,9 @@ class RISCVDAGToDAGISel : public SelectionDAGISel {
bool selectShiftMask32(SDValue N, SDValue &ShAmt) {
return selectShiftMask(N, 32, ShAmt);
}
+ bool selectShiftMask64(SDValue N, SDValue &ShAmt) {
+ return selectShiftMask(N, 64, ShAmt);
+ }
bool selectSETCC(SDValue N, ISD::CondCode ExpectedCCVal, SDValue &Val);
bool selectSETNE(SDValue N, SDValue &Val) {
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoP.td b/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
index e39e400f7d369..7ad5981734058 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
@@ -1504,6 +1504,13 @@ def SDT_RISCVNarrowingShift : SDTypeProfile<1, 3, [SDTCisVT<0, i32>,
def riscv_nsrl : RVSDNode<"NSRL", SDT_RISCVNarrowingShift>;
def riscv_nsra : RVSDNode<"NSRA", SDT_RISCVNarrowingShift>;
+// ComplexPattern for 64-bit shift mask (NSRL/NSRA only read 6 bits).
+def shiftMask64 : ComplexPattern<i32, 1, "selectShiftMask64", [], [], 0>;
+
+// Build a GPRPair from two GPR registers for narrowing shift instructions.
+def BuildPairGPRPair : OutPatFrag<(ops node:$lo, node:$hi),
+ (REG_SEQUENCE GPRPair, $lo, sub_gpr_even, $hi, sub_gpr_odd)>;
+
// Averaging subtraction, (a - b) >> 2
def riscv_asub : RVSDNode<"ASUB", SDTIntBinOp>;
def riscv_asubu : RVSDNode<"ASUBU", SDTIntBinOp>;
@@ -1726,6 +1733,18 @@ let Predicates = [HasStdExtP, IsRV32] in {
def : PatGprGpr<usubsat, SSUBU>;
def : PatGprGpr<sshlsat, SSHA>;
+ // Narrowing shift patterns (NSRL/NSRA)
+ // Immediate shift amount patterns
+ def : Pat<(i32 (riscv_nsrl GPR:$lo, GPR:$hi, uimm6:$shamt)),
+ (NSRLI (BuildPairGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
+ def : Pat<(i32 (riscv_nsra GPR:$lo, GPR:$hi, uimm6:$shamt)),
+ (NSRAI (BuildPairGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
+ // Register shift amount patterns
+ def : Pat<(i32 (riscv_nsrl GPR:$lo, GPR:$hi, shiftMask64:$shamt)),
+ (NSRL (BuildPairGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
+ def : Pat<(i32 (riscv_nsra GPR:$lo, GPR:$hi, shiftMask64:$shamt)),
+ (NSRA (BuildPairGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
+
// 8/16-bit multiply low patterns
def: Pat<(v4i8 (mul GPR:$rs1, GPR:$rs2)),
(PNSRLI_B (PWMUL_B GPR:$rs1, GPR:$rs2), 0)>;
>From 34fb78da0feaee006e780e0f938bce1300a11e6a Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Wed, 11 Feb 2026 23:12:24 -0800
Subject: [PATCH 2/2] fixup! Rename BuildPairGPRPair->BuildGPRPair
---
llvm/lib/Target/RISCV/RISCVInstrInfoP.td | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoP.td b/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
index 7ad5981734058..5d9a52644a38f 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfoP.td
@@ -1508,7 +1508,7 @@ def riscv_nsra : RVSDNode<"NSRA", SDT_RISCVNarrowingShift>;
def shiftMask64 : ComplexPattern<i32, 1, "selectShiftMask64", [], [], 0>;
// Build a GPRPair from two GPR registers for narrowing shift instructions.
-def BuildPairGPRPair : OutPatFrag<(ops node:$lo, node:$hi),
+def BuildGPRPair : OutPatFrag<(ops node:$lo, node:$hi),
(REG_SEQUENCE GPRPair, $lo, sub_gpr_even, $hi, sub_gpr_odd)>;
// Averaging subtraction, (a - b) >> 2
@@ -1736,14 +1736,14 @@ let Predicates = [HasStdExtP, IsRV32] in {
// Narrowing shift patterns (NSRL/NSRA)
// Immediate shift amount patterns
def : Pat<(i32 (riscv_nsrl GPR:$lo, GPR:$hi, uimm6:$shamt)),
- (NSRLI (BuildPairGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
+ (NSRLI (BuildGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
def : Pat<(i32 (riscv_nsra GPR:$lo, GPR:$hi, uimm6:$shamt)),
- (NSRAI (BuildPairGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
+ (NSRAI (BuildGPRPair GPR:$lo, GPR:$hi), uimm6:$shamt)>;
// Register shift amount patterns
def : Pat<(i32 (riscv_nsrl GPR:$lo, GPR:$hi, shiftMask64:$shamt)),
- (NSRL (BuildPairGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
+ (NSRL (BuildGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
def : Pat<(i32 (riscv_nsra GPR:$lo, GPR:$hi, shiftMask64:$shamt)),
- (NSRA (BuildPairGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
+ (NSRA (BuildGPRPair GPR:$lo, GPR:$hi), shiftMask64:$shamt)>;
// 8/16-bit multiply low patterns
def: Pat<(v4i8 (mul GPR:$rs1, GPR:$rs2)),
More information about the llvm-commits
mailing list