[VPlan] Use InstSimplifyFolder in IRBuilder

Author: artagnon

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -488,8 +488,9 @@ class InnerLoopVectorizer {
       : OrigLoop(OrigLoop), PSE(PSE), LI(LI), DT(DT), TLI(TLI), TTI(TTI),
         AC(AC), ORE(ORE), VF(VecWidth),
         MinProfitableTripCount(MinProfitableTripCount), UF(UnrollFactor),
-        Builder(PSE.getSE()->getContext()), Cost(CM), BFI(BFI), PSI(PSI),
-        RTChecks(RTChecks), Plan(Plan),
+        Folder(PSE.getSE()->getDataLayout()),
+        Builder(PSE.getSE()->getContext(), Folder), Cost(CM), BFI(BFI),
+        PSI(PSI), RTChecks(RTChecks), Plan(Plan),
         VectorPHVPB(Plan.getEntry()->getSingleSuccessor()) {}
 
   virtual ~InnerLoopVectorizer() = default;
@@ -597,8 +598,11 @@ class InnerLoopVectorizer {
   /// many different vector instructions.
   unsigned UF;
 
-  /// The builder that we use
-  IRBuilder<> Builder;
+  /// The folder that we use for the builder.
+  InstSimplifyFolder Folder;
+
+  /// The builder that we use.
+  IRBuilder<InstSimplifyFolder> Builder;
 
   // --- Vectorization state ---
 

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -775,29 +775,37 @@ class VPRecipeWithIRFlags : public VPSingleDefRecipe {
   void applyFlags(Instruction &I) const {
     switch (OpType) {
     case OperationType::OverflowingBinOp:
-      I.setHasNoUnsignedWrap(WrapFlags.HasNUW);
-      I.setHasNoSignedWrap(WrapFlags.HasNSW);
+      if (isa<OverflowingBinaryOperator>(I) || isa<TruncInst>(I)) {
+        I.setHasNoUnsignedWrap(WrapFlags.HasNUW);
+        I.setHasNoSignedWrap(WrapFlags.HasNSW);
+      }
       break;
     case OperationType::DisjointOp:
-      cast<PossiblyDisjointInst>(&I)->setIsDisjoint(DisjointFlags.IsDisjoint);
+      if (auto *Disjoint = dyn_cast<PossiblyDisjointInst>(&I))
+        Disjoint->setIsDisjoint(DisjointFlags.IsDisjoint);
       break;
     case OperationType::PossiblyExactOp:
-      I.setIsExact(ExactFlags.IsExact);
+      if (isa<PossiblyExactOperator>(I))
+        I.setIsExact(ExactFlags.IsExact);
       break;
     case OperationType::GEPOp:
-      cast<GetElementPtrInst>(&I)->setNoWrapFlags(GEPFlags);
+      if (auto *GEP = dyn_cast<GetElementPtrInst>(&I))
+        GEP->setNoWrapFlags(GEPFlags);
       break;
     case OperationType::FPMathOp:
-      I.setHasAllowReassoc(FMFs.AllowReassoc);
-      I.setHasNoNaNs(FMFs.NoNaNs);
-      I.setHasNoInfs(FMFs.NoInfs);
-      I.setHasNoSignedZeros(FMFs.NoSignedZeros);
-      I.setHasAllowReciprocal(FMFs.AllowReciprocal);
-      I.setHasAllowContract(FMFs.AllowContract);
-      I.setHasApproxFunc(FMFs.ApproxFunc);
+      if (isa<FPMathOperator>(I)) {
+        I.setHasAllowReassoc(FMFs.AllowReassoc);
+        I.setHasNoNaNs(FMFs.NoNaNs);
+        I.setHasNoInfs(FMFs.NoInfs);
+        I.setHasNoSignedZeros(FMFs.NoSignedZeros);
+        I.setHasAllowReciprocal(FMFs.AllowReciprocal);
+        I.setHasAllowContract(FMFs.AllowContract);
+        I.setHasApproxFunc(FMFs.ApproxFunc);
+      }
       break;
     case OperationType::NonNegOp:
-      I.setNonNeg(NonNegFlags.NonNeg);
+      if (isa<PossiblyNonNegInst>(I))
+        I.setNonNeg(NonNegFlags.NonNeg);
       break;
     case OperationType::Cmp:
     case OperationType::Other: