Tweak pattern complexity calc.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25122 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 9 deletions

diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index 1d8e645..21e5ed3 100644
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -1691,12 +1691,7 @@ static const ComplexPattern *NodeGetComplexPattern(TreePatternNode *N,
 /// 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 @@ static unsigned getPatternSize(TreePatternNode *P, DAGISelEmitter &ISE) {
     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;
     }
   }