[llvm] [VPlan] Add VPlan-based addMinIterCheck, replace ILV for non-epilogue. (PR #153643)

[Florian Hahn via llvm-commits]

================
@@ -7327,6 +7257,17 @@ DenseMap<const SCEV *, Value *> LoopVectorizationPlanner::executePlan(
       BestVPlan.resetTripCount(Exp);
     ExpSCEV->eraseFromParent();
   }
+  // SCEV expansion will add new instructions in the IRBB wrapped by Entry.
+  // Remove existing VPIRInstructions/VPIRPhi and re-create them to make sure
+  // all IR instructions are wrapped. Otherwise VPInstructions may be inserted
+  // at the wrong place.
+  for (VPRecipeBase &R : make_early_inc_range(*Entry)) {
+    if (!isa<VPIRInstruction, VPIRPhi>(&R))
+      continue;
+    R.eraseFromParent();
+  }
+  for (Instruction &I : drop_begin(reverse(*Entry->getIRBasicBlock())))
+    VPIRInstruction::create(I)->insertBefore(*Entry, Entry->begin());
 
----------------
fhahn wrote:

> When vectorizing main loop with the epilog to be vectorized later, is EpilogueVectorizerMainLoop used instead of base ILV?

Yes, it uses `EpilogueVectorizerMainLoop`, as it still needs to take care to set up the epilogue trip count checks and populate epilogue vectorization info.

https://github.com/llvm/llvm-project/pull/153643