if (TP.hasError())
return false;
- for (unsigned i = 0, e = LegalTypes.size(); i != e; ++i)
- if (!Pred || Pred(LegalTypes[i]))
- TypeVec.push_back(LegalTypes[i]);
+ for (MVT::SimpleValueType VT : LegalTypes)
+ if (!Pred || Pred(VT))
+ TypeVec.push_back(VT);
// If we have nothing that matches the predicate, bail out.
if (TypeVec.empty()) {
/// Dependent variable map for CodeGenDAGPattern variant generation
typedef std::map<std::string, int> DepVarMap;
-/// Const iterator shorthand for DepVarMap
-typedef DepVarMap::const_iterator DepVarMap_citer;
-
static void FindDepVarsOf(TreePatternNode *N, DepVarMap &DepMap) {
if (N->isLeaf()) {
if (isa<DefInit>(N->getLeafValue()))
static void FindDepVars(TreePatternNode *N, MultipleUseVarSet &DepVars) {
DepVarMap depcounts;
FindDepVarsOf(N, depcounts);
- for (DepVarMap_citer i = depcounts.begin(); i != depcounts.end(); ++i) {
- if (i->second > 1) // std::pair<std::string, int>
- DepVars.insert(i->first);
+ for (const std::pair<std::string, int> &Pair : depcounts) {
+ if (Pair.second > 1)
+ DepVars.insert(Pair.first);
}
}
DEBUG(errs() << "<empty set>");
} else {
DEBUG(errs() << "[ ");
- for (MultipleUseVarSet::const_iterator i = DepVars.begin(),
- e = DepVars.end(); i != e; ++i) {
- DEBUG(errs() << (*i) << " ");
+ for (const std::string &DepVar : DepVars) {
+ DEBUG(errs() << DepVar << " ");
}
DEBUG(errs() << "]");
}
// Parse the properties.
Properties = 0;
- std::vector<Record*> PropList = R->getValueAsListOfDefs("Properties");
- for (unsigned i = 0, e = PropList.size(); i != e; ++i) {
- if (PropList[i]->getName() == "SDNPCommutative") {
+ for (Record *Property : R->getValueAsListOfDefs("Properties")) {
+ if (Property->getName() == "SDNPCommutative") {
Properties |= 1 << SDNPCommutative;
- } else if (PropList[i]->getName() == "SDNPAssociative") {
+ } else if (Property->getName() == "SDNPAssociative") {
Properties |= 1 << SDNPAssociative;
- } else if (PropList[i]->getName() == "SDNPHasChain") {
+ } else if (Property->getName() == "SDNPHasChain") {
Properties |= 1 << SDNPHasChain;
- } else if (PropList[i]->getName() == "SDNPOutGlue") {
+ } else if (Property->getName() == "SDNPOutGlue") {
Properties |= 1 << SDNPOutGlue;
- } else if (PropList[i]->getName() == "SDNPInGlue") {
+ } else if (Property->getName() == "SDNPInGlue") {
Properties |= 1 << SDNPInGlue;
- } else if (PropList[i]->getName() == "SDNPOptInGlue") {
+ } else if (Property->getName() == "SDNPOptInGlue") {
Properties |= 1 << SDNPOptInGlue;
- } else if (PropList[i]->getName() == "SDNPMayStore") {
+ } else if (Property->getName() == "SDNPMayStore") {
Properties |= 1 << SDNPMayStore;
- } else if (PropList[i]->getName() == "SDNPMayLoad") {
+ } else if (Property->getName() == "SDNPMayLoad") {
Properties |= 1 << SDNPMayLoad;
- } else if (PropList[i]->getName() == "SDNPSideEffect") {
+ } else if (Property->getName() == "SDNPSideEffect") {
Properties |= 1 << SDNPSideEffect;
- } else if (PropList[i]->getName() == "SDNPMemOperand") {
+ } else if (Property->getName() == "SDNPMemOperand") {
Properties |= 1 << SDNPMemOperand;
- } else if (PropList[i]->getName() == "SDNPVariadic") {
+ } else if (Property->getName() == "SDNPVariadic") {
Properties |= 1 << SDNPVariadic;
} else {
PrintFatalError("Unknown SD Node property '" +
- PropList[i]->getName() + "' on node '" +
+ Property->getName() + "' on node '" +
R->getName() + "'!");
}
}
"We only work with nodes with zero or one result so far!");
assert(ResNo == 0 && "Only handles single result nodes so far");
- for (unsigned i = 0, e = TypeConstraints.size(); i != e; ++i) {
+ for (const SDTypeConstraint &Constraint : TypeConstraints) {
// Make sure that this applies to the correct node result.
- if (TypeConstraints[i].OperandNo >= NumResults) // FIXME: need value #
+ if (Constraint.OperandNo >= NumResults) // FIXME: need value #
continue;
- switch (TypeConstraints[i].ConstraintType) {
+ switch (Constraint.ConstraintType) {
default: break;
case SDTypeConstraint::SDTCisVT:
- return TypeConstraints[i].x.SDTCisVT_Info.VT;
+ return Constraint.x.SDTCisVT_Info.VT;
case SDTypeConstraint::SDTCisPtrTy:
return MVT::iPTR;
}
OS << ")";
}
- for (unsigned i = 0, e = PredicateFns.size(); i != e; ++i)
- OS << "<<P:" << PredicateFns[i].getFnName() << ">>";
+ for (const TreePredicateFn &Pred : PredicateFns)
+ OS << "<<P:" << Pred.getFnName() << ">>";
if (TransformFn)
OS << "<<X:" << TransformFn->getName() << ">>";
if (!getName().empty())
FragTree->UpdateNodeType(i, getExtType(i), TP);
// Transfer in the old predicates.
- for (unsigned i = 0, e = getPredicateFns().size(); i != e; ++i)
- FragTree->addPredicateFn(getPredicateFns()[i]);
+ for (const TreePredicateFn &Pred : getPredicateFns())
+ FragTree->addPredicateFn(Pred);
// Get a new copy of this fragment to stitch into here.
//delete this; // FIXME: implement refcounting!
}
void TreePattern::ComputeNamedNodes() {
- for (unsigned i = 0, e = Trees.size(); i != e; ++i)
- ComputeNamedNodes(Trees[i]);
+ for (TreePatternNode *Tree : Trees)
+ ComputeNamedNodes(Tree);
}
void TreePattern::ComputeNamedNodes(TreePatternNode *N) {
bool MadeChange = true;
while (MadeChange) {
MadeChange = false;
- for (unsigned i = 0, e = Trees.size(); i != e; ++i) {
- MadeChange |= Trees[i]->ApplyTypeConstraints(*this, false);
- MadeChange |= SimplifyTree(Trees[i]);
+ for (TreePatternNode *Tree : Trees) {
+ MadeChange |= Tree->ApplyTypeConstraints(*this, false);
+ MadeChange |= SimplifyTree(Tree);
}
// If there are constraints on our named nodes, apply them.
- for (StringMap<SmallVector<TreePatternNode*,1> >::iterator
- I = NamedNodes.begin(), E = NamedNodes.end(); I != E; ++I) {
- SmallVectorImpl<TreePatternNode*> &Nodes = I->second;
+ for (auto &Entry : NamedNodes) {
+ SmallVectorImpl<TreePatternNode*> &Nodes = Entry.second;
// If we have input named node types, propagate their types to the named
// values here.
if (InNamedTypes) {
- if (!InNamedTypes->count(I->getKey())) {
- error("Node '" + std::string(I->getKey()) +
+ if (!InNamedTypes->count(Entry.getKey())) {
+ error("Node '" + std::string(Entry.getKey()) +
"' in output pattern but not input pattern");
return true;
}
const SmallVectorImpl<TreePatternNode*> &InNodes =
- InNamedTypes->find(I->getKey())->second;
+ InNamedTypes->find(Entry.getKey())->second;
// The input types should be fully resolved by now.
- for (unsigned i = 0, e = Nodes.size(); i != e; ++i) {
+ for (TreePatternNode *Node : Nodes) {
// If this node is a register class, and it is the root of the pattern
// then we're mapping something onto an input register. We allow
// changing the type of the input register in this case. This allows
// us to match things like:
// def : Pat<(v1i64 (bitconvert(v2i32 DPR:$src))), (v1i64 DPR:$src)>;
- if (Nodes[i] == Trees[0] && Nodes[i]->isLeaf()) {
- DefInit *DI = dyn_cast<DefInit>(Nodes[i]->getLeafValue());
+ if (Node == Trees[0] && Node->isLeaf()) {
+ DefInit *DI = dyn_cast<DefInit>(Node->getLeafValue());
if (DI && (DI->getDef()->isSubClassOf("RegisterClass") ||
DI->getDef()->isSubClassOf("RegisterOperand")))
continue;
}
- assert(Nodes[i]->getNumTypes() == 1 &&
+ assert(Node->getNumTypes() == 1 &&
InNodes[0]->getNumTypes() == 1 &&
"FIXME: cannot name multiple result nodes yet");
- MadeChange |= Nodes[i]->UpdateNodeType(0, InNodes[0]->getExtType(0),
- *this);
+ MadeChange |= Node->UpdateNodeType(0, InNodes[0]->getExtType(0),
+ *this);
}
}
// If there are multiple nodes with the same name, they must all have the
// same type.
- if (I->second.size() > 1) {
+ if (Entry.second.size() > 1) {
for (unsigned i = 0, e = Nodes.size()-1; i != e; ++i) {
TreePatternNode *N1 = Nodes[i], *N2 = Nodes[i+1];
assert(N1->getNumTypes() == 1 && N2->getNumTypes() == 1 &&
}
bool HasUnresolvedTypes = false;
- for (unsigned i = 0, e = Trees.size(); i != e; ++i)
- HasUnresolvedTypes |= Trees[i]->ContainsUnresolvedType();
+ for (const TreePatternNode *Tree : Trees)
+ HasUnresolvedTypes |= Tree->ContainsUnresolvedType();
return !HasUnresolvedTypes;
}
if (Trees.size() > 1)
OS << "[\n";
- for (unsigned i = 0, e = Trees.size(); i != e; ++i) {
+ for (const TreePatternNode *Tree : Trees) {
OS << "\t";
- Trees[i]->print(OS);
+ Tree->print(OS);
OS << "\n";
}
std::vector<Record*> Fragments = Records.getAllDerivedDefinitions("PatFrag");
// First step, parse all of the fragments.
- for (unsigned i = 0, e = Fragments.size(); i != e; ++i) {
- if (OutFrags != Fragments[i]->isSubClassOf("OutPatFrag"))
+ for (Record *Frag : Fragments) {
+ if (OutFrags != Frag->isSubClassOf("OutPatFrag"))
continue;
- DagInit *Tree = Fragments[i]->getValueAsDag("Fragment");
+ DagInit *Tree = Frag->getValueAsDag("Fragment");
TreePattern *P =
- (PatternFragments[Fragments[i]] = llvm::make_unique<TreePattern>(
- Fragments[i], Tree, !Fragments[i]->isSubClassOf("OutPatFrag"),
+ (PatternFragments[Frag] = llvm::make_unique<TreePattern>(
+ Frag, Tree, !Frag->isSubClassOf("OutPatFrag"),
*this)).get();
// Validate the argument list, converting it to set, to discard duplicates.
P->error("Cannot have unnamed 'node' values in pattern fragment!");
// Parse the operands list.
- DagInit *OpsList = Fragments[i]->getValueAsDag("Operands");
+ DagInit *OpsList = Frag->getValueAsDag("Operands");
DefInit *OpsOp = dyn_cast<DefInit>(OpsList->getOperator());
// Special cases: ops == outs == ins. Different names are used to
// improve readability.
// If there is a node transformation corresponding to this, keep track of
// it.
- Record *Transform = Fragments[i]->getValueAsDef("OperandTransform");
+ Record *Transform = Frag->getValueAsDef("OperandTransform");
if (!getSDNodeTransform(Transform).second.empty()) // not noop xform?
P->getOnlyTree()->setTransformFn(Transform);
}
// Now that we've parsed all of the tree fragments, do a closure on them so
// that there are not references to PatFrags left inside of them.
- for (unsigned i = 0, e = Fragments.size(); i != e; ++i) {
- if (OutFrags != Fragments[i]->isSubClassOf("OutPatFrag"))
+ for (Record *Frag : Fragments) {
+ if (OutFrags != Frag->isSubClassOf("OutPatFrag"))
continue;
- TreePattern &ThePat = *PatternFragments[Fragments[i]];
+ TreePattern &ThePat = *PatternFragments[Frag];
ThePat.InlinePatternFragments();
// Infer as many types as possible. Don't worry about it if we don't infer
void CodeGenDAGPatterns::ParseInstructions() {
std::vector<Record*> Instrs = Records.getAllDerivedDefinitions("Instruction");
- for (unsigned i = 0, e = Instrs.size(); i != e; ++i) {
+ for (Record *Instr : Instrs) {
ListInit *LI = nullptr;
- if (isa<ListInit>(Instrs[i]->getValueInit("Pattern")))
- LI = Instrs[i]->getValueAsListInit("Pattern");
+ if (isa<ListInit>(Instr->getValueInit("Pattern")))
+ LI = Instr->getValueAsListInit("Pattern");
// If there is no pattern, only collect minimal information about the
// instruction for its operand list. We have to assume that there is one
std::vector<Record*> Results;
std::vector<Record*> Operands;
- CodeGenInstruction &InstInfo = Target.getInstruction(Instrs[i]);
+ CodeGenInstruction &InstInfo = Target.getInstruction(Instr);
if (InstInfo.Operands.size() != 0) {
for (unsigned j = 0, e = InstInfo.Operands.NumDefs; j < e; ++j)
// Create and insert the instruction.
std::vector<Record*> ImpResults;
- Instructions.insert(std::make_pair(Instrs[i],
+ Instructions.insert(std::make_pair(Instr,
DAGInstruction(nullptr, Results, Operands, ImpResults)));
continue; // no pattern.
}
- CodeGenInstruction &CGI = Target.getInstruction(Instrs[i]);
+ CodeGenInstruction &CGI = Target.getInstruction(Instr);
const DAGInstruction &DI = parseInstructionPattern(CGI, LI, Instructions);
(void)DI;
}
// If we can, convert the instructions to be patterns that are matched!
- for (std::map<Record*, DAGInstruction, LessRecordByID>::iterator II =
- Instructions.begin(),
- E = Instructions.end(); II != E; ++II) {
- DAGInstruction &TheInst = II->second;
+ for (auto &Entry : Instructions) {
+ DAGInstruction &TheInst = Entry.second;
TreePattern *I = TheInst.getPattern();
if (!I) continue; // No pattern.
SrcPattern = Pattern;
}
- Record *Instr = II->first;
+ Record *Instr = Entry.first;
AddPatternToMatch(I,
PatternToMatch(Instr,
Instr->getValueAsListInit("Predicates"),
// Scan all of the named values in the destination pattern, rejecting them if
// they don't exist in the input pattern.
- for (std::map<std::string, NameRecord>::iterator
- I = DstNames.begin(), E = DstNames.end(); I != E; ++I) {
- if (SrcNames[I->first].first == nullptr)
+ for (const auto &Entry : DstNames) {
+ if (SrcNames[Entry.first].first == nullptr)
Pattern->error("Pattern has input without matching name in output: $" +
- I->first);
+ Entry.first);
}
// Scan all of the named values in the source pattern, rejecting them if the
// name isn't used in the dest, and isn't used to tie two values together.
- for (std::map<std::string, NameRecord>::iterator
- I = SrcNames.begin(), E = SrcNames.end(); I != E; ++I)
- if (DstNames[I->first].first == nullptr && SrcNames[I->first].second == 1)
- Pattern->error("Pattern has dead named input: $" + I->first);
+ for (const auto &Entry : SrcNames)
+ if (DstNames[Entry.first].first == nullptr &&
+ SrcNames[Entry.first].second == 1)
+ Pattern->error("Pattern has dead named input: $" + Entry.first);
PatternsToMatch.push_back(PTM);
}
// Revisit instructions with undefined flags and no pattern.
if (Target.guessInstructionProperties()) {
- for (unsigned i = 0, e = Revisit.size(); i != e; ++i) {
- CodeGenInstruction &InstInfo = *Revisit[i];
- if (InstInfo.InferredFrom)
+ for (CodeGenInstruction *InstInfo : Revisit) {
+ if (InstInfo->InferredFrom)
continue;
// The mayLoad and mayStore flags default to false.
// Conservatively assume hasSideEffects if it wasn't explicit.
- if (InstInfo.hasSideEffects_Unset)
- InstInfo.hasSideEffects = true;
+ if (InstInfo->hasSideEffects_Unset)
+ InstInfo->hasSideEffects = true;
}
return;
}
// Complain about any flags that are still undefined.
- for (unsigned i = 0, e = Revisit.size(); i != e; ++i) {
- CodeGenInstruction &InstInfo = *Revisit[i];
- if (InstInfo.InferredFrom)
+ for (CodeGenInstruction *InstInfo : Revisit) {
+ if (InstInfo->InferredFrom)
continue;
- if (InstInfo.hasSideEffects_Unset)
- PrintError(InstInfo.TheDef->getLoc(),
+ if (InstInfo->hasSideEffects_Unset)
+ PrintError(InstInfo->TheDef->getLoc(),
"Can't infer hasSideEffects from patterns");
- if (InstInfo.mayStore_Unset)
- PrintError(InstInfo.TheDef->getLoc(),
+ if (InstInfo->mayStore_Unset)
+ PrintError(InstInfo->TheDef->getLoc(),
"Can't infer mayStore from patterns");
- if (InstInfo.mayLoad_Unset)
- PrintError(InstInfo.TheDef->getLoc(),
+ if (InstInfo->mayLoad_Unset)
+ PrintError(InstInfo->TheDef->getLoc(),
"Can't infer mayLoad from patterns");
}
}
unsigned NumSideEffects = 0;
unsigned NumStores = 0;
unsigned NumLoads = 0;
- for (unsigned i = 0, e = Instrs.size(); i != e; ++i) {
- const CodeGenInstruction &InstInfo = Target.getInstruction(Instrs[i]);
+ for (const Record *Instr : Instrs) {
+ const CodeGenInstruction &InstInfo = Target.getInstruction(Instr);
NumSideEffects += InstInfo.hasSideEffects;
NumStores += InstInfo.mayStore;
NumLoads += InstInfo.mayLoad;
continue;
++Errors;
- for (unsigned i = 0, e = Msgs.size(); i != e; ++i)
- PrintError(PTM.getSrcRecord()->getLoc(), Twine(Msgs[i]) + " on the " +
+ for (const std::string &Msg : Msgs)
+ PrintError(PTM.getSrcRecord()->getLoc(), Twine(Msg) + " on the " +
(Instrs.size() == 1 ?
"instruction" : "output instructions"));
// Provide the location of the relevant instruction definitions.
- for (unsigned i = 0, e = Instrs.size(); i != e; ++i) {
- if (Instrs[i] != PTM.getSrcRecord())
- PrintError(Instrs[i]->getLoc(), "defined here");
- const CodeGenInstruction &InstInfo = Target.getInstruction(Instrs[i]);
+ for (const Record *Instr : Instrs) {
+ if (Instr != PTM.getSrcRecord())
+ PrintError(Instr->getLoc(), "defined here");
+ const CodeGenInstruction &InstInfo = Target.getInstruction(Instr);
if (InstInfo.InferredFrom &&
InstInfo.InferredFrom != InstInfo.TheDef &&
InstInfo.InferredFrom != PTM.getSrcRecord())
void CodeGenDAGPatterns::ParsePatterns() {
std::vector<Record*> Patterns = Records.getAllDerivedDefinitions("Pattern");
- for (unsigned i = 0, e = Patterns.size(); i != e; ++i) {
- Record *CurPattern = Patterns[i];
+ for (Record *CurPattern : Patterns) {
DagInit *Tree = CurPattern->getValueAsDag("PatternToMatch");
// If the pattern references the null_frag, there's nothing to do.
CodeGenDAGPatterns &CDP,
const MultipleUseVarSet &DepVars) {
// Make sure that each operand has at least one variant to choose from.
- for (unsigned i = 0, e = ChildVariants.size(); i != e; ++i)
- if (ChildVariants[i].empty())
+ for (const auto &Variants : ChildVariants)
+ if (Variants.empty())
return;
// The end result is an all-pairs construction of the resultant pattern.
#ifndef NDEBUG
DEBUG(if (!Idxs.empty()) {
errs() << Orig->getOperator()->getName() << ": Idxs = [ ";
- for (unsigned i = 0; i < Idxs.size(); ++i) {
- errs() << Idxs[i] << " ";
+ for (unsigned Idx : Idxs) {
+ errs() << Idx << " ";
}
errs() << "]\n";
});
// intentionally do not reconsider these. Any variants of added patterns have
// already been added.
//
- for (unsigned i = 0, e = PatternsToMatch.size(); i != e; ++i) {
+ for (PatternToMatch &PTM : PatternsToMatch) {
MultipleUseVarSet DepVars;
std::vector<TreePatternNode*> Variants;
- FindDepVars(PatternsToMatch[i].getSrcPattern(), DepVars);
+ FindDepVars(PTM.getSrcPattern(), DepVars);
DEBUG(errs() << "Dependent/multiply used variables: ");
DEBUG(DumpDepVars(DepVars));
DEBUG(errs() << "\n");
- GenerateVariantsOf(PatternsToMatch[i].getSrcPattern(), Variants, *this,
+ GenerateVariantsOf(PTM.getSrcPattern(), Variants, *this,
DepVars);
assert(!Variants.empty() && "Must create at least original variant!");
continue;
DEBUG(errs() << "FOUND VARIANTS OF: ";
- PatternsToMatch[i].getSrcPattern()->dump();
+ PTM.getSrcPattern()->dump();
errs() << "\n");
for (unsigned v = 0, e = Variants.size(); v != e; ++v) {
// Scan to see if an instruction or explicit pattern already matches this.
bool AlreadyExists = false;
- for (unsigned p = 0, e = PatternsToMatch.size(); p != e; ++p) {
+ for (PatternToMatch &OtherPTM : PatternsToMatch) {
// Skip if the top level predicates do not match.
- if (PatternsToMatch[i].getPredicates() !=
- PatternsToMatch[p].getPredicates())
+ if (PTM.getPredicates() != OtherPTM.getPredicates())
continue;
// Check to see if this variant already exists.
- if (Variant->isIsomorphicTo(PatternsToMatch[p].getSrcPattern(),
- DepVars)) {
+ if (Variant->isIsomorphicTo(OtherPTM.getSrcPattern(), DepVars)) {
DEBUG(errs() << " *** ALREADY EXISTS, ignoring variant.\n");
AlreadyExists = true;
break;
if (AlreadyExists) continue;
// Otherwise, add it to the list of patterns we have.
- PatternsToMatch.emplace_back(
- PatternsToMatch[i].getSrcRecord(), PatternsToMatch[i].getPredicates(),
- Variant, PatternsToMatch[i].getDstPattern(),
- PatternsToMatch[i].getDstRegs(),
- PatternsToMatch[i].getAddedComplexity(), Record::getNewUID());
+ PatternsToMatch.emplace_back(PTM.getSrcRecord(), PTM.getPredicates(),
+ Variant, PTM.getDstPattern(),
+ PTM.getDstRegs(), PTM.getAddedComplexity(),
+ Record::getNewUID());
}
DEBUG(errs() << "\n");
projects / oota-llvm.git / blobdiff