Merge pull request #31270 from eeckstein/pass-manager-reorg

SILOptimizer: reorganize the optimization-prepare passpipeline

Author: eeckstein

include/swift/SILOptimizer/PassManager/PassPipeline.def

@@ -24,7 +24,6 @@
 
 PASSPIPELINE(Diagnostic, "Guaranteed Passes")
 PASSPIPELINE(OwnershipEliminator, "Utility pass to just run the ownership eliminator pass")
-PASSPIPELINE(SILOptPrepare, "Passes that prepare SIL for -O")
 PASSPIPELINE(Performance, "Passes run at -O")
 PASSPIPELINE(Onone, "Passes run at -Onone")
 PASSPIPELINE(InstCount, "Utility pipeline to just run the inst count pass")

include/swift/SILOptimizer/PassManager/Passes.h

@@ -33,9 +33,6 @@ namespace swift {
   /// \returns true if the diagnostic passes produced an error
   bool runSILDiagnosticPasses(SILModule &M);
 
-  /// Prepare SIL for the -O pipeline.
-  void runSILOptPreparePasses(SILModule &Module);
-
   /// Run all the SIL performance optimization passes on \p M.
   void runSILOptimizationPasses(SILModule &M);
 

lib/Frontend/Frontend.cpp

@@ -1062,8 +1062,6 @@ static void performSILOptimizations(CompilerInvocation &Invocation,
     runSILPassesForOnone(*SM);
     return;
   }
-  runSILOptPreparePasses(*SM);
-
   StringRef CustomPipelinePath =
   Invocation.getSILOptions().ExternalPassPipelineFilename;
   if (!CustomPipelinePath.empty()) {

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -396,6 +396,15 @@ static void addPerfDebugSerializationPipeline(SILPassPipelinePlan &P) {
   P.addPerformanceSILLinker();
 }
 
+
+static void addPrepareOptimizationsPipeline(SILPassPipelinePlan &P) {
+  P.startPipeline("PrepareOptimizationPasses");
+
+  P.addForEachLoopUnroll();
+  P.addMandatoryCombine();
+  P.addAccessMarkerElimination();
+}
+
 static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   P.startPipeline("EarlyModulePasses");
 
@@ -625,23 +634,6 @@ SILPassPipelinePlan::getIRGenPreparePassPipeline(const SILOptions &Options) {
   return P;
 }
 
-SILPassPipelinePlan
-SILPassPipelinePlan::getSILOptPreparePassPipeline(const SILOptions &Options) {
-  SILPassPipelinePlan P(Options);
-
-  if (Options.DebugSerialization) {
-    addPerfDebugSerializationPipeline(P);
-    return P;
-  }
-
-  P.startPipeline("SILOpt Prepare Passes");
-  P.addForEachLoopUnroll();
-  P.addMandatoryCombine();
-  P.addAccessMarkerElimination();
-
-  return P;
-}
-
 SILPassPipelinePlan
 SILPassPipelinePlan::getPerformancePassPipeline(const SILOptions &Options) {
   SILPassPipelinePlan P(Options);
@@ -650,6 +642,10 @@ SILPassPipelinePlan::getPerformancePassPipeline(const SILOptions &Options) {
     addPerfDebugSerializationPipeline(P);
     return P;
   }
+  
+  // Passes which run once before all other optimizations run. Those passes are
+  // _not_ intended to run later again.
+  addPrepareOptimizationsPipeline(P);
 
   // Eliminate immediately dead functions and then clone functions from the
   // stdlib.

lib/SILOptimizer/PassManager/Passes.cpp

@@ -84,13 +84,6 @@ bool swift::runSILOwnershipEliminatorPass(SILModule &Module) {
   return Ctx.hadError();
 }
 
-// Prepare SIL for the -O pipeline.
-void swift::runSILOptPreparePasses(SILModule &Module) {
-  auto &opts = Module.getOptions();
-  auto plan = SILPassPipelinePlan::getSILOptPreparePassPipeline(opts);
-  executePassPipelinePlan(&Module, plan);
-}
-
 void swift::runSILOptimizationPasses(SILModule &Module) {
   auto &opts = Module.getOptions();
 

tools/sil-opt/SILOpt.cpp

@@ -480,7 +480,6 @@ int main(int argc, char **argv) {
   if (OptimizationGroup == OptGroup::Diagnostics) {
     runSILDiagnosticPasses(*CI.getSILModule());
   } else if (OptimizationGroup == OptGroup::Performance) {
-    runSILOptPreparePasses(*CI.getSILModule());
     runSILOptimizationPasses(*CI.getSILModule());
   } else if (OptimizationGroup == OptGroup::Lowering) {
     runSILLoweringPasses(*CI.getSILModule());