fix the comments

Author: LiqinWeng

llvm/lib/IR/VectorBuilder.cpp

@@ -60,7 +60,8 @@ Value *VectorBuilder::createVectorInstruction(unsigned Opcode, Type *ReturnTy,
   return createVectorInstructionImpl(VPID, ReturnTy, InstOpArray, Name);
 }
 
-Value *VectorBuilder::createSimpleReduction(Intrinsic::ID RdxID, Type *ValTy,
+Value *VectorBuilder::createSimpleReduction(Intrinsic::ID RdxID,
+                                            Type *ValTy,
                                             ArrayRef<Value *> InstOpArray,
                                             const Twine &Name) {
   auto VPID = VPIntrinsic::getForIntrinsic(RdxID);

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -1034,18 +1034,23 @@ InstructionCost VPWidenIntrinsicRecipe::computeCost(ElementCount VF,
   // TODO: Rework TTI interface to be independent of concrete IR values.
   SmallVector<const Value *> Arguments;
 
+  // VP Intrinsics should have the same cost as their non-vp counterpart.
   Intrinsic::ID FID = VectorIntrinsicID;
   unsigned NumOperands = getNumOperands();
+  const_operand_range arg_operands =
+      make_range(op_begin(), op_begin() + getNumOperands());
   if (VPIntrinsic::isVPIntrinsic(VectorIntrinsicID)) {
     std::optional<Intrinsic::ID> ID =
         VPIntrinsic::getFunctionalIntrinsicIDForVP(VectorIntrinsicID);
     if (ID) {
       FID = ID.value();
       NumOperands = getNumOperands() - 1;
+      // Remove the EVL
+      arg_operands = make_range(op_begin(), op_begin() + getNumOperands() - 1);
     }
   }
 
-  for (const auto &[Idx, Op] : enumerate(operands())) {
+  for (const auto &[Idx, Op] : enumerate(arg_operands)) {
     auto *V = Op->getUnderlyingValue();
     if (!V) {
       if (auto *UI = dyn_cast_or_null<CallBase>(getUnderlyingValue())) {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -1489,13 +1489,13 @@ static void transformRecipestoEVLRecipes(VPlan &Plan, VPValue &EVL) {
                     auto *CI = cast<CallInst>(CInst->getUnderlyingInstr());
                     SmallVector<VPValue *> Ops(CInst->operands());
                     Ops.push_back(&EVL);
+
                     Intrinsic::ID VPID = VPIntrinsic::getForIntrinsic(
                         CI->getCalledFunction()->getIntrinsicID());
                     if (VPID == Intrinsic::not_intrinsic)
                       return nullptr;
                     return new VPWidenIntrinsicRecipe(
-                        VPID, Ops, TypeInfo.inferScalarType(CInst), false,
-                        false, false);
+                        *CI, VPID, Ops, CI->getType(), CI->getDebugLoc());
                   })
               .Case<VPWidenSelectRecipe>([&](VPWidenSelectRecipe *Sel) {
                 SmallVector<VPValue *> Ops(Sel->operands());