Ver Fonte

[SLP] Allow vectorization of the instruction from the same basic blocks only, NFC.

Summary:
After some changes in SLP vectorizer we missed some additional checks to
limit the instructions for vectorization. We should not perform analysis
of the instructions if the parent of instruction is not the same as the
parent of the first instruction in the tree or it was analyzed already.

Subscribers: mzolotukhin

Differential Revision: https://reviews.llvm.org/D34881

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309425 91177308-0d34-0410-b5e6-96231b3b80d8
Alexey Bataev há 8 anos atrás
pai
commit
2976ab9c15
1 ficheiros alterados com 8 adições e 3 exclusões
  1. 8 3
      lib/Transforms/Vectorize/SLPVectorizer.cpp

+ 8 - 3
lib/Transforms/Vectorize/SLPVectorizer.cpp

@@ -4776,7 +4776,7 @@ static bool tryToVectorizeHorReductionOrInstOperands(
   if (!Root)
   if (!Root)
     return false;
     return false;
 
 
-  if (Root->getParent() != BB)
+  if (Root->getParent() != BB || isa<PHINode>(Root))
     return false;
     return false;
   // Start analysis starting from Root instruction. If horizontal reduction is
   // Start analysis starting from Root instruction. If horizontal reduction is
   // found, try to vectorize it. If it is not a horizontal reduction or
   // found, try to vectorize it. If it is not a horizontal reduction or
@@ -4797,7 +4797,7 @@ static bool tryToVectorizeHorReductionOrInstOperands(
     if (!V)
     if (!V)
       continue;
       continue;
     auto *Inst = dyn_cast<Instruction>(V);
     auto *Inst = dyn_cast<Instruction>(V);
-    if (!Inst || isa<PHINode>(Inst))
+    if (!Inst)
       continue;
       continue;
     if (auto *BI = dyn_cast<BinaryOperator>(Inst)) {
     if (auto *BI = dyn_cast<BinaryOperator>(Inst)) {
       HorizontalReduction HorRdx;
       HorizontalReduction HorRdx;
@@ -4831,9 +4831,14 @@ static bool tryToVectorizeHorReductionOrInstOperands(
     }
     }
 
 
     // Try to vectorize operands.
     // Try to vectorize operands.
+    // Continue analysis for the instruction from the same basic block only to
+    // save compile time.
     if (++Level < RecursionMaxDepth)
     if (++Level < RecursionMaxDepth)
       for (auto *Op : Inst->operand_values())
       for (auto *Op : Inst->operand_values())
-        Stack.emplace_back(Op, Level);
+        if (VisitedInstrs.insert(Op).second)
+          if (auto *I = dyn_cast<Instruction>(Op))
+            if (!isa<PHINode>(Inst) && I->getParent() == BB)
+              Stack.emplace_back(Op, Level);
   }
   }
   return Res;
   return Res;
 }
 }