[llvm] 26afa2d - [VPlan] Create VPInstructions after setting preds in HCFG builder (NFC)

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2025-02-22T10:33:17Z
New Revision: 26afa2deea1240febccaa635eed50db097a7fac1

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

LOG: [VPlan] Create VPInstructions after setting preds in HCFG builder (NFC)

Set VPBBs predecessors before creating VPInstructions, as setting
incoming values for non-header phis directly there will require
predecessors to be available.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp b/llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
index 82ccd48d89f4f..47acf9d44e3a0 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanHCFGBuilder.cpp
@@ -393,11 +393,9 @@ void PlainCFGBuilder::buildPlainCFG(
   RPO.perform(LI);
 
   for (BasicBlock *BB : RPO) {
-    // Create or retrieve the VPBasicBlock for this BB and create its
-    // VPInstructions.
+    // Create or retrieve the VPBasicBlock for this BB.
     VPBasicBlock *VPBB = getOrCreateVPBB(BB);
     VPRegionBlock *Region = VPBB->getParent();
-    createVPInstructionsForVPBB(VPBB, BB);
     Loop *LoopForBB = LI->getLoopFor(BB);
     // Set VPBB predecessors in the same order as they are in the incoming BB.
     if (!isHeaderBB(BB, LoopForBB)) {
@@ -410,6 +408,9 @@ void PlainCFGBuilder::buildPlainCFG(
         setRegionPredsFromBB(Region, BB);
     }
 
+    // Create VPInstructions for BB.
+    createVPInstructionsForVPBB(VPBB, BB);
+
     if (TheLoop->getLoopLatch() == BB) {
       VPBB->setOneSuccessor(VectorLatchVPBB);
       VectorLatchVPBB->clearPredecessors();