Pass Pipeline: replace the old GlobalOpt with the new InitializeStaticGlobals and ReadOnlyGlobalVariablesPass passes.

eeckstein · eeckstein · commit 1e6511e7c02f · 2023-05-08T21:23:36.000+02:00
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -231,7 +231,9 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
     P.addDiagnoseLifetimeIssues();
   }
 
-  P.addGlobalOpt();
+  P.addOnoneSimplification();
+  P.addInitializeStaticGlobals();
+
   P.addPerformanceDiagnostics();
   
   // Canonical swift requires all non cond_br critical edges to be split.
@@ -627,10 +629,6 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   // is linked in from the stdlib.
   P.addTempRValueOpt();
 
-  // Needed to serialize static initializers of globals for cross-module
-  // optimization.
-  P.addGlobalOpt();
-
   // Add the outliner pass (Osize).
   P.addOutliner();
 }
@@ -674,7 +672,6 @@ static void addHighLevelModulePipeline(SILPassPipelinePlan &P) {
   P.addComputeSideEffects();
   P.addStackPromotion();
 
-  P.addGlobalOpt();
   P.addLetPropertiesOpt();
 }
 
@@ -699,25 +696,26 @@ static void addMidLevelFunctionPipeline(SILPassPipelinePlan &P) {
 static void addClosureSpecializePassPipeline(SILPassPipelinePlan &P) {
   P.startPipeline("ClosureSpecialize");
   P.addDeadFunctionAndGlobalElimination();
+  P.addReadOnlyGlobalVariablesPass();
   P.addTargetConstantFolding();
   P.addDeadStoreElimination();
   P.addDeadObjectElimination();
 
-  // These few passes are needed to cleanup between loop unrolling and GlobalOpt.
+  // These few passes are needed to cleanup between loop unrolling and InitializeStaticGlobals.
   // This is needed to fully optimize static small String constants.
   P.addSimplifyCFG();
   P.addSILCombine();
   P.addPerformanceConstantPropagation();
   P.addSimplifyCFG();
-  
+  P.addSimplification();
+
+  P.addInitializeStaticGlobals();
+
   // 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.
+  // pass (LetPropertiesOpt) is a module pass, so this is the end of a function-pipeline.
   P.addComputeEscapeEffects();
   P.addComputeSideEffects();
 
-  // Hoist globals out of loops.
-  // Global-init functions should not be inlined GlobalOpt is done.
-  P.addGlobalOpt();
   P.addLetPropertiesOpt();
 
   // Propagate constants into closures and convert to static dispatch.  This
@@ -984,7 +982,6 @@ SILPassPipelinePlan::getOnonePassPipeline(const SILOptions &Options) {
   // in the editor.
   P.startPipeline("Non-Diagnostic Mandatory Optimizations");
   P.addForEachLoopUnroll();
-  P.addOnoneSimplification();
 
   // TODO: MandatoryARCOpts should be subsumed by CopyPropagation. There should
   // be no need to run another analysis of copies at -Onone.
diff --git a/test/IRGen/globals.swift b/test/IRGen/globals.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend -primary-file %s -emit-ir | %FileCheck %s
 
-// REQUIRES: CPU=x86_64
+// REQUIRES: swift_in_compiler
+// REQUIRES: PTRSIZE=64
 
 var g0 : Int = 1
 var g1 : (Void, Int, Void)
diff --git a/test/SILGen/fragile_globals.swift b/test/SILGen/fragile_globals.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -emit-module -parse-as-library -o %t %S/Inputs/ModuleA.swift
 // RUN: %target-swift-frontend -emit-module -parse-as-library -o %t %S/Inputs/ModuleB.swift
-// RUN: %target-swift-emit-sil -parse-as-library -I%t %s -Xllvm -sil-disable-pass=GlobalOpt -O | %FileCheck %s
+// RUN: %target-swift-emit-sil -parse-as-library -I%t %s -Xllvm -sil-disable-pass=initialize-static-globals -O | %FileCheck %s
 
 import ModuleA
 import ModuleB
diff --git a/test/SILGen/global_resilience.swift b/test/SILGen/global_resilience.swift
@@ -3,6 +3,8 @@
 // RUN: %target-swift-emit-silgen -I %t -enable-library-evolution -parse-as-library %s | %FileCheck %s
 // RUN: %target-swift-emit-sil -I %t -O -enable-library-evolution -parse-as-library %s | %FileCheck --check-prefix=CHECK-OPT %s
 
+// REQUIRES: swift_in_compiler
+
 import resilient_global
 
 public struct MyEmptyStruct {}
diff --git a/test/SILOptimizer/cross-module-optimization.swift b/test/SILOptimizer/cross-module-optimization.swift
@@ -18,6 +18,7 @@
 // RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT
 
 // REQUIRES: executable_test
+// REQUIRES: swift_in_compiler
 
 // Second test: check if CMO really imports the SIL of functions in other modules.
 
diff --git a/test/SILOptimizer/dead_function_elimination.swift b/test/SILOptimizer/dead_function_elimination.swift
@@ -198,7 +198,6 @@ public func keepPtrAlive() {
 // CHECK-TESTING: sil {{.*}}publicClassMethod
 // CHECK-TESTING: sil {{.*}}DeadWitness
 
-// CHECK-LABEL: sil_global {{.*}}@$s25dead_function_elimination5GFStrV12aliveFuncPtryycvpZ
 // CHECK-LABEL: @$s25dead_function_elimination14donotEliminateyyF
 // CHECK-LABEL: sil @$s25dead_function_elimination12keepPtrAliveyyF
 
diff --git a/test/SILOptimizer/default-cmo.swift b/test/SILOptimizer/default-cmo.swift
@@ -7,19 +7,24 @@
 
 // RUN: %target-build-swift -O -wmo -module-name=Main -I%t -I%S/Inputs/cross-module %s -emit-sil | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 
 import Module
 import ModuleTBD
 
-// CHECK-LABEL: sil_global public_external [serialized] @$s6Module0A6StructV21publicFunctionPointeryS2icvpZ : $@callee_guaranteed (Int) -> Int = {
-// CHECK:        %0 = function_ref @$s6Module16incrementByThreeyS2iF
-
-// CHECK-LABEL: sil_global public_external @$s6Module0A6StructV22privateFunctionPointeryS2icvpZ : $@callee_guaranteed (Int) -> Int{{$}}
+// CHECK-LABEL: sil_global public_external [let] @$s6Module0A6StructV22privateFunctionPointeryS2icvpZ : $@callee_guaranteed (Int) -> Int{{$}}
 
 public func callPublicFunctionPointer(_ x: Int) -> Int {
   return Module.ModuleStruct.publicFunctionPointer(x)
 }
 
+// CHECK-LABEL: sil @$s4Main25callPublicFunctionPointeryS2iF :
+// CHECK-NOT:     global_addr
+// CHECK-NOT:     apply
+// CHECK:         builtin "sadd
+// CHECK-NOT:     global_addr
+// CHECK-NOT:     apply
+// CHECK:       } // end sil function '$s4Main25callPublicFunctionPointeryS2iF'
 public func callPrivateFunctionPointer(_ x: Int) -> Int {
   return Module.ModuleStruct.privateFunctionPointer(x)
 }
diff --git a/test/SILOptimizer/global-c-functionptr.swift b/test/SILOptimizer/global-c-functionptr.swift
@@ -12,6 +12,7 @@
 // RUN: %target-build-swift -O -module-name=Test %s -emit-sil | %FileCheck %s -check-prefix=CHECK-SIL
 
 // REQUIRES: executable_test
+// REQUIRES: swift_in_compiler
 
 
 internal func cFn(_ i: Int) -> Int {
diff --git a/test/SILOptimizer/global_init_with_empty.swift b/test/SILOptimizer/global_init_with_empty.swift
@@ -6,6 +6,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT
 // REQUIRES: executable_test,optimized_stdlib
+// REQUIRES: swift_in_compiler
 
 struct Empty { }
 
diff --git a/test/SILOptimizer/globalopt_global_propagation.swift b/test/SILOptimizer/globalopt_global_propagation.swift
@@ -1,8 +1,8 @@
-// RUN: %target-swift-frontend -O -emit-sil %s | %FileCheck %s
-// RUN: %target-swift-frontend -O -wmo -emit-sil %s | %FileCheck -check-prefix=CHECK-WMO %s
 // RUN: %target-swift-frontend -parse-as-library -O -emit-sil %s | %FileCheck %s
 // RUN: %target-swift-frontend -parse-as-library -O -wmo -emit-sil %s | %FileCheck -check-prefix=CHECK-WMO %s
 
+// REQUIRES: swift_in_compiler
+
 // Check that values of internal and private global variables, which are provably assigned only 
 // once, are propagated into their uses and enable further optimizations like constant
 // propagation, simplifications, etc.
diff --git a/test/SILOptimizer/globalopt_let_propagation.swift b/test/SILOptimizer/globalopt_let_propagation.swift
@@ -1,6 +1,7 @@
-// RUN: %target-swift-frontend -O -emit-sil -primary-file %s | %FileCheck %s
 // RUN: %target-swift-frontend -parse-as-library -O -emit-sil -primary-file %s | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-LIB %s
 
+// REQUIRES: swift_in_compiler
+
 // Check that values of static let and global let variables are propagated into their uses
 // and enable further optimizations like constant propagation, simplifications, etc.
 
diff --git a/test/SILOptimizer/globalopt_resilience.swift b/test/SILOptimizer/globalopt_resilience.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend  -O -module-name=test -enable-library-evolution -emit-sil -primary-file %s | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
+
 // Check if GlobalOpt generates the optimal getter for a static property with a resilient type.
 // The (resilient) getter should just return the literal (and not lazily initialize a global variable).
 
diff --git a/test/SILOptimizer/globalopt_resilience_testing.swift b/test/SILOptimizer/globalopt_resilience_testing.swift
@@ -1,6 +1,8 @@
 // RUN: %target-swift-frontend -emit-sil -O -enable-library-evolution -primary-file %s | %FileCheck %s
 // RUN: %target-swift-frontend -emit-sil -O -enable-library-evolution -enable-testing -primary-file %s | %FileCheck %s --check-prefix=CHECK-TESTING
 
+// REQUIRES: swift_in_compiler
+
 // If a global variable with a resilient type has public linkage, we have to
 // allocate a buffer for it even if the type has a fixed size in its
 // defining module.
diff --git a/test/SILOptimizer/optimizer_counters.sil b/test/SILOptimizer/optimizer_counters.sil
@@ -19,9 +19,8 @@ sil @fatalError : $@convention(thin) () -> Never
 
 // Check that module level statistics are produced.
 //
-// CHECK-SIL-STATS-MODULES: module, inst, HighLevel,Function+EarlyLoopOpt, PerformanceConstantPropagation, {{.*}}, 14, 11
-// CHECK-SIL-STATS-MODULES: module, block, HighLevel,Function+EarlyLoopOpt, SimplifyCFG, {{.*}}, 5, 3
-// CHECK-SIL-STATS-MODULES: module, inst, HighLevel,Function+EarlyLoopOpt, SimplifyCFG, {{.*}}, 11, 6
+// CHECK-SIL-STATS-MODULES: module, block, PrepareOptimizationPasses, Simplification, {{.*}}, 6, 3
+// CHECK-SIL-STATS-MODULES: module, inst, PrepareOptimizationPasses, Simplification, {{.*}}, 15, 6
 
 // Check that module level statistics are produced.
 //
diff --git a/test/SILOptimizer/performance-annotations.swift b/test/SILOptimizer/performance-annotations.swift
@@ -1,5 +1,6 @@
 // RUN: %target-swift-frontend -experimental-performance-annotations -emit-sil %s -o /dev/null -verify
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
+// REQUIRES: swift_in_compiler
 
 protocol P {
   func protoMethod(_ a: Int) -> Int
diff --git a/test/SILOptimizer/remove_unused_global_vars.swift b/test/SILOptimizer/remove_unused_global_vars.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -primary-file %s -O -module-name=test -emit-sil | %FileCheck %s
+// RUN: %target-swift-frontend -parse-as-library -primary-file %s -O -module-name=test -emit-sil | %FileCheck %s
 
 import SwiftShims
 
@@ -16,8 +16,8 @@ struct Foo {
 private let unused1 = 0
 // CHECK-NOT: sil_global private {{.*}}unused2{{.*}}
 private var unused2 = 42
-// CHECK: sil_global private [let] @${{.*}}used1{{.*}} : $Int
-private let used1 = 0
+// CHECK: sil_global private @${{.*}}used1{{.*}} : $Int
+private var used1 = 0
 // CHECK: sil_global private @${{.*}}used2{{.*}} : $Int
 private var used2 = 0
 
@@ -48,8 +48,6 @@ var unused6 = 0
 
 // CHECK-LABEL: sil [Onone] @${{.*}}test{{.*}}
 @_optimize(none) public func test(x: Int) -> Int {
-  // CHECK: %{{[0-9]+}} = global_addr @${{.*}}used2{{.*}}
-  // CHECK: %{{[0-9]+}} = global_addr @${{.*}}used1{{.*}}
   return used1 + used2 + x
 }
 
diff --git a/test/SILOptimizer/target-const-prop.swift b/test/SILOptimizer/target-const-prop.swift
@@ -6,6 +6,7 @@
 // RUN: %target-run %t/a.out | %FileCheck %s -check-prefix=CHECK-OUTPUT
 
 // REQUIRES: executable_test,swift_stdlib_no_asserts,optimized_stdlib
+// REQUIRES: swift_in_compiler
 
 
 struct S {
diff --git a/test/SILOptimizer/zeroInitializer.swift b/test/SILOptimizer/zeroInitializer.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -O -parse-stdlib -emit-ir -module-name ZeroInit -verify %s | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
+
 import Swift
 
 @frozen
diff --git a/test/sil-passpipeline-dump/basic.test-sh b/test/sil-passpipeline-dump/basic.test-sh
@@ -7,8 +7,7 @@
 
 // CHECK: ---
 // CHECK: name:            Non-Diagnostic Mandatory Optimizations
-// CHECK: passes:          [ "for-each-loop-unroll", "onone-simplification", "mandatory-arc-opts",
-// CHECK:                     "onone-prespecializer" ]
+// CHECK: passes:          [ "for-each-loop-unroll", "mandatory-arc-opts", "onone-prespecializer" ]
 // CHECK: ---
 // CHECK: name:            Serialization
 // CHECK: passes:          [ "serialize-sil", "sil-moved-async-var-dbginfo-propagator",
