From fc8475bde993cc0fa6101427e73e8a9cf7d1c3a4 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Wed, 19 Jan 2011 02:16:49 +0000 Subject: [PATCH] Don't forget to emit the load from indirect symbol when using movw + movt to materialize GA indirect symbols. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123809 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMISelLowering.cpp | 9 ++++++++- lib/Target/ARM/ARMInstrInfo.td | 4 ++-- lib/Target/ARM/ARMInstrThumb2.td | 5 +++-- lib/Target/ARM/ARMSubtarget.cpp | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp index 3710be21eb8..b0d3e70918e 100644 --- a/lib/Target/ARM/ARMISelLowering.cpp +++ b/lib/Target/ARM/ARMISelLowering.cpp @@ -54,6 +54,7 @@ using namespace llvm; STATISTIC(NumTailCalls, "Number of tail calls"); +STATISTIC(NumMovwMovt, "Number of GAs materialized with movw + movt"); // This option should go away when tail calls fully work. static cl::opt @@ -1955,6 +1956,7 @@ SDValue ARMTargetLowering::LowerGlobalAddressELF(SDValue Op, // If we have T2 ops, we can materialize the address directly via movt/movw // pair. This is always cheaper. if (Subtarget->useMovt()) { + ++NumMovwMovt; // FIXME: Once remat is capable of dealing with instructions with register // operands, expand this into two nodes. return DAG.getNode(ARMISD::Wrapper, dl, PtrVT, @@ -1978,6 +1980,7 @@ SDValue ARMTargetLowering::LowerGlobalAddressDarwin(SDValue Op, ARMFunctionInfo *AFI = MF.getInfo(); if (Subtarget->useMovt()) { + ++NumMovwMovt; // FIXME: Once remat is capable of dealing with instructions with register // operands, expand this into two nodes. if (RelocM != Reloc::PIC_) @@ -1990,7 +1993,11 @@ SDValue ARMTargetLowering::LowerGlobalAddressDarwin(SDValue Op, SDValue Result = DAG.getNode(ARMISD::WrapperPIC, dl, PtrVT, DAG.getTargetGlobalAddress(GV, dl, PtrVT), PICLabel); - return DAG.getNode(ARMISD::PIC_ADD, dl, PtrVT, Result, PICLabel); + Result = DAG.getNode(ARMISD::PIC_ADD, dl, PtrVT, Result, PICLabel); + if (Subtarget->GVIsIndirectSymbol(GV, RelocM)) + Result = DAG.getLoad(PtrVT, dl, DAG.getEntryNode(), Result, + MachinePointerInfo::getGOT(), false, false, 0); + return Result; } unsigned ARMPCLabelIndex = 0; diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td index dbc4d9d15de..5161f88df2b 100644 --- a/lib/Target/ARM/ARMInstrInfo.td +++ b/lib/Target/ARM/ARMInstrInfo.td @@ -3403,16 +3403,16 @@ def Int_eh_sjlj_dispatchsetup : // This is a single pseudo instruction, the benefit is that it can be remat'd // as a single unit instead of having to handle reg inputs. // FIXME: Remove this when we can do generalized remat. -let isReMaterializable = 1, isMoveImm = 1 in { +let isReMaterializable = 1, isMoveImm = 1 in def MOVi32imm : PseudoInst<(outs GPR:$dst), (ins i32imm:$src), IIC_iMOVix2, [(set GPR:$dst, (arm_i32imm:$src))]>, Requires<[IsARM]>; +let isReMaterializable = 1 in def MOV_pic_ga : PseudoInst<(outs GPR:$dst), (ins i32imm:$addr, pclabel:$id), IIC_iMOVix2, [(set GPR:$dst, (ARMWrapperPIC tglobaladdr:$addr, imm:$id))]>, Requires<[IsARM, UseMovt]>; -} // isReMaterializable = 1, isMoveImm = 1 in // ConstantPool, GlobalAddress, and JumpTable def : ARMPat<(ARMWrapper tglobaladdr :$dst), (LEApcrel tglobaladdr :$dst)>, diff --git a/lib/Target/ARM/ARMInstrThumb2.td b/lib/Target/ARM/ARMInstrThumb2.td index 779391768ff..e9c7513c966 100644 --- a/lib/Target/ARM/ARMInstrThumb2.td +++ b/lib/Target/ARM/ARMInstrThumb2.td @@ -3240,16 +3240,17 @@ def t2RFEIA : T2RFE<0b111010011001, // 32-bit immediate using movw + movt. // This is a single pseudo instruction to make it re-materializable. // FIXME: Remove this when we can do generalized remat. -let isReMaterializable = 1, isMoveImm = 1 in { +let isReMaterializable = 1, isMoveImm = 1 in def t2MOVi32imm : PseudoInst<(outs rGPR:$dst), (ins i32imm:$src), IIC_iMOVix2, [(set rGPR:$dst, (i32 imm:$src))]>, Requires<[IsThumb, HasV6T2]>; +// Materialize GA with movw + movt. +let isReMaterializable = 1 in def t2MOV_pic_ga : PseudoInst<(outs rGPR:$dst), (ins i32imm:$addr, pclabel:$id), IIC_iMOVix2, [(set rGPR:$dst, (ARMWrapperPIC tglobaladdr:$addr, imm:$id))]>, Requires<[IsThumb2, UseMovt]>; -} // isReMaterializable = 1, isMoveImm = 1 in // ConstantPool, GlobalAddress, and JumpTable def : T2Pat<(ARMWrapper tglobaladdr :$dst), (t2LEApcrel tglobaladdr :$dst)>, diff --git a/lib/Target/ARM/ARMSubtarget.cpp b/lib/Target/ARM/ARMSubtarget.cpp index 1ba52d21fa7..366af55369f 100644 --- a/lib/Target/ARM/ARMSubtarget.cpp +++ b/lib/Target/ARM/ARMSubtarget.cpp @@ -153,7 +153,7 @@ ARMSubtarget::ARMSubtarget(const std::string &TT, const std::string &FS, if (UseMOVT && hasV6T2Ops()) { unsigned Maj, Min, Rev; TargetTriple.getDarwinNumber(Maj, Min, Rev); - UseMovt = (Maj > 4 || Min > 2); + UseMovt = Maj > 4; } }