Skip to content

[RISCV] Use SelectAddrRegRegScale for Xqcisls instructions. #145608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
+36 −40
Merged

[RISCV] Use SelectAddrRegRegScale for Xqcisls instructions. #145608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions llvm/lib/Target/RISCV/RISCVInstrInfo.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,12 @@ def uimm6gt32 : ImmLeaf<XLenVT, [{
// Addressing modes.
def AddrRegImm : ComplexPattern<iPTR, 2, "SelectAddrRegImm">;

class AddrRegRegScale<int N>
: ComplexPattern<iPTR, 3, "SelectAddrRegRegScale<"#N#">">;
class AddrRegZextRegScale<int N>
: ComplexPattern<i64, 3, "SelectAddrRegZextRegScale<"#N#", 32>",
[], [], 10>;

// Return the negation of an immediate value.
def NegImm : SDNodeXForm<imm, [{
return CurDAG->getSignedTargetConstant(-N->getSExtValue(), SDLoc(N),
Expand Down
14 changes: 6 additions & 8 deletions llvm/lib/Target/RISCV/RISCVInstrInfoXTHead.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,32 +743,30 @@ def TH_SYNC_I : THCacheInst_void<0b11010, "th.sync.i">;
def TH_SYNC_IS : THCacheInst_void<0b11011, "th.sync.is">;
}

def AddrRegRegScale : ComplexPattern<iPTR, 3, "SelectAddrRegRegScale<3>">;
def AddrRegZextRegScale
: ComplexPattern<i64, 3, "SelectAddrRegZextRegScale<3, 32>",
[], [], 10>;
def AddrRegRegScale3 : AddrRegRegScale<3>;
def AddrRegZextRegScale3 : AddrRegZextRegScale<3>;

multiclass LdIdxPat<PatFrag LoadOp, RVInst Inst, ValueType vt = XLenVT> {
def : Pat<(vt (LoadOp (AddrRegRegScale (XLenVT GPR:$rs1), (XLenVT GPR:$rs2), uimm2:$uimm2))),
def : Pat<(vt (LoadOp (AddrRegRegScale3 (XLenVT GPR:$rs1), (XLenVT GPR:$rs2), uimm2:$uimm2))),
(Inst GPR:$rs1, GPR:$rs2, uimm2:$uimm2)>;
}

multiclass LdZextIdxPat<PatFrag LoadOp, RVInst Inst, ValueType vt = i64> {
def : Pat<(vt (LoadOp (AddrRegZextRegScale (i64 GPR:$rs1), (i64 GPR:$rs2), uimm2:$uimm2))),
def : Pat<(vt (LoadOp (AddrRegZextRegScale3 (i64 GPR:$rs1), (i64 GPR:$rs2), uimm2:$uimm2))),
(Inst GPR:$rs1, GPR:$rs2, uimm2:$uimm2)>;
}

multiclass StIdxPat<PatFrag StoreOp, RVInst Inst, RegisterClass StTy,
ValueType vt = XLenVT> {
def : Pat<(StoreOp (vt StTy:$rd),
(AddrRegRegScale (XLenVT GPR:$rs1), (XLenVT GPR:$rs2), uimm2:$uimm2)),
(AddrRegRegScale3 (XLenVT GPR:$rs1), (XLenVT GPR:$rs2), uimm2:$uimm2)),
(Inst StTy:$rd, GPR:$rs1, GPR:$rs2, uimm2:$uimm2)>;
}

multiclass StZextIdxPat<PatFrag StoreOp, RVInst Inst, RegisterClass StTy,
ValueType vt = i64> {
def : Pat<(StoreOp (vt StTy:$rd),
(AddrRegZextRegScale (i64 GPR:$rs1), (i64 GPR:$rs2), uimm2:$uimm2)),
(AddrRegZextRegScale3 (i64 GPR:$rs1), (i64 GPR:$rs2), uimm2:$uimm2)),
(Inst StTy:$rd, GPR:$rs1, GPR:$rs2, uimm2:$uimm2)>;
}

