Swift Optimizer: rename the ComputeEffects pass to ComputeEscapeEffects

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt

@@ -8,7 +8,7 @@
 
 swift_compiler_sources(Optimizer
   AssumeSingleThreaded.swift
-  ComputeEffects.swift
+  ComputeEscapeEffects.swift
   ObjCBridgingOptimization.swift
   MergeCondFails.swift
   ReleaseDevirtualizer.swift

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ComputeEffects.swift renamed to SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ComputeEscapeEffects.swift

@@ -1,4 +1,4 @@
-//===--- ComputeEffects.swift - Compute function effects ------------------===//
+//===--- ComputeEscapeEffects.swift ----------------------------------------==//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -25,7 +25,7 @@ import SIL
 /// ```
 /// The pass does not try to change or re-compute _defined_ effects.
 ///
-let computeEffects = FunctionPass(name: "compute-effects", {
+let computeEscapeEffects = FunctionPass(name: "compute-escape-effects", {
   (function: Function, context: PassContext) in
 
   var newEffects = Stack<EscapeEffects.ArgumentEffect>(context)

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -51,7 +51,7 @@ private func registerSwiftPasses() {
 
   // Function passes
   registerPass(mergeCondFailsPass, { mergeCondFailsPass.run($0) })
-  registerPass(computeEffects, { computeEffects.run($0) })
+  registerPass(computeEscapeEffects, { computeEscapeEffects.run($0) })
   registerPass(objCBridgingOptimization, { objCBridgingOptimization.run($0) })
   registerPass(stackPromotion, { stackPromotion.run($0) })
   registerPass(functionStackProtection, { functionStackProtection.run($0) })

include/swift/SILOptimizer/PassManager/Passes.def

@@ -243,8 +243,8 @@ SWIFT_FUNCTION_PASS(AddressEscapeInfoDumper, "dump-addr-escape-info",
      "Dumps address escape information")
 SWIFT_FUNCTION_PASS(AccessDumper, "dump-access",
      "Dump access information")
-SWIFT_FUNCTION_PASS(ComputeEffects, "compute-effects",
-     "Computes function effects")
+SWIFT_FUNCTION_PASS(ComputeEscapeEffects, "compute-escape-effects",
+     "Computes function escape effects")
 PASS(FlowIsolation, "flow-isolation",
      "Enforces flow-sensitive actor isolation rules")
 PASS(FunctionOrderPrinter, "function-order-printer",

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -638,7 +638,7 @@ static void addHighLevelFunctionPipeline(SILPassPipelinePlan &P) {
   addHighLevelLoopOptPasses(P);
 
   P.addStringOptimization();
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
 }
 
 // After "high-level" function passes have processed the entire call tree, run
@@ -653,7 +653,7 @@ static void addHighLevelModulePipeline(SILPassPipelinePlan &P) {
   // Do the first stack promotion on high-level SIL before serialization.
   //
   // FIXME: why does StackPromotion need to run in the module pipeline?
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
   P.addStackPromotion();
 
   P.addGlobalOpt();
@@ -694,7 +694,7 @@ static void addClosureSpecializePassPipeline(SILPassPipelinePlan &P) {
 
   // ComputeEffects should be done at the end of a function-pipeline. The next
   // pass (GlobalOpt) is a module pass, so this is the end of a function-pipeline.
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
 
   // Hoist globals out of loops.
   // Global-init functions should not be inlined GlobalOpt is done.
@@ -725,7 +725,7 @@ static void addClosureSpecializePassPipeline(SILPassPipelinePlan &P) {
   // passes can expose more inlining opportunities.
   addSimplifyCFGSILCombinePasses(P);
 
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
 
   // 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
@@ -746,7 +746,7 @@ static void addLowLevelPassPipeline(SILPassPipelinePlan &P) {
 
   // We've done a lot of optimizations on this function, attempt to FSO.
   P.addFunctionSignatureOpts();
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
 }
 
 static void addLateLoopOptPassPipeline(SILPassPipelinePlan &P) {
@@ -775,7 +775,7 @@ static void addLateLoopOptPassPipeline(SILPassPipelinePlan &P) {
 
   // Sometimes stack promotion can catch cases only at this late stage of the
   // pipeline, after FunctionSignatureOpts.
-  P.addComputeEffects();
+  P.addComputeEscapeEffects();
   P.addStackPromotion();
 
   // Optimize overflow checks.

test/SILOptimizer/function_effects.sil renamed to test/SILOptimizer/escape_effects.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt %s -compute-effects | %FileCheck %s
+// RUN: %target-sil-opt %s -compute-escape-effects | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 

test/SILOptimizer/function_effects_objc.sil renamed to test/SILOptimizer/escape_effects_objc.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt %s -compute-effects | %FileCheck %s
+// RUN: %target-sil-opt %s -compute-escape-effects | %FileCheck %s
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: objc_interop

test/SILOptimizer/stack_promotion.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -compute-effects -stack-promotion -enable-sil-verify-all %s | %FileCheck %s
+// RUN: %target-sil-opt -compute-escape-effects -stack-promotion -enable-sil-verify-all %s | %FileCheck %s
 
 // REQUIRES: swift_in_compiler