Merge pull request #28363 from gottesmm/pr-d097386463f35a7609fbf264df06cb5904d9746f

[silopt] Wire up the SerializeSIL pass pipeline so we always serialize at -O even if we don't run all or a subset of the passes.

Author: gottesmm

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -97,7 +97,7 @@ class SILPassManager {
 
   /// If true, passes are also run for functions which have
   /// OptimizationMode::NoOptimization.
-  bool isMandatoryPipeline = false;
+  bool isMandatory = false;
 
   /// The IRGen SIL passes. These have to be dynamically added by IRGen.
   llvm::DenseMap<unsigned, SILTransform *> IRGenPasses;
@@ -114,16 +114,15 @@ class SILPassManager {
   /// C'tor. It creates and registers all analysis passes, which are defined
   /// in Analysis.def.
   ///
-  /// If \p isMandatoryPipeline is true, passes are also run for functions
+  /// If \p isMandatory is true, passes are also run for functions
   /// which have OptimizationMode::NoOptimization.
   SILPassManager(SILModule *M, llvm::StringRef Stage = "",
-                 bool isMandatoryPipeline = false);
+                 bool isMandatory = false);
 
   /// C'tor. It creates an IRGen pass manager. Passes can query for the
   /// IRGenModule.
   SILPassManager(SILModule *M, irgen::IRGenModule *IRMod,
-                 llvm::StringRef Stage = "",
-                 bool isMandatoryPipeline = false);
+                 llvm::StringRef Stage = "", bool isMandatory = false);
 
   const SILOptions &getOptions() const;
 

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -273,8 +273,8 @@ class PassManagerDeserializationNotificationHandler final
 } // end anonymous namespace
 
 SILPassManager::SILPassManager(SILModule *M, llvm::StringRef Stage,
-                               bool isMandatoryPipeline)
-    : Mod(M), StageName(Stage), isMandatoryPipeline(isMandatoryPipeline),
+                               bool isMandatory)
+    : Mod(M), StageName(Stage), isMandatory(isMandatory),
       deserializationNotificationHandler(nullptr) {
 #define ANALYSIS(NAME) \
   Analyses.push_back(create##NAME##Analysis(Mod));
@@ -292,13 +292,13 @@ SILPassManager::SILPassManager(SILModule *M, llvm::StringRef Stage,
 }
 
 SILPassManager::SILPassManager(SILModule *M, irgen::IRGenModule *IRMod,
-                               llvm::StringRef Stage, bool isMandatoryPipeline)
-    : SILPassManager(M, Stage, isMandatoryPipeline) {
+                               llvm::StringRef Stage, bool isMandatory)
+    : SILPassManager(M, Stage, isMandatory) {
   this->IRMod = IRMod;
 }
 
 bool SILPassManager::continueTransforming() {
-  if (isMandatoryPipeline)
+  if (isMandatory)
     return true;
   return NumPassesRun < SILNumOptPassesToRun;
 }
@@ -467,7 +467,7 @@ runFunctionPasses(unsigned FromTransIdx, unsigned ToTransIdx) {
 
     // Only include functions that are definitions, and which have not
     // been intentionally excluded from optimization.
-    if (F.isDefinition() && (isMandatoryPipeline || F.shouldOptimize()))
+    if (F.isDefinition() && (isMandatory || F.shouldOptimize()))
       FunctionWorklist.push_back(*I);
   }
 
@@ -675,8 +675,8 @@ void SILPassManager::notifyOfNewFunction(SILFunction *F, SILTransform *T) {
 
 void SILPassManager::addFunctionToWorklist(SILFunction *F,
                                            SILFunction *DerivedFrom) {
-  assert(F && F->isDefinition() && (isMandatoryPipeline || F->shouldOptimize())
-         && "Expected optimizable function definition!");
+  assert(F && F->isDefinition() && (isMandatory || F->shouldOptimize()) &&
+         "Expected optimizable function definition!");
 
   constexpr int MaxDeriveLevels = 10;
 

lib/SILOptimizer/PassManager/Passes.cpp

@@ -96,12 +96,27 @@ void swift::runSILOptimizationPasses(SILModule &Module) {
   if (Module.getOptions().VerifyAll)
     Module.verify();
 
-  if (Module.getOptions().DisableSILPerfOptimizations)
+  if (Module.getOptions().DisableSILPerfOptimizations) {
+    // If we are not supposed to run SIL perf optzns, we may still need to
+    // serialize. So serialize now.
+    SILPassManager PM(&Module, "" /*stage*/, true /*isMandatory*/);
+    PM.executePassPipelinePlan(
+        SILPassPipelinePlan::getSerializeSILPassPipeline(Module.getOptions()));
     return;
+  }
 
-  SILPassManager PM(&Module);
-  PM.executePassPipelinePlan(
-      SILPassPipelinePlan::getPerformancePassPipeline(Module.getOptions()));
+  {
+    SILPassManager PM(&Module);
+    PM.executePassPipelinePlan(
+        SILPassPipelinePlan::getPerformancePassPipeline(Module.getOptions()));
+  }
+
+  // Check if we actually serialized our module. If we did not, serialize now.
+  if (!Module.isSerialized()) {
+    SILPassManager PM(&Module, "" /*stage*/, true /*isMandatory*/);
+    PM.executePassPipelinePlan(
+        SILPassPipelinePlan::getSerializeSILPassPipeline(Module.getOptions()));
+  }
 
   // If we were asked to debug serialization, exit now.
   if (Module.getOptions().DebugSerialization)