SILOptimizer: Recognize globalinit once functions using an attribute instead of symbol name matching

Author: jckarter

lib/SIL/IR/SILGlobalVariable.cpp

@@ -272,7 +272,7 @@ SILFunction *swift::findInitializer(SILFunction *AddrF,
   if (!CallToOnce)
     return nullptr;
   SILFunction *callee = getCalleeOfOnceCall(CallToOnce);
-  if (!callee->getName().startswith("globalinit_"))
+  if (!callee->isGlobalInitOnceFunction())
     return nullptr;
   return callee;
 }

lib/SILOptimizer/ARC/ARCLoopOpts.cpp

@@ -47,7 +47,7 @@ class ARCLoopOpts : public SILFunctionTransform {
       return;
 
     // Skip global init functions.
-    if (F->getName().startswith("globalinit_"))
+    if (F->isGlobalInitOnceFunction())
       return;
 
     auto *LA = getAnalysis<SILLoopAnalysis>();

lib/SILOptimizer/ARC/ARCSequenceOpts.cpp

@@ -183,7 +183,7 @@ processFunctionWithoutLoopSupport(SILFunction &F, bool FreezePostDomReleases,
   // globalinit_func. Since that is not *that* interesting from an ARC
   // perspective (i.e. no ref count operations in a loop), disable it on such
   // functions temporarily in order to unblock others. This should be removed.
-  if (F.getName().startswith("globalinit_"))
+  if (F.isGlobalInitOnceFunction())
     return false;
 
   LLVM_DEBUG(llvm::dbgs() << "***** Processing " << F.getName() << " *****\n");
@@ -231,7 +231,7 @@ static bool processFunctionWithLoopSupport(
   // globalinit_func. Since that is not *that* interesting from an ARC
   // perspective (i.e. no ref count operations in a loop), disable it on such
   // functions temporarily in order to unblock others. This should be removed.
-  if (F.getName().startswith("globalinit_"))
+  if (F.isGlobalInitOnceFunction())
     return false;
 
   LLVM_DEBUG(llvm::dbgs() << "***** Processing " << F.getName() << " *****\n");

lib/SILOptimizer/IPO/GlobalOpt.cpp

@@ -260,7 +260,7 @@ void SILGlobalOpt::collectOnceCall(BuiltinInst *BI) {
     UnhandledOnceCallee = true;
     return;
   }
-  if (!Callee->getName().startswith("globalinit_"))
+  if (!Callee->isGlobalInitOnceFunction())
     return;
 
   // We currently disable optimizing the initializer if a globalinit_func

test/SILOptimizer/globalopt_trivial_nontrivial.sil

@@ -38,7 +38,7 @@ sil_global private @globalinit_nontrivialglobal_token : $Builtin.Word
 
 sil_global hidden [let] @$nontrivialglobal : $TClass
 
-sil private @globalinit_trivialglobal_func : $@convention(c) () -> () {
+sil private [global_init_once_fn] @globalinit_trivialglobal_func : $@convention(c) () -> () {
 bb0:
   alloc_global @$trivialglobal 
   %1 = global_addr @$trivialglobal : $*TStruct 
@@ -83,13 +83,13 @@ bb0:
   return %4 : $Int32                              
 }
 
-// CHECK-LABEL: sil private @globalinit_nontrivialglobal_func :
+// CHECK-LABEL: sil private [global_init_once_fn] @globalinit_nontrivialglobal_func :
 // CHECK: alloc_global @$nontrivialglobal 
 // CHECK: [[GLOBL_ADDR:%.*]] = global_addr @$nontrivialglobal : $*TClass 
 // CHECK: [[REF:%.*]] = alloc_ref $TClass                          
 // CHECK: store [[REF]] to [[GLOBL_ADDR]] : $*TClass 
 // CHECK: } // end sil function 'globalinit_nontrivialglobal_func'
-sil private @globalinit_nontrivialglobal_func : $@convention(c) () -> () {
+sil private [global_init_once_fn] @globalinit_nontrivialglobal_func : $@convention(c) () -> () {
 bb0:
   alloc_global @$nontrivialglobal 
   %1 = global_addr @$nontrivialglobal : $*TClass 

test/SILOptimizer/globalopt_trivial_nontrivial_ossa.sil

@@ -32,7 +32,7 @@ sil_global private @globalinit_nontrivialglobal_token : $Builtin.Word
 
 sil_global hidden [let] @$nontrivialglobal : $TClass
 
-sil private [ossa] @globalinit_trivialglobal_func : $@convention(c) () -> () {
+sil private [global_init_once_fn] [ossa] @globalinit_trivialglobal_func : $@convention(c) () -> () {
 bb0:
   alloc_global @$trivialglobal 
   %1 = global_addr @$trivialglobal : $*TStruct 
@@ -75,13 +75,13 @@ bb0:
   return %4 : $Int32                              
 }
 
-// CHECK-LABEL: sil private [ossa] @globalinit_nontrivialglobal_func :
+// CHECK-LABEL: sil private [global_init_once_fn] [ossa] @globalinit_nontrivialglobal_func :
 // CHECK: alloc_global @$nontrivialglobal 
 // CHECK: [[GLOBL_ADDR:%.*]] = global_addr @$nontrivialglobal : $*TClass 
 // CHECK: [[REF:%.*]] = alloc_ref $TClass                          
 // CHECK: store [[REF]] to [init] [[GLOBL_ADDR]] : $*TClass 
 // CHECK: } // end sil function 'globalinit_nontrivialglobal_func'
-sil private [ossa] @globalinit_nontrivialglobal_func : $@convention(c) () -> () {
+sil private [global_init_once_fn] [ossa] @globalinit_nontrivialglobal_func : $@convention(c) () -> () {
 bb0:
   alloc_global @$nontrivialglobal 
   %1 = global_addr @$nontrivialglobal : $*TClass 

test/SILOptimizer/static_initializer.sil

@@ -25,8 +25,8 @@ sil_global private @globalinit_token0 : $Builtin.Word
 // CHECK-NEXT: }
 sil_global @_Tv2ch1xSi : $Outer
 
-// CHECK-LABEL: sil private @globalinit_func0 : $@convention(c) () -> () {
-sil private @globalinit_func0 : $@convention(c) () -> () {
+// CHECK-LABEL: sil private [global_init_once_fn] @globalinit_func0 : $@convention(c) () -> () {
+sil private [global_init_once_fn] @globalinit_func0 : $@convention(c) () -> () {
 bb0:
   %0 = global_addr @_Tv2ch1xSi : $*Outer
   %1 = integer_literal $Builtin.Int32, 2