Changes in directory llvm/utils/TableGen:
DAGISelEmitter.cpp updated: 1.179 -> 1.180
---
Log message:
The node wrapped in PatLeaf<> should be treated as a leaf even if it isn't
one, i.e. don't select it.
---
Diffs of the changes: (+11 -4)
DAGISelEmitter.cpp | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
Index: llvm/utils/TableGen/DAGISelEmitter.cpp
diff -u llvm/utils/TableGen/DAGISelEmitter.cpp:1.179
llvm/utils/TableGen/DAGISelEmitter.cpp:1.180
--- llvm/utils/TableGen/DAGISelEmitter.cpp:1.179 Mon Mar 20 02:09:17 2006
+++ llvm/utils/TableGen/DAGISelEmitter.cpp Mon Mar 20 16:53:06 2006
@@ -2175,7 +2175,7 @@
/// EmitResultCode - Emit the action for a pattern. Now that it has matched
/// we actually have to build a DAG!
std::pair<unsigned, unsigned>
- EmitResultCode(TreePatternNode *N, bool isRoot = false) {
+ EmitResultCode(TreePatternNode *N, bool LikeLeaf = false, bool isRoot =
false) {
// This is something selected from the pattern we matched.
if (!N->getName().empty()) {
assert(!isRoot && "Root of pattern cannot be a leaf!");
@@ -2257,7 +2257,12 @@
TmpNo = ResNo + NumRes;
} else {
emitDecl("Tmp" + utostr(ResNo));
- emitCode("Select(Tmp" + utostr(ResNo) + ", " + Val + ");");
+ // This node, probably wrapped in a SDNodeXForms, behaves like a leaf
+ // node even if it isn't one. Don't select it.
+ if (LikeLeaf)
+ emitCode("Tmp" + utostr(ResNo) + " = " + Val + ";");
+ else
+ emitCode("Select(Tmp" + utostr(ResNo) + ", " + Val + ");");
}
// Add Tmp<ResNo> to VariableMap, so that we don't multiply select this
// value if used multiple times by this pattern result.
@@ -2552,7 +2557,9 @@
return std::make_pair(1, ResNo);
} else if (Op->isSubClassOf("SDNodeXForm")) {
assert(N->getNumChildren() == 1 && "node xform should have one child!");
- unsigned OpVal = EmitResultCode(N->getChild(0)).second;
+ // PatLeaf node - the operand may or may not be a leaf node. But it
should
+ // behave like one.
+ unsigned OpVal = EmitResultCode(N->getChild(0), true).second;
unsigned ResNo = TmpNo++;
emitDecl("Tmp" + utostr(ResNo));
emitCode("Tmp" + utostr(ResNo) + " = Transform_" + Op->getName()
@@ -2748,7 +2755,7 @@
// otherwise we are done.
} while (Emitter.InsertOneTypeCheck(Pat, Pattern.getSrcPattern(), "N"));
- Emitter.EmitResultCode(Pattern.getDstPattern(), true /*the root*/);
+ Emitter.EmitResultCode(Pattern.getDstPattern(), false, true /*the root*/);
delete Pat;
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
