Merge pull request #39776 from meg-gupta/moveb4mem2reg

Move non-transparent OME to just before Mem2Reg

Author: meg-gupta

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -362,6 +362,16 @@ void addFunctionPasses(SILPassPipelinePlan &P,
     P.addSROA();
   }
 
+  if (!P.getOptions().EnableOSSAModules && !SILDisableLateOMEByDefault) {
+    if (P.getOptions().StopOptimizationBeforeLoweringOwnership)
+      return;
+
+    if (SILPrintFinalOSSAModule) {
+      addModulePrinterPipeline(P, "SIL Print Final OSSA Module");
+    }
+    P.addNonTransparentFunctionOwnershipModelEliminator();
+  }
+
   // Promote stack allocations to values.
   P.addMem2Reg();
 
@@ -571,16 +581,6 @@ static void addPerfEarlyModulePassPipeline(SILPassPipelinePlan &P) {
   // optimization.
   P.addGlobalOpt();
 
-  if (!P.getOptions().EnableOSSAModules && !SILDisableLateOMEByDefault) {
-    if (P.getOptions().StopOptimizationBeforeLoweringOwnership)
-      return;
-
-    if (SILPrintFinalOSSAModule) {
-      addModulePrinterPipeline(P, "SIL Print Final OSSA Module");
-    }
-    P.addNonTransparentFunctionOwnershipModelEliminator();
-  }
-
   // Add the outliner pass (Osize).
   P.addOutliner();
 }
