Merge pull request #4418 from eeckstein/pass-manager

Re-instate: "SILPassManager: After a new function is pushed on the stack don't restart the pipeline on the old function."

Author: eeckstein

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -42,8 +42,21 @@ class SILPassManager {
   /// A list of registered analysis.
   llvm::SmallVector<SILAnalysis *, 16> Analysis;
 
+  /// An entry in the FunctionWorkList.
+  struct WorklistEntry {
+    WorklistEntry(SILFunction *F) : F(F) { }
+
+    SILFunction *F;
+
+    /// The current position in the transform-list.
+    unsigned PipelineIdx = 0;
+
+    /// How many times the pipeline was restarted for the function.
+    unsigned NumRestarts = 0;
+  };
+
   /// The worklist of functions to be processed by function passes.
-  std::vector<SILFunction *> FunctionWorklist;
+  std::vector<WorklistEntry> FunctionWorklist;
 
   // Name of the current optimization stage for diagnostics.
   std::string StageName;
@@ -62,6 +75,13 @@ class SILPassManager {
   /// A completed-passes mask for each function.
   llvm::DenseMap<SILFunction *, CompletedPasses> CompletedPassesMap;
 
+  /// Stores for each function the number of levels of specializations it is
+  /// derived from an original function. E.g. if a function is a signature
+  /// optimized specialization of a generic specialiation, it has level 2.
+  /// This is used to avoid an infinite amount of functions pushed on the
+  /// worklist (e.g. caused by a bug in a specializing optimization).
+  llvm::DenseMap<SILFunction *, int> DerivationLevels;
+
   /// Set to true when a pass invalidates an analysis.
   bool CurrentPassHasInvalidated = false;
 
@@ -96,13 +116,6 @@ class SILPassManager {
   /// \brief Run one iteration of the optimization pipeline.
   void runOneIteration();
 
-  /// \brief Add a function to the function pass worklist.
-  void addFunctionToWorklist(SILFunction *F) {
-    assert(F && F->isDefinition() && F->shouldOptimize() &&
-           "Expected optimizable function definition!");
-    FunctionWorklist.push_back(F);
-  }
-
   /// \brief Restart the function pass pipeline on the same function
   /// that is currently being processed.
   void restartWithCurrentFunction(SILTransform *T);
@@ -124,11 +137,12 @@ class SILPassManager {
     CompletedPassesMap.clear();
   }
 
-  /// \brief Add the function to the function pass worklist.
-  void notifyTransformationOfFunction(SILFunction *F) {
-    addFunctionToWorklist(F);
-  }
-
+  /// \brief Add the function \p F to the function pass worklist.
+  /// If not null, the function \p DerivedFrom is the function from which \p F
+  /// is derived. This is used to avoid an infinite amount of functions pushed
+  /// on the worklist (e.g. caused by a bug in a specializing optimization).
+  void addFunctionToWorklist(SILFunction *F, SILFunction *DerivedFrom);
+  
   /// \brief Iterate over all analysis and notify them of the function.
   /// This function does not necessarily have to be newly created function. It
   /// is the job of the analysis to make sure no extra work is done if the
@@ -211,9 +225,8 @@ class SILPassManager {
   /// the module.
   void runModulePass(SILModuleTransform *SMT);
 
-  /// Run the passes in \p FuncTransforms on the function \p F.
-  void runPassesOnFunction(PassList FuncTransforms, SILFunction *F,
-                           bool runToCompletion);
+  /// Run the pass \p SFT on the function \p F.
+  void runPassOnFunction(SILFunctionTransform *SFT, SILFunction *F);
 
   /// Run the passes in \p FuncTransforms. Return true
   /// if the pass manager requested to stop the execution

include/swift/SILOptimizer/PassManager/Transforms.h

@@ -96,10 +96,16 @@ namespace swift {
 
     void injectFunction(SILFunction *Func) { F = Func; }
 
-    /// \brief Notify the pass manager of a function that needs to be
+    /// \brief Notify the pass manager of a function \p F that needs to be
     /// processed by the function passes and the analyses.
-    void notifyPassManagerOfFunction(SILFunction *F) {
-      PM->notifyTransformationOfFunction(F);
+    ///
+    /// If not null, the function \p DerivedFrom is the function from which \p F
+    /// is derived. This is used to limit the number of new functions which are
+    /// derived from a common base function, e.g. due to specialization.
+    /// The number should be small anyway, but bugs in optimizations could cause
+    /// an infinite loop in the passmanager.
+    void notifyPassManagerOfFunction(SILFunction *F, SILFunction *DerivedFrom) {
+      PM->addFunctionToWorklist(F, DerivedFrom);
       PM->notifyAnalysisOfFunction(F);
     }
 

include/swift/SILOptimizer/Utils/FunctionSignatureOptUtils.h

@@ -104,6 +104,12 @@ struct ArgumentDescriptor {
     if (!canOptimizeLiveArg())
       return false;
 
+    // See if the projection tree consists of potentially multiple levels of
+    // structs containing one field. In such a case, there is no point in
+    // exploding the argument.
+    if (ProjTree.isSingleton())
+      return false;
+
     // If this argument is @owned and we can not find all the releases for it
     // try to explode it, maybe we can find some of the releases and O2G some
     // of its components.
@@ -114,12 +120,6 @@ struct ArgumentDescriptor {
         ERM.hasSomeReleasesForArgument(Arg))
       return true;
 
-    // See if the projection tree consists of potentially multiple levels of
-    // structs containing one field. In such a case, there is no point in
-    // exploding the argument.
-    if (ProjTree.isSingleton())
-      return false;
-
     size_t explosionSize = ProjTree.liveLeafCount();
     return explosionSize >= 1 && explosionSize <= 3;
   }

lib/SILOptimizer/IPO/CapturePropagation.cpp

@@ -312,7 +312,7 @@ bool CapturePropagation::optimizePartialApply(PartialApplyInst *PAI) {
   SILFunction *NewF = specializeConstClosure(PAI, SubstF);
   rewritePartialApply(PAI, NewF);
 
-  notifyPassManagerOfFunction(NewF);
+  notifyPassManagerOfFunction(NewF, SubstF);
   return true;
 }
 

lib/SILOptimizer/IPO/ClosureSpecializer.cpp

@@ -843,7 +843,7 @@ bool ClosureSpecializer::specialize(SILFunction *Caller,
       // directly.
       if (!NewF) {
         NewF = ClosureSpecCloner::cloneFunction(CSDesc, NewFName);
-        SFT->notifyPassManagerOfFunction(NewF);
+        SFT->notifyPassManagerOfFunction(NewF, CSDesc.getApplyCallee());
       }
 
       // Rewrite the call