X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2FTableGen%2FDAGISelEmitter.cpp;h=43513525579aaed2f8cc5f42fe453b51f73e128b;hb=0d52ff1f7b993750a74a5d4432273092de9af069;hp=bdb7fcf35ad4b2a036ec3f1a8b74fc51673c54ab;hpb=95d110920e4ce9ded59934a432327a5343b1069d;p=oota-llvm.git diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp index bdb7fcf35ad..43513525579 100644 --- a/utils/TableGen/DAGISelEmitter.cpp +++ b/utils/TableGen/DAGISelEmitter.cpp @@ -14,13 +14,21 @@ #include "DAGISelEmitter.h" #include "Record.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/MathExtras.h" +#include "llvm/Support/Debug.h" #include "llvm/Support/Streams.h" #include #include using namespace llvm; +namespace { + cl::opt + GenDebug("gen-debug", cl::desc("Generate debug code"), + cl::init(false)); +} + //===----------------------------------------------------------------------===// // DAGISelEmitter Helper methods // @@ -56,7 +64,8 @@ static unsigned getPatternSize(TreePatternNode *P, CodeGenDAGPatterns &CGP) { EMVT::isExtFloatingPointInVTs(P->getExtTypes()) || P->getExtTypeNum(0) == MVT::isVoid || P->getExtTypeNum(0) == MVT::Flag || - P->getExtTypeNum(0) == MVT::iPTR) && + P->getExtTypeNum(0) == MVT::iPTR || + P->getExtTypeNum(0) == MVT::iPTRAny) && "Not a valid pattern node to size!"); unsigned Size = 3; // The node itself. // If the root node is a ConstantSDNode, increases its size. @@ -75,7 +84,7 @@ static unsigned getPatternSize(TreePatternNode *P, CodeGenDAGPatterns &CGP) { // If this node has some predicate function that must match, it adds to the // complexity of this node. - if (!P->getPredicateFn().empty()) + if (!P->getPredicateFns().empty()) ++Size; // Count children in the count if they are also nodes. @@ -88,7 +97,7 @@ static unsigned getPatternSize(TreePatternNode *P, CodeGenDAGPatterns &CGP) { Size += 5; // Matches a ConstantSDNode (+3) and a specific value (+2). else if (NodeIsComplexPattern(Child)) Size += getPatternSize(Child, CGP); - else if (!Child->getPredicateFn().empty()) + else if (!Child->getPredicateFns().empty()) ++Size; } } @@ -139,8 +148,15 @@ struct PatternSortingPredicate { PatternSortingPredicate(CodeGenDAGPatterns &cgp) : CGP(cgp) {} CodeGenDAGPatterns &CGP; - bool operator()(const PatternToMatch *LHS, - const PatternToMatch *RHS) { + typedef std::pair CodeLine; + typedef std::vector CodeList; + typedef std::vector > PatternList; + + bool operator()(const std::pair &LHSPair, + const std::pair &RHSPair) { + const PatternToMatch *LHS = LHSPair.first; + const PatternToMatch *RHS = RHSPair.first; + unsigned LHSSize = getPatternSize(LHS->getSrcPattern(), CGP); unsigned RHSSize = getPatternSize(RHS->getSrcPattern(), CGP); LHSSize += LHS->getAddedComplexity(); @@ -254,7 +270,7 @@ void DAGISelEmitter::EmitNodeTransforms(std::ostream &OS) { std::string ClassName = CGP.getSDNodeInfo(SDNode).getSDClassName(); const char *C2 = ClassName == "SDNode" ? "N" : "inN"; - OS << "inline SDOperand Transform_" << I->first << "(SDNode *" << C2 + OS << "inline SDValue Transform_" << I->first << "(SDNode *" << C2 << ") {\n"; if (ClassName != "SDNode") OS << " " << ClassName << " *N = cast<" << ClassName << ">(inN);\n"; @@ -316,7 +332,7 @@ private: CodeGenDAGPatterns &CGP; // Predicates. - ListInit *Predicates; + std::string PredicateCheck; // Pattern cost. unsigned Cost; // Instruction selector pattern. @@ -347,7 +363,7 @@ private: /// tested, and if true, the match fails) [when 1], or normal code to emit /// [when 0], or initialization code to emit [when 2]. std::vector > &GeneratedCode; - /// GeneratedDecl - This is the set of all SDOperand declarations needed for + /// GeneratedDecl - This is the set of all SDValue declarations needed for /// the set of patterns for each top-level opcode. std::set &GeneratedDecl; /// TargetOpcodes - The target specific opcodes used by the resulting @@ -394,7 +410,7 @@ private: VTNo++; } public: - PatternCodeEmitter(CodeGenDAGPatterns &cgp, ListInit *preds, + PatternCodeEmitter(CodeGenDAGPatterns &cgp, std::string predcheck, TreePatternNode *pattern, TreePatternNode *instr, std::vector > &gc, std::set &gd, @@ -402,7 +418,7 @@ public: std::vector &tv, bool &oiv, unsigned &niro) - : CGP(cgp), Predicates(preds), Pattern(pattern), Instruction(instr), + : CGP(cgp), PredicateCheck(predcheck), Pattern(pattern), Instruction(instr), GeneratedCode(gc), GeneratedDecl(gd), TargetOpcodes(to), TargetVTs(tv), OutputIsVariadic(oiv), NumInputRootOps(niro), @@ -428,31 +444,16 @@ public: NumInputRootOps = N->getNumChildren(); if (DisablePatternForFastISel(N, CGP)) - emitCheck("!FastISel"); + emitCheck("!Fast"); - std::string PredicateCheck; - for (unsigned i = 0, e = Predicates->getSize(); i != e; ++i) { - if (DefInit *Pred = dynamic_cast(Predicates->getElement(i))) { - Record *Def = Pred->getDef(); - if (!Def->isSubClassOf("Predicate")) { -#ifndef NDEBUG - Def->dump(); -#endif - assert(0 && "Unknown predicate type!"); - } - if (!PredicateCheck.empty()) - PredicateCheck += " && "; - PredicateCheck += "(" + Def->getValueAsString("CondString") + ")"; - } - } - emitCheck(PredicateCheck); } if (N->isLeaf()) { if (IntInit *II = dynamic_cast(N->getLeafValue())) { emitCheck("cast(" + RootName + - ")->getSignExtended() == " + itostr(II->getValue())); + ")->getSExtValue() == INT64_C(" + + itostr(II->getValue()) + ")"); return; } else if (!NodeIsComplexPattern(N)) { assert(0 && "Cannot match this as a leaf value!"); @@ -521,22 +522,22 @@ public: if (NeedCheck) { std::string ParentName(RootName.begin(), RootName.end()-1); - emitCheck("CanBeFoldedBy(" + RootName + ".Val, " + ParentName + - ".Val, N.Val)"); + emitCheck("IsLegalAndProfitableToFold(" + RootName + + ".getNode(), " + ParentName + ".getNode(), N.getNode())"); } } } if (NodeHasChain) { if (FoundChain) { - emitCheck("(" + ChainName + ".Val == " + RootName + ".Val || " - "IsChainCompatible(" + ChainName + ".Val, " + - RootName + ".Val))"); + emitCheck("(" + ChainName + ".getNode() == " + RootName + ".getNode() || " + "IsChainCompatible(" + ChainName + ".getNode(), " + + RootName + ".getNode()))"); OrigChains.push_back(std::make_pair(ChainName, RootName)); } else FoundChain = true; ChainName = "Chain" + ChainSuffix; - emitInit("SDOperand " + ChainName + " = " + RootName + + emitInit("SDValue " + ChainName + " = " + RootName + ".getOperand(0);"); } } @@ -556,11 +557,10 @@ public: } } - // If there is a node predicate for this, emit the call. - if (!N->getPredicateFn().empty()) - emitCheck(N->getPredicateFn() + "(" + RootName + ".Val)"); + // If there are node predicates for this, emit the calls. + for (unsigned i = 0, e = N->getPredicateFns().size(); i != e; ++i) + emitCheck(N->getPredicateFns()[i] + "(" + RootName + ".getNode())"); - // If this is an 'and R, 1234' where the operation is AND/OR and the RHS is // a constant without a predicate fn that has more that one bit set, handle // this as a special case. This is usually for targets that have special @@ -575,19 +575,22 @@ public: (N->getOperator()->getName() == "and" || N->getOperator()->getName() == "or") && N->getChild(1)->isLeaf() && - N->getChild(1)->getPredicateFn().empty()) { + N->getChild(1)->getPredicateFns().empty()) { if (IntInit *II = dynamic_cast(N->getChild(1)->getLeafValue())) { if (!isPowerOf2_32(II->getValue())) { // Don't bother with single bits. - emitInit("SDOperand " + RootName + "0" + " = " + + emitInit("SDValue " + RootName + "0" + " = " + RootName + ".getOperand(" + utostr(0) + ");"); - emitInit("SDOperand " + RootName + "1" + " = " + + emitInit("SDValue " + RootName + "1" + " = " + RootName + ".getOperand(" + utostr(1) + ");"); - emitCheck("isa(" + RootName + "1)"); + unsigned NTmp = TmpNo++; + emitCode("ConstantSDNode *Tmp" + utostr(NTmp) + + " = dyn_cast(" + RootName + "1);"); + emitCheck("Tmp" + utostr(NTmp)); const char *MaskPredicate = N->getOperator()->getName() == "or" ? "CheckOrMask(" : "CheckAndMask("; - emitCheck(MaskPredicate + RootName + "0, cast(" + - RootName + "1), " + itostr(II->getValue()) + ")"); + emitCheck(MaskPredicate + RootName + "0, Tmp" + utostr(NTmp) + + ", INT64_C(" + itostr(II->getValue()) + "))"); EmitChildMatchCode(N->getChild(0), N, RootName + utostr(0), RootName, ChainSuffix + utostr(0), FoundChain); @@ -597,7 +600,7 @@ public: } for (unsigned i = 0, e = N->getNumChildren(); i != e; ++i, ++OpNo) { - emitInit("SDOperand " + RootName + utostr(OpNo) + " = " + + emitInit("SDValue " + RootName + utostr(OpNo) + " = " + RootName + ".getOperand(" +utostr(OpNo) + ");"); EmitChildMatchCode(N->getChild(i), N, RootName + utostr(OpNo), RootName, @@ -610,19 +613,19 @@ public: std::string Fn = CP->getSelectFunc(); unsigned NumOps = CP->getNumOperands(); for (unsigned i = 0; i < NumOps; ++i) { - emitDecl("CPTmp" + utostr(i)); - emitCode("SDOperand CPTmp" + utostr(i) + ";"); + emitDecl("CPTmp" + RootName + "_" + utostr(i)); + emitCode("SDValue CPTmp" + RootName + "_" + utostr(i) + ";"); } if (CP->hasProperty(SDNPHasChain)) { emitDecl("CPInChain"); emitDecl("Chain" + ChainSuffix); - emitCode("SDOperand CPInChain;"); - emitCode("SDOperand Chain" + ChainSuffix + ";"); + emitCode("SDValue CPInChain;"); + emitCode("SDValue Chain" + ChainSuffix + ";"); } std::string Code = Fn + "(" + RootName + ", " + RootName; for (unsigned i = 0; i < NumOps; i++) - Code += ", CPTmp" + utostr(i); + Code += ", CPTmp" + RootName + "_" + utostr(i); if (CP->hasProperty(SDNPHasChain)) { ChainName = "Chain" + ChainSuffix; Code += ", CPInChain, Chain" + ChainSuffix; @@ -684,8 +687,8 @@ public: std::string Fn = CP->getSelectFunc(); unsigned NumOps = CP->getNumOperands(); for (unsigned i = 0; i < NumOps; ++i) { - emitDecl("CPTmp" + utostr(i)); - emitCode("SDOperand CPTmp" + utostr(i) + ";"); + emitDecl("CPTmp" + RootName + "_" + utostr(i)); + emitCode("SDValue CPTmp" + RootName + "_" + utostr(i) + ";"); } if (CP->hasProperty(SDNPHasChain)) { const SDNodeInfo &PInfo = CGP.getSDNodeInfo(Parent->getOperator()); @@ -694,8 +697,8 @@ public: ChainName = "Chain" + ChainSuffix; emitDecl("CPInChain"); emitDecl(ChainName); - emitCode("SDOperand CPInChain;"); - emitCode("SDOperand " + ChainName + ";"); + emitCode("SDValue CPInChain;"); + emitCode("SDValue " + ChainName + ";"); } std::string Code = Fn + "("; @@ -710,7 +713,7 @@ public: } Code += RootName; for (unsigned i = 0; i < NumOps; i++) - Code += ", CPTmp" + utostr(i); + Code += ", CPTmp" + RootName + "_" + utostr(i); if (CP->hasProperty(SDNPHasChain)) Code += ", CPInChain, Chain" + ChainSuffix; emitCheck(Code + ")"); @@ -732,18 +735,22 @@ public: assert(0 && "Unknown leaf type!"); } - // If there is a node predicate for this, emit the call. - if (!Child->getPredicateFn().empty()) - emitCheck(Child->getPredicateFn() + "(" + RootName + - ".Val)"); + // If there are node predicates for this, emit the calls. + for (unsigned i = 0, e = Child->getPredicateFns().size(); i != e; ++i) + emitCheck(Child->getPredicateFns()[i] + "(" + RootName + + ".getNode())"); } else if (IntInit *II = dynamic_cast(Child->getLeafValue())) { - emitCheck("isa(" + RootName + ")"); + unsigned NTmp = TmpNo++; + emitCode("ConstantSDNode *Tmp"+ utostr(NTmp) + + " = dyn_cast("+ + RootName + ");"); + emitCheck("Tmp" + utostr(NTmp)); unsigned CTmp = TmpNo++; - emitCode("int64_t CN"+utostr(CTmp)+" = cast("+ - RootName + ")->getSignExtended();"); - - emitCheck("CN" + utostr(CTmp) + " == " +itostr(II->getValue())); + emitCode("int64_t CN"+ utostr(CTmp) + + " = Tmp" + utostr(NTmp) + "->getSExtValue();"); + emitCheck("CN" + utostr(CTmp) + " == " + "INT64_C(" +itostr(II->getValue()) + ")"); } else { #ifndef NDEBUG Child->dump(); @@ -794,9 +801,9 @@ public: case MVT::i32: CastType = "unsigned"; break; case MVT::i64: CastType = "uint64_t"; break; } - emitCode("SDOperand " + TmpVar + + emitCode("SDValue " + TmpVar + " = CurDAG->getTargetConstant(((" + CastType + - ") cast(" + Val + ")->getValue()), " + + ") cast(" + Val + ")->getZExtValue()), " + getEnumName(N->getTypeNum(0)) + ");"); // Add Tmp to VariableMap, so that we don't multiply select this // value if used multiple times by this pattern result. @@ -806,10 +813,10 @@ public: } else if (!N->isLeaf() && N->getOperator()->getName() == "fpimm") { assert(N->getExtTypes().size() == 1 && "Multiple types not handled!"); std::string TmpVar = "Tmp" + utostr(ResNo); - emitCode("SDOperand " + TmpVar + - " = CurDAG->getTargetConstantFP(cast(" + - Val + ")->getValueAPF(), cast(" + Val + - ")->getValueType(0));"); + emitCode("SDValue " + TmpVar + + " = CurDAG->getTargetConstantFP(*cast(" + + Val + ")->getConstantFPValue(), cast(" + + Val + ")->getValueType(0));"); // Add Tmp to VariableMap, so that we don't multiply select this // value if used multiple times by this pattern result. Val = TmpVar; @@ -820,7 +827,7 @@ public: // Transform ExternalSymbol to TargetExternalSymbol if (Op && Op->getName() == "externalsym") { std::string TmpVar = "Tmp"+utostr(ResNo); - emitCode("SDOperand " + TmpVar + " = CurDAG->getTarget" + emitCode("SDValue " + TmpVar + " = CurDAG->getTarget" "ExternalSymbol(cast(" + Val + ")->getSymbol(), " + getEnumName(N->getTypeNum(0)) + ");"); @@ -837,7 +844,7 @@ public: if (Op && (Op->getName() == "globaladdr" || Op->getName() == "globaltlsaddr")) { std::string TmpVar = "Tmp" + utostr(ResNo); - emitCode("SDOperand " + TmpVar + " = CurDAG->getTarget" + emitCode("SDValue " + TmpVar + " = CurDAG->getTarget" "GlobalAddress(cast(" + Val + ")->getGlobal(), " + getEnumName(N->getTypeNum(0)) + ");"); @@ -855,14 +862,12 @@ public: NodeOps.push_back(Val); } else if (N->isLeaf() && (CP = NodeGetComplexPattern(N, CGP))) { for (unsigned i = 0; i < CP->getNumOperands(); ++i) { - emitCode("AddToISelQueue(CPTmp" + utostr(i) + ");"); - NodeOps.push_back("CPTmp" + utostr(i)); + NodeOps.push_back("CPTmp" + Val + "_" + utostr(i)); } } else { // This node, probably wrapped in a SDNodeXForm, behaves like a leaf // node even if it isn't one. Don't select it. if (!LikeLeaf) { - emitCode("AddToISelQueue(" + Val + ");"); if (isRoot && N->isLeaf()) { emitCode("ReplaceUses(N, " + Val + ");"); emitCode("return NULL;"); @@ -881,13 +886,13 @@ public: if (DefInit *DI = dynamic_cast(N->getLeafValue())) { unsigned ResNo = TmpNo++; if (DI->getDef()->isSubClassOf("Register")) { - emitCode("SDOperand Tmp" + utostr(ResNo) + " = CurDAG->getRegister(" + + emitCode("SDValue Tmp" + utostr(ResNo) + " = CurDAG->getRegister(" + getQualifiedName(DI->getDef()) + ", " + getEnumName(N->getTypeNum(0)) + ");"); NodeOps.push_back("Tmp" + utostr(ResNo)); return NodeOps; } else if (DI->getDef()->getName() == "zero_reg") { - emitCode("SDOperand Tmp" + utostr(ResNo) + + emitCode("SDValue Tmp" + utostr(ResNo) + " = CurDAG->getRegister(0, " + getEnumName(N->getTypeNum(0)) + ");"); NodeOps.push_back("Tmp" + utostr(ResNo)); @@ -896,7 +901,7 @@ public: } else if (IntInit *II = dynamic_cast(N->getLeafValue())) { unsigned ResNo = TmpNo++; assert(N->getExtTypes().size() == 1 && "Multiple types not handled!"); - emitCode("SDOperand Tmp" + utostr(ResNo) + + emitCode("SDValue Tmp" + utostr(ResNo) + " = CurDAG->getTargetConstant(0x" + itohexstr(II->getValue()) + "ULL, " + getEnumName(N->getTypeNum(0)) + ");"); NodeOps.push_back("Tmp" + utostr(ResNo)); @@ -920,7 +925,8 @@ public: TreePatternNode *InstPatNode = isRoot ? (InstPat ? InstPat->getTree(0) : Pattern) : (InstPat ? InstPat->getTree(0) : NULL); - if (InstPatNode && InstPatNode->getOperator()->getName() == "set") { + if (InstPatNode && !InstPatNode->isLeaf() && + InstPatNode->getOperator()->getName() == "set") { InstPatNode = InstPatNode->getChild(InstPatNode->getNumChildren()-1); } bool IsVariadic = isRoot && II.isVariadic; @@ -948,7 +954,7 @@ public: "(N.getOperand(N.getNumOperands()-1).getValueType() == MVT::Flag);"); } if (IsVariadic) - emitCode("SmallVector Ops" + utostr(OpcNo) + ";"); + emitCode("SmallVector Ops" + utostr(OpcNo) + ";"); // How many results is this pattern expected to produce? unsigned NumPatResults = 0; @@ -964,18 +970,21 @@ public: // TokenFactor with it and the chain of the folded op as the new chain. // We could potentially be doing multiple levels of folding, in that // case, the TokenFactor can have more operands. - emitCode("SmallVector InChains;"); + emitCode("SmallVector InChains;"); for (unsigned i = 0, e = OrigChains.size(); i < e; ++i) { - emitCode("if (" + OrigChains[i].first + ".Val != " + - OrigChains[i].second + ".Val) {"); - emitCode(" AddToISelQueue(" + OrigChains[i].first + ");"); + emitCode("if (" + OrigChains[i].first + ".getNode() != " + + OrigChains[i].second + ".getNode()) {"); emitCode(" InChains.push_back(" + OrigChains[i].first + ");"); emitCode("}"); } - emitCode("AddToISelQueue(" + ChainName + ");"); emitCode("InChains.push_back(" + ChainName + ");"); - emitCode(ChainName + " = CurDAG->getNode(ISD::TokenFactor, MVT::Other, " + emitCode(ChainName + " = CurDAG->getNode(ISD::TokenFactor, " + "N.getDebugLoc(), MVT::Other, " "&InChains[0], InChains.size());"); + if (GenDebug) { + emitCode("CurDAG->setSubgraphColor(" + ChainName +".getNode(), \"yellow\");"); + emitCode("CurDAG->setSubgraphColor(" + ChainName +".getNode(), \"black\");"); + } } // Loop over all of the operands of the instruction pattern, emitting code @@ -1015,20 +1024,17 @@ public: // Emit all the chain and CopyToReg stuff. bool ChainEmitted = NodeHasChain; - if (NodeHasChain) - emitCode("AddToISelQueue(" + ChainName + ");"); if (NodeHasInFlag || HasImpInputs) EmitInFlagSelectCode(Pattern, "N", ChainEmitted, InFlagDecled, ResNodeDecled, true); if (NodeHasOptInFlag || NodeHasInFlag || HasImpInputs) { if (!InFlagDecled) { - emitCode("SDOperand InFlag(0, 0);"); + emitCode("SDValue InFlag(0, 0);"); InFlagDecled = true; } if (NodeHasOptInFlag) { emitCode("if (HasInFlag) {"); emitCode(" InFlag = N.getOperand(N.getNumOperands()-1);"); - emitCode(" AddToISelQueue(InFlag);"); emitCode("}"); } } @@ -1042,7 +1048,7 @@ public: std::string NodeName; if (!isRoot) { NodeName = "Tmp" + utostr(ResNo); - CodePrefix = "SDOperand " + NodeName + "("; + CodePrefix = "SDValue " + NodeName + "("; } else { NodeName = "ResNode"; if (!ResNodeDecled) { @@ -1054,6 +1060,10 @@ public: std::string Code = "Opc" + utostr(OpcNo); + if (!isRoot || (InputHasChain && !NodeHasChain)) + // For call to "getTargetNode()". + Code += ", N.getDebugLoc()"; + emitOpcode(II.Namespace + "::" + II.TheDef->getName()); // Output order: results, chain, flags @@ -1093,23 +1103,27 @@ public: emitCode("for (unsigned i = NumInputRootOps + " + utostr(NodeHasChain) + ", e = N.getNumOperands()" + EndAdjust + "; i != e; ++i) {"); - emitCode(" AddToISelQueue(N.getOperand(i));"); emitCode(" Ops" + utostr(OpsNo) + ".push_back(N.getOperand(i));"); emitCode("}"); } // Generate MemOperandSDNodes nodes for each memory accesses covered by // this pattern. - if (II.isSimpleLoad | II.mayLoad | II.mayStore) { + if (II.mayLoad | II.mayStore) { std::vector::const_iterator mi, mie; for (mi = LSI.begin(), mie = LSI.end(); mi != mie; ++mi) { - emitCode("SDOperand LSI_" + *mi + " = " + std::string LSIName = "LSI_" + *mi; + emitCode("SDValue " + LSIName + " = " "CurDAG->getMemOperand(cast(" + *mi + ")->getMemOperand());"); + if (GenDebug) { + emitCode("CurDAG->setSubgraphColor(" + LSIName +".getNode(), \"yellow\");"); + emitCode("CurDAG->setSubgraphColor(" + LSIName +".getNode(), \"black\");"); + } if (IsVariadic) - emitCode("Ops" + utostr(OpsNo) + ".push_back(LSI_" + *mi + ");"); + emitCode("Ops" + utostr(OpsNo) + ".push_back(" + LSIName + ");"); else - AllOps.push_back("LSI_" + *mi); + AllOps.push_back(LSIName); } } @@ -1138,7 +1152,7 @@ public: for (unsigned i = 0; i != NumOps; ++i) Code += ", " + AllOps[i]; } else { - std::string OpsCode = "SDOperand Ops" + utostr(OpsNo) + "[] = { "; + std::string OpsCode = "SDValue Ops" + utostr(OpsNo) + "[] = { "; for (unsigned i = 0; i != NumOps; ++i) { OpsCode += AllOps[i]; if (i != NumOps-1) @@ -1157,52 +1171,52 @@ public: if (!isRoot) Code += "), 0"; - bool NeedReplace = false; + std::vector ReplaceFroms; + std::vector ReplaceTos; if (!isRoot) { NodeOps.push_back("Tmp" + utostr(ResNo)); } else { if (NodeHasOutFlag) { if (!InFlagDecled) { - After.push_back("SDOperand InFlag(ResNode, " + + After.push_back("SDValue InFlag(ResNode, " + utostr(NumResults+NumDstRegs+(unsigned)NodeHasChain) + ");"); InFlagDecled = true; } else - After.push_back("InFlag = SDOperand(ResNode, " + + After.push_back("InFlag = SDValue(ResNode, " + utostr(NumResults+NumDstRegs+(unsigned)NodeHasChain) + ");"); } - if (FoldedChains.size() > 0) { - std::string Code; - for (unsigned j = 0, e = FoldedChains.size(); j < e; j++) - After.push_back("ReplaceUses(SDOperand(" + - FoldedChains[j].first + ".Val, " + - utostr(FoldedChains[j].second) + - "), SDOperand(ResNode, " + - utostr(NumResults+NumDstRegs) + "));"); - NeedReplace = true; + for (unsigned j = 0, e = FoldedChains.size(); j < e; j++) { + ReplaceFroms.push_back("SDValue(" + + FoldedChains[j].first + ".getNode(), " + + utostr(FoldedChains[j].second) + + ")"); + ReplaceTos.push_back("SDValue(ResNode, " + + utostr(NumResults+NumDstRegs) + ")"); } if (NodeHasOutFlag) { if (FoldedFlag.first != "") { - After.push_back("ReplaceUses(SDOperand(" + FoldedFlag.first + - ".Val, " + - utostr(FoldedFlag.second) + "), InFlag);"); + ReplaceFroms.push_back("SDValue(" + FoldedFlag.first + ".getNode(), " + + utostr(FoldedFlag.second) + ")"); + ReplaceTos.push_back("InFlag"); } else { assert(NodeHasProperty(Pattern, SDNPOutFlag, CGP)); - After.push_back("ReplaceUses(SDOperand(N.Val, " + - utostr(NumPatResults + (unsigned)InputHasChain) - +"), InFlag);"); + ReplaceFroms.push_back("SDValue(N.getNode(), " + + utostr(NumPatResults + (unsigned)InputHasChain) + + ")"); + ReplaceTos.push_back("InFlag"); } - NeedReplace = true; } - if (NeedReplace && InputHasChain) { - After.push_back("ReplaceUses(SDOperand(N.Val, " + - utostr(NumPatResults) + "), SDOperand(" + ChainName - + ".Val, " + ChainName + ".ResNo" + "));"); + if (!ReplaceFroms.empty() && InputHasChain) { + ReplaceFroms.push_back("SDValue(N.getNode(), " + + utostr(NumPatResults) + ")"); + ReplaceTos.push_back("SDValue(" + ChainName + ".getNode(), " + + ChainName + ".getResNo()" + ")"); ChainAssignmentNeeded |= NodeHasChain; } @@ -1211,13 +1225,15 @@ public: ; } else if (InputHasChain && !NodeHasChain) { // One of the inner node produces a chain. - if (NodeHasOutFlag) - After.push_back("ReplaceUses(SDOperand(N.Val, " + - utostr(NumPatResults+1) + - "), SDOperand(ResNode, N.ResNo-1));"); - After.push_back("ReplaceUses(SDOperand(N.Val, " + - utostr(NumPatResults) + "), " + ChainName + ");"); - NeedReplace = true; + if (NodeHasOutFlag) { + ReplaceFroms.push_back("SDValue(N.getNode(), " + + utostr(NumPatResults+1) + + ")"); + ReplaceTos.push_back("SDValue(ResNode, N.getResNo()-1)"); + } + ReplaceFroms.push_back("SDValue(N.getNode(), " + + utostr(NumPatResults) + ")"); + ReplaceTos.push_back(ChainName); } } @@ -1225,33 +1241,43 @@ public: // Remember which op produces the chain. std::string ChainAssign; if (!isRoot) - ChainAssign = ChainName + " = SDOperand(" + NodeName + - ".Val, " + utostr(NumResults+NumDstRegs) + ");"; + ChainAssign = ChainName + " = SDValue(" + NodeName + + ".getNode(), " + utostr(NumResults+NumDstRegs) + ");"; else - ChainAssign = ChainName + " = SDOperand(" + NodeName + + ChainAssign = ChainName + " = SDValue(" + NodeName + ", " + utostr(NumResults+NumDstRegs) + ");"; After.push_front(ChainAssign); } - // Use getTargetNode or SelectNodeTo? The safe choice is getTargetNode, - // but SelectNodeTo can be faster. - // - // SelectNodeTo is not safe in a non-root context, or if there is any - // replacement of results needed. + if (ReplaceFroms.size() == 1) { + After.push_back("ReplaceUses(" + ReplaceFroms[0] + ", " + + ReplaceTos[0] + ");"); + } else if (!ReplaceFroms.empty()) { + After.push_back("const SDValue Froms[] = {"); + for (unsigned i = 0, e = ReplaceFroms.size(); i != e; ++i) + After.push_back(" " + ReplaceFroms[i] + (i + 1 != e ? "," : "")); + After.push_back("};"); + After.push_back("const SDValue Tos[] = {"); + for (unsigned i = 0, e = ReplaceFroms.size(); i != e; ++i) + After.push_back(" " + ReplaceTos[i] + (i + 1 != e ? "," : "")); + After.push_back("};"); + After.push_back("ReplaceUses(Froms, Tos, " + + itostr(ReplaceFroms.size()) + ");"); + } + + // We prefer to use SelectNodeTo since it avoids allocation when + // possible and it avoids CSE map recalculation for the node's + // users, however it's tricky to use in a non-root context. // - // SelectNodeTo is not profitable if it would require a dynamically - // allocated operand list in a situation where getTargetNode would be - // able to reuse a co-allocated operand list (as in a unary, binary or - // ternary SDNode, for example). + // We also don't use if the pattern replacement is being used to + // jettison a chain result, since morphing the node in place + // would leave users of the chain dangling. // - if (!isRoot || NeedReplace || - (!IsVariadic && AllOps.size() < 4 && - Pattern->getNumChildren() + InputHasChain + NodeHasInFlag < - AllOps.size())) { + if (!isRoot || (InputHasChain && !NodeHasChain)) { Code = "CurDAG->getTargetNode(" + Code; } else { - Code = "CurDAG->SelectNodeTo(N.Val, " + Code; + Code = "CurDAG->SelectNodeTo(N.getNode(), " + Code; } if (isRoot) { if (After.empty()) @@ -1261,11 +1287,24 @@ public: } emitCode(CodePrefix + Code + ");"); + + if (GenDebug) { + if (!isRoot) { + emitCode("CurDAG->setSubgraphColor(" + NodeName +".getNode(), \"yellow\");"); + emitCode("CurDAG->setSubgraphColor(" + NodeName +".getNode(), \"black\");"); + } + else { + emitCode("CurDAG->setSubgraphColor(" + NodeName +", \"yellow\");"); + emitCode("CurDAG->setSubgraphColor(" + NodeName +", \"black\");"); + } + } + for (unsigned i = 0, e = After.size(); i != e; ++i) emitCode(After[i]); return NodeOps; - } else if (Op->isSubClassOf("SDNodeXForm")) { + } + if (Op->isSubClassOf("SDNodeXForm")) { assert(N->getNumChildren() == 1 && "node xform should have one child!"); // PatLeaf node - the operand may or may not be a leaf node. But it should // behave like one. @@ -1273,17 +1312,17 @@ public: EmitResultCode(N->getChild(0), DstRegs, InFlagDecled, ResNodeDecled, true); unsigned ResNo = TmpNo++; - emitCode("SDOperand Tmp" + utostr(ResNo) + " = Transform_" + Op->getName() - + "(" + Ops.back() + ".Val);"); + emitCode("SDValue Tmp" + utostr(ResNo) + " = Transform_" + Op->getName() + + "(" + Ops.back() + ".getNode());"); NodeOps.push_back("Tmp" + utostr(ResNo)); if (isRoot) - emitCode("return Tmp" + utostr(ResNo) + ".Val;"); + emitCode("return Tmp" + utostr(ResNo) + ".getNode();"); return NodeOps; - } else { - N->dump(); - cerr << "\n"; - throw std::string("Unknown node in result pattern!"); } + + N->dump(); + cerr << "\n"; + throw std::string("Unknown node in result pattern!"); } /// InsertOneTypeCheck - Insert a type-check for an unresolved type in 'Pat' @@ -1298,7 +1337,7 @@ public: Pat->setTypes(Other->getExtTypes()); // The top level node type is checked outside of the select function. if (!isRoot) - emitCheck(Prefix + ".Val->getValueType(0) == " + + emitCheck(Prefix + ".getNode()->getValueType(0) == " + getName(Pat->getTypeNum(0))); return true; } @@ -1341,29 +1380,28 @@ private: MVT::SimpleValueType RVT = getRegisterValueType(RR, T); if (RVT == MVT::Flag) { if (!InFlagDecled) { - emitCode("SDOperand InFlag = " + RootName + utostr(OpNo) + ";"); + emitCode("SDValue InFlag = " + RootName + utostr(OpNo) + ";"); InFlagDecled = true; } else emitCode("InFlag = " + RootName + utostr(OpNo) + ";"); - emitCode("AddToISelQueue(InFlag);"); } else { if (!ChainEmitted) { - emitCode("SDOperand Chain = CurDAG->getEntryNode();"); + emitCode("SDValue Chain = CurDAG->getEntryNode();"); ChainName = "Chain"; ChainEmitted = true; } - emitCode("AddToISelQueue(" + RootName + utostr(OpNo) + ");"); if (!InFlagDecled) { - emitCode("SDOperand InFlag(0, 0);"); + emitCode("SDValue InFlag(0, 0);"); InFlagDecled = true; } std::string Decl = (!ResNodeDecled) ? "SDNode *" : ""; emitCode(Decl + "ResNode = CurDAG->getCopyToReg(" + ChainName + + ", " + RootName + ".getDebugLoc()" + ", " + getQualifiedName(RR) + - ", " + RootName + utostr(OpNo) + ", InFlag).Val;"); + ", " + RootName + utostr(OpNo) + ", InFlag).getNode();"); ResNodeDecled = true; - emitCode(ChainName + " = SDOperand(ResNode, 0);"); - emitCode("InFlag = SDOperand(ResNode, 1);"); + emitCode(ChainName + " = SDValue(ResNode, 0);"); + emitCode("InFlag = SDValue(ResNode, 1);"); } } } @@ -1372,13 +1410,12 @@ private: if (HasInFlag) { if (!InFlagDecled) { - emitCode("SDOperand InFlag = " + RootName + + emitCode("SDValue InFlag = " + RootName + ".getOperand(" + utostr(OpNo) + ");"); InFlagDecled = true; } else emitCode("InFlag = " + RootName + ".getOperand(" + utostr(OpNo) + ");"); - emitCode("AddToISelQueue(InFlag);"); } } }; @@ -1396,7 +1433,7 @@ void DAGISelEmitter::GenerateCodeForPattern(const PatternToMatch &Pattern, OutputIsVariadic = false; NumInputRootOps = 0; - PatternCodeEmitter Emitter(CGP, Pattern.getPredicates(), + PatternCodeEmitter Emitter(CGP, Pattern.getPredicateCheck(), Pattern.getSrcPattern(), Pattern.getDstPattern(), GeneratedCode, GeneratedDecl, TargetOpcodes, TargetVTs, @@ -1588,17 +1625,8 @@ static std::string getLegalCName(std::string OpName) { void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { const CodeGenTarget &Target = CGP.getTargetInfo(); - // Get the namespace to insert instructions into. Make sure not to pick up - // "TargetInstrInfo" by accidentally getting the namespace off the PHI - // instruction or something. - std::string InstNS; - for (CodeGenTarget::inst_iterator i = Target.inst_begin(), - e = Target.inst_end(); i != e; ++i) { - InstNS = i->second.Namespace; - if (InstNS != "TargetInstrInfo") - break; - } - + // Get the namespace to insert instructions into. + std::string InstNS = Target.getInstNamespace(); if (!InstNS.empty()) InstNS += "::"; // Group the patterns by their top-level opcodes. @@ -1650,29 +1678,13 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { std::vector &PatternsOfOp = PBOI->second; assert(!PatternsOfOp.empty() && "No patterns but map has entry?"); - // We want to emit all of the matching code now. However, we want to emit - // the matches in order of minimal cost. Sort the patterns so the least - // cost one is at the start. - std::stable_sort(PatternsOfOp.begin(), PatternsOfOp.end(), - PatternSortingPredicate(CGP)); - // Split them into groups by type. std::map > PatternsByType; for (unsigned i = 0, e = PatternsOfOp.size(); i != e; ++i) { const PatternToMatch *Pat = PatternsOfOp[i]; TreePatternNode *SrcPat = Pat->getSrcPattern(); - MVT::SimpleValueType VT = SrcPat->getTypeNum(0); - std::map >::iterator TI = - PatternsByType.find(VT); - if (TI != PatternsByType.end()) - TI->second.push_back(Pat); - else { - std::vector PVec; - PVec.push_back(Pat); - PatternsByType.insert(std::make_pair(VT, PVec)); - } + PatternsByType[SrcPat->getTypeNum(0)].push_back(Pat); } for (std::mapfirst; std::vector &Patterns = II->second; - typedef std::vector > CodeList; - typedef std::vector >::iterator CodeListI; + typedef std::pair CodeLine; + typedef std::vector CodeList; + typedef CodeList::iterator CodeListI; std::vector > CodeForPatterns; std::vector > PatternOpcodes; @@ -1708,30 +1721,6 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { NumInputRootOpsCounts.push_back(NumInputRootOps); } - // Scan the code to see if all of the patterns are reachable and if it is - // possible that the last one might not match. - bool mightNotMatch = true; - for (unsigned i = 0, e = CodeForPatterns.size(); i != e; ++i) { - CodeList &GeneratedCode = CodeForPatterns[i].second; - mightNotMatch = false; - - for (unsigned j = 0, e = GeneratedCode.size(); j != e; ++j) { - if (GeneratedCode[j].first == 1) { // predicate. - mightNotMatch = true; - break; - } - } - - // If this pattern definitely matches, and if it isn't the last one, the - // patterns after it CANNOT ever match. Error out. - if (mightNotMatch == false && i != CodeForPatterns.size()-1) { - cerr << "Pattern '"; - CodeForPatterns[i].first->getSrcPattern()->print(*cerr.stream()); - cerr << "' is impossible to select!\n"; - exit(1); - } - } - // Factor target node emission code (emitted by EmitResultCode) into // separate functions. Uniquing and share them among all instruction // selection routines. @@ -1752,7 +1741,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { AddedInits.push_back(GeneratedCode[j].second); } - std::string CalleeCode = "(const SDOperand &N"; + std::string CalleeCode = "(const SDValue &N"; std::string CallerCode = "(N"; for (unsigned j = 0, e = TargetOpcodes.size(); j != e; ++j) { CalleeCode += ", unsigned Opc" + utostr(j); @@ -1765,7 +1754,7 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { for (std::set::iterator I = Decls.begin(), E = Decls.end(); I != E; ++I) { std::string Name = *I; - CalleeCode += ", SDOperand &" + Name; + CalleeCode += ", SDValue &" + Name; CallerCode += ", " + Name; } @@ -1805,14 +1794,27 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { // Replace the emission code within selection routines with calls to the // emission functions. - CallerCode = "return Emit_" + utostr(EmitFuncNum) + CallerCode; - GeneratedCode.push_back(std::make_pair(false, CallerCode)); + if (GenDebug) { + GeneratedCode.push_back(std::make_pair(0, "CurDAG->setSubgraphColor(N.getNode(), \"red\");")); + } + CallerCode = "SDNode *Result = Emit_" + utostr(EmitFuncNum) + CallerCode; + GeneratedCode.push_back(std::make_pair(3, CallerCode)); + if (GenDebug) { + GeneratedCode.push_back(std::make_pair(0, "if(Result) {")); + GeneratedCode.push_back(std::make_pair(0, " CurDAG->setSubgraphColor(Result, \"yellow\");")); + GeneratedCode.push_back(std::make_pair(0, " CurDAG->setSubgraphColor(Result, \"black\");")); + GeneratedCode.push_back(std::make_pair(0, "}")); + //GeneratedCode.push_back(std::make_pair(0, "CurDAG->setSubgraphColor(N.getNode(), \"black\");")); + } + GeneratedCode.push_back(std::make_pair(0, "return Result;")); } // Print function. std::string OpVTStr; if (OpVT == MVT::iPTR) { OpVTStr = "_iPTR"; + } else if (OpVT == MVT::iPTRAny) { + OpVTStr = "_iPTRAny"; } else if (OpVT == MVT::isVoid) { // Nodes with a void result actually have a first result type of either // Other (a chain) or Flag. Since there is no one-to-one mapping from @@ -1829,8 +1831,35 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { } else OpVTI->second.push_back(OpVTStr); - OS << "SDNode *Select_" << getLegalCName(OpName) - << OpVTStr << "(const SDOperand &N) {\n"; + // We want to emit all of the matching code now. However, we want to emit + // the matches in order of minimal cost. Sort the patterns so the least + // cost one is at the start. + std::stable_sort(CodeForPatterns.begin(), CodeForPatterns.end(), + PatternSortingPredicate(CGP)); + + // Scan the code to see if all of the patterns are reachable and if it is + // possible that the last one might not match. + bool mightNotMatch = true; + for (unsigned i = 0, e = CodeForPatterns.size(); i != e; ++i) { + CodeList &GeneratedCode = CodeForPatterns[i].second; + mightNotMatch = false; + + for (unsigned j = 0, e = GeneratedCode.size(); j != e; ++j) { + if (GeneratedCode[j].first == 1) { // predicate. + mightNotMatch = true; + break; + } + } + + // If this pattern definitely matches, and if it isn't the last one, the + // patterns after it CANNOT ever match. Error out. + if (mightNotMatch == false && i != CodeForPatterns.size()-1) { + cerr << "Pattern '"; + CodeForPatterns[i].first->getSrcPattern()->print(*cerr.stream()); + cerr << "' is impossible to select!\n"; + exit(1); + } + } // Loop through and reverse all of the CodeList vectors, as we will be // accessing them from their logical front, but accessing the end of a @@ -1843,124 +1872,108 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { // Next, reverse the list of patterns itself for the same reason. std::reverse(CodeForPatterns.begin(), CodeForPatterns.end()); + OS << "SDNode *Select_" << getLegalCName(OpName) + << OpVTStr << "(const SDValue &N) {\n"; + // Emit all of the patterns now, grouped together to share code. EmitPatterns(CodeForPatterns, 2, OS); // If the last pattern has predicates (which could fail) emit code to // catch the case where nothing handles a pattern. if (mightNotMatch) { - OS << " cerr << \"Cannot yet select: \";\n"; + OS << "\n"; if (OpName != "ISD::INTRINSIC_W_CHAIN" && OpName != "ISD::INTRINSIC_WO_CHAIN" && - OpName != "ISD::INTRINSIC_VOID") { - OS << " N.Val->dump(CurDAG);\n"; - } else { - OS << " unsigned iid = cast(N.getOperand(" - "N.getOperand(0).getValueType() == MVT::Other))->getValue();\n" - << " cerr << \"intrinsic %\"<< " - "Intrinsic::getName((Intrinsic::ID)iid);\n"; - } - OS << " cerr << '\\n';\n" - << " abort();\n" - << " return NULL;\n"; + OpName != "ISD::INTRINSIC_VOID") + OS << " CannotYetSelect(N);\n"; + else + OS << " CannotYetSelectIntrinsic(N);\n"; + + OS << " return NULL;\n"; } OS << "}\n\n"; } } // Emit boilerplate. - OS << "SDNode *Select_INLINEASM(SDOperand N) {\n" - << " std::vector Ops(N.Val->op_begin(), N.Val->op_end());\n" - << " SelectInlineAsmMemoryOperands(Ops, *CurDAG);\n\n" - - << " // Ensure that the asm operands are themselves selected.\n" - << " for (unsigned j = 0, e = Ops.size(); j != e; ++j)\n" - << " AddToISelQueue(Ops[j]);\n\n" + OS << "SDNode *Select_INLINEASM(SDValue N) {\n" + << " std::vector Ops(N.getNode()->op_begin(), N.getNode()->op_end());\n" + << " SelectInlineAsmMemoryOperands(Ops);\n\n" << " std::vector VTs;\n" << " VTs.push_back(MVT::Other);\n" << " VTs.push_back(MVT::Flag);\n" - << " SDOperand New = CurDAG->getNode(ISD::INLINEASM, VTs, &Ops[0], " - "Ops.size());\n" - << " return New.Val;\n" + << " SDValue New = CurDAG->getNode(ISD::INLINEASM, N.getDebugLoc(), " + "VTs, &Ops[0], Ops.size());\n" + << " return New.getNode();\n" << "}\n\n"; - OS << "SDNode *Select_UNDEF(const SDOperand &N) {\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::IMPLICIT_DEF,\n" + OS << "SDNode *Select_UNDEF(const SDValue &N) {\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::IMPLICIT_DEF,\n" << " N.getValueType());\n" << "}\n\n"; - OS << "SDNode *Select_DBG_LABEL(const SDOperand &N) {\n" - << " SDOperand Chain = N.getOperand(0);\n" + OS << "SDNode *Select_DBG_LABEL(const SDValue &N) {\n" + << " SDValue Chain = N.getOperand(0);\n" << " unsigned C = cast(N)->getLabelID();\n" - << " SDOperand Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" - << " AddToISelQueue(Chain);\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::DBG_LABEL,\n" + << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::DBG_LABEL,\n" << " MVT::Other, Tmp, Chain);\n" << "}\n\n"; - OS << "SDNode *Select_EH_LABEL(const SDOperand &N) {\n" - << " SDOperand Chain = N.getOperand(0);\n" + OS << "SDNode *Select_EH_LABEL(const SDValue &N) {\n" + << " SDValue Chain = N.getOperand(0);\n" << " unsigned C = cast(N)->getLabelID();\n" - << " SDOperand Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" - << " AddToISelQueue(Chain);\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::EH_LABEL,\n" + << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::EH_LABEL,\n" << " MVT::Other, Tmp, Chain);\n" << "}\n\n"; - OS << "SDNode *Select_DECLARE(const SDOperand &N) {\n" - << " SDOperand Chain = N.getOperand(0);\n" - << " SDOperand N1 = N.getOperand(1);\n" - << " SDOperand N2 = N.getOperand(2);\n" + OS << "SDNode *Select_DECLARE(const SDValue &N) {\n" + << " SDValue Chain = N.getOperand(0);\n" + << " SDValue N1 = N.getOperand(1);\n" + << " SDValue N2 = N.getOperand(2);\n" << " if (!isa(N1) || !isa(N2)) {\n" - << " cerr << \"Cannot yet select llvm.dbg.declare: \";\n" - << " N.Val->dump(CurDAG);\n" - << " abort();\n" + << " CannotYetSelect(N);\n" << " }\n" << " int FI = cast(N1)->getIndex();\n" << " GlobalValue *GV = cast(N2)->getGlobal();\n" - << " SDOperand Tmp1 = " + << " SDValue Tmp1 = " << "CurDAG->getTargetFrameIndex(FI, TLI.getPointerTy());\n" - << " SDOperand Tmp2 = " + << " SDValue Tmp2 = " << "CurDAG->getTargetGlobalAddress(GV, TLI.getPointerTy());\n" - << " AddToISelQueue(Chain);\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::DECLARE,\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::DECLARE,\n" << " MVT::Other, Tmp1, Tmp2, Chain);\n" << "}\n\n"; - OS << "SDNode *Select_EXTRACT_SUBREG(const SDOperand &N) {\n" - << " SDOperand N0 = N.getOperand(0);\n" - << " SDOperand N1 = N.getOperand(1);\n" - << " unsigned C = cast(N1)->getValue();\n" - << " SDOperand Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" - << " AddToISelQueue(N0);\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::EXTRACT_SUBREG,\n" + OS << "SDNode *Select_EXTRACT_SUBREG(const SDValue &N) {\n" + << " SDValue N0 = N.getOperand(0);\n" + << " SDValue N1 = N.getOperand(1);\n" + << " unsigned C = cast(N1)->getZExtValue();\n" + << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::EXTRACT_SUBREG,\n" << " N.getValueType(), N0, Tmp);\n" << "}\n\n"; - OS << "SDNode *Select_INSERT_SUBREG(const SDOperand &N) {\n" - << " SDOperand N0 = N.getOperand(0);\n" - << " SDOperand N1 = N.getOperand(1);\n" - << " SDOperand N2 = N.getOperand(2);\n" - << " unsigned C = cast(N2)->getValue();\n" - << " SDOperand Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" - << " AddToISelQueue(N1);\n" - << " AddToISelQueue(N0);\n" - << " return CurDAG->SelectNodeTo(N.Val, TargetInstrInfo::INSERT_SUBREG,\n" + OS << "SDNode *Select_INSERT_SUBREG(const SDValue &N) {\n" + << " SDValue N0 = N.getOperand(0);\n" + << " SDValue N1 = N.getOperand(1);\n" + << " SDValue N2 = N.getOperand(2);\n" + << " unsigned C = cast(N2)->getZExtValue();\n" + << " SDValue Tmp = CurDAG->getTargetConstant(C, MVT::i32);\n" + << " return CurDAG->SelectNodeTo(N.getNode(), TargetInstrInfo::INSERT_SUBREG,\n" << " N.getValueType(), N0, N1, Tmp);\n" << "}\n\n"; OS << "// The main instruction selector code.\n" - << "SDNode *SelectCode(SDOperand N) {\n" - << " if (N.getOpcode() >= ISD::BUILTIN_OP_END &&\n" - << " N.getOpcode() < (ISD::BUILTIN_OP_END+" << InstNS - << "INSTRUCTION_LIST_END)) {\n" - << " return NULL; // Already selected.\n" - << " }\n\n" - << " MVT::SimpleValueType NVT = N.Val->getValueType(0).getSimpleVT();\n" + << "SDNode *SelectCode(SDValue N) {\n" + << " MVT::SimpleValueType NVT = N.getNode()->getValueType(0).getSimpleVT();\n" << " switch (N.getOpcode()) {\n" - << " default: break;\n" - << " case ISD::EntryToken: // These leaves remain the same.\n" + << " default:\n" + << " assert(!N.isMachineOpcode() && \"Node already selected!\");\n" + << " break;\n" + << " case ISD::EntryToken: // These nodes remain the same.\n" + << " case ISD::MEMOPERAND:\n" << " case ISD::BasicBlock:\n" << " case ISD::Register:\n" << " case ISD::HANDLENODE:\n" @@ -1971,22 +1984,17 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { << " case ISD::TargetExternalSymbol:\n" << " case ISD::TargetJumpTable:\n" << " case ISD::TargetGlobalTLSAddress:\n" - << " case ISD::TargetGlobalAddress: {\n" + << " case ISD::TargetGlobalAddress:\n" + << " case ISD::TokenFactor:\n" + << " case ISD::CopyFromReg:\n" + << " case ISD::CopyToReg: {\n" << " return NULL;\n" << " }\n" << " case ISD::AssertSext:\n" << " case ISD::AssertZext: {\n" - << " AddToISelQueue(N.getOperand(0));\n" << " ReplaceUses(N, N.getOperand(0));\n" << " return NULL;\n" << " }\n" - << " case ISD::TokenFactor:\n" - << " case ISD::CopyFromReg:\n" - << " case ISD::CopyToReg: {\n" - << " for (unsigned i = 0, e = N.getNumOperands(); i != e; ++i)\n" - << " AddToISelQueue(N.getOperand(i));\n" - << " return NULL;\n" - << " }\n" << " case ISD::INLINEASM: return Select_INLINEASM(N);\n" << " case ISD::DBG_LABEL: return Select_DBG_LABEL(N);\n" << " case ISD::EH_LABEL: return Select_EH_LABEL(N);\n" @@ -1995,7 +2003,6 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { << " case ISD::INSERT_SUBREG: return Select_INSERT_SUBREG(N);\n" << " case ISD::UNDEF: return Select_UNDEF(N);\n"; - // Loop over all of the case statements, emiting a call to each method we // emitted above. for (std::map >::iterator @@ -2048,21 +2055,32 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) { } OS << " } // end of big switch.\n\n" - << " cerr << \"Cannot yet select: \";\n" << " if (N.getOpcode() != ISD::INTRINSIC_W_CHAIN &&\n" << " N.getOpcode() != ISD::INTRINSIC_WO_CHAIN &&\n" << " N.getOpcode() != ISD::INTRINSIC_VOID) {\n" - << " N.Val->dump(CurDAG);\n" + << " CannotYetSelect(N);\n" << " } else {\n" - << " unsigned iid = cast(N.getOperand(" - "N.getOperand(0).getValueType() == MVT::Other))->getValue();\n" - << " cerr << \"intrinsic %\"<< " - "Intrinsic::getName((Intrinsic::ID)iid);\n" + << " CannotYetSelectIntrinsic(N);\n" << " }\n" + << " return NULL;\n" + << "}\n\n"; + + OS << "void CannotYetSelect(SDValue N) DISABLE_INLINE {\n" + << " cerr << \"Cannot yet select: \";\n" + << " N.getNode()->dump(CurDAG);\n" << " cerr << '\\n';\n" << " abort();\n" - << " return NULL;\n" - << "}\n"; + << "}\n\n"; + + OS << "void CannotYetSelectIntrinsic(SDValue N) DISABLE_INLINE {\n" + << " cerr << \"Cannot yet select: \";\n" + << " unsigned iid = cast(N.getOperand(" + << "N.getOperand(0).getValueType() == MVT::Other))->getZExtValue();\n" + << " cerr << \"intrinsic %\"<< " + << "Intrinsic::getName((Intrinsic::ID)iid);\n" + << " cerr << '\\n';\n" + << " abort();\n" + << "}\n\n"; } void DAGISelEmitter::run(std::ostream &OS) {