Merge pull request #1744 from trentxintong/FSO

Implement a function signature cloner and rewriter.

Author: trentxintong

include/swift/SIL/Projection.h

@@ -772,6 +772,8 @@ class ProjectionTreeNode {
   NullablePtr<SILInstruction> createProjection(SILBuilder &B, SILLocation Loc,
                                                SILValue Arg) const;
 
+  std::string getNameEncoding(const ProjectionTree &PT) const;
+
   SILInstruction *
   createAggregate(SILBuilder &B, SILLocation Loc,
                   ArrayRef<SILValue> Args) const;
@@ -846,6 +848,9 @@ class ProjectionTree {
   /// All debug instructions (debug_value, debug_value_addr) are ignored.
   void computeUsesAndLiveness(SILValue Base);
 
+  /// Return a name encoding of the projection tree.
+  std::string getNameEncoding() const; 
+
   /// Initialize an empty projection tree with an existing, computed projection
   /// tree.
   void initializeWithExistingTree(const ProjectionTree &PT);

include/swift/SILOptimizer/Analysis/FunctionSignatureAnalysis.h

@@ -174,6 +174,12 @@ struct ResultDescriptor {
 };
 
 class FunctionSignatureInfo {
+  /// Have the signature be computed for this function.
+  bool SignatureComputed;
+
+  /// Should we optimize the signature for this function.
+  bool SignatureOptimize;
+
   /// Function currently analyzing.
   SILFunction *F;
 
@@ -204,9 +210,10 @@ class FunctionSignatureInfo {
 
 
 public:
-  FunctionSignatureInfo(SILFunction *F, llvm::BumpPtrAllocator &BPA, AliasAnalysis *AA,
-                        RCIdentityFunctionInfo *RCFI) :
-  F(F), Allocator(BPA), AA(AA), RCFI(RCFI), MayBindDynamicSelf(computeMayBindDynamicSelf(F)) {}
+  FunctionSignatureInfo(SILFunction *F, llvm::BumpPtrAllocator &BPA,
+                        AliasAnalysis *AA, RCIdentityFunctionInfo *RCFI) :
+  SignatureComputed(false), SignatureOptimize(false), F(F), Allocator(BPA),
+  AA(AA), RCFI(RCFI), MayBindDynamicSelf(computeMayBindDynamicSelf(F)) {}
 
   bool analyze();
   bool analyzeParameters();

include/swift/SILOptimizer/PassManager/Passes.def

@@ -104,6 +104,10 @@ PASS(FunctionOrderPrinter, "function-order-printer",
      "Print function orderings for test purposes")
 PASS(FunctionSignatureOpts, "function-signature-opts",
      "Optimize Function Signatures")
+PASS(FunctionSignatureOptCloner, "function-signature-opt-cloner",
+     "Create function with optimized signatures")
+PASS(FunctionSignatureOptRewriter, "function-signature-opt-rewriter",
+     "Optimize Function Signatures by rewriting callsites")
 PASS(ARCSequenceOpts, "arc-sequence-opts",
      "Optimize sequences of retain/release opts by removing redundant inner "
      "retain/release sequences")

include/swift/SILOptimizer/Utils/FunctionSignatureOptUtils.h

@@ -0,0 +1,45 @@
+//===--- FunctionSignatureOptUtils.h ----------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_SIL_FUNCTIONSIGOPTUTILS_H
+#define SWIFT_SIL_FUNCTIONSIGOPTUTILS_H
+
+#include "swift/SIL/SILFunction.h"
+#include "swift/SIL/SILInstruction.h"
+#include "swift/SIL/SILDebugScope.h"
+#include "swift/SILOptimizer/Analysis/FunctionSignatureAnalysis.h"
+
+namespace swift {
+
+bool canSpecializeFunction(SILFunction *F);
+
+void 
+addReleasesForConvertedOwnedParameter(SILBuilder &Builder,
+                                      SILLocation Loc,
+                                      OperandValueArrayRef Parameters,
+                                      ArrayRef<ArgumentDescriptor> &ArgDescs);
+
+void
+addReleasesForConvertedOwnedParameter(SILBuilder &Builder,
+                                      SILLocation Loc,
+                                      ArrayRef<SILArgument*> Parameters,
+                                      ArrayRef<ArgumentDescriptor> &ArgDescs);
+void
+addRetainsForConvertedDirectResults(SILBuilder &Builder,
+                                    SILLocation Loc,
+                                    SILValue ReturnValue,
+                                    SILInstruction *AI,
+                                    ArrayRef<ResultDescriptor> DirectResults);
+
+} // end namespace swift
+
+#endif

lib/SIL/Projection.cpp

@@ -875,6 +875,19 @@ createProjection(SILBuilder &B, SILLocation Loc, SILValue Arg) const {
   return Proj->createProjection(B, Loc, Arg);
 }
 
+std::string
+ProjectionTreeNode::getNameEncoding(const ProjectionTree &PT) const {
+  std::string Encoding;
+  const ProjectionTreeNode *Node = this;
+  while(Node) {
+    if (Node->isRoot())
+      break;
+    Encoding += std::to_string(Node->Proj->getIndex());
+    Node = Node->getParent(PT);
+  }
+  return Encoding;
+}
+
 void
 ProjectionTreeNode::
 processUsersOfValue(ProjectionTree &Tree,
@@ -1182,6 +1195,15 @@ ProjectionTree::initializeWithExistingTree(const ProjectionTree &PT) {
   }
 }
 
+std::string ProjectionTree::getNameEncoding() const {
+  std::string Encoding;
+  for (unsigned index : LiveLeafIndices) {
+    const ProjectionTreeNode *Node = ProjectionTreeNodes[index];
+    Encoding += Node->getNameEncoding(*this);
+  }
+  return Encoding;
+}
+
 SILValue
 ProjectionTree::computeExplodedArgumentValueInner(SILBuilder &Builder,
                                                   SILLocation Loc,

lib/SILOptimizer/Analysis/FunctionSignatureAnalysis.cpp

@@ -130,7 +130,7 @@ bool FunctionSignatureInfo::analyzeParameters() {
       RCFI, F, ConsumedArgToEpilogueReleaseMatcher::ExitKind::Throw);
 
   // Did we decide we should optimize any parameter?
-  bool ShouldOptimize = false;
+  bool SignatureOptimize = false;
 
   // Analyze the argument information.
   for (unsigned i = 0, e = Args.size(); i != e; ++i) {
@@ -183,7 +183,7 @@ bool FunctionSignatureInfo::analyzeParameters() {
     }
 
     if (HaveOptimizedArg) {
-      ShouldOptimize = true;
+      SignatureOptimize = true;
       // Store that we have modified the self argument. We need to change the
       // calling convention later.
       if (Args[i]->isSelf())
@@ -194,7 +194,7 @@ bool FunctionSignatureInfo::analyzeParameters() {
     ArgDescList.push_back(std::move(A));
   }
 
-  return ShouldOptimize;
+  return SignatureOptimize;
 }
 
 bool FunctionSignatureInfo::analyzeResult() {
@@ -203,7 +203,7 @@ bool FunctionSignatureInfo::analyzeResult() {
     return false;
 
   // Did we decide we should optimize any parameter?
-  bool ShouldOptimize = false;
+  bool SignatureOptimize = false;
 
   // Analyze return result information.
   auto DirectResults = F->getLoweredFunctionType()->getDirectResults();
@@ -221,19 +221,26 @@ bool FunctionSignatureInfo::analyzeResult() {
     // going to be used in the return block/normal block of the try_apply instruction.
     if (!Retains.empty()) {
       RI.CalleeRetain = Retains;
-      ShouldOptimize = true;
+      SignatureOptimize = true;
     }
   }
-  return ShouldOptimize;
+  return SignatureOptimize;
 }
 
 /// This function goes through the arguments of F and sees if we have anything
 /// to optimize in which case it returns true. If we have nothing to optimize,
 /// it returns false.
 bool FunctionSignatureInfo::analyze() {
+  if (SignatureComputed)
+    return SignatureOptimize;
+
+  // Compute the signature optimization.
   bool OptimizedParams = analyzeParameters();
   bool OptimizedResult = analyzeResult();
-  return OptimizedParams || OptimizedResult;
+
+  SignatureComputed = true;
+  SignatureOptimize = OptimizedParams || OptimizedResult;
+  return SignatureOptimize;
 }
 
 //===----------------------------------------------------------------------===//
@@ -245,6 +252,8 @@ std::string FunctionSignatureInfo::getOptimizedName() const {
   auto P = SpecializationPass::FunctionSignatureOpts;
   FunctionSignatureSpecializationMangler FSSM(P, M, F);
 
+  std::string ArgEnc;
+
   // Handle arguments' changes.
   for (unsigned i : indices(ArgDescList)) {
     const ArgumentDescriptor &Arg = ArgDescList[i];
@@ -262,6 +271,9 @@ std::string FunctionSignatureInfo::getOptimizedName() const {
     // mangling.
     if (Arg.Explode && !Arg.IsEntirelyDead) {
       FSSM.setArgumentSROA(i);
+      // Generate a string of encoding for the argument projection tree.
+      // TODO: we can put this into the mangler itself.
+      ArgEnc += "_arg" + std::to_string(i) + "_" + Arg.ProjTree.getNameEncoding();
     }
   }
 
@@ -273,7 +285,7 @@ std::string FunctionSignatureInfo::getOptimizedName() const {
 
   FSSM.mangle();
 
-  return M.finalize();
+  return M.finalize() + ArgEnc;
 }
 
 

lib/SILOptimizer/PassManager/Passes.cpp

@@ -197,6 +197,7 @@ void AddSSAPasses(SILPassManager &PM, OptimizationLevelKind OpLevel) {
   // current function (after optimizing any new callees).
   PM.addDevirtualizer();
   PM.addGenericSpecializer();
+
   switch (OpLevel) {
     case OptimizationLevelKind::HighLevel:
       // Does not inline functions with defined semantics.
@@ -245,6 +246,7 @@ void AddSSAPasses(SILPassManager &PM, OptimizationLevelKind OpLevel) {
     PM.addLateCodeMotion();
   else
     PM.addEarlyCodeMotion();
+
   PM.addARCSequenceOpts();
   PM.addRemovePins();
 }
@@ -327,8 +329,6 @@ void swift::runSILOptimizationPasses(SILModule &Module) {
   // We do this late since it is a pass like the inline caches that we only want
   // to run once very late. Make sure to run at least one round of the ARC
   // optimizer after this.
-  PM.addFunctionSignatureOpts();
-
   PM.runOneIteration();
   PM.resetAndRemoveTransformations();
 
@@ -338,11 +338,20 @@ void swift::runSILOptimizationPasses(SILModule &Module) {
 
   PM.setStageName("LowLevel");
 
+  // Rewrite to get the benefit of release devirtualizer.
+  // Also, Make sure the run the rewriter to create the optimized functions before
+  // the cloner on the current function is run !.
+  PM.addFunctionSignatureOptRewriter();
+
   // Should be after FunctionSignatureOpts and before the last inliner.
   PM.addReleaseDevirtualizer();
 
   AddSSAPasses(PM, OptimizationLevelKind::LowLevel);
   PM.addDeadStoreElimination();
+
+  // We've done a lot of optimizations on this function, attempt to FSO.
+  PM.addFunctionSignatureOptCloner();
+
   PM.runOneIteration();
   PM.resetAndRemoveTransformations();
 

lib/SILOptimizer/Transforms/CMakeLists.txt

@@ -8,6 +8,8 @@ set(TRANSFORMS_SOURCES
   Transforms/DeadObjectElimination.cpp
   Transforms/DeadStoreElimination.cpp
   Transforms/Devirtualizer.cpp
+  Transforms/FunctionSignatureOptCloner.cpp
+  Transforms/FunctionSignatureOptRewriter.cpp
   Transforms/GenericSpecializer.cpp
   Transforms/MergeCondFail.cpp
   Transforms/RedundantLoadElimination.cpp