Post-rebase clean-up

Author: SamTebbs33

llvm/include/llvm/Analysis/LoopAccessAnalysis.h

@@ -16,8 +16,6 @@
 
 #include "llvm/ADT/EquivalenceClasses.h"
 #include "llvm/Analysis/ScalarEvolution.h"
-#include "llvm/Analysis/LoopAnalysisManager.h"
-#include "llvm/Analysis/ScalarEvolutionExpressions.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include <optional>
 #include <variant>

llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h

@@ -26,7 +26,6 @@
 
 #include "VPlan.h"
 #include "llvm/ADT/SmallSet.h"
-#include "llvm/Analysis/LoopAccessAnalysis.h"
 #include "llvm/Support/InstructionCost.h"
 
 namespace llvm {
@@ -369,7 +368,8 @@ class LoopVectorizationPlanner {
   /// and the vector loop should be entered even if the pointers alias across a
   /// loop iteration.
   void plan(ElementCount UserVF, unsigned UserIC,
-       std::optional<ArrayRef<PointerDiffInfo>> DiffChecks, bool &HasAliasMask);
+            std::optional<ArrayRef<PointerDiffInfo>> DiffChecks,
+            bool &HasAliasMask);
 
   /// Use the VPlan-native path to plan how to best vectorize, return the best
   /// VF and its cost.

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -7002,7 +7002,8 @@ LoopVectorizationPlanner::planInVPlanNativePath(ElementCount UserVF) {
   return VectorizationFactor::Disabled();
 }
 
-void LoopVectorizationPlanner::plan(ElementCount UserVF, unsigned UserIC,
+void LoopVectorizationPlanner::plan(
+    ElementCount UserVF, unsigned UserIC,
     std::optional<ArrayRef<PointerDiffInfo>> RTChecks, bool &HasAliasMask) {
   assert(OrigLoop->isInnermost() && "Inner loop expected.");
   CM.collectValuesToIgnore();
@@ -7012,8 +7013,6 @@ void LoopVectorizationPlanner::plan(ElementCount UserVF, unsigned UserIC,
   if (!MaxFactors) // Cases that should not to be vectorized nor interleaved.
     return;
 
-  // VPlan needs the aliasing pointers as Values and not SCEVs, so expand them
-  // here and put them into a list.
   ArrayRef<PointerDiffInfo> DiffChecks;
   if (RTChecks.has_value() && useActiveLaneMask(CM.getTailFoldingStyle(true)))
     DiffChecks = *RTChecks;
@@ -10000,11 +9999,13 @@ bool LoopVectorizePass::processLoop(Loop *L) {
 
   bool AddBranchWeights =
       hasBranchWeightMD(*L->getLoopLatch()->getTerminator());
-  GeneratedRTChecks Checks(*PSE.getSE(), DT, LI, TTI,
-                           F->getDataLayout(), AddBranchWeights);
+  GeneratedRTChecks Checks(*PSE.getSE(), DT, LI, TTI, F->getDataLayout(),
+                           AddBranchWeights);
 
   // Plan how to best vectorize.
-  LVP.plan(UserVF, UserIC, LVL.getLAI()->getRuntimePointerChecking()->getDiffChecks(), Checks.HasAliasMask);
+  LVP.plan(UserVF, UserIC,
+           LVL.getLAI()->getRuntimePointerChecking()->getDiffChecks(),
+           Checks.HasAliasMask);
   VectorizationFactor VF = LVP.computeBestVF();
   if (Checks.HasAliasMask)
     LoopsAliasMasked++;

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -43,7 +43,6 @@
 #include "llvm/IR/FMF.h"
 #include "llvm/IR/Operator.h"
 #include "llvm/Support/InstructionCost.h"
-#include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
@@ -3882,20 +3881,6 @@ inline bool isUniformAfterVectorization(const VPValue *VPV) {
 bool isHeaderMask(const VPValue *V, VPlan &Plan);
 } // end namespace vputils
 
-/// A pair of pointers that could overlap across a loop iteration.
-struct PointerDiffInfoValues {
-  /// The pointer being read from
-  Value *Src;
-  /// The pointer being stored to
-  Value *Sink;
-
-  PointerDiffInfoValues(const SCEV *SrcStart, const SCEV *SinkStart,
-                        SCEVExpander Exp, Instruction *Loc)
-      : Src(Exp.expandCodeFor(SrcStart, SrcStart->getType(), Loc)),
-        Sink(Exp.expandCodeFor(SinkStart, SinkStart->getType(), Loc)) {}
-  PointerDiffInfoValues(Value *Src, Value *Sink) : Src(Src), Sink(Sink) {}
-};
-
 } // end namespace llvm
 
 #endif // LLVM_TRANSFORMS_VECTORIZE_VPLAN_H

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -18,11 +18,9 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/IVDescriptors.h"
 #include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/Casting.h"