[llvm] f925040 - [TableGen] Move formation of MoveSiblingMatcher earlier in ContractNodes. NFC
Craig Topper via llvm-commits
llvm-commits at lists.llvm.org
Sat Feb 8 15:58:22 PST 2025
Author: Craig Topper
Date: 2025-02-08T15:58:12-08:00
New Revision: f9250401ef120a4605ad67bb43d3b25500900498
URL: https://github.com/llvm/llvm-project/commit/f9250401ef120a4605ad67bb43d3b25500900498
DIFF: https://github.com/llvm/llvm-project/commit/f9250401ef120a4605ad67bb43d3b25500900498.diff
LOG: [TableGen] Move formation of MoveSiblingMatcher earlier in ContractNodes. NFC
ContractNodes recursively walks forward through a linked list. During
this recursion, Matchers are combined into other Matchers.
Previously the formation of MoveSiblingMatcher was after the
recursive call so it occurred as we were unwinding. If a
MoveSiblingMatcher was formed, we would recursively walk forward
to the end of the linked list again which isn't efficient.
To make this more efficient, move the formation of MoveSiblingMatcher
to the forward pass. Add additional rules to unfold MoveSiblingMatcher
if it would be more efficient to use CheckChildType, CheckChildInteger,
CheckChildSame, etc.
As an added benefit, this makes the function tail recursive which
the compiler can better optimize.
Added:
Modified:
llvm/utils/TableGen/DAGISelMatcherOpt.cpp
Removed:
################################################################################
diff --git a/llvm/utils/TableGen/DAGISelMatcherOpt.cpp b/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
index 400534290a0912d..b10fe7e0661eb48 100644
--- a/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
+++ b/llvm/utils/TableGen/DAGISelMatcherOpt.cpp
@@ -75,6 +75,164 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
}
}
+ // Turn MoveParent->MoveChild into MoveSibling.
+ if (auto *MP = dyn_cast<MoveParentMatcher>(N)) {
+ if (auto *MC = dyn_cast<MoveChildMatcher>(MP->getNext())) {
+ auto *MS = new MoveSiblingMatcher(MC->getChildNo());
+ MS->setNext(MC->takeNext());
+ MatcherPtr.reset(MS);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+
+ // Uncontract MoveSibling if it will help form other child operations.
+ if (auto *MS = dyn_cast<MoveSiblingMatcher>(N)) {
+ if (auto *RM = dyn_cast<RecordMatcher>(MS->getNext())) {
+ // Turn MoveSibling->Record->MoveParent into MoveParent->RecordChild.
+ if (auto *MP = dyn_cast<MoveParentMatcher>(RM->getNext())) {
+ if (MS->getSiblingNo() < 8) { // Only have RecordChild0...7
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewRCM = new RecordChildMatcher(
+ MS->getSiblingNo(), RM->getWhatFor(), RM->getResultNo());
+ NewMP->setNext(NewRCM);
+ NewRCM->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+
+ // Turn MoveSibling->Record->CheckType->MoveParent into
+ // MoveParent->RecordChild->CheckChildType.
+ if (auto *CT = dyn_cast<CheckTypeMatcher>(RM->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CT->getNext())) {
+ if (MS->getSiblingNo() < 8 && // Only have CheckChildType0...7
+ CT->getResNo() == 0) { // CheckChildType checks res #0
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewRCM = new RecordChildMatcher(
+ MS->getSiblingNo(), RM->getWhatFor(), RM->getResultNo());
+ auto *NewCCT =
+ new CheckChildTypeMatcher(MS->getSiblingNo(), CT->getType());
+ NewMP->setNext(NewRCM);
+ NewRCM->setNext(NewCCT);
+ NewCCT->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+ }
+ }
+
+ // Turn MoveSibling->CheckType->MoveParent into MoveParent->CheckChildType.
+ if (auto *CT = dyn_cast<CheckTypeMatcher>(MS->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CT->getNext())) {
+ if (MS->getSiblingNo() < 8 && // Only have CheckChildType0...7
+ CT->getResNo() == 0) { // CheckChildType checks res #0
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCT =
+ new CheckChildTypeMatcher(MS->getSiblingNo(), CT->getType());
+ NewMP->setNext(NewCCT);
+ NewCCT->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+ }
+
+ // Turn MoveSibling->CheckInteger->MoveParent into
+ // MoveParent->CheckChildInteger.
+ if (auto *CI = dyn_cast<CheckIntegerMatcher>(MS->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CI->getNext())) {
+ if (MS->getSiblingNo() < 5) { // Only have CheckChildInteger0...4
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCI =
+ new CheckChildIntegerMatcher(MS->getSiblingNo(), CI->getValue());
+ NewMP->setNext(NewCCI);
+ NewCCI->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+
+ // Turn MoveSibling->CheckInteger->CheckType->MoveParent into
+ // MoveParent->CheckChildInteger->CheckType.
+ if (auto *CT = dyn_cast<CheckTypeMatcher>(CI->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CT->getNext())) {
+ if (MS->getSiblingNo() < 5 && // Only have CheckChildInteger0...4
+ CT->getResNo() == 0) { // CheckChildType checks res #0
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCI = new CheckChildIntegerMatcher(MS->getSiblingNo(),
+ CI->getValue());
+ auto *NewCCT =
+ new CheckChildTypeMatcher(MS->getSiblingNo(), CT->getType());
+ NewMP->setNext(NewCCI);
+ NewCCI->setNext(NewCCT);
+ NewCCT->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+ }
+ }
+
+ // Turn MoveSibling->CheckCondCode->MoveParent into
+ // MoveParent->CheckChild2CondCode.
+ if (auto *CCC = dyn_cast<CheckCondCodeMatcher>(MS->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CCC->getNext())) {
+ if (MS->getSiblingNo() == 2) { // Only have CheckChild2CondCode
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCCC =
+ new CheckChild2CondCodeMatcher(CCC->getCondCodeName());
+ NewMP->setNext(NewCCCC);
+ NewCCCC->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+ }
+
+ // Turn MoveSibling->CheckSame->MoveParent into
+ // MoveParent->CheckChildSame.
+ if (auto *CS = dyn_cast<CheckSameMatcher>(MS->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CS->getNext())) {
+ if (MS->getSiblingNo() < 4) { // Only have CheckChildSame0...3
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCS = new CheckChildSameMatcher(MS->getSiblingNo(),
+ CS->getMatchNumber());
+ NewMP->setNext(NewCCS);
+ NewCCS->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+
+ // Turn MoveSibling->CheckSame->CheckType->MoveParent into
+ // MoveParent->CheckChildSame->CheckChildType.
+ if (auto *CT = dyn_cast<CheckTypeMatcher>(CS->getNext())) {
+ if (auto *MP = dyn_cast<MoveParentMatcher>(CT->getNext())) {
+ if (MS->getSiblingNo() < 4 && // Only have CheckChildSame0...3
+ CT->getResNo() == 0) { // CheckChildType checks res #0
+ auto *NewMP = new MoveParentMatcher();
+ auto *NewCCS = new CheckChildSameMatcher(MS->getSiblingNo(),
+ CS->getMatchNumber());
+ auto *NewCCT =
+ new CheckChildTypeMatcher(MS->getSiblingNo(), CT->getType());
+ NewMP->setNext(NewCCS);
+ NewCCS->setNext(NewCCT);
+ NewCCT->setNext(MP->takeNext());
+ MatcherPtr.reset(NewMP);
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+ }
+ }
+
+ // Turn MoveSibling->MoveParent into MoveParent.
+ if (auto *MP = dyn_cast<MoveParentMatcher>(MS->getNext())) {
+ MatcherPtr.reset(MS->takeNext());
+ return ContractNodes(MatcherPtr, CGP);
+ }
+ }
+
// Zap movechild -> moveparent.
if (MoveChildMatcher *MC = dyn_cast<MoveChildMatcher>(N))
if (MoveParentMatcher *MP = dyn_cast<MoveParentMatcher>(MC->getNext())) {
@@ -153,30 +311,6 @@ static void ContractNodes(std::unique_ptr<Matcher> &MatcherPtr,
}
ContractNodes(N->getNextPtr(), CGP);
-
- // If we have a MoveParent followed by a MoveChild, we convert it to
- // MoveSibling.
- if (auto *MP = dyn_cast<MoveParentMatcher>(N)) {
- if (auto *MC = dyn_cast<MoveChildMatcher>(MP->getNext())) {
- auto *MS = new MoveSiblingMatcher(MC->getChildNo());
- MS->setNext(MC->takeNext());
- MatcherPtr.reset(MS);
- return ContractNodes(MatcherPtr, CGP);
- }
- if (auto *RC = dyn_cast<RecordChildMatcher>(MP->getNext())) {
- if (auto *MC = dyn_cast<MoveChildMatcher>(RC->getNext())) {
- if (RC->getChildNo() == MC->getChildNo()) {
- auto *MS = new MoveSiblingMatcher(MC->getChildNo());
- auto *RM = new RecordMatcher(RC->getWhatFor(), RC->getResultNo());
- // Insert the new node.
- RM->setNext(MC->takeNext());
- MS->setNext(RM);
- MatcherPtr.reset(MS);
- return ContractNodes(MatcherPtr, CGP);
- }
- }
- }
- }
}
/// FindNodeWithKind - Scan a series of matchers looking for a matcher with a
More information about the llvm-commits
mailing list