-
Notifications
You must be signed in to change notification settings - Fork 13.6k
[TableGen][GISel] Simplify checks for BasicBlockSDNode (NFC) #121098
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
s-barannikov
merged 1 commit into
llvm:main
from
s-barannikov:tablegen/gisel/bb-sdnode-check
Dec 25, 2024
Merged
[TableGen][GISel] Simplify checks for BasicBlockSDNode (NFC) #121098
s-barannikov
merged 1 commit into
llvm:main
from
s-barannikov:tablegen/gisel/bb-sdnode-check
Dec 25, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@llvm/pr-subscribers-llvm-globalisel Author: Sergei Barannikov (s-barannikov) ChangesFull diff: https://github.com/llvm/llvm-project/pull/121098.diff 1 Files Affected:
diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp
index 4250b57581f63e..5038be7b24fbcb 100644
--- a/llvm/utils/TableGen/GlobalISelEmitter.cpp
+++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp
@@ -992,27 +992,24 @@ Error GlobalISelEmitter::importChildMatcher(
// Check MBB's before the type check since they are not a known type.
if (!SrcChild.isLeaf()) {
- if (SrcChild.getOperator()->isSubClassOf("SDNode")) {
- auto &ChildSDNI = CGP.getSDNodeInfo(SrcChild.getOperator());
- if (ChildSDNI.getSDClassName() == "BasicBlockSDNode") {
- OM.addPredicate<MBBOperandMatcher>();
- return Error::success();
- }
- if (SrcChild.getOperator()->getName() == "timm") {
- OM.addPredicate<ImmOperandMatcher>();
+ if (SrcChild.getOperator()->getName() == "bb") {
+ OM.addPredicate<MBBOperandMatcher>();
+ return Error::success();
+ }
+ if (SrcChild.getOperator()->getName() == "timm") {
+ OM.addPredicate<ImmOperandMatcher>();
- // Add predicates, if any
- for (const TreePredicateCall &Call : SrcChild.getPredicateCalls()) {
- const TreePredicateFn &Predicate = Call.Fn;
+ // Add predicates, if any
+ for (const TreePredicateCall &Call : SrcChild.getPredicateCalls()) {
+ const TreePredicateFn &Predicate = Call.Fn;
- // Only handle immediate patterns for now
- if (Predicate.isImmediatePattern()) {
- OM.addPredicate<OperandImmPredicateMatcher>(Predicate);
- }
+ // Only handle immediate patterns for now
+ if (Predicate.isImmediatePattern()) {
+ OM.addPredicate<OperandImmPredicateMatcher>(Predicate);
}
-
- return Error::success();
}
+
+ return Error::success();
}
} else if (auto *ChildDefInit = dyn_cast<DefInit>(SrcChild.getLeafValue())) {
auto *ChildRec = ChildDefInit->getDef();
@@ -1228,12 +1225,9 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderer(
// We accept 'bb' here. It's an operator because BasicBlockSDNode isn't
// inline, but in MI it's just another operand.
- if (Dst.getOperator()->isSubClassOf("SDNode")) {
- auto &ChildSDNI = CGP.getSDNodeInfo(Dst.getOperator());
- if (ChildSDNI.getSDClassName() == "BasicBlockSDNode") {
- DstMIBuilder.addRenderer<CopyRenderer>(Dst.getName());
- return InsertPt;
- }
+ if (Dst.getOperator()->getName() == "bb") {
+ DstMIBuilder.addRenderer<CopyRenderer>(Dst.getName());
+ return InsertPt;
}
// Similarly, imm is an operator in TreePatternNode's view but must be
|
@llvm/pr-subscribers-tablegen Author: Sergei Barannikov (s-barannikov) ChangesFull diff: https://github.com/llvm/llvm-project/pull/121098.diff 1 Files Affected:
diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp
index 4250b57581f63e..5038be7b24fbcb 100644
--- a/llvm/utils/TableGen/GlobalISelEmitter.cpp
+++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp
@@ -992,27 +992,24 @@ Error GlobalISelEmitter::importChildMatcher(
// Check MBB's before the type check since they are not a known type.
if (!SrcChild.isLeaf()) {
- if (SrcChild.getOperator()->isSubClassOf("SDNode")) {
- auto &ChildSDNI = CGP.getSDNodeInfo(SrcChild.getOperator());
- if (ChildSDNI.getSDClassName() == "BasicBlockSDNode") {
- OM.addPredicate<MBBOperandMatcher>();
- return Error::success();
- }
- if (SrcChild.getOperator()->getName() == "timm") {
- OM.addPredicate<ImmOperandMatcher>();
+ if (SrcChild.getOperator()->getName() == "bb") {
+ OM.addPredicate<MBBOperandMatcher>();
+ return Error::success();
+ }
+ if (SrcChild.getOperator()->getName() == "timm") {
+ OM.addPredicate<ImmOperandMatcher>();
- // Add predicates, if any
- for (const TreePredicateCall &Call : SrcChild.getPredicateCalls()) {
- const TreePredicateFn &Predicate = Call.Fn;
+ // Add predicates, if any
+ for (const TreePredicateCall &Call : SrcChild.getPredicateCalls()) {
+ const TreePredicateFn &Predicate = Call.Fn;
- // Only handle immediate patterns for now
- if (Predicate.isImmediatePattern()) {
- OM.addPredicate<OperandImmPredicateMatcher>(Predicate);
- }
+ // Only handle immediate patterns for now
+ if (Predicate.isImmediatePattern()) {
+ OM.addPredicate<OperandImmPredicateMatcher>(Predicate);
}
-
- return Error::success();
}
+
+ return Error::success();
}
} else if (auto *ChildDefInit = dyn_cast<DefInit>(SrcChild.getLeafValue())) {
auto *ChildRec = ChildDefInit->getDef();
@@ -1228,12 +1225,9 @@ Expected<action_iterator> GlobalISelEmitter::importExplicitUseRenderer(
// We accept 'bb' here. It's an operator because BasicBlockSDNode isn't
// inline, but in MI it's just another operand.
- if (Dst.getOperator()->isSubClassOf("SDNode")) {
- auto &ChildSDNI = CGP.getSDNodeInfo(Dst.getOperator());
- if (ChildSDNI.getSDClassName() == "BasicBlockSDNode") {
- DstMIBuilder.addRenderer<CopyRenderer>(Dst.getName());
- return InsertPt;
- }
+ if (Dst.getOperator()->getName() == "bb") {
+ DstMIBuilder.addRenderer<CopyRenderer>(Dst.getName());
+ return InsertPt;
}
// Similarly, imm is an operator in TreePatternNode's view but must be
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.