[llvm] cb96d80 - [LV] Hoist code to get vector loop latch (NFC).

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2021-04-27T13:30:17+01:00
New Revision: cb96d802d4d735cb0617788b636602410c7a15b1

URL: https://github.com/llvm/llvm-project/commit/cb96d802d4d735cb0617788b636602410c7a15b1
DIFF: https://github.com/llvm/llvm-project/commit/cb96d802d4d735cb0617788b636602410c7a15b1.diff

LOG: [LV] Hoist code to get vector loop latch (NFC).

Address suggestion from D99294.

Added: 
    

Modified: 
    llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index a8a2bd5475c8..17e9947c1c63 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -4288,17 +4288,17 @@ void InnerLoopVectorizer::fixReduction(PHINode *Phi, VPTransformState &State) {
 
   // Reductions do not have to start at zero. They can start with
   // any loop invariant values.
-  BasicBlock *Latch = OrigLoop->getLoopLatch();
-  Value *LoopVal = Phi->getIncomingValueForBlock(Latch);
+  BasicBlock *OrigLatch = OrigLoop->getLoopLatch();
+  Value *OrigLoopVal = Phi->getIncomingValueForBlock(OrigLatch);
+  BasicBlock *VectorLoopLatch = LI->getLoopFor(LoopVectorBody)->getLoopLatch();
 
   for (unsigned Part = 0; Part < UF; ++Part) {
     Value *VecRdxPhi = State.get(State.Plan->getVPValue(Phi), Part);
-    Value *Val = State.get(State.Plan->getVPValue(LoopVal), Part);
+    Value *Val = State.get(State.Plan->getVPValue(OrigLoopVal), Part);
     if (IsInLoopReductionPhi && useOrderedReductions(RdxDesc) &&
         State.VF.isVector())
-      Val = State.get(State.Plan->getVPValue(LoopVal), UF - 1);
-    cast<PHINode>(VecRdxPhi)
-      ->addIncoming(Val, LI->getLoopFor(LoopVectorBody)->getLoopLatch());
+      Val = State.get(State.Plan->getVPValue(OrigLoopVal), UF - 1);
+    cast<PHINode>(VecRdxPhi)->addIncoming(Val, VectorLoopLatch);
   }
 
   // Before each round, move the insertion point right between