[Polly] Remove ScopPass infrastructure

Author: Meinersbur

polly/docs/ReleaseNotes.rst

@@ -17,3 +17,4 @@ In Polly |version| the following important changes have been incorporated.
 
  * Polly's support for the legacy pass manager has been removed.
 
+ * The infrastructure around ScopPasses has been removed.

polly/include/polly/CodeGen/CodeGeneration.h

@@ -10,12 +10,16 @@
 #define POLLY_CODEGENERATION_H
 
 #include "polly/CodeGen/IRBuilder.h"
-#include "polly/ScopPass.h"
-#include "llvm/IR/PassManager.h"
+
+namespace llvm {
+class RegionInfo;
+}
 
 namespace polly {
 class IslAstInfo;
 
+using llvm::BasicBlock;
+
 enum VectorizerChoice {
   VECTORIZER_NONE,
   VECTORIZER_STRIPMINE,
@@ -28,11 +32,6 @@ extern VectorizerChoice PollyVectorizerChoice;
 /// UnreachableInst.
 void markBlockUnreachable(BasicBlock &Block, PollyIRBuilder &Builder);
 
-struct CodeGenerationPass final : PassInfoMixin<CodeGenerationPass> {
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &SAM,
-                        ScopStandardAnalysisResults &AR, SPMUpdater &U);
-};
-
 extern bool PerfMonitoring;
 
 bool runCodeGeneration(Scop &S, llvm::RegionInfo &RI, IslAstInfo &AI);

polly/include/polly/CodeGen/IslAst.h

@@ -22,12 +22,11 @@
 #define POLLY_ISLAST_H
 
 #include "polly/DependenceInfo.h"
-#include "polly/ScopPass.h"
 #include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/IR/PassManager.h"
 #include "isl/ctx.h"
 
 namespace polly {
+using llvm::raw_ostream;
 using llvm::SmallPtrSet;
 
 class Dependences;
@@ -164,24 +163,6 @@ class IslAstInfo {
   ///}
 };
 
-struct IslAstAnalysis : AnalysisInfoMixin<IslAstAnalysis> {
-  static AnalysisKey Key;
-
-  using Result = IslAstInfo;
-
-  IslAstInfo run(Scop &S, ScopAnalysisManager &SAM,
-                 ScopStandardAnalysisResults &SAR);
-};
-
-struct IslAstPrinterPass final : PassInfoMixin<IslAstPrinterPass> {
-  IslAstPrinterPass(raw_ostream &OS) : OS(OS) {}
-
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &SAM,
-                        ScopStandardAnalysisResults &, SPMUpdater &U);
-
-  raw_ostream &OS;
-};
-
 std::unique_ptr<IslAstInfo> runIslAstGen(Scop &S,
                                          DependenceAnalysis::Result &DA);
 } // namespace polly

polly/include/polly/CodePreparation.h

@@ -13,19 +13,16 @@
 #ifndef POLLY_CODEPREPARATION_H
 #define POLLY_CODEPREPARATION_H
 
-#include "llvm/IR/PassManager.h"
-
 namespace llvm {
 class DominatorTree;
+class Function;
 class LoopInfo;
 class RegionInfo;
 } // namespace llvm
 
 namespace polly {
-struct CodePreparationPass final : llvm::PassInfoMixin<CodePreparationPass> {
-  llvm::PreservedAnalyses run(llvm::Function &F,
-                              llvm::FunctionAnalysisManager &FAM);
-};
+bool runCodePreparation(llvm::Function &F, llvm::DominatorTree *DT,
+                        llvm::LoopInfo *LI, llvm::RegionInfo *RI);
 } // namespace polly
 
 #endif /* POLLY_CODEPREPARATION_H */

polly/include/polly/DeLICM.h

@@ -17,31 +17,14 @@
 #ifndef POLLY_DELICM_H
 #define POLLY_DELICM_H
 
-#include "polly/ScopPass.h"
 #include "isl/isl-noexceptions.h"
 
 namespace llvm {
 class raw_ostream;
 } // namespace llvm
 
 namespace polly {
-
-struct DeLICMPass final : llvm::PassInfoMixin<DeLICMPass> {
-  DeLICMPass() {}
-
-  llvm::PreservedAnalyses run(Scop &S, ScopAnalysisManager &SAM,
-                              ScopStandardAnalysisResults &SAR, SPMUpdater &U);
-};
-
-struct DeLICMPrinterPass final : llvm::PassInfoMixin<DeLICMPrinterPass> {
-  DeLICMPrinterPass(raw_ostream &OS) : OS(OS) {}
-
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &,
-                        ScopStandardAnalysisResults &SAR, SPMUpdater &);
-
-private:
-  llvm::raw_ostream &OS;
-};
+class Scop;
 
 /// Determine whether two lifetimes are conflicting.
 ///

polly/include/polly/DeadCodeElimination.h

@@ -14,17 +14,9 @@
 #define POLLY_DEADCODEELIMINATION_H
 
 #include "polly/DependenceInfo.h"
-#include "polly/ScopPass.h"
 
 namespace polly {
 
-struct DeadCodeElimPass final : llvm::PassInfoMixin<DeadCodeElimPass> {
-  DeadCodeElimPass() {}
-
-  llvm::PreservedAnalyses run(Scop &S, ScopAnalysisManager &SAM,
-                              ScopStandardAnalysisResults &SAR, SPMUpdater &U);
-};
-
 bool runDeadCodeElim(Scop &S, DependenceAnalysis::Result &DA);
 } // namespace polly
 

