[VPlan] Fix nits

Author: artagnon

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -7563,10 +7563,10 @@ createWidenInductionRecipes(PHINode *Phi, Instruction *PhiOrTrunc,
   assert(SE.isLoopInvariant(IndDesc.getStep(), &OrigLoop) &&
          "step must be loop invariant");
 
-  // It is always safe to copy over the NoWrap flags. In particular, when
-  // folding tail by masking, the masked-off lanes are never executed, so it is
-  // safe.
-  VPIRFlags Flags = vputils::getNoWrapFlagsFromIndDesc(IndDesc);
+  // It is always safe to copy over the NoWrap and FastMath flags. In
+  // particular, when folding tail by masking, the masked-off lanes are never
+  // executed, so it is safe.
+  VPIRFlags Flags = vputils::getFlagsFromIndDesc(IndDesc);
   VPValue *Step =
       vputils::getOrCreateVPValueForSCEVExpr(Plan, IndDesc.getStep());
   if (auto *TruncI = dyn_cast<TruncInst>(PhiOrTrunc)) {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -80,10 +80,10 @@ bool VPlanTransforms::tryToConvertVPInstructionsToVPRecipes(
           VPValue *Start = Plan.getOrAddLiveIn(II->getStartValue());
           VPValue *Step =
               vputils::getOrCreateVPValueForSCEVExpr(Plan, II->getStep());
-          // It is always safe to copy over the NoWrap flags. In particular,
-          // when folding tail by masking, the masked-off lanes are never
-          // executed, so it is safe.
-          VPIRFlags Flags = vputils::getNoWrapFlagsFromIndDesc(*II);
+          // It is always safe to copy over the NoWrap and FastMath flags. In
+          // particular, when folding tail by masking, the masked-off lanes are
+          // never executed, so it is safe.
+          VPIRFlags Flags = vputils::getFlagsFromIndDesc(*II);
           NewRecipe = new VPWidenIntOrFpInductionRecipe(
               Phi, Start, Step, &Plan.getVF(), *II, Flags,
               Ingredient.getDebugLoc());

llvm/lib/Transforms/Vectorize/VPlanUtils.h

@@ -71,8 +71,9 @@ getRecipesForUncountableExit(VPlan &Plan,
                              SmallVectorImpl<VPRecipeBase *> &Recipes,
                              SmallVectorImpl<VPRecipeBase *> &GEPs);
 
-/// Extracts and returns nowrap flags from the induction binop in \p ID.
-inline VPIRFlags getNoWrapFlagsFromIndDesc(const InductionDescriptor &ID) {
+/// Extracts and returns NoWrap and FastMath flags from the induction binop in
+/// \p ID.
+inline VPIRFlags getFlagsFromIndDesc(const InductionDescriptor &ID) {
   if (ID.getKind() == InductionDescriptor::IK_FpInduction)
     return ID.getInductionBinOp()->getFastMathFlags();