[llvm] r363058 - [RISCV] Add lowering of addressing sequences for PIC
Lewis Revill via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 11 05:57:47 PDT 2019
Author: lewis-revill
Date: Tue Jun 11 05:57:47 2019
New Revision: 363058
URL: http://llvm.org/viewvc/llvm-project?rev=363058&view=rev
Log:
[RISCV] Add lowering of addressing sequences for PIC
This patch allows lowering of PIC addresses by using PC-relative
addressing for DSO-local symbols and accessing the address through the
global offset table for non-DSO-local symbols.
Differential Revision: https://reviews.llvm.org/D55303
Added:
llvm/trunk/test/CodeGen/RISCV/pic-models.ll
Modified:
llvm/trunk/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp
llvm/trunk/lib/Target/RISCV/RISCVISelLowering.cpp
llvm/trunk/lib/Target/RISCV/RISCVISelLowering.h
llvm/trunk/lib/Target/RISCV/RISCVInstrInfo.cpp
llvm/trunk/lib/Target/RISCV/RISCVMCInstLower.cpp
llvm/trunk/lib/Target/RISCV/Utils/RISCVBaseInfo.h
Modified: llvm/trunk/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp Tue Jun 11 05:57:47 2019
@@ -54,9 +54,16 @@ private:
bool expandAtomicCmpXchg(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI, bool IsMasked,
int Width, MachineBasicBlock::iterator &NextMBBI);
+ bool expandAuipcInstPair(MachineBasicBlock &MBB,
+ MachineBasicBlock::iterator MBBI,
+ MachineBasicBlock::iterator &NextMBBI,
+ unsigned FlagsHi, unsigned SecondOpcode);
bool expandLoadLocalAddress(MachineBasicBlock &MBB,
MachineBasicBlock::iterator MBBI,
MachineBasicBlock::iterator &NextMBBI);
+ bool expandLoadAddress(MachineBasicBlock &MBB,
+ MachineBasicBlock::iterator MBBI,
+ MachineBasicBlock::iterator &NextMBBI);
};
char RISCVExpandPseudo::ID = 0;
@@ -122,6 +129,8 @@ bool RISCVExpandPseudo::expandMI(Machine
return expandAtomicCmpXchg(MBB, MBBI, true, 32, NextMBBI);
case RISCV::PseudoLLA:
return expandLoadLocalAddress(MBB, MBBI, NextMBBI);
+ case RISCV::PseudoLA:
+ return expandLoadAddress(MBB, MBBI, NextMBBI);
}
return false;
@@ -602,9 +611,10 @@ bool RISCVExpandPseudo::expandAtomicCmpX
return true;
}
-bool RISCVExpandPseudo::expandLoadLocalAddress(
+bool RISCVExpandPseudo::expandAuipcInstPair(
MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
- MachineBasicBlock::iterator &NextMBBI) {
+ MachineBasicBlock::iterator &NextMBBI, unsigned FlagsHi,
+ unsigned SecondOpcode) {
MachineFunction *MF = MBB.getParent();
MachineInstr &MI = *MBBI;
DebugLoc DL = MI.getDebugLoc();
@@ -621,8 +631,8 @@ bool RISCVExpandPseudo::expandLoadLocalA
MF->insert(++MBB.getIterator(), NewMBB);
BuildMI(NewMBB, DL, TII->get(RISCV::AUIPC), DestReg)
- .addDisp(Symbol, 0, RISCVII::MO_PCREL_HI);
- BuildMI(NewMBB, DL, TII->get(RISCV::ADDI), DestReg)
+ .addDisp(Symbol, 0, FlagsHi);
+ BuildMI(NewMBB, DL, TII->get(SecondOpcode), DestReg)
.addReg(DestReg)
.addMBB(NewMBB, RISCVII::MO_PCREL_LO);
@@ -642,6 +652,31 @@ bool RISCVExpandPseudo::expandLoadLocalA
return true;
}
+bool RISCVExpandPseudo::expandLoadLocalAddress(
+ MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
+ MachineBasicBlock::iterator &NextMBBI) {
+ return expandAuipcInstPair(MBB, MBBI, NextMBBI, RISCVII::MO_PCREL_HI,
+ RISCV::ADDI);
+}
+
+bool RISCVExpandPseudo::expandLoadAddress(
+ MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI,
+ MachineBasicBlock::iterator &NextMBBI) {
+ MachineFunction *MF = MBB.getParent();
+
+ unsigned SecondOpcode;
+ unsigned FlagsHi;
+ if (MF->getTarget().isPositionIndependent()) {
+ const auto &STI = MF->getSubtarget<RISCVSubtarget>();
+ SecondOpcode = STI.is64Bit() ? RISCV::LD : RISCV::LW;
+ FlagsHi = RISCVII::MO_GOT_HI;
+ } else {
+ SecondOpcode = RISCV::ADDI;
+ FlagsHi = RISCVII::MO_PCREL_HI;
+ }
+ return expandAuipcInstPair(MBB, MBBI, NextMBBI, FlagsHi, SecondOpcode);
+}
+
} // end of anonymous namespace
INITIALIZE_PASS(RISCVExpandPseudo, "riscv-expand-pseudo",
Modified: llvm/trunk/lib/Target/RISCV/RISCVISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVISelLowering.cpp?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVISelLowering.cpp Tue Jun 11 05:57:47 2019
@@ -403,10 +403,25 @@ static SDValue getTargetNode(ConstantPoo
}
template <class NodeTy>
-SDValue RISCVTargetLowering::getAddr(NodeTy *N, SelectionDAG &DAG) const {
+SDValue RISCVTargetLowering::getAddr(NodeTy *N, SelectionDAG &DAG,
+ bool IsLocal) const {
SDLoc DL(N);
EVT Ty = getPointerTy(DAG.getDataLayout());
+ if (isPositionIndependent()) {
+ SDValue Addr = getTargetNode(N, DL, Ty, DAG, 0);
+ if (IsLocal)
+ // Use PC-relative addressing to access the symbol. This generates the
+ // pattern (PseudoLLA sym), which expands to (addi (auipc %pcrel_hi(sym))
+ // %pcrel_lo(auipc)).
+ return SDValue(DAG.getMachineNode(RISCV::PseudoLLA, DL, Ty, Addr), 0);
+
+ // Use PC-relative addressing to access the GOT for this symbol, then load
+ // the address from the GOT. This generates the pattern (PseudoLA sym),
+ // which expands to (ld (addi (auipc %got_pcrel_hi(sym)) %pcrel_lo(auipc))).
+ return SDValue(DAG.getMachineNode(RISCV::PseudoLA, DL, Ty, Addr), 0);
+ }
+
switch (getTargetMachine().getCodeModel()) {
default:
report_fatal_error("Unsupported code model for lowering");
@@ -436,10 +451,9 @@ SDValue RISCVTargetLowering::lowerGlobal
int64_t Offset = N->getOffset();
MVT XLenVT = Subtarget.getXLenVT();
- if (isPositionIndependent())
- report_fatal_error("Unable to lowerGlobalAddress");
-
- SDValue Addr = getAddr(N, DAG);
+ const GlobalValue *GV = N->getGlobal();
+ bool IsLocal = getTargetMachine().shouldAssumeDSOLocal(*GV->getParent(), GV);
+ SDValue Addr = getAddr(N, DAG, IsLocal);
// In order to maximise the opportunity for common subexpression elimination,
// emit a separate ADD node for the global address offset instead of folding
@@ -455,9 +469,6 @@ SDValue RISCVTargetLowering::lowerBlockA
SelectionDAG &DAG) const {
BlockAddressSDNode *N = cast<BlockAddressSDNode>(Op);
- if (isPositionIndependent())
- report_fatal_error("Unable to lowerBlockAddress");
-
return getAddr(N, DAG);
}
@@ -465,9 +476,6 @@ SDValue RISCVTargetLowering::lowerConsta
SelectionDAG &DAG) const {
ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
- if (isPositionIndependent())
- report_fatal_error("Unable to lowerConstantPool");
-
return getAddr(N, DAG);
}
Modified: llvm/trunk/lib/Target/RISCV/RISCVISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVISelLowering.h?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVISelLowering.h (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVISelLowering.h Tue Jun 11 05:57:47 2019
@@ -155,7 +155,7 @@ private:
}
template <class NodeTy>
- SDValue getAddr(NodeTy *N, SelectionDAG &DAG) const;
+ SDValue getAddr(NodeTy *N, SelectionDAG &DAG, bool IsLocal = true) const;
SDValue lowerGlobalAddress(SDValue Op, SelectionDAG &DAG) const;
SDValue lowerBlockAddress(SDValue Op, SelectionDAG &DAG) const;
Modified: llvm/trunk/lib/Target/RISCV/RISCVInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVInstrInfo.cpp?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVInstrInfo.cpp Tue Jun 11 05:57:47 2019
@@ -439,6 +439,7 @@ unsigned RISCVInstrInfo::getInstSizeInBy
case RISCV::PseudoCALL:
case RISCV::PseudoTAIL:
case RISCV::PseudoLLA:
+ case RISCV::PseudoLA:
return 8;
case TargetOpcode::INLINEASM:
case TargetOpcode::INLINEASM_BR: {
Modified: llvm/trunk/lib/Target/RISCV/RISCVMCInstLower.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVMCInstLower.cpp?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVMCInstLower.cpp (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVMCInstLower.cpp Tue Jun 11 05:57:47 2019
@@ -51,6 +51,9 @@ static MCOperand lowerSymbolOperand(cons
case RISCVII::MO_PCREL_HI:
Kind = RISCVMCExpr::VK_RISCV_PCREL_HI;
break;
+ case RISCVII::MO_GOT_HI:
+ Kind = RISCVMCExpr::VK_RISCV_GOT_HI;
+ break;
}
const MCExpr *ME =
Modified: llvm/trunk/lib/Target/RISCV/Utils/RISCVBaseInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/Utils/RISCVBaseInfo.h?rev=363058&r1=363057&r2=363058&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/Utils/RISCVBaseInfo.h (original)
+++ llvm/trunk/lib/Target/RISCV/Utils/RISCVBaseInfo.h Tue Jun 11 05:57:47 2019
@@ -53,6 +53,7 @@ enum {
MO_HI,
MO_PCREL_LO,
MO_PCREL_HI,
+ MO_GOT_HI,
};
} // namespace RISCVII
Added: llvm/trunk/test/CodeGen/RISCV/pic-models.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/RISCV/pic-models.ll?rev=363058&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/RISCV/pic-models.ll (added)
+++ llvm/trunk/test/CodeGen/RISCV/pic-models.ll Tue Jun 11 05:57:47 2019
@@ -0,0 +1,85 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=riscv32 -relocation-model=static < %s \
+; RUN: | FileCheck -check-prefix=RV32-STATIC %s
+; RUN: llc -mtriple=riscv32 -relocation-model=pic < %s \
+; RUN: | FileCheck -check-prefix=RV32-PIC %s
+; RUN: llc -mtriple=riscv64 -relocation-model=static < %s \
+; RUN: | FileCheck -check-prefix=RV64-STATIC %s
+; RUN: llc -mtriple=riscv64 -relocation-model=pic < %s \
+; RUN: | FileCheck -check-prefix=RV64-PIC %s
+
+; Check basic lowering of PIC addressing.
+; TODO: Check other relocation models?
+
+ at external_var = external global i32
+ at internal_var = internal global i32 42
+
+
+; external address
+
+define i32* @f1() nounwind {
+; RV32-STATIC-LABEL: f1:
+; RV32-STATIC: # %bb.0: # %entry
+; RV32-STATIC-NEXT: lui a0, %hi(external_var)
+; RV32-STATIC-NEXT: addi a0, a0, %lo(external_var)
+; RV32-STATIC-NEXT: ret
+;
+; RV32-PIC-LABEL: f1:
+; RV32-PIC: # %bb.0: # %entry
+; RV32-PIC-NEXT: .LBB0_1: # %entry
+; RV32-PIC-NEXT: # Label of block must be emitted
+; RV32-PIC-NEXT: auipc a0, %got_pcrel_hi(external_var)
+; RV32-PIC-NEXT: lw a0, %pcrel_lo(.LBB0_1)(a0)
+; RV32-PIC-NEXT: ret
+;
+; RV64-STATIC-LABEL: f1:
+; RV64-STATIC: # %bb.0: # %entry
+; RV64-STATIC-NEXT: lui a0, %hi(external_var)
+; RV64-STATIC-NEXT: addi a0, a0, %lo(external_var)
+; RV64-STATIC-NEXT: ret
+;
+; RV64-PIC-LABEL: f1:
+; RV64-PIC: # %bb.0: # %entry
+; RV64-PIC-NEXT: .LBB0_1: # %entry
+; RV64-PIC-NEXT: # Label of block must be emitted
+; RV64-PIC-NEXT: auipc a0, %got_pcrel_hi(external_var)
+; RV64-PIC-NEXT: ld a0, %pcrel_lo(.LBB0_1)(a0)
+; RV64-PIC-NEXT: ret
+entry:
+ ret i32* @external_var
+}
+
+
+; internal address
+
+define i32* @f2() nounwind {
+; RV32-STATIC-LABEL: f2:
+; RV32-STATIC: # %bb.0: # %entry
+; RV32-STATIC-NEXT: lui a0, %hi(internal_var)
+; RV32-STATIC-NEXT: addi a0, a0, %lo(internal_var)
+; RV32-STATIC-NEXT: ret
+;
+; RV32-PIC-LABEL: f2:
+; RV32-PIC: # %bb.0: # %entry
+; RV32-PIC-NEXT: .LBB1_1: # %entry
+; RV32-PIC-NEXT: # Label of block must be emitted
+; RV32-PIC-NEXT: auipc a0, %pcrel_hi(internal_var)
+; RV32-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB1_1)
+; RV32-PIC-NEXT: ret
+;
+; RV64-STATIC-LABEL: f2:
+; RV64-STATIC: # %bb.0: # %entry
+; RV64-STATIC-NEXT: lui a0, %hi(internal_var)
+; RV64-STATIC-NEXT: addi a0, a0, %lo(internal_var)
+; RV64-STATIC-NEXT: ret
+;
+; RV64-PIC-LABEL: f2:
+; RV64-PIC: # %bb.0: # %entry
+; RV64-PIC-NEXT: .LBB1_1: # %entry
+; RV64-PIC-NEXT: # Label of block must be emitted
+; RV64-PIC-NEXT: auipc a0, %pcrel_hi(internal_var)
+; RV64-PIC-NEXT: addi a0, a0, %pcrel_lo(.LBB1_1)
+; RV64-PIC-NEXT: ret
+entry:
+ ret i32* @internal_var
+}
More information about the llvm-commits
mailing list