polly/include/polly/DependenceInfo.h

@@ -22,11 +22,20 @@
 #ifndef POLLY_DEPENDENCE_INFO_H
 #define POLLY_DEPENDENCE_INFO_H
 
-#include "polly/ScopPass.h"
+#include "llvm/ADT/DenseMap.h"
 #include "isl/ctx.h"
 #include "isl/isl-noexceptions.h"
 
+namespace llvm {
+class raw_ostream;
+}
+
 namespace polly {
+class MemoryAccess;
+class Scop;
+class ScopStmt;
+
+using llvm::DenseMap;
 
 /// The accumulated dependence information for a SCoP.
 ///
@@ -193,8 +202,7 @@ class Dependences final {
 
 extern Dependences::AnalysisLevel OptAnalysisLevel;
 
-struct DependenceAnalysis final : public AnalysisInfoMixin<DependenceAnalysis> {
-  static AnalysisKey Key;
+struct DependenceAnalysis final {
   struct Result {
     Scop &S;
     std::unique_ptr<Dependences> D[Dependences::NumAnalysisLevels];
@@ -219,18 +227,6 @@ struct DependenceAnalysis final : public AnalysisInfoMixin<DependenceAnalysis> {
     /// dependencies.
     void abandonDependences();
   };
-  Result run(Scop &S, ScopAnalysisManager &SAM,
-             ScopStandardAnalysisResults &SAR);
-};
-
-struct DependenceInfoPrinterPass final
-    : PassInfoMixin<DependenceInfoPrinterPass> {
-  DependenceInfoPrinterPass(raw_ostream &OS) : OS(OS) {}
-
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &,
-                        ScopStandardAnalysisResults &, SPMUpdater &);
-
-  raw_ostream &OS;
 };
 
 DependenceAnalysis::Result runDependenceAnalysis(Scop &S);

polly/include/polly/ForwardOpTree.h

@@ -13,27 +13,8 @@
 #ifndef POLLY_FORWARDOPTREE_H
 #define POLLY_FORWARDOPTREE_H
 
-#include "polly/ScopPass.h"
-
 namespace polly {
-
-struct ForwardOpTreePass final : llvm::PassInfoMixin<ForwardOpTreePass> {
-  ForwardOpTreePass() {}
-
-  llvm::PreservedAnalyses run(Scop &S, ScopAnalysisManager &SAM,
-                              ScopStandardAnalysisResults &SAR, SPMUpdater &U);
-};
-
-struct ForwardOpTreePrinterPass final
-    : llvm::PassInfoMixin<ForwardOpTreePrinterPass> {
-  ForwardOpTreePrinterPass(raw_ostream &OS) : OS(OS) {}
-
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &,
-                        ScopStandardAnalysisResults &SAR, SPMUpdater &);
-
-private:
-  llvm::raw_ostream &OS;
-};
+class Scop;
 
 /// Pass that redirects scalar reads to array elements that are known to contain
 /// the same value.

polly/include/polly/JSONExporter.h

@@ -10,26 +10,15 @@
 #define POLLY_JSONEXPORTER_H
 
 #include "polly/DependenceInfo.h"
-#include "polly/ScopPass.h"
-#include "llvm/IR/PassManager.h"
 
 namespace polly {
 
-/// This pass exports a scop to a jscop file. The filename is generated from the
-/// concatenation of the function and scop name.
-struct JSONExportPass final : llvm::PassInfoMixin<JSONExportPass> {
-  llvm::PreservedAnalyses run(Scop &, ScopAnalysisManager &,
-                              ScopStandardAnalysisResults &, SPMUpdater &);
-};
-
 /// This pass imports a scop from a jscop file. The filename is deduced from the
 /// concatenation of the function and scop name.
-struct JSONImportPass final : llvm::PassInfoMixin<JSONExportPass> {
-  llvm::PreservedAnalyses run(Scop &, ScopAnalysisManager &,
-                              ScopStandardAnalysisResults &, SPMUpdater &);
-};
-
 void runImportJSON(Scop &S, DependenceAnalysis::Result &DA);
+
+/// This pass exports a scop to a jscop file. The filename is generated from the
+/// concatenation of the function and scop name.
 void runExportJSON(Scop &S);
 } // namespace polly
 

polly/include/polly/MaximalStaticExpansion.h

@@ -15,29 +15,9 @@
 #define POLLY_MAXIMALSTATICEXPANSION_H
 
 #include "polly/DependenceInfo.h"
-#include "polly/ScopPass.h"
-#include "llvm/IR/PassManager.h"
 
 namespace polly {
 
-class MaximalStaticExpansionPass
-    : public llvm::PassInfoMixin<MaximalStaticExpansionPass> {
-public:
-  llvm::PreservedAnalyses run(Scop &, ScopAnalysisManager &,
-                              ScopStandardAnalysisResults &, SPMUpdater &);
-};
-
-struct MaximalStaticExpansionPrinterPass
-    : llvm::PassInfoMixin<MaximalStaticExpansionPrinterPass> {
-  MaximalStaticExpansionPrinterPass(raw_ostream &OS) : OS(OS) {}
-
-  PreservedAnalyses run(Scop &S, ScopAnalysisManager &,
-                        ScopStandardAnalysisResults &SAR, SPMUpdater &);
-
-private:
-  llvm::raw_ostream &OS;
-};
-
 void runMaximalStaticExpansion(Scop &S, DependenceAnalysis::Result &DI);
 } // namespace polly