[llvm] 2b64427 - [TableGen] clang-format DAGISelMatcherOpt.cpp. NFC
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Sun Apr 2 14:14:17 PDT 2023
Author: Craig Topper
Date: 2023-04-02T14:05:02-07:00
New Revision: 2b644270dec18e98b541e64d6dcd8956395e53f3
URL: https://github.com/llvm/llvm-project/commit/2b644270dec18e98b541e64d6dcd8956395e53f3
DIFF: https://github.com/llvm/llvm-project/commit/2b644270dec18e98b541e64d6dcd8956395e53f3.diff
LOG: [TableGen] clang-format DAGISelMatcherOpt.cpp. NFC
Added:
Modified:
llvm/utils/TableGen/DAGISelMatcherOpt.cpp
Removed:
################################################################################
diff --git a/llvm/utils/TableGen/DAGISelMatcherOpt.cpp b/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
index 6983ccef4413..7e920f235987 100644
--- a/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
+++ b/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
-#include "DAGISelMatcher.h"
#include "CodeGenDAGPatterns.h"
+#include "DAGISelMatcher.h"
#include "SDNodeProperties.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/Debug.h"
@@ -26,8 +26,9 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
const CodeGenDAGPatterns &CGP) {
// If we reached the end of the chain, we're done.
Matcher *N = MatcherPtr.get();
- if (!N) return;
-
+ if (!N)
+ return;
+
// If we have a scope node, walk down all of the children.
if (ScopeMatcher *Scope = dyn_cast<ScopeMatcher>(N)) {
for (unsigned i = 0, e = Scope->getNumChildren(); i != e; ++i) {
@@ -37,31 +38,31 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
}
return;
}
-
+
// If we found a movechild node with a node that comes in a 'foochild' form,
// transform it.
if (MoveChildMatcher *MC = dyn_cast<MoveChildMatcher>(N)) {
Matcher *New = nullptr;
if (RecordMatcher *RM = dyn_cast<RecordMatcher>(MC->getNext()))
- if (MC->getChildNo() < 8) // Only have RecordChild0...7
+ if (MC->getChildNo() < 8) // Only have RecordChild0...7
New = new RecordChildMatcher(MC->getChildNo(), RM->getWhatFor(),
RM->getResultNo());
if (CheckTypeMatcher *CT = dyn_cast<CheckTypeMatcher>(MC->getNext()))
- if (MC->getChildNo() < 8 && // Only have CheckChildType0...7
- CT->getResNo() == 0) // CheckChildType checks res #0
+ if (MC->getChildNo() < 8 && // Only have CheckChildType0...7
+ CT->getResNo() == 0) // CheckChildType checks res #0
New = new CheckChildTypeMatcher(MC->getChildNo(), CT->getType());
if (CheckSameMatcher *CS = dyn_cast<CheckSameMatcher>(MC->getNext()))
- if (MC->getChildNo() < 4) // Only have CheckChildSame0...3
+ if (MC->getChildNo() < 4) // Only have CheckChildSame0...3
New = new CheckChildSameMatcher(MC->getChildNo(), CS->getMatchNumber());
if (CheckIntegerMatcher *CI = dyn_cast<CheckIntegerMatcher>(MC->getNext()))
- if (MC->getChildNo() < 5) // Only have CheckChildInteger0...4
+ if (MC->getChildNo() < 5) // Only have CheckChildInteger0...4
New = new CheckChildIntegerMatcher(MC->getChildNo(), CI->getValue());
if (auto *CCC = dyn_cast<CheckCondCodeMatcher>(MC->getNext()))
- if (MC->getChildNo() == 2) // Only have CheckChild2CondCode
+ if (MC->getChildNo() == 2) // Only have CheckChild2CondCode
New = new CheckChild2CondCodeMatcher(CCC->getCondCodeName());
if (New) {
@@ -73,11 +74,10 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
return ContractNodes(MatcherPtr, CGP);
}
}
-
+
// Zap movechild -> moveparent.
if (MoveChildMatcher *MC = dyn_cast<MoveChildMatcher>(N))
- if (MoveParentMatcher *MP =
- dyn_cast<MoveParentMatcher>(MC->getNext())) {
+ if (MoveParentMatcher *MP = dyn_cast<MoveParentMatcher>(MC->getNext())) {
MatcherPtr.reset(MP->takeNext());
return ContractNodes(MatcherPtr, CGP);
}
@@ -85,19 +85,19 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
// Turn EmitNode->CompleteMatch into MorphNodeTo if we can.
if (EmitNodeMatcher *EN = dyn_cast<EmitNodeMatcher>(N))
if (CompleteMatchMatcher *CM =
- dyn_cast<CompleteMatchMatcher>(EN->getNext())) {
+ dyn_cast<CompleteMatchMatcher>(EN->getNext())) {
// We can only use MorphNodeTo if the result values match up.
unsigned RootResultFirst = EN->getFirstResultSlot();
bool ResultsMatch = true;
for (unsigned i = 0, e = CM->getNumResults(); i != e; ++i)
- if (CM->getResult(i) != RootResultFirst+i)
+ if (CM->getResult(i) != RootResultFirst + i)
ResultsMatch = false;
-
+
// If the selected node defines a subset of the glue/chain results, we
// can't use MorphNodeTo. For example, we can't use MorphNodeTo if the
// matched pattern has a chain but the root node doesn't.
const PatternToMatch &Pattern = CM->getPattern();
-
+
if (!EN->hasChain() &&
Pattern.getSrcPattern()->NodeHasProperty(SDNPHasChain, CGP))
ResultsMatch = false;
@@ -111,37 +111,32 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
if (!EN->hasOutFlag() &&
Pattern.getSrcPattern()->NodeHasProperty(SDNPOutGlue, CGP))
ResultsMatch = false;
-
-
+
+#if 0
// If the root result node defines more results than the source root node
// *and* has a chain or glue input, then we can't match it because it
// would end up replacing the extra result with the chain/glue.
-#if 0
if ((EN->hasGlue() || EN->hasChain()) &&
EN->getNumNonChainGlueVTs() > ... need to get no results reliably ...)
ResultMatch = false;
#endif
-
+
if (ResultsMatch) {
const SmallVectorImpl<MVT::SimpleValueType> &VTs = EN->getVTList();
const SmallVectorImpl<unsigned> &Operands = EN->getOperandList();
- MatcherPtr.reset(new MorphNodeToMatcher(EN->getOpcodeName(),
- VTs, Operands,
- EN->hasChain(), EN->hasInFlag(),
- EN->hasOutFlag(),
- EN->hasMemRefs(),
- EN->getNumFixedArityOperands(),
- Pattern));
+ MatcherPtr.reset(new MorphNodeToMatcher(
+ EN->getOpcodeName(), VTs, Operands, EN->hasChain(), EN->hasInFlag(),
+ EN->hasOutFlag(), EN->hasMemRefs(), EN->getNumFixedArityOperands(),
+ Pattern));
return;
}
// FIXME2: Kill off all the SelectionDAG::SelectNodeTo and getMachineNode
// variants.
}
-
+
ContractNodes(N->getNextPtr(), CGP);
-
-
+
// If we have a CheckType/CheckChildType/Record node followed by a
// CheckOpcode, invert the two nodes. We prefer to do structural checks
// before type checks, as this opens opportunities for factoring on targets
@@ -153,7 +148,7 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
Matcher *CheckType = MatcherPtr.release();
Matcher *CheckOpcode = CheckType->takeNext();
Matcher *Tail = CheckOpcode->takeNext();
-
+
// Relink them.
MatcherPtr.reset(CheckOpcode);
CheckOpcode->setNext(CheckType);
@@ -172,7 +167,6 @@ static Matcher *FindNodeWithKind(Matcher *M, Matcher::KindTy Kind) {
return nullptr;
}
-
/// FactorNodes - Turn matches like this:
/// Scope
/// OPC_CheckType i32
@@ -192,7 +186,8 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
while (!Scope) {
// If we reached the end of the chain, we're done.
Matcher *N = RebindableMatcherPtr->get();
- if (!N) return;
+ if (!N)
+ return;
// If this is not a push node, just scan for one.
Scope = dyn_cast<ScopeMatcher>(N);
@@ -200,11 +195,11 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
RebindableMatcherPtr = &(N->getNextPtr());
}
std::unique_ptr<Matcher> &MatcherPtr = *RebindableMatcherPtr;
-
+
// Okay, pull together the children of the scope node into a vector so we can
// inspect it more easily.
- SmallVector<Matcher*, 32> OptionsToMatch;
-
+ SmallVector<Matcher *, 32> OptionsToMatch;
+
for (unsigned i = 0, e = Scope->getNumChildren(); i != e; ++i) {
// Factor the subexpression.
std::unique_ptr<Matcher> Child(Scope->takeChild(i));
@@ -218,9 +213,9 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
OptionsToMatch.push_back(Child.release());
}
}
-
- SmallVector<Matcher*, 32> NewOptionsToMatch;
-
+
+ SmallVector<Matcher *, 32> NewOptionsToMatch;
+
// Loop over options to match, merging neighboring patterns with identical
// starting nodes into a shared matcher.
for (unsigned OptionIdx = 0, e = OptionsToMatch.size(); OptionIdx != e;) {
@@ -231,14 +226,14 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
NewOptionsToMatch.push_back(Optn);
continue;
}
-
+
// See if the next option starts with the same matcher. If the two
// neighbors *do* start with the same matcher, we can factor the matcher out
// of at least these two patterns. See what the maximal set we can merge
// together is.
- SmallVector<Matcher*, 8> EqualMatchers;
+ SmallVector<Matcher *, 8> EqualMatchers;
EqualMatchers.push_back(Optn);
-
+
// Factor all of the known-equal matchers after this one into the same
// group.
while (OptionIdx != e && OptionsToMatch[OptionIdx]->isEqual(Optn))
@@ -251,21 +246,22 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
unsigned Scan = OptionIdx;
while (true) {
// If we ran out of stuff to scan, we're done.
- if (Scan == e) break;
-
+ if (Scan == e)
+ break;
+
Matcher *ScanMatcher = OptionsToMatch[Scan];
-
+
// If we found an entry that matches out matcher, merge it into the set to
// handle.
if (Optn->isEqual(ScanMatcher)) {
// If is equal after all, add the option to EqualMatchers and remove it
// from OptionsToMatch.
EqualMatchers.push_back(ScanMatcher);
- OptionsToMatch.erase(OptionsToMatch.begin()+Scan);
+ OptionsToMatch.erase(OptionsToMatch.begin() + Scan);
--e;
continue;
}
-
+
// If the option we're checking for contradicts the start of the list,
// skip over it.
if (Optn->isContradictory(ScanMatcher)) {
@@ -278,8 +274,7 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
// or the same as what we're looking for. If so, reorder it.
if (Optn->isSimplePredicateOrRecordNode()) {
Matcher *M2 = FindNodeWithKind(ScanMatcher, Optn->getKind());
- if (M2 && M2 != ScanMatcher &&
- M2->canMoveBefore(ScanMatcher) &&
+ if (M2 && M2 != ScanMatcher && M2->canMoveBefore(ScanMatcher) &&
(M2->isEqual(Optn) || M2->isContradictory(Optn))) {
Matcher *MatcherWithoutM2 = ScanMatcher->unlinkNode(M2);
M2->setNext(MatcherWithoutM2);
@@ -287,14 +282,14 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
continue;
}
}
-
+
// Otherwise, we don't know how to handle this entry, we have to bail.
break;
}
-
+
if (Scan != e &&
// Don't print it's obvious nothing extra could be merged anyway.
- Scan+1 != e) {
+ Scan + 1 != e) {
LLVM_DEBUG(errs() << "Couldn't merge this:\n"; Optn->print(errs(), 4);
errs() << "into this:\n";
OptionsToMatch[Scan]->print(errs(), 4);
@@ -302,14 +297,14 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
if (Scan + 2 < e) OptionsToMatch[Scan + 2]->printOne(errs());
errs() << "\n");
}
-
+
// If we only found one option starting with this matcher, no factoring is
// possible.
if (EqualMatchers.size() == 1) {
NewOptionsToMatch.push_back(EqualMatchers[0]);
continue;
}
-
+
// Factor these checks by pulling the first node off each entry and
// discarding it. Take the first one off the first entry to reuse.
Matcher *Shared = Optn;
@@ -333,29 +328,28 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
NewOptionsToMatch.push_back(Shared);
}
-
+
// If we're down to a single pattern to match, then we don't need this scope
// anymore.
if (NewOptionsToMatch.size() == 1) {
MatcherPtr.reset(NewOptionsToMatch[0]);
return;
}
-
+
if (NewOptionsToMatch.empty()) {
MatcherPtr.reset();
return;
}
-
+
// If our factoring failed (didn't achieve anything) see if we can simplify in
// other ways.
-
+
// Check to see if all of the leading entries are now opcode checks. If so,
// we can convert this Scope to be a OpcodeSwitch instead.
bool AllOpcodeChecks = true, AllTypeChecks = true;
for (unsigned i = 0, e = NewOptionsToMatch.size(); i != e; ++i) {
// Check to see if this breaks a series of CheckOpcodeMatchers.
- if (AllOpcodeChecks &&
- !isa<CheckOpcodeMatcher>(NewOptionsToMatch[i])) {
+ if (AllOpcodeChecks && !isa<CheckOpcodeMatcher>(NewOptionsToMatch[i])) {
#if 0
if (i > 3) {
errs() << "FAILING OPC #" << i << "\n";
@@ -367,9 +361,8 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
// Check to see if this breaks a series of CheckTypeMatcher's.
if (AllTypeChecks) {
- CheckTypeMatcher *CTM =
- cast_or_null<CheckTypeMatcher>(FindNodeWithKind(NewOptionsToMatch[i],
- Matcher::CheckType));
+ CheckTypeMatcher *CTM = cast_or_null<CheckTypeMatcher>(
+ FindNodeWithKind(NewOptionsToMatch[i], Matcher::CheckType));
if (!CTM ||
// iPTR checks could alias any other case without us knowing, don't
// bother with them.
@@ -389,11 +382,11 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
}
}
}
-
+
// If all the options are CheckOpcode's, we can form the SwitchOpcode, woot.
if (AllOpcodeChecks) {
StringSet<> Opcodes;
- SmallVector<std::pair<const SDNodeInfo*, Matcher*>, 8> Cases;
+ SmallVector<std::pair<const SDNodeInfo *, Matcher *>, 8> Cases;
for (unsigned i = 0, e = NewOptionsToMatch.size(); i != e; ++i) {
CheckOpcodeMatcher *COM = cast<CheckOpcodeMatcher>(NewOptionsToMatch[i]);
assert(Opcodes.insert(COM->getOpcode().getEnumName()).second &&
@@ -405,13 +398,13 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
MatcherPtr.reset(new SwitchOpcodeMatcher(std::move(Cases)));
return;
}
-
+
// If all the options are CheckType's, we can form the SwitchType, woot.
if (AllTypeChecks) {
DenseMap<unsigned, unsigned> TypeEntry;
- SmallVector<std::pair<MVT::SimpleValueType, Matcher*>, 8> Cases;
+ SmallVector<std::pair<MVT::SimpleValueType, Matcher *>, 8> Cases;
for (unsigned i = 0, e = NewOptionsToMatch.size(); i != e; ++i) {
- Matcher* M = FindNodeWithKind(NewOptionsToMatch[i], Matcher::CheckType);
+ Matcher *M = FindNodeWithKind(NewOptionsToMatch[i], Matcher::CheckType);
assert(M && isa<CheckTypeMatcher>(M) && "Unknown Matcher type");
auto *CTM = cast<CheckTypeMatcher>(M);
@@ -422,10 +415,10 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
unsigned &Entry = TypeEntry[CTMTy];
if (Entry != 0) {
// If we have unfactored duplicate types, then we should factor them.
- Matcher *PrevMatcher = Cases[Entry-1].second;
+ Matcher *PrevMatcher = Cases[Entry - 1].second;
if (ScopeMatcher *SM = dyn_cast<ScopeMatcher>(PrevMatcher)) {
- SM->setNumChildren(SM->getNumChildren()+1);
- SM->resetChild(SM->getNumChildren()-1, MatcherWithoutCTM);
+ SM->setNumChildren(SM->getNumChildren() + 1);
+ SM->resetChild(SM->getNumChildren() - 1, MatcherWithoutCTM);
continue;
}
@@ -433,11 +426,11 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
Cases[Entry - 1].second = new ScopeMatcher(std::move(Entries));
continue;
}
-
- Entry = Cases.size()+1;
+
+ Entry = Cases.size() + 1;
Cases.push_back(std::make_pair(CTMTy, MatcherWithoutCTM));
}
-
+
// Make sure we recursively factor any scopes we may have created.
for (auto &M : Cases) {
if (ScopeMatcher *SM = dyn_cast<ScopeMatcher>(M.second)) {
@@ -457,7 +450,6 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
}
return;
}
-
// Reassemble the Scope node with the adjusted children.
Scope->setNumChildren(NewOptionsToMatch.size());
@@ -465,9 +457,8 @@ static void FactorNodes(std::unique_ptr<Matcher> &InputMatcherPtr) {
Scope->resetChild(i, NewOptionsToMatch[i]);
}
-void
-llvm::OptimizeMatcher(std::unique_ptr<Matcher> &MatcherPtr,
- const CodeGenDAGPatterns &CGP) {
+void llvm::OptimizeMatcher(std::unique_ptr<Matcher> &MatcherPtr,
+ const CodeGenDAGPatterns &CGP) {
ContractNodes(MatcherPtr, CGP);
FactorNodes(MatcherPtr);
}
More information about the llvm-commits
mailing list