Skip to content

[RISCV][Xqcilo] Load/Store Pseudos #134931

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.

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 4 commits into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3746,18 +3746,23 @@ bool RISCVAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
emitLoadTLSGDAddress(Inst, IDLoc, Out);
return false;
case RISCV::PseudoLB:
case RISCV::PseudoQC_E_LB:
emitLoadStoreSymbol(Inst, RISCV::LB, IDLoc, Out, /*HasTmpReg=*/false);
return false;
case RISCV::PseudoLBU:
case RISCV::PseudoQC_E_LBU:
emitLoadStoreSymbol(Inst, RISCV::LBU, IDLoc, Out, /*HasTmpReg=*/false);
return false;
case RISCV::PseudoLH:
case RISCV::PseudoQC_E_LH:
emitLoadStoreSymbol(Inst, RISCV::LH, IDLoc, Out, /*HasTmpReg=*/false);
return false;
case RISCV::PseudoLHU:
case RISCV::PseudoQC_E_LHU:
emitLoadStoreSymbol(Inst, RISCV::LHU, IDLoc, Out, /*HasTmpReg=*/false);
return false;
case RISCV::PseudoLW:
case RISCV::PseudoQC_E_LW:
emitLoadStoreSymbol(Inst, RISCV::LW, IDLoc, Out, /*HasTmpReg=*/false);
return false;
case RISCV::PseudoLWU:
Expand All @@ -3776,12 +3781,15 @@ bool RISCVAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc,
emitLoadStoreSymbol(Inst, RISCV::FLD, IDLoc, Out, /*HasTmpReg=*/true);
return false;
case RISCV::PseudoSB:
case RISCV::PseudoQC_E_SB:
emitLoadStoreSymbol(Inst, RISCV::SB, IDLoc, Out, /*HasTmpReg=*/true);
return false;
case RISCV::PseudoSH:
case RISCV::PseudoQC_E_SH:
emitLoadStoreSymbol(Inst, RISCV::SH, IDLoc, Out, /*HasTmpReg=*/true);
return false;
case RISCV::PseudoSW:
case RISCV::PseudoQC_E_SW:
emitLoadStoreSymbol(Inst, RISCV::SW, IDLoc, Out, /*HasTmpReg=*/true);
return false;
case RISCV::PseudoSD:
Expand Down
17 changes: 17 additions & 0 deletions llvm/lib/Target/RISCV/RISCVInstrInfoXqci.td
Original file line number Diff line number Diff line change
Expand Up @@ -1186,6 +1186,23 @@ def PseudoLongQC_E_BGEI : LongBcciPseudo<simm16nonzero, 10>;
def PseudoLongQC_E_BLTUI : LongBcciPseudo<uimm16nonzero, 10>;
def PseudoLongQC_E_BGEUI : LongBcciPseudo<uimm16nonzero, 10>;

// Load/Store pseudos with QC.E.* Mnemonics. These expand to an AUIPC +
// (Standard) Load/Store sequence, as this can materialize all 32-bit addresses,
// and is shorter than e.g. an AUIPC + Xqcilo Load/Store sequence. These
// sequences can be turned back into a single Xqcilo instruction using linker
// relaxation.
let Predicates = [HasVendorXqcilo, IsRV32] in {
def PseudoQC_E_LB : PseudoLoad<"qc.e.lb">;
def PseudoQC_E_LBU : PseudoLoad<"qc.e.lbu">;
def PseudoQC_E_LH : PseudoLoad<"qc.e.lh">;
def PseudoQC_E_LHU : PseudoLoad<"qc.e.lhu">;
def PseudoQC_E_LW : PseudoLoad<"qc.e.lw">;

def PseudoQC_E_SB : PseudoStore<"qc.e.sb">;
def PseudoQC_E_SH : PseudoStore<"qc.e.sh">;
def PseudoQC_E_SW : PseudoStore<"qc.e.sw">;
} // Predicates = [HasVendorXqcilo, IsRV32]

