!fixup, Update inferScalarType and not clear the VF of plan.

Author: ElvisWang123

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -9469,13 +9469,17 @@ LoopVectorizationPlanner::tryToBuildVPlanWithVPRecipes(VFRange &Range) {
                              CostCtx, Range);
   }
 
-  // Update VF after convertToAbstractRecipes. Cannot set the VF here since
+  // Update VF after `convertToAbstractRecipes`. Cannot set the VF here since
   // `handleUncountableEarlyExit` will check the VF of the plan, need to set
   // before it and update.
   // TODO: Use a better method that only set the VF for plan once.
-  Plan->clearVF();
-  for (ElementCount VF : Range)
-    Plan->addVF(VF);
+  SmallVector<ElementCount, 2> VFToRemove;
+  for (ElementCount VF : Plan->vectorFactors())
+    if (!Range.contains(VF))
+      VFToRemove.push_back(VF);
+
+  for (ElementCount VF : VFToRemove)
+    Plan->removeVF(VF);
 
   // Interleave memory: for each Interleave Group we marked earlier as relevant
   // for this VPlan, replace the Recipes widening its memory instructions with a

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -3797,7 +3797,7 @@ class VPlan {
     VFs.insert(VF);
   }
 
-  void clearVF() { VFs.clear(); }
+  void removeVF(ElementCount VF) { VFs.remove(VF); }
 
   bool hasVF(ElementCount VF) const { return VFs.count(VF); }
   bool hasScalableVF() const {

llvm/lib/Transforms/Vectorize/VPlanAnalysis.cpp

@@ -273,6 +273,14 @@ Type *VPTypeAnalysis::inferScalarType(const VPValue *V) {
               [](const VPWidenCastRecipe *R) { return R->getResultType(); })
           .Case<VPScalarCastRecipe>(
               [](const VPScalarCastRecipe *R) { return R->getResultType(); })
+          .Case<VPExtendedReductionRecipe>(
+              [](const VPExtendedReductionRecipe *R) {
+                return R->getResultType();
+              })
+          .Case<VPMulAccumulateReductionRecipe>(
+              [](const VPMulAccumulateReductionRecipe *R) {
+                return R->getResultType();
+              })
           .Case<VPExpandSCEVRecipe>([](const VPExpandSCEVRecipe *R) {
             return R->getSCEV()->getType();
           })

llvm/lib/Transforms/Vectorize/VPlanHelpers.h

@@ -78,6 +78,11 @@ struct VFRange {
     return End.getKnownMinValue() <= Start.getKnownMinValue();
   }
 
+  bool contains(const ElementCount &VF) const {
+    return VF.getKnownMinValue() >= Start.getKnownMinValue() &&
+           VF.getKnownMinValue() < End.getKnownMinValue();
+  }
+
   VFRange(const ElementCount &Start, const ElementCount &End)
       : Start(Start), End(End) {
     assert(Start.isScalable() == End.isScalable() &&