Enable global address legalization, fixing a todo and allowing the removal

of some code.  This exposes the implicit load from the stubs to the DAG, allowing
them to be optimized by the dag combiner.  It also moves darwin specific stuff
out of the isel into the legalizer, and allows more to be moved to the .td file.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@24397 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-11-17 18:26:56 +00:00
parent 4f0f86de5f
commit 3eef4e377c
3 changed files with 2 additions and 49 deletions

View File

@ -428,20 +428,7 @@ bool PPCDAGToDAGISel::SelectAddr(SDOperand Addr, SDOperand &Op1,
} }
} }
// Now check if we're dealing with a global, and whether or not we should emit if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(Addr)) {
// an optimized load or store for statics.
if (GlobalAddressSDNode *GN = dyn_cast<GlobalAddressSDNode>(Addr)) {
GlobalValue *GV = GN->getGlobal();
if (!GV->hasWeakLinkage() && !GV->isExternal()) {
Op1 = CurDAG->getTargetGlobalAddress(GV, MVT::i32);
if (PICEnabled)
Op2 = CurDAG->getTargetNode(PPC::ADDIS, MVT::i32, getGlobalBaseReg(),
Op1);
else
Op2 = CurDAG->getTargetNode(PPC::LIS, MVT::i32, Op1);
return false;
}
} else if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(Addr)) {
Op1 = getI32Imm(0); Op1 = getI32Imm(0);
Op2 = CurDAG->getTargetFrameIndex(FI->getIndex(), MVT::i32); Op2 = CurDAG->getTargetFrameIndex(FI->getIndex(), MVT::i32);
return false; return false;
@ -907,22 +894,6 @@ SDOperand PPCDAGToDAGISel::Select(SDOperand Op) {
} }
return CurDAG->getTargetNode(PPC::LA, MVT::i32, Tmp, CPI); return CurDAG->getTargetNode(PPC::LA, MVT::i32, Tmp, CPI);
} }
#if 1
case ISD::GlobalAddress: {
GlobalValue *GV = cast<GlobalAddressSDNode>(N)->getGlobal();
SDOperand Tmp;
SDOperand GA = CurDAG->getTargetGlobalAddress(GV, MVT::i32);
if (PICEnabled)
Tmp = CurDAG->getTargetNode(PPC::ADDIS, MVT::i32, getGlobalBaseReg(), GA);
else
Tmp = CurDAG->getTargetNode(PPC::LIS, MVT::i32, GA);
if (GV->hasWeakLinkage() || GV->isExternal())
return CurDAG->getTargetNode(PPC::LWZ, MVT::i32, GA, Tmp);
else
return CurDAG->getTargetNode(PPC::LA, MVT::i32, Tmp, GA);
}
#endif
case ISD::FADD: { case ISD::FADD: {
MVT::ValueType Ty = N->getValueType(0); MVT::ValueType Ty = N->getValueType(0);
if (!NoExcessFPPrecision) { // Match FMA ops if (!NoExcessFPPrecision) { // Match FMA ops

View File

@ -93,7 +93,7 @@ PPCTargetLowering::PPCTargetLowering(TargetMachine &TM)
// We want to legalize GlobalAddress into the appropriate instructions to // We want to legalize GlobalAddress into the appropriate instructions to
// materialize the address. // materialize the address.
//setOperationAction(ISD::GlobalAddress, MVT::i32, Custom); setOperationAction(ISD::GlobalAddress, MVT::i32, Custom);
if (TM.getSubtarget<PPCSubtarget>().is64Bit()) { if (TM.getSubtarget<PPCSubtarget>().is64Bit()) {
// They also have instructions for converting between i64 and fp. // They also have instructions for converting between i64 and fp.

View File

@ -31,24 +31,6 @@ as one load when using --enable-pic.
* Support 'update' load/store instructions. These are cracked on the G5, but * Support 'update' load/store instructions. These are cracked on the G5, but
are still a codesize win. are still a codesize win.
* Add a custom legalizer for the GlobalAddress node, to move the funky darwin
stub stuff from the instruction selector to the legalizer (exposing low-level
operations to the dag for optzn. For example, we want to codegen this:
int A = 0;
void B() { A++; }
as:
lis r9,ha16(_A)
lwz r2,lo16(_A)(r9)
addi r2,r2,1
stw r2,lo16(_A)(r9)
not:
lis r2, ha16(_A)
lwz r2, lo16(_A)(r2)
addi r2, r2, 1
lis r3, ha16(_A)
stw r2, lo16(_A)(r3)
* should hint to the branch select pass that it doesn't need to print the * should hint to the branch select pass that it doesn't need to print the
second unconditional branch, so we don't end up with things like: second unconditional branch, so we don't end up with things like:
b .LBBl42__2E_expand_function_8_674 ; loopentry.24 b .LBBl42__2E_expand_function_8_674 ; loopentry.24