//===----------------------------------------------------------------------===//
// Code Gen Patterns
//===----------------------------------------------------------------------===//
Expand Down
70 changes: 70 additions & 0 deletions llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Xqcilo - Qualcomm uC Large Offset Load Store extension
# RUN: not llvm-mc %s -triple=riscv32 -mattr=+experimental-xqcilo \
# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ENABLED %s
# RUN: not llvm-mc %s -triple=riscv32 -mattr=-experimental-xqcilo \
# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-DISABLED %s

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lb a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lb a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lbu a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lh a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lhu a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.lw a0, 0xf000

# CHECK-ENABLED: [[@LINE+2]]:21: error: invalid operand for instruction
# CHECK-DISABLED: [[@LINE+1]]:21: error: invalid operand for instruction
qc.e.sb a0, 0xf000, t0

# CHECK-ENABLED: [[@LINE+2]]:21: error: invalid operand for instruction
# CHECK-DISABLED: [[@LINE+1]]:21: error: invalid operand for instruction
qc.e.sh a0, 0xf000, t0

# CHECK-ENABLED: [[@LINE+2]]:21: error: invalid operand for instruction
# CHECK-DISABLED: [[@LINE+1]]:21: error: invalid operand for instruction
qc.e.sw a0, 0xf000, t0

# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.lb a0, undefined
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.lbu a0, undefined
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.lh a0, undefined
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.lhu a0, undefined
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.lw a0, undefined
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.sb a0, undefined, t0
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.sh a0, undefined, t0
# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
qc.e.sw a0, undefined, t0

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.sb a0, undefined

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.sh a0, undefined

# CHECK-ENABLED: [[@LINE+2]]:1: error: too few operands for instruction
# CHECK-DISABLED: [[@LINE+1]]:1: error: too few operands for instruction
qc.e.sw a0, undefined
43 changes: 43 additions & 0 deletions llvm/test/MC/RISCV/xqcilo-pseudos-valid.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Xqcilo - Qualcomm uC Large Offset Load Store extension
# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-xqcilo \
# RUN: | FileCheck -check-prefixes=CHECK %s

# CHECK-LABEL: .Lpcrel_hi0
# CHECK-NEXT: auipc a0, %pcrel_hi(undefined)
# CHECK-NEXT: lb a0, %pcrel_lo(.Lpcrel_hi0)(a0)
qc.e.lb a0, undefined

# CHECK-LABEL: .Lpcrel_hi1
# CHECK-NEXT: auipc a0, %pcrel_hi(undefined)
# CHECK-NEXT: lbu a0, %pcrel_lo(.Lpcrel_hi1)(a0)
qc.e.lbu a0, undefined

# CHECK-LABEL: .Lpcrel_hi2
# CHECK-NEXT: auipc a0, %pcrel_hi(undefined)
# CHECK-NEXT: lh a0, %pcrel_lo(.Lpcrel_hi2)(a0)
qc.e.lh a0, undefined

# CHECK-LABEL: .Lpcrel_hi3
# CHECK-NEXT: auipc a0, %pcrel_hi(undefined)
# CHECK-NEXT: lhu a0, %pcrel_lo(.Lpcrel_hi3)(a0)
qc.e.lhu a0, undefined

# CHECK-LABEL: .Lpcrel_hi4
# CHECK-NEXT: auipc a0, %pcrel_hi(undefined)
# CHECK-NEXT: lw a0, %pcrel_lo(.Lpcrel_hi4)(a0)
qc.e.lw a0, undefined

# CHECK-LABEL: .Lpcrel_hi5
# CHECK-NEXT: auipc t0, %pcrel_hi(undefined)
# CHECK-NEXT: sb a0, %pcrel_lo(.Lpcrel_hi5)(t0)
qc.e.sb a0, undefined, t0

# CHECK-LABEL: .Lpcrel_hi6
# CHECK-NEXT: auipc t0, %pcrel_hi(undefined)
# CHECK-NEXT: sh a0, %pcrel_lo(.Lpcrel_hi6)(t0)
qc.e.sh a0, undefined, t0

# CHECK-LABEL: .Lpcrel_hi7
# CHECK-NEXT: auipc t0, %pcrel_hi(undefined)
# CHECK-NEXT: sw a0, %pcrel_lo(.Lpcrel_hi7)(t0)
qc.e.sw a0, undefined, t0