@@ -826,17 +826,17 @@ SILPassPipelinePlan::getPerformancePassPipeline(const SILOptions &Options) {
   // This also performs early OSSA based optimizations on *all* swift code.
   addPerfEarlyModulePassPipeline(P);
 
-  // Then if we were asked to stop optimization before lowering OSSA (causing us
-  // to exit early from addPerfEarlyModulePassPipeline), exit early.
-  if (P.getOptions().StopOptimizationBeforeLoweringOwnership)
-    return P;
-
   // Then run an iteration of the high-level SSA passes.
   //
   // FIXME: When *not* emitting a .swiftmodule, skip the high-level function
   // pipeline to save compile time.
   addHighLevelFunctionPipeline(P);
 
+  // Then if we were asked to stop optimization before lowering OSSA (causing us
+  // to exit early from addHighLevelFunctionPipeline), exit early.
+  if (P.getOptions().StopOptimizationBeforeLoweringOwnership)
+    return P;
+
   addHighLevelModulePipeline(P);
 
   // Run one last copy propagation/semantic arc opts run before serialization/us

test/SILOptimizer/assemblyvision_remark/cast_remarks.swift

@@ -42,6 +42,7 @@ public func forcedCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T {
   var x = ns
   x = ns2
   return x as! T  // expected-remark @:12 {{unconditional runtime cast of value with type 'NS' to 'T'}}
+                  // expected-note @-9:44 {{of 'ns2'}}
 }
 
 public func condCast<NS, T>(_ ns: NS) -> T? {
@@ -79,6 +80,7 @@ public func condCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T? {
   var x = ns
   x = ns2
   return x as? T  // expected-remark @:12 {{conditional runtime cast of value with type 'NS' to 'T'}}
+                  // expected-note @-9:42 {{of 'ns2'}}
 }
 
 public func condCast5<NS, T>(_ ns: NS) -> T? {
@@ -249,6 +251,7 @@ public func forcedCast4(_ ns: Existential1, _ ns2: Existential1) -> Existential2
   var x = ns
   x = ns2
   return x as! Existential2  // expected-remark @:12 {{unconditional runtime cast of value with type 'Existential1' to 'Existential2'}}
+                             // expected-note @-5:47 {{of 'ns2'}}
 }
 
 public func condCast(_ ns: Existential1) -> Existential2? {
@@ -283,6 +286,7 @@ public func condCast4(_ ns: Existential1, _ ns2: Existential1) -> Existential2?
   var x = ns
   x = ns2
   return x as? Existential2 // expected-remark @:12 {{conditional runtime cast of value with type 'Existential1' to 'Existential2'}}
+                            // expected-note @-5:45 {{of 'ns2'}}
 }
 
 public func condCast5(_ ns: Existential1) -> Existential2? {

test/SILOptimizer/assemblyvision_remark/cast_remarks_objc.swift

@@ -45,6 +45,7 @@ public func forcedCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T {
   var x = ns
   x = ns2
   return x as! T  // expected-remark @:12 {{unconditional runtime cast of value with type 'NS' to 'T'}}
+                  // expected-note @-9:44 {{of 'ns2'}}
 }
 
 public func condCast<NS, T>(_ ns: NS) -> T? {
@@ -82,6 +83,7 @@ public func condCast4<NS, T>(_ ns: NS, _ ns2: NS) -> T? {
   var x = ns
   x = ns2
   return x as? T  // expected-remark @:12 {{conditional runtime cast of value with type 'NS' to 'T'}}
+                  // expected-note @-9:42 {{of 'ns2'}}
 }
 
 public func condCast5<NS, T>(_ ns: NS) -> T? {

test/SILOptimizer/outliner.swift

@@ -15,11 +15,10 @@ public class MyGizmo {
   }
 
    // CHECK-LABEL: sil @$s8outliner7MyGizmoC11usePropertyyyF :
-   // CHECK: [[A_FUN:%.*]] = function_ref @$sSo5GizmoC14stringPropertySSSgvgToTeab_
-   // CHECK: apply [[A_FUN]]({{.*}}) : $@convention(thin) (@in_guaranteed Gizmo) -> @owned Optional<String>
-   // CHECK-NOT: return
    // CHECK: [[P_FUN:%.*]] = function_ref @$sSo5GizmoC14stringPropertySSSgvgToTepb_
    // CHECK: apply [[P_FUN]]({{.*}}) : $@convention(thin) (Gizmo) -> @owned Optional<String>
+   // CHECK-NOT: return
+   // CHECK: apply [[P_FUN]]({{.*}}) : $@convention(thin) (Gizmo) -> @owned Optional<String>
    // CHECK: return
    // CHECK: } // end sil function '$s8outliner7MyGizmoC11usePropertyyyF'
    public func useProperty() {
@@ -66,26 +65,6 @@ public func testOutlining() {
 // CHECK:  switch_enum [[RES]]
 // CHECK: } // end sil function '$s8outliner9dontCrash1ayyp_tF'
 
-// CHECK-LABEL: sil shared [noinline] @$sSo5GizmoC14stringPropertySSSgvgToTeab_ : $@convention(thin) (@in_guaranteed Gizmo) -> @owned Optional<String>
-// CHECK: bb0(%0 : $*Gizmo):
-// CHECK:   %1 = load %0 : $*Gizmo
-// CHECK:   %2 = objc_method %1 : $Gizmo, #Gizmo.stringProperty!getter.foreign : (Gizmo) -> () -> String?
-// CHECK:   %3 = apply %2(%1) : $@convention(objc_method) (Gizmo) -> @autoreleased Optional<NSString>
-// CHECK:   switch_enum %3 : $Optional<NSString>, case #Optional.some!enumelt: bb1, case #Optional.none!enumelt: bb2
-// CHECK: bb1(%5 : $NSString):
-// CHECK:   %6 = function_ref @$sSS10FoundationE36_unconditionallyBridgeFromObjectiveCySSSo8NSStringCSgFZ : $@convention(method) (@guaranteed Optional<NSString>, @thin String.Type) -> @owned String
-// CHECK:   %7 = metatype $@thin String.Type
-// CHECK:   %8 = apply %6(%3, %7) : $@convention(method) (@guaranteed Optional<NSString>, @thin String.Type) -> @owned String
-// CHECK:   release_value %3 : $Optional<NSString>
-// CHECK:   %10 = enum $Optional<String>, #Optional.some!enumelt, %8 : $String
-// CHECK:   br bb3(%10 : $Optional<String>)
-// CHECK: bb2:
-// CHECK:   %12 = enum $Optional<String>, #Optional.none!enumelt
-// CHECK:   br bb3(%12 : $Optional<String>)
-// CHECK: bb3(%14 : $Optional<String>):
-// CHECK:   return %14 : $Optional<String>
-// CHECK: } // end sil function '$sSo5GizmoC14stringPropertySSSgvgToTeab_'
-
 // CHECK-LABEL: sil shared [noinline] @$sSo5GizmoC14stringPropertySSSgvgToTepb_ : $@convention(thin) (Gizmo) -> @owned Optional<String>
 // CHECK: bb0(%0 : $Gizmo):
 // CHECK:  %1 = objc_method %0 : $Gizmo, #Gizmo.stringProperty!getter.foreign : (Gizmo) -> () -> String?