X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FSelectionDAG%2FLegalizeTypes.cpp;h=6876e9f94f81f167a5740fed34857a9a28fdc505;hb=9a6b92de4c2207b427f3b9cd67cd122dafc5b6c6;hp=5c04de912d13019ff836ccf9834bd68d8d715881;hpb=d164ea2fb07ab3540121ffe1c59ad2cdc0a7a0a3;p=oota-llvm.git diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp index 5c04de912d1..6876e9f94f8 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp @@ -19,15 +19,6 @@ #include "llvm/Target/TargetData.h" using namespace llvm; -#ifndef NDEBUG -static cl::opt -ViewLegalizeTypesDAGs("view-legalize-types-dags", cl::Hidden, - cl::desc("Pop up a window to show dags before legalize types")); -#else -static const bool ViewLegalizeTypesDAGs = 0; -#endif - - /// run - This is the main entry point for the type legalizer. This does a /// top-down traversal of the dag, legalizing types as it goes. void DAGTypeLegalizer::run() { @@ -38,9 +29,9 @@ void DAGTypeLegalizer::run() { // The root of the dag may dangle to deleted nodes until the type legalizer is // done. Set it to null to avoid confusion. - DAG.setRoot(SDOperand()); + DAG.setRoot(SDValue()); - // Walk all nodes in the graph, assigning them a NodeID of 'ReadyToProcess' + // Walk all nodes in the graph, assigning them a NodeId of 'ReadyToProcess' // (and remembering them) if they are leaves and assigning 'NewNode' if // non-leaves. for (SelectionDAG::allnodes_iterator I = DAG.allnodes_begin(), @@ -101,7 +92,7 @@ ScanOperands: bool NeedsRevisit = false; unsigned i; for (i = 0; i != NumOperands; ++i) { - if (IgnoreNodeResults(N->getOperand(i).Val)) + if (IgnoreNodeResults(N->getOperand(i).getNode())) continue; MVT OpVT = N->getOperand(i).getValueType(); @@ -136,9 +127,10 @@ ScanOperands: if (NeedsRevisit) continue; - if (i == NumOperands) + if (i == NumOperands) { DEBUG(cerr << "Legally typed node: "; N->dump(&DAG); cerr << "\n"); } + } NodeDone: // If we reach here, the node was processed, potentially creating new nodes. @@ -147,26 +139,26 @@ NodeDone: for (SDNode::use_iterator UI = N->use_begin(), E = N->use_end(); UI != E; ++UI) { - SDNode *User = UI->getUser(); - int NodeID = User->getNodeId(); - assert(NodeID != ReadyToProcess && NodeID != Processed && + SDNode *User = *UI; + int NodeId = User->getNodeId(); + assert(NodeId != ReadyToProcess && NodeId != Processed && "Invalid node id for user of unprocessed node!"); // This node has two options: it can either be a new node or its Node ID // may be a count of the number of operands it has that are not ready. - if (NodeID > 0) { - User->setNodeId(NodeID-1); + if (NodeId > 0) { + User->setNodeId(NodeId-1); // If this was the last use it was waiting on, add it to the ready list. - if (NodeID-1 == ReadyToProcess) + if (NodeId-1 == ReadyToProcess) Worklist.push_back(User); continue; } // Otherwise, this node is new: this is the first operand of it that - // became ready. Its new NodeID is the number of operands it has minus 1 + // became ready. Its new NodeId is the number of operands it has minus 1 // (as this node is now processed). - assert(NodeID == NewNode && "Unknown node ID!"); + assert(NodeId == NewNode && "Unknown node ID!"); User->setNodeId(User->getNumOperands()-1); // If the node only has a single operand, it is now ready. @@ -202,7 +194,7 @@ NodeDone: // Check that all operand types are legal. for (unsigned i = 0, NumOps = I->getNumOperands(); i < NumOps; ++i) - if (!IgnoreNodeResults(I->getOperand(i).Val) && + if (!IgnoreNodeResults(I->getOperand(i).getNode()) && !isTypeLegal(I->getOperand(i).getValueType())) { cerr << "Operand type " << i << " illegal!\n"; Failed = true; @@ -228,11 +220,13 @@ NodeDone: /// AnalyzeNewNode - The specified node is the root of a subtree of potentially /// new nodes. Correct any processed operands (this may change the node) and -/// calculate the NodeId. -void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) { +/// calculate the NodeId. If the node itself changes to a processed node, it +/// is not remapped - the caller needs to take care of this. +/// Returns the potentially changed node. +SDNode *DAGTypeLegalizer::AnalyzeNewNode(SDNode *N) { // If this was an existing node that is already done, we're done. if (N->getNodeId() != NewNode) - return; + return N; // Remove any stale map entries. ExpungeNode(N); @@ -248,18 +242,18 @@ void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) { // replaced them, which can result in our node changing. Since remapping // is rare, the code tries to minimize overhead in the non-remapping case. - SmallVector NewOps; + SmallVector NewOps; unsigned NumProcessed = 0; for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) { - SDOperand OrigOp = N->getOperand(i); - SDOperand Op = OrigOp; + SDValue OrigOp = N->getOperand(i); + SDValue Op = OrigOp; - if (Op.Val->getNodeId() == Processed) - RemapNode(Op); + if (Op.getNode()->getNodeId() == Processed) + RemapValue(Op); + else if (Op.getNode()->getNodeId() == NewNode) + AnalyzeNewValue(Op); - if (Op.Val->getNodeId() == NewNode) - AnalyzeNewNode(Op.Val); - else if (Op.Val->getNodeId() == Processed) + if (Op.getNode()->getNodeId() == Processed) ++NumProcessed; if (!NewOps.empty()) { @@ -274,14 +268,45 @@ void DAGTypeLegalizer::AnalyzeNewNode(SDNode *&N) { } // Some operands changed - update the node. - if (!NewOps.empty()) - N = DAG.UpdateNodeOperands(SDOperand(N, 0), &NewOps[0], NewOps.size()).Val; + if (!NewOps.empty()) { + SDNode *M = DAG.UpdateNodeOperands(SDValue(N, 0), &NewOps[0], + NewOps.size()).getNode(); + if (M != N) { + if (M->getNodeId() != NewNode) + // It morphed into a previously analyzed node - nothing more to do. + return M; + + // It morphed into a different new node. Do the equivalent of passing + // it to AnalyzeNewNode: expunge it and calculate the NodeId. + N = M; + ExpungeNode(N); + } + } + // Calculate the NodeId. N->setNodeId(N->getNumOperands()-NumProcessed); if (N->getNodeId() == ReadyToProcess) Worklist.push_back(N); + + return N; } +/// AnalyzeNewValue - Call AnalyzeNewNode, updating the node in Val if needed. +/// If the node changes to a processed node, then remap it. +void DAGTypeLegalizer::AnalyzeNewValue(SDValue &Val) { + SDNode *N(Val.getNode()); + // If this was an existing node that is already done, avoid remapping it. + if (N->getNodeId() != NewNode) + return; + SDNode *M(AnalyzeNewNode(N)); + if (M != N) + Val.setNode(M); + if (M->getNodeId() == Processed) + // It morphed into an already processed node - remap it. + RemapValue(Val); +} + + namespace { /// NodeUpdateListener - This class is a DAGUpdateListener that listens for /// updates to nodes and recomputes their ready state. @@ -296,7 +321,7 @@ namespace { N->getNodeId() != DAGTypeLegalizer::ReadyToProcess && "RAUW deleted processed node!"); // It is possible, though rare, for the deleted node N to occur as a - // target in a map, so note the replacement N -> E in ReplacedNodes. + // target in a map, so note the replacement N -> E in ReplacedValues. assert(E && "Node not replaced?"); DTL.NoteDeletion(N, E); } @@ -315,14 +340,14 @@ namespace { /// ReplaceValueWith - The specified value was legalized to the specified other -/// value. If they are different, update the DAG and NodeIDs replacing any uses +/// value. If they are different, update the DAG and NodeIds replacing any uses /// of From to use To instead. -void DAGTypeLegalizer::ReplaceValueWith(SDOperand From, SDOperand To) { +void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) { if (From == To) return; // If expansion produced new nodes, make sure they are properly marked. - ExpungeNode(From.Val); - AnalyzeNewNode(To.Val); // Expunges To. + ExpungeNode(From.getNode()); + AnalyzeNewValue(To); // Expunges To. // Anything that used the old node should now use the new one. Note that this // can potentially cause recursive merging. @@ -331,7 +356,7 @@ void DAGTypeLegalizer::ReplaceValueWith(SDOperand From, SDOperand To) { // The old node may still be present in a map like ExpandedIntegers or // PromotedIntegers. Inform maps about the replacement. - ReplacedNodes[From] = To; + ReplacedValues[From] = To; } /// ReplaceNodeWith - Replace uses of the 'from' node's results with the 'to' @@ -341,7 +366,10 @@ void DAGTypeLegalizer::ReplaceNodeWith(SDNode *From, SDNode *To) { // If expansion produced new nodes, make sure they are properly marked. ExpungeNode(From); - AnalyzeNewNode(To); // Expunges To. + + To = AnalyzeNewNode(To); // Expunges To. + // If To morphed into an already processed node, its values may need + // remapping. This is done below. assert(From->getNumValues() == To->getNumValues() && "Node results don't match"); @@ -349,50 +377,61 @@ void DAGTypeLegalizer::ReplaceNodeWith(SDNode *From, SDNode *To) { // Anything that used the old node should now use the new one. Note that this // can potentially cause recursive merging. NodeUpdateListener NUL(*this); - DAG.ReplaceAllUsesWith(From, To, &NUL); - - // The old node may still be present in a map like ExpandedIntegers or - // PromotedIntegers. Inform maps about the replacement. for (unsigned i = 0, e = From->getNumValues(); i != e; ++i) { - assert(From->getValueType(i) == To->getValueType(i) && - "Node results don't match"); - ReplacedNodes[SDOperand(From, i)] = SDOperand(To, i); + SDValue FromVal(From, i); + SDValue ToVal(To, i); + + // AnalyzeNewNode may have morphed a new node into a processed node. Remap + // values now. + if (To->getNodeId() == Processed) + RemapValue(ToVal); + + assert(FromVal.getValueType() == ToVal.getValueType() && + "Node results don't match!"); + + // Make anything that used the old value use the new value. + DAG.ReplaceAllUsesOfValueWith(FromVal, ToVal, &NUL); + + // The old node may still be present in a map like ExpandedIntegers or + // PromotedIntegers. Inform maps about the replacement. + ReplacedValues[FromVal] = ToVal; } } -/// RemapNode - If the specified value was already legalized to another value, +/// RemapValue - If the specified value was already legalized to another value, /// replace it by that value. -void DAGTypeLegalizer::RemapNode(SDOperand &N) { - DenseMap::iterator I = ReplacedNodes.find(N); - if (I != ReplacedNodes.end()) { +void DAGTypeLegalizer::RemapValue(SDValue &N) { + DenseMap::iterator I = ReplacedValues.find(N); + if (I != ReplacedValues.end()) { // Use path compression to speed up future lookups if values get multiply // replaced with other values. - RemapNode(I->second); + RemapValue(I->second); N = I->second; } + assert(N.getNode()->getNodeId() != NewNode && "Mapped to unanalyzed node!"); } -/// ExpungeNode - If N has a bogus mapping in ReplacedNodes, eliminate it. +/// ExpungeNode - If N has a bogus mapping in ReplacedValues, eliminate it. /// This can occur when a node is deleted then reallocated as a new node - -/// the mapping in ReplacedNodes applies to the deleted node, not the new +/// the mapping in ReplacedValues applies to the deleted node, not the new /// one. -/// The only map that can have a deleted node as a source is ReplacedNodes. +/// The only map that can have a deleted node as a source is ReplacedValues. /// Other maps can have deleted nodes as targets, but since their looked-up -/// values are always immediately remapped using RemapNode, resulting in a -/// not-deleted node, this is harmless as long as ReplacedNodes/RemapNode +/// values are always immediately remapped using RemapValue, resulting in a +/// not-deleted node, this is harmless as long as ReplacedValues/RemapValue /// always performs correct mappings. In order to keep the mapping correct, /// ExpungeNode should be called on any new nodes *before* adding them as -/// either source or target to ReplacedNodes (which typically means calling +/// either source or target to ReplacedValues (which typically means calling /// Expunge when a new node is first seen, since it may no longer be marked -/// NewNode by the time it is added to ReplacedNodes). +/// NewNode by the time it is added to ReplacedValues). void DAGTypeLegalizer::ExpungeNode(SDNode *N) { if (N->getNodeId() != NewNode) return; - // If N is not remapped by ReplacedNodes then there is nothing to do. + // If N is not remapped by ReplacedValues then there is nothing to do. unsigned i, e; for (i = 0, e = N->getNumValues(); i != e; ++i) - if (ReplacedNodes.find(SDOperand(N, i)) != ReplacedNodes.end()) + if (ReplacedValues.find(SDValue(N, i)) != ReplacedValues.end()) break; if (i == e) @@ -400,142 +439,142 @@ void DAGTypeLegalizer::ExpungeNode(SDNode *N) { // Remove N from all maps - this is expensive but rare. - for (DenseMap::iterator I = PromotedIntegers.begin(), + for (DenseMap::iterator I = PromotedIntegers.begin(), E = PromotedIntegers.end(); I != E; ++I) { - assert(I->first.Val != N); - RemapNode(I->second); + assert(I->first.getNode() != N); + RemapValue(I->second); } - for (DenseMap::iterator I = SoftenedFloats.begin(), + for (DenseMap::iterator I = SoftenedFloats.begin(), E = SoftenedFloats.end(); I != E; ++I) { - assert(I->first.Val != N); - RemapNode(I->second); + assert(I->first.getNode() != N); + RemapValue(I->second); } - for (DenseMap::iterator I = ScalarizedVectors.begin(), + for (DenseMap::iterator I = ScalarizedVectors.begin(), E = ScalarizedVectors.end(); I != E; ++I) { - assert(I->first.Val != N); - RemapNode(I->second); + assert(I->first.getNode() != N); + RemapValue(I->second); } - for (DenseMap >::iterator + for (DenseMap >::iterator I = ExpandedIntegers.begin(), E = ExpandedIntegers.end(); I != E; ++I){ - assert(I->first.Val != N); - RemapNode(I->second.first); - RemapNode(I->second.second); + assert(I->first.getNode() != N); + RemapValue(I->second.first); + RemapValue(I->second.second); } - for (DenseMap >::iterator + for (DenseMap >::iterator I = ExpandedFloats.begin(), E = ExpandedFloats.end(); I != E; ++I) { - assert(I->first.Val != N); - RemapNode(I->second.first); - RemapNode(I->second.second); + assert(I->first.getNode() != N); + RemapValue(I->second.first); + RemapValue(I->second.second); } - for (DenseMap >::iterator + for (DenseMap >::iterator I = SplitVectors.begin(), E = SplitVectors.end(); I != E; ++I) { - assert(I->first.Val != N); - RemapNode(I->second.first); - RemapNode(I->second.second); + assert(I->first.getNode() != N); + RemapValue(I->second.first); + RemapValue(I->second.second); } - for (DenseMap::iterator I = ReplacedNodes.begin(), - E = ReplacedNodes.end(); I != E; ++I) - RemapNode(I->second); + for (DenseMap::iterator I = ReplacedValues.begin(), + E = ReplacedValues.end(); I != E; ++I) + RemapValue(I->second); for (unsigned i = 0, e = N->getNumValues(); i != e; ++i) - ReplacedNodes.erase(SDOperand(N, i)); + ReplacedValues.erase(SDValue(N, i)); } -void DAGTypeLegalizer::SetPromotedInteger(SDOperand Op, SDOperand Result) { - AnalyzeNewNode(Result.Val); +void DAGTypeLegalizer::SetPromotedInteger(SDValue Op, SDValue Result) { + AnalyzeNewValue(Result); - SDOperand &OpEntry = PromotedIntegers[Op]; - assert(OpEntry.Val == 0 && "Node is already promoted!"); + SDValue &OpEntry = PromotedIntegers[Op]; + assert(OpEntry.getNode() == 0 && "Node is already promoted!"); OpEntry = Result; } -void DAGTypeLegalizer::SetSoftenedFloat(SDOperand Op, SDOperand Result) { - AnalyzeNewNode(Result.Val); +void DAGTypeLegalizer::SetSoftenedFloat(SDValue Op, SDValue Result) { + AnalyzeNewValue(Result); - SDOperand &OpEntry = SoftenedFloats[Op]; - assert(OpEntry.Val == 0 && "Node is already converted to integer!"); + SDValue &OpEntry = SoftenedFloats[Op]; + assert(OpEntry.getNode() == 0 && "Node is already converted to integer!"); OpEntry = Result; } -void DAGTypeLegalizer::SetScalarizedVector(SDOperand Op, SDOperand Result) { - AnalyzeNewNode(Result.Val); +void DAGTypeLegalizer::SetScalarizedVector(SDValue Op, SDValue Result) { + AnalyzeNewValue(Result); - SDOperand &OpEntry = ScalarizedVectors[Op]; - assert(OpEntry.Val == 0 && "Node is already scalarized!"); + SDValue &OpEntry = ScalarizedVectors[Op]; + assert(OpEntry.getNode() == 0 && "Node is already scalarized!"); OpEntry = Result; } -void DAGTypeLegalizer::GetExpandedInteger(SDOperand Op, SDOperand &Lo, - SDOperand &Hi) { - std::pair &Entry = ExpandedIntegers[Op]; - RemapNode(Entry.first); - RemapNode(Entry.second); - assert(Entry.first.Val && "Operand isn't expanded"); +void DAGTypeLegalizer::GetExpandedInteger(SDValue Op, SDValue &Lo, + SDValue &Hi) { + std::pair &Entry = ExpandedIntegers[Op]; + RemapValue(Entry.first); + RemapValue(Entry.second); + assert(Entry.first.getNode() && "Operand isn't expanded"); Lo = Entry.first; Hi = Entry.second; } -void DAGTypeLegalizer::SetExpandedInteger(SDOperand Op, SDOperand Lo, - SDOperand Hi) { +void DAGTypeLegalizer::SetExpandedInteger(SDValue Op, SDValue Lo, + SDValue Hi) { // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. - AnalyzeNewNode(Lo.Val); - AnalyzeNewNode(Hi.Val); + AnalyzeNewValue(Lo); + AnalyzeNewValue(Hi); // Remember that this is the result of the node. - std::pair &Entry = ExpandedIntegers[Op]; - assert(Entry.first.Val == 0 && "Node already expanded"); + std::pair &Entry = ExpandedIntegers[Op]; + assert(Entry.first.getNode() == 0 && "Node already expanded"); Entry.first = Lo; Entry.second = Hi; } -void DAGTypeLegalizer::GetExpandedFloat(SDOperand Op, SDOperand &Lo, - SDOperand &Hi) { - std::pair &Entry = ExpandedFloats[Op]; - RemapNode(Entry.first); - RemapNode(Entry.second); - assert(Entry.first.Val && "Operand isn't expanded"); +void DAGTypeLegalizer::GetExpandedFloat(SDValue Op, SDValue &Lo, + SDValue &Hi) { + std::pair &Entry = ExpandedFloats[Op]; + RemapValue(Entry.first); + RemapValue(Entry.second); + assert(Entry.first.getNode() && "Operand isn't expanded"); Lo = Entry.first; Hi = Entry.second; } -void DAGTypeLegalizer::SetExpandedFloat(SDOperand Op, SDOperand Lo, - SDOperand Hi) { +void DAGTypeLegalizer::SetExpandedFloat(SDValue Op, SDValue Lo, + SDValue Hi) { // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. - AnalyzeNewNode(Lo.Val); - AnalyzeNewNode(Hi.Val); + AnalyzeNewValue(Lo); + AnalyzeNewValue(Hi); // Remember that this is the result of the node. - std::pair &Entry = ExpandedFloats[Op]; - assert(Entry.first.Val == 0 && "Node already expanded"); + std::pair &Entry = ExpandedFloats[Op]; + assert(Entry.first.getNode() == 0 && "Node already expanded"); Entry.first = Lo; Entry.second = Hi; } -void DAGTypeLegalizer::GetSplitVector(SDOperand Op, SDOperand &Lo, - SDOperand &Hi) { - std::pair &Entry = SplitVectors[Op]; - RemapNode(Entry.first); - RemapNode(Entry.second); - assert(Entry.first.Val && "Operand isn't split"); +void DAGTypeLegalizer::GetSplitVector(SDValue Op, SDValue &Lo, + SDValue &Hi) { + std::pair &Entry = SplitVectors[Op]; + RemapValue(Entry.first); + RemapValue(Entry.second); + assert(Entry.first.getNode() && "Operand isn't split"); Lo = Entry.first; Hi = Entry.second; } -void DAGTypeLegalizer::SetSplitVector(SDOperand Op, SDOperand Lo, - SDOperand Hi) { +void DAGTypeLegalizer::SetSplitVector(SDValue Op, SDValue Lo, + SDValue Hi) { // Lo/Hi may have been newly allocated, if so, add nodeid's as relevant. - AnalyzeNewNode(Lo.Val); - AnalyzeNewNode(Hi.Val); + AnalyzeNewValue(Lo); + AnalyzeNewValue(Hi); // Remember that this is the result of the node. - std::pair &Entry = SplitVectors[Op]; - assert(Entry.first.Val == 0 && "Node already split"); + std::pair &Entry = SplitVectors[Op]; + assert(Entry.first.getNode() == 0 && "Node already split"); Entry.first = Lo; Entry.second = Hi; } @@ -546,27 +585,27 @@ void DAGTypeLegalizer::SetSplitVector(SDOperand Op, SDOperand Lo, //===----------------------------------------------------------------------===// /// BitConvertToInteger - Convert to an integer of the same size. -SDOperand DAGTypeLegalizer::BitConvertToInteger(SDOperand Op) { +SDValue DAGTypeLegalizer::BitConvertToInteger(SDValue Op) { unsigned BitWidth = Op.getValueType().getSizeInBits(); return DAG.getNode(ISD::BIT_CONVERT, MVT::getIntegerVT(BitWidth), Op); } -SDOperand DAGTypeLegalizer::CreateStackStoreLoad(SDOperand Op, - MVT DestVT) { +SDValue DAGTypeLegalizer::CreateStackStoreLoad(SDValue Op, + MVT DestVT) { // Create the stack frame object. Make sure it is aligned for both // the source and destination types. unsigned SrcAlign = TLI.getTargetData()->getPrefTypeAlignment(Op.getValueType().getTypeForMVT()); - SDOperand FIPtr = DAG.CreateStackTemporary(DestVT, SrcAlign); + SDValue FIPtr = DAG.CreateStackTemporary(DestVT, SrcAlign); // Emit a store to the stack slot. - SDOperand Store = DAG.getStore(DAG.getEntryNode(), Op, FIPtr, NULL, 0); + SDValue Store = DAG.getStore(DAG.getEntryNode(), Op, FIPtr, NULL, 0); // Result is a load from the stack slot. return DAG.getLoad(DestVT, Store, FIPtr, NULL, 0); } /// JoinIntegers - Build an integer with low bits Lo and high bits Hi. -SDOperand DAGTypeLegalizer::JoinIntegers(SDOperand Lo, SDOperand Hi) { +SDValue DAGTypeLegalizer::JoinIntegers(SDValue Lo, SDValue Hi) { MVT LVT = Lo.getValueType(); MVT HVT = Hi.getValueType(); MVT NVT = MVT::getIntegerVT(LVT.getSizeInBits() + HVT.getSizeInBits()); @@ -580,9 +619,9 @@ SDOperand DAGTypeLegalizer::JoinIntegers(SDOperand Lo, SDOperand Hi) { /// SplitInteger - Return the lower LoVT bits of Op in Lo and the upper HiVT /// bits in Hi. -void DAGTypeLegalizer::SplitInteger(SDOperand Op, +void DAGTypeLegalizer::SplitInteger(SDValue Op, MVT LoVT, MVT HiVT, - SDOperand &Lo, SDOperand &Hi) { + SDValue &Lo, SDValue &Hi) { assert(LoVT.getSizeInBits() + HiVT.getSizeInBits() == Op.getValueType().getSizeInBits() && "Invalid integer splitting!"); Lo = DAG.getNode(ISD::TRUNCATE, LoVT, Op); @@ -592,19 +631,19 @@ void DAGTypeLegalizer::SplitInteger(SDOperand Op, Hi = DAG.getNode(ISD::TRUNCATE, HiVT, Hi); } -/// SplitInteger - Return the lower and upper halves of Op's bits in a value type -/// half the size of Op's. -void DAGTypeLegalizer::SplitInteger(SDOperand Op, - SDOperand &Lo, SDOperand &Hi) { +/// SplitInteger - Return the lower and upper halves of Op's bits in a value +/// type half the size of Op's. +void DAGTypeLegalizer::SplitInteger(SDValue Op, + SDValue &Lo, SDValue &Hi) { MVT HalfVT = MVT::getIntegerVT(Op.getValueType().getSizeInBits()/2); SplitInteger(Op, HalfVT, HalfVT, Lo, Hi); } /// MakeLibCall - Generate a libcall taking the given operands as arguments and /// returning a result of type RetVT. -SDOperand DAGTypeLegalizer::MakeLibCall(RTLIB::Libcall LC, MVT RetVT, - const SDOperand *Ops, unsigned NumOps, - bool isSigned) { +SDValue DAGTypeLegalizer::MakeLibCall(RTLIB::Libcall LC, MVT RetVT, + const SDValue *Ops, unsigned NumOps, + bool isSigned) { TargetLowering::ArgListTy Args; Args.reserve(NumOps); @@ -616,18 +655,38 @@ SDOperand DAGTypeLegalizer::MakeLibCall(RTLIB::Libcall LC, MVT RetVT, Entry.isZExt = !isSigned; Args.push_back(Entry); } - SDOperand Callee = DAG.getExternalSymbol(TLI.getLibcallName(LC), - TLI.getPointerTy()); + SDValue Callee = DAG.getExternalSymbol(TLI.getLibcallName(LC), + TLI.getPointerTy()); const Type *RetTy = RetVT.getTypeForMVT(); - std::pair CallInfo = + std::pair CallInfo = TLI.LowerCallTo(DAG.getEntryNode(), RetTy, isSigned, !isSigned, false, - CallingConv::C, false, Callee, Args, DAG); + false, CallingConv::C, false, Callee, Args, DAG); return CallInfo.first; } -SDOperand DAGTypeLegalizer::GetVectorElementPointer(SDOperand VecPtr, MVT EltVT, - SDOperand Index) { +/// LibCallify - Convert the node into a libcall with the same prototype. +SDValue DAGTypeLegalizer::LibCallify(RTLIB::Libcall LC, SDNode *N, + bool isSigned) { + unsigned NumOps = N->getNumOperands(); + if (NumOps == 0) { + return MakeLibCall(LC, N->getValueType(0), 0, 0, isSigned); + } else if (NumOps == 1) { + SDValue Op = N->getOperand(0); + return MakeLibCall(LC, N->getValueType(0), &Op, 1, isSigned); + } else if (NumOps == 2) { + SDValue Ops[2] = { N->getOperand(0), N->getOperand(1) }; + return MakeLibCall(LC, N->getValueType(0), Ops, 2, isSigned); + } + SmallVector Ops(NumOps); + for (unsigned i = 0; i < NumOps; ++i) + Ops[i] = N->getOperand(i); + + return MakeLibCall(LC, N->getValueType(0), &Ops[0], NumOps, isSigned); +} + +SDValue DAGTypeLegalizer::GetVectorElementPointer(SDValue VecPtr, MVT EltVT, + SDValue Index) { // Make sure the index type is big enough to compute in. if (Index.getValueType().bitsGT(TLI.getPointerTy())) Index = DAG.getNode(ISD::TRUNCATE, TLI.getPointerTy(), Index); @@ -673,7 +732,5 @@ void DAGTypeLegalizer::GetSplitDestVTs(MVT InVT, MVT &LoVT, MVT &HiVT) { /// Note that this is an involved process that may invalidate pointers into /// the graph. void SelectionDAG::LegalizeTypes() { - if (ViewLegalizeTypesDAGs) viewGraph(); - DAGTypeLegalizer(*this).run(); }