Expand Down
9 changes: 4 additions & 5 deletions llvm/lib/Target/RISCV/RISCVInstrInfoXqci.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@ def AddLike: PatFrags<(ops node:$A, node:$B),
return CurDAG->isBaseWithConstantOffset(SDValue(N, 0));
}]>;

def AddShl : PatFrag<(ops node:$Ra, node:$Rb, node:$SH3),
(add node:$Ra, (shl node:$Rb, node:$SH3))>;

def IntCCtoQCRISCVCC : SDNodeXForm<riscv_selectcc, [{
ISD::CondCode CC = cast<CondCodeSDNode>(N->getOperand(2))->get();
int64_t Imm = cast<ConstantSDNode>(N->getOperand(1))->getSExtValue();
Expand Down Expand Up @@ -1327,12 +1324,14 @@ class QC48StPat<PatFrag StoreOp, RVInst48 Inst>
: Pat<(StoreOp (i32 GPR:$rs2), (AddLike (i32 GPR:$rs1), simm26_nosimm12:$imm26)),
(Inst GPR:$rs2, GPR:$rs1, simm26_nosimm12:$imm26)>;

def AddrRegRegScale7 : AddrRegRegScale<7>;

class QCScaledLdPat<PatFrag LoadOp, RVInst Inst>
: Pat<(i32 (LoadOp (AddShl (i32 GPRMem:$rs1), (i32 GPRNoX0:$rs2), uimm3:$shamt))),
: Pat<(i32 (LoadOp (AddrRegRegScale7 (i32 GPRMem:$rs1), (i32 GPRNoX0:$rs2), uimm3:$shamt))),
(Inst GPRMem:$rs1, GPRNoX0:$rs2, uimm3:$shamt)>;

class QCScaledStPat<PatFrag StoreOp, RVInst Inst>
: Pat<(StoreOp (i32 GPR:$rd), (AddShl (i32 GPRMem:$rs1), (i32 GPRNoX0:$rs2), uimm3:$shamt)),
: Pat<(StoreOp (i32 GPR:$rd), (AddrRegRegScale7 (i32 GPRMem:$rs1), (i32 GPRNoX0:$rs2), uimm3:$shamt)),
(Inst GPR:$rd, GPRMem:$rs1, GPRNoX0:$rs2, uimm3:$shamt)>;

// Match `riscv_brcc` and lower to the appropriate XQCIBI branch instruction.
Expand Down
47 changes: 20 additions & 27 deletions llvm/test/CodeGen/RISCV/xqcisls.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ define i8 @lrb_anyext(ptr %a, i64 %b) {
;
; RV32IZBAXQCISLS-LABEL: lrb_anyext:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lbu a0, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrbu a0, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: ret
%1 = getelementptr i8, ptr %a, i64 %b
%2 = load i8, ptr %1, align 1
Expand Down Expand Up @@ -254,8 +253,7 @@ define i64 @lrb(ptr %a, i64 %b) {
;
; RV32IZBAXQCISLS-LABEL: lrb:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lb a1, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrb a1, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: srai a2, a1, 31
; RV32IZBAXQCISLS-NEXT: add a0, a1, a1
; RV32IZBAXQCISLS-NEXT: sltu a1, a0, a1
Expand Down Expand Up @@ -284,8 +282,7 @@ define i8 @lurb_anyext(ptr %a, i32 %b) {
;
; RV32IZBAXQCISLS-LABEL: lurb_anyext:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lbu a0, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrbu a0, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: ret
%1 = zext i32 %b to i64
%2 = getelementptr i8, ptr %a, i64 %1
Expand Down Expand Up @@ -318,8 +315,7 @@ define i64 @lurb(ptr %a, i32 %b) {
;
; RV32IZBAXQCISLS-LABEL: lurb:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lb a1, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrb a1, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: srai a2, a1, 31
; RV32IZBAXQCISLS-NEXT: add a0, a1, a1
; RV32IZBAXQCISLS-NEXT: sltu a1, a0, a1
Expand Down Expand Up @@ -353,8 +349,7 @@ define i64 @lrbu(ptr %a, i64 %b) {
;
; RV32IZBAXQCISLS-LABEL: lrbu:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lbu a1, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrbu a1, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: add a0, a1, a1
; RV32IZBAXQCISLS-NEXT: sltu a1, a0, a1
; RV32IZBAXQCISLS-NEXT: ret
Expand Down Expand Up @@ -384,8 +379,7 @@ define i64 @lurbu(ptr %a, i32 %b) {
;
; RV32IZBAXQCISLS-LABEL: lurbu:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: lbu a1, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.lrbu a1, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: add a0, a1, a1
; RV32IZBAXQCISLS-NEXT: sltu a1, a0, a1
; RV32IZBAXQCISLS-NEXT: ret
Expand Down Expand Up @@ -423,13 +417,14 @@ define i64 @lrd_2(ptr %a, i64 %b) {
;
; RV32IZBAXQCISLS-LABEL: lrd_2:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: sh3add a0, a1, a0
; RV32IZBAXQCISLS-NEXT: lw a1, 96(a0)
; RV32IZBAXQCISLS-NEXT: lw a2, 100(a0)
; RV32IZBAXQCISLS-NEXT: add a0, a1, a1
; RV32IZBAXQCISLS-NEXT: sltu a1, a0, a1
; RV32IZBAXQCISLS-NEXT: add a2, a2, a2
; RV32IZBAXQCISLS-NEXT: add a1, a2, a1
; RV32IZBAXQCISLS-NEXT: addi a2, a0, 96
; RV32IZBAXQCISLS-NEXT: qc.lrw a2, a2, a1, 3
; RV32IZBAXQCISLS-NEXT: addi a0, a0, 100
; RV32IZBAXQCISLS-NEXT: qc.lrw a1, a0, a1, 3
; RV32IZBAXQCISLS-NEXT: add a0, a2, a2
; RV32IZBAXQCISLS-NEXT: sltu a2, a0, a2
; RV32IZBAXQCISLS-NEXT: add a1, a1, a1
; RV32IZBAXQCISLS-NEXT: add a1, a1, a2
; RV32IZBAXQCISLS-NEXT: ret
%1 = add i64 %b, 12
%2 = getelementptr i64, ptr %a, i64 %1
Expand All @@ -456,8 +451,7 @@ define void @srb(ptr %a, i64 %b, i8 %c) {
; RV32IZBAXQCISLS-LABEL: srb:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a3, a3, a3
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: sb a3, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.srb a3, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: ret
%1 = add i8 %c, %c
%2 = getelementptr i8, ptr %a, i64 %b
Expand All @@ -483,8 +477,7 @@ define void @surb(ptr %a, i32 %b, i8 %c) {
; RV32IZBAXQCISLS-LABEL: surb:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: add a2, a2, a2
; RV32IZBAXQCISLS-NEXT: add a0, a0, a1
; RV32IZBAXQCISLS-NEXT: sb a2, 0(a0)
; RV32IZBAXQCISLS-NEXT: qc.srb a2, a0, a1, 0
; RV32IZBAXQCISLS-NEXT: ret
%1 = zext i32 %b to i64
%2 = add i8 %c, %c
Expand Down Expand Up @@ -512,10 +505,10 @@ define i64 @lrd_large_shift(ptr %a, i64 %b) {
;
; RV32IZBAXQCISLS-LABEL: lrd_large_shift:
; RV32IZBAXQCISLS: # %bb.0:
; RV32IZBAXQCISLS-NEXT: slli a1, a1, 5
; RV32IZBAXQCISLS-NEXT: add a1, a1, a0
; RV32IZBAXQCISLS-NEXT: lw a0, 384(a1)
; RV32IZBAXQCISLS-NEXT: lw a1, 388(a1)
; RV32IZBAXQCISLS-NEXT: addi a2, a0, 384
; RV32IZBAXQCISLS-NEXT: addi a3, a0, 388
; RV32IZBAXQCISLS-NEXT: qc.lrw a0, a2, a1, 5
; RV32IZBAXQCISLS-NEXT: qc.lrw a1, a3, a1, 5
; RV32IZBAXQCISLS-NEXT: ret
%1 = add i64 %b, 12
%2 = shl i64 %1, 2
Expand Down
Loading