6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-28 03:25:23 +00:00
Code Issues Projects Releases Wiki Activity

Assign ordering to SDNodes in PromoteNode. Also fixing a subtle bug where BSWAP

Browse Source 
was using "Tmp1" in the first getNode call instead of Node->getOperand(0).


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91936 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2009-12-22 22:53:39 +00:00
parent 542eabcba6
commit 167bea71a4
2 changed files with 83 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
View File

@@ -2931,22 +2931,29 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node,
void SelectionDAGLegalize::PromoteNode(SDNode *Node, void SelectionDAGLegalize::PromoteNode(SDNode *Node,
SmallVectorImpl<SDValue> &Results) { SmallVectorImpl<SDValue> &Results) {
EVT OVT = Node->getValueType(0); EVT OVT = Node->getValueType(0);
if (Node->getOpcode() == ISD::UINT_TO_FP || if (Node->getOpcode() == ISD::UINT_TO_FP ||
Node->getOpcode() == ISD::SINT_TO_FP || Node->getOpcode() == ISD::SINT_TO_FP ||
Node->getOpcode() == ISD::SETCC) { Node->getOpcode() == ISD::SETCC)
OVT = Node->getOperand(0).getValueType(); OVT = Node->getOperand(0).getValueType();
}
EVT NVT = TLI.getTypeToPromoteTo(Node->getOpcode(), OVT); EVT NVT = TLI.getTypeToPromoteTo(Node->getOpcode(), OVT);
DebugLoc dl = Node->getDebugLoc(); DebugLoc dl = Node->getDebugLoc();
unsigned Order = DAG.GetOrdering(Node);
SDValue Tmp1, Tmp2, Tmp3; SDValue Tmp1, Tmp2, Tmp3;
switch (Node->getOpcode()) { switch (Node->getOpcode()) {
case ISD::CTTZ: case ISD::CTTZ:
case ISD::CTLZ: case ISD::CTLZ:
case ISD::CTPOP: case ISD::CTPOP:
// Zero extend the argument. // Zero extend the argument.
Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, NVT, Node->getOperand(0)); Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, NVT, Node->getOperand(0));
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
// Perform the larger operation. // Perform the larger operation.
Tmp1 = DAG.getNode(Node->getOpcode(), dl, NVT, Tmp1); Tmp1 = DAG.getNode(Node->getOpcode(), dl, NVT, Tmp1);
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
if (Node->getOpcode() == ISD::CTTZ) { if (Node->getOpcode() == ISD::CTTZ) {
//if Tmp1 == sizeinbits(NVT) then Tmp1 = sizeinbits(Old VT) //if Tmp1 == sizeinbits(NVT) then Tmp1 = sizeinbits(Old VT)
Tmp2 = DAG.getSetCC(dl, TLI.getSetCCResultType(NVT), Tmp2 = DAG.getSetCC(dl, TLI.getSetCCResultType(NVT),
@@ -2954,21 +2961,37 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
ISD::SETEQ); ISD::SETEQ);
Tmp1 = DAG.getNode(ISD::SELECT, dl, NVT, Tmp2, Tmp1 = DAG.getNode(ISD::SELECT, dl, NVT, Tmp2,
DAG.getConstant(OVT.getSizeInBits(), NVT), Tmp1); DAG.getConstant(OVT.getSizeInBits(), NVT), Tmp1);
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
}
} else if (Node->getOpcode() == ISD::CTLZ) { } else if (Node->getOpcode() == ISD::CTLZ) {
// Tmp1 = Tmp1 - (sizeinbits(NVT) - sizeinbits(Old VT)) // Tmp1 = Tmp1 - (sizeinbits(NVT) - sizeinbits(Old VT))
Tmp1 = DAG.getNode(ISD::SUB, dl, NVT, Tmp1, Tmp1 = DAG.getNode(ISD::SUB, dl, NVT, Tmp1,
DAG.getConstant(NVT.getSizeInBits() - DAG.getConstant(NVT.getSizeInBits() -
OVT.getSizeInBits(), NVT)); OVT.getSizeInBits(), NVT));
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
} }
Results.push_back(DAG.getNode(ISD::TRUNCATE, dl, OVT, Tmp1));
Tmp3 = DAG.getNode(ISD::TRUNCATE, dl, OVT, Tmp1);
Results.push_back(Tmp3);
if (DisableScheduling) DAG.AssignOrdering(Tmp3.getNode(), Order);
break; break;
case ISD::BSWAP: { case ISD::BSWAP: {
unsigned DiffBits = NVT.getSizeInBits() - OVT.getSizeInBits(); unsigned DiffBits = NVT.getSizeInBits() - OVT.getSizeInBits();
Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, NVT, Tmp1); Tmp1 = DAG.getNode(ISD::ZERO_EXTEND, dl, NVT, Node->getOperand(0));
Tmp1 = DAG.getNode(ISD::BSWAP, dl, NVT, Tmp1); Tmp2 = DAG.getNode(ISD::BSWAP, dl, NVT, Tmp1);
Tmp1 = DAG.getNode(ISD::SRL, dl, NVT, Tmp1, Tmp3 = DAG.getNode(ISD::SRL, dl, NVT, Tmp2,
DAG.getConstant(DiffBits, TLI.getShiftAmountTy())); DAG.getConstant(DiffBits, TLI.getShiftAmountTy()));
Results.push_back(Tmp1); Results.push_back(Tmp3);
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
DAG.AssignOrdering(Tmp3.getNode(), Order);
}
break; break;
} }
case ISD::FP_TO_UINT: case ISD::FP_TO_UINT:
@@ -2976,12 +2999,14 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
Tmp1 = PromoteLegalFP_TO_INT(Node->getOperand(0), Node->getValueType(0), Tmp1 = PromoteLegalFP_TO_INT(Node->getOperand(0), Node->getValueType(0),
Node->getOpcode() == ISD::FP_TO_SINT, dl); Node->getOpcode() == ISD::FP_TO_SINT, dl);
Results.push_back(Tmp1); Results.push_back(Tmp1);
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
break; break;
case ISD::UINT_TO_FP: case ISD::UINT_TO_FP:
case ISD::SINT_TO_FP: case ISD::SINT_TO_FP:
Tmp1 = PromoteLegalINT_TO_FP(Node->getOperand(0), Node->getValueType(0), Tmp1 = PromoteLegalINT_TO_FP(Node->getOperand(0), Node->getValueType(0),
Node->getOpcode() == ISD::SINT_TO_FP, dl); Node->getOpcode() == ISD::SINT_TO_FP, dl);
Results.push_back(Tmp1); Results.push_back(Tmp1);
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
break; break;
case ISD::AND: case ISD::AND:
case ISD::OR: case ISD::OR:
@@ -2996,12 +3021,23 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
} else { } else {
llvm_report_error("Cannot promote logic operation"); llvm_report_error("Cannot promote logic operation");
} }
// Promote each of the values to the new type. // Promote each of the values to the new type.
Tmp1 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(0)); Tmp1 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(0));
Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1)); Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1));
// Perform the larger operation, then convert back // Perform the larger operation, then convert back
Tmp1 = DAG.getNode(Node->getOpcode(), dl, NVT, Tmp1, Tmp2); Tmp3 = DAG.getNode(Node->getOpcode(), dl, NVT, Tmp1, Tmp2);
Results.push_back(DAG.getNode(TruncOp, dl, OVT, Tmp1));
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
DAG.AssignOrdering(Tmp3.getNode(), Order);
}
Tmp1 = DAG.getNode(TruncOp, dl, OVT, Tmp3);
Results.push_back(Tmp1);
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
break; break;
} }
case ISD::SELECT: { case ISD::SELECT: {
@@ -3016,18 +3052,34 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
ExtOp = ISD::FP_EXTEND; ExtOp = ISD::FP_EXTEND;
TruncOp = ISD::FP_ROUND; TruncOp = ISD::FP_ROUND;
} }
Tmp1 = Node->getOperand(0); Tmp1 = Node->getOperand(0);
// Promote each of the values to the new type. // Promote each of the values to the new type.
Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1)); Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1));
Tmp3 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(2)); Tmp3 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(2));
if (DisableScheduling) {
DAG.AssignOrdering(Tmp2.getNode(), Order);
DAG.AssignOrdering(Tmp3.getNode(), Order);
}
// Perform the larger operation, then round down. // Perform the larger operation, then round down.
Tmp1 = DAG.getNode(ISD::SELECT, dl, NVT, Tmp1, Tmp2, Tmp3); Tmp1 = DAG.getNode(ISD::SELECT, dl, NVT, Tmp1, Tmp2, Tmp3);
if (TruncOp != ISD::FP_ROUND) if (TruncOp != ISD::FP_ROUND)
Tmp1 = DAG.getNode(TruncOp, dl, Node->getValueType(0), Tmp1); Tmp2 = DAG.getNode(TruncOp, dl, Node->getValueType(0), Tmp1);
else else
Tmp1 = DAG.getNode(TruncOp, dl, Node->getValueType(0), Tmp1, Tmp2 = DAG.getNode(TruncOp, dl, Node->getValueType(0), Tmp1,
DAG.getIntPtrConstant(0)); DAG.getIntPtrConstant(0));
Results.push_back(Tmp1);
Results.push_back(Tmp2);
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
}
break; break;
} }
case ISD::VECTOR_SHUFFLE: { case ISD::VECTOR_SHUFFLE: {
@@ -3039,9 +3091,17 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
Tmp2 = DAG.getNode(ISD::BIT_CONVERT, dl, NVT, Node->getOperand(1)); Tmp2 = DAG.getNode(ISD::BIT_CONVERT, dl, NVT, Node->getOperand(1));
// Convert the shuffle mask to the right # elements. // Convert the shuffle mask to the right # elements.
Tmp1 = ShuffleWithNarrowerEltType(NVT, OVT, dl, Tmp1, Tmp2, Mask); Tmp3 = ShuffleWithNarrowerEltType(NVT, OVT, dl, Tmp1, Tmp2, Mask);
Tmp1 = DAG.getNode(ISD::BIT_CONVERT, dl, OVT, Tmp1);
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
DAG.AssignOrdering(Tmp3.getNode(), Order);
}
Tmp1 = DAG.getNode(ISD::BIT_CONVERT, dl, OVT, Tmp3);
Results.push_back(Tmp1); Results.push_back(Tmp1);
if (DisableScheduling) DAG.AssignOrdering(Tmp1.getNode(), Order);
break; break;
} }
case ISD::SETCC: { case ISD::SETCC: {
@@ -3051,10 +3111,17 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node,
cast<CondCodeSDNode>(Node->getOperand(2))->get(); cast<CondCodeSDNode>(Node->getOperand(2))->get();
ExtOp = isSignedIntSetCC(CCCode) ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND; ExtOp = isSignedIntSetCC(CCCode) ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND;
} }
Tmp1 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(0)); Tmp1 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(0));
Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1)); Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1));
Results.push_back(DAG.getNode(ISD::SETCC, dl, Node->getValueType(0), Results.push_back(DAG.getNode(ISD::SETCC, dl, Node->getValueType(0),
Tmp1, Tmp2, Node->getOperand(2))); Tmp1, Tmp2, Node->getOperand(2)));
if (DisableScheduling) {
DAG.AssignOrdering(Tmp1.getNode(), Order);
DAG.AssignOrdering(Tmp2.getNode(), Order);
}
break; break;
} }
} }

1
lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View File

@@ -648,6 +648,7 @@ SDValue SelectionDAGBuilder::getControlRoot() {
PendingExports.size()); PendingExports.size());
PendingExports.clear(); PendingExports.clear();
DAG.setRoot(Root); DAG.setRoot(Root);
if (DisableScheduling) DAG.AssignOrdering(Root.getNode(), SDNodeOrder);
return Root; return Root;
} }