Tweak pattern complexity calc.
llvm-svn: 25122
diff --git a/llvm/utils/TableGen/DAGISelEmitter.cpp b/llvm/utils/TableGen/DAGISelEmitter.cpp
index 1d8e645..21e5ed3 100644
--- a/llvm/utils/TableGen/DAGISelEmitter.cpp
+++ b/llvm/utils/TableGen/DAGISelEmitter.cpp
@@ -1691,12 +1691,7 @@
/// patterns before small ones. This is used to determine the size of a
/// pattern.
static unsigned getPatternSize(TreePatternNode *P, DAGISelEmitter &ISE) {
- assert(isExtIntegerInVTs(P->getExtTypes()) ||
- isExtFloatingPointInVTs(P->getExtTypes()) ||
- P->getExtTypeNum(0) == MVT::isVoid ||
- P->getExtTypeNum(0) == MVT::Flag &&
- "Not a valid pattern node to size!");
- unsigned Size = 1; // The node itself.
+ unsigned Size = 2; // The node itself.
// FIXME: This is a hack to statically increase the priority of patterns
// which maps a sub-dag to a complex pattern. e.g. favors LEA over ADD.
@@ -1713,10 +1708,10 @@
if (!Child->isLeaf() && Child->getExtTypeNum(0) != MVT::Other)
Size += getPatternSize(Child, ISE);
else if (Child->isLeaf()) {
+ Size += getPatternSize(Child, ISE);
if (dynamic_cast<IntInit*>(Child->getLeafValue()))
- ++Size; // Matches a ConstantSDNode.
- else if (NodeIsComplexPattern(Child))
- Size += getPatternSize(Child, ISE);
+ // Matches a ConstantSDNode. More specific to any immediate.
+ ++Size;
}
}