Address review comments

Author: david-arm

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -7553,7 +7553,7 @@ VectorizationFactor LoopVectorizationPlanner::computeBestVF() {
                         CM.CostKind);
   precomputeCosts(BestPlan, BestFactor.Width, CostCtx);
   assert((BestFactor.Width == LegacyVF.Width ||
-          Legal->hasUncountableEarlyExit() ||
+          BestPlan.hasRegionWithEarlyExit() ||
           planContainsAdditionalSimplifications(getPlanFor(BestFactor.Width),
                                                 CostCtx, OrigLoop) ||
           planContainsAdditionalSimplifications(getPlanFor(LegacyVF.Width),

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -3623,6 +3623,15 @@ class VPlan {
   /// of VPBlockShallowTraversalWrapper.
   auto getExitBlocks();
 
+  /// Returns true if the plan has a region containing an early exit, i.e. the
+  /// loop exits due to a condition other than testing the canonical induction
+  /// variable against the trip count.
+  bool hasRegionWithEarlyExit() {
+    auto *VectorRegion = getVectorLoopRegion();
+    return VectorRegion &&
+           VectorRegion->getSingleSuccessor() != getMiddleBlock();
+  }
+
   /// Returns true if \p VPBB is an exit block.
   bool isExitBlock(VPBlockBase *VPBB);
 

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -715,9 +715,9 @@ InstructionCost VPInstruction::computeCost(ElementCount VF,
                                            VPCostContext &Ctx) const {
   switch (getOpcode()) {
   case VPInstruction::AnyOf: {
-    auto *VecI1Ty = VectorType::get(Type::getInt1Ty(Ctx.LLVMCtx), VF);
-    return Ctx.TTI.getArithmeticReductionCost(Instruction::Or, VecI1Ty,
-                                              std::nullopt, Ctx.CostKind);
+    auto *VecTy = toVectorTy(Ctx.Types.inferScalarType(this), VF);
+    return Ctx.TTI.getArithmeticReductionCost(
+        Instruction::Or, cast<VectorType>(VecTy), std::nullopt, Ctx.CostKind);
   }
   default:
     // TODO: Fill out other opcodes!