Optimizer: replace PredictableMemoryAccessOptimizations with MandatoryRedundantLoadElimination in the pass pipeline

PredictableMemoryAccessOptimizations has become unmaintainable as-is.
RedundantLoadElimination does (almost) the same thing as PredictableMemoryAccessOptimizations.
It's not as powerful but good enough because PredictableMemoryAccessOptimizations is actually only needed for promoting integer values for mandatory constant propagation.
And most importantly: RedundantLoadElimination does not insert additional copies which was a big problem in PredictableMemoryAccessOptimizations.

Fixes rdar://142814676

Author: eeckstein

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -213,7 +213,7 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
 
   // Promote loads as necessary to ensure we have enough SSA formation to emit
   // SSA based diagnostics.
-  P.addPredictableMemoryAccessOptimizations();
+  P.addMandatoryRedundantLoadElimination();
 
   // This phase performs optimizations necessary for correct interoperation of
   // Swift os log APIs with C os_log ABIs.

test/DebugInfo/conditional-assign.swift

@@ -16,12 +16,10 @@ public class M {
   // Verify that definite initialization doesn't create a bogus description of
   // self pointing to the liveness bitvector.
 
-  // CHECK: sil @$s4main1MC4fromAcA12WithDelegate_p_tKcfc
-  // CHECK: bb0
-  // CHECK-NEXT: %2 = alloc_stack $Builtin.Int2
-  // CHECK-NOT: let
-  // CHECK-NOT: name
-  // CHECK: scope
+  // CHECK-LABEL: sil @$s4main1MC4fromAcA12WithDelegate_p_tKcfc
+  // CHECK:       bb0
+  // CHECK-NOT:     alloc_stack $Builtin.Int2{{.*}}let
+  // CHECK:       } // end sil function '$s4main1MC4fromAcA12WithDelegate_p_tKcfc'
     public init(from d: WithDelegate) throws {
         guard let delegate = d.delegate as? DelegateB
         else { throw Err.s(0) }

test/Distributed/SIL/distributed_actor_default_init_sil_1.swift

@@ -44,17 +44,17 @@ distributed actor MyDistActor {
 // CHECK:    [[RELOADED_SYS1:%[0-9]+]] = load [[TP_FIELD2]] : $*FakeActorSystem
 // CHECK:    [[SELF_METATYPE:%[0-9]+]] = metatype $@thick MyDistActor.Type
 // CHECK:    [[ASSIGN_ID_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV8assignIDyAA0C7AddressVxm0B00bC0RzAF0G0RtzlF
-// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], [[RELOADED_SYS1]])
+// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]],
 
                 // *** save identity ***
 // CHECK:    [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:    store [[ID]] to [[ID_FIELD]] : $*ActorAddress
+// CHECK:    copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 
                 // *** invoke actorReady ***
 // CHECK:    [[TP_FIELD3:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:    [[RELOADED_SYS2:%[0-9]+]] = load [[TP_FIELD3]] : $*FakeActorSystem
 // CHECK:    [[READY_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV10actorReadyyyx0B00bC0RzAA0C7AddressV2IDRtzlF
-// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], [[RELOADED_SYS2]])
+// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]],
 
 // CHECK:  } // end sil function '$s14default_deinit11MyDistActorC11system_syncAC015FakeDistributedE7Systems0hE6SystemV_tcfc'
 

test/Distributed/SIL/distributed_actor_default_init_sil_2.swift

@@ -37,7 +37,7 @@ distributed actor MyDistActor {
 // CHECK:   store [[SYS_PARAM]] to [[SYS_FIELD]] : $*FakeActorSystem
 
 // CHECK:   [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:   store {{%[0-9]+}} to [[ID_FIELD]] : $*ActorAddress
+// CHECK:   copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 
 // CHECK:   [[RAW_BOOL:%[0-9]+]] = struct_extract [[COND]] : $Bool, #Bool._value
 // CHECK:   cond_br [[RAW_BOOL]], [[SUCCESS_BB:bb[0-9]+]], [[FAIL_BB:bb[0-9]+]]

test/Distributed/SIL/distributed_actor_default_init_sil_5.swift

@@ -37,7 +37,7 @@ distributed actor MyDistActor {
 // CHECK:   [[SYS_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:   store [[SYSTEM]] to [[SYS_FIELD]] : $*FakeActorSystem
 // CHECK:   [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:   store {{.*}} to [[ID_FIELD]] : $*ActorAddress
+// CHECK:   copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 // CHECK:   [[RAW_BOOL:%[0-9]+]] = struct_extract [[COND]] : $Bool, #Bool._value
 // CHECK:   cond_br [[RAW_BOOL]], [[TRUE_BB:bb[0-9]+]], [[FALSE_BB:bb[0-9]+]]
 
@@ -51,7 +51,7 @@ distributed actor MyDistActor {
 // CHECK: [[FALSE_BB]]:
 // CHECK:   br [[JOIN]]
 
-// CHECK: [[JOIN]]:
+// CHECK: [[JOIN]]({{.*}} : $Builtin.Int3):
 // CHECK:   cond_br {{%[0-9]+}}, [[PARTIAL_DEINIT:bb[0-9]+]], [[NO_DEINIT:bb[0-9]+]]
 
 // CHECK: [[PARTIAL_DEINIT]]:

test/Distributed/SIL/distributed_actor_default_init_sil_6.swift

@@ -42,17 +42,17 @@ distributed actor MyDistActor {
 // CHECK:    [[RELOADED_SYS1:%[0-9]+]] = load [[TP_FIELD2]] : $*FakeActorSystem
 // CHECK:    [[SELF_METATYPE:%[0-9]+]] = metatype $@thick MyDistActor.Type
 // CHECK:    [[ASSIGN_ID_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV8assignIDyAA0C7AddressVxm0B00bC0RzAF0G0RtzlF
-// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], [[RELOADED_SYS1]])
+// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]],
 
                 // *** save identity ***
 // CHECK:    [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:    store [[ID]] to [[ID_FIELD]] : $*ActorAddress
+// CHECK:    copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 
                 // *** invoke actorReady ***
 // CHECK:    [[TP_FIELD3:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:    [[RELOADED_SYS2:%[0-9]+]] = load [[TP_FIELD3]] : $*FakeActorSystem
 // CHECK:    [[READY_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV10actorReadyyyx0B00bC0RzAA0C7AddressV2IDRtzlF
-// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], [[RELOADED_SYS2]])
+// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]],
 // CHECK:    return [[SELF]]
 
 // CHECK:       [[ERROR_BB]]([[ERRVAL:%[0-9]+]] : $any Error):

test/Distributed/SIL/distributed_actor_default_init_sil_7.swift

@@ -49,10 +49,10 @@ distributed actor MyDistActor {
 // CHECK:    [[RELOADED_SYS1:%[0-9]+]] = load [[TP_FIELD2]] : $*FakeActorSystem
 // CHECK:    [[SELF_METATYPE:%[0-9]+]] = metatype $@thick MyDistActor.Type
 // CHECK:    [[ASSIGN_ID_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV8assignIDyAA0C7AddressVxm0B00bC0RzAF0G0RtzlF
-// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], [[RELOADED_SYS1]])
+// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], {{.*}}
                 // *** save identity ***
 // CHECK:    [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:    store [[ID]] to [[ID_FIELD]] : $*ActorAddress
+// CHECK:    copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 // CHECK-NOT: apply
 // CHECK:    br [[JOIN_PT:bb[0-9]+]]
 
@@ -65,7 +65,7 @@ distributed actor MyDistActor {
 // CHECK:    [[TP_FIELD3:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:    [[RELOADED_SYS2:%[0-9]+]] = load [[TP_FIELD3]] : $*FakeActorSystem
 // CHECK:    [[READY_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0aC6SystemV10actorReadyyyx0B00bC0RzAA0C7AddressV2IDRtzlF
-// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], [[RELOADED_SYS2]])
+// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], {{.*}}
 // CHECK:    return [[SELF]] : $MyDistActor
 
 // CHECK:  [[SYSTEM_ERROR_BB]]{{.*}}:

test/Distributed/SIL/distributed_actor_default_init_sil_8.swift

@@ -51,11 +51,11 @@ distributed actor MyDistActor {
 // CHECK:    [[SELF_METATYPE:%[0-9]+]] = metatype $@thick MyDistActor.Type
 // CHECK:    strong_retain [[RELOADED_SYS1]] : $FakeRoundtripActorSystem
 // CHECK:    [[ASSIGN_ID_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0a9RoundtripC6SystemC8assignIDyAA0C7AddressVxm0B00bC0RzlF
-// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], [[RELOADED_SYS1]])
-// CHECK:    strong_release [[RELOADED_SYS1]] : $FakeRoundtripActorSystem
+// CHECK:    [[ID:%[0-9]+]] = apply [[ASSIGN_ID_FN]]<MyDistActor>([[SELF_METATYPE]], {{.*}})
+// CHECK:    strong_release {{.*}} : $FakeRoundtripActorSystem
                 // *** save identity ***
 // CHECK:    [[ID_FIELD:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.id
-// CHECK:    store [[ID]] to [[ID_FIELD]] : $*ActorAddress
+// CHECK:    copy_addr {{.*}} to [init] [[ID_FIELD]] : $*ActorAddress
 // CHECK-NOT: apply
 // CHECK:    br [[JOIN_PT:bb[0-9]+]]
 
@@ -68,7 +68,7 @@ distributed actor MyDistActor {
 // CHECK:    [[TP_FIELD3:%[0-9]+]] = ref_element_addr [[SELF]] : $MyDistActor, #MyDistActor.actorSystem
 // CHECK:    [[RELOADED_SYS2:%[0-9]+]] = load [[TP_FIELD3]] : $*FakeRoundtripActorSystem
 // CHECK:    [[READY_FN:%[0-9]+]] = function_ref @$s27FakeDistributedActorSystems0a9RoundtripC6SystemC10actorReadyyyx0B00bC0RzAA0C7AddressV2IDRtzlF
-// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], [[RELOADED_SYS2]])
+// CHECK:    = apply [[READY_FN]]<MyDistActor>([[SELF]], {{.*}})
 // CHECK:    return [[SELF]] : $MyDistActor
 
 // CHECK:  [[SYSTEM_ERROR_BB]]([[ERROR_ARG:%[0-9]+]] : $any Error):

test/IRGen/typed_throws_abi.swift

@@ -2994,7 +2994,7 @@ func callImplAsync_i5(_ impl: ImplAsync, _ b: Bool) async -> (Int, Int, Int, Int
 // CHECK: [[SUCCESS]]:
 // CHECK:   ret { float, float, i64 } { float 1.000000e+00, float 2.000000e+00, i64 undef }
 // CHECK: [[FAIL]]:
-// CHECK:   [[ERROR_RES0:%.*]] = load i64, ptr %.x1._value, align 8
+// CHECK:   [[ERROR_RES0:%.*]] = call swiftcc i64 @"$s16typed_throws_abi7OneWordVACycfC"()
 // CHECK:   store ptr inttoptr (i64 1 to ptr), ptr %2, align 8
 // CHECK:   [[ERROR_RES:%.*]] = insertvalue { float, float, i64 } undef, i64 [[ERROR_RES0]], 2
 // CHECK:   ret { float, float, i64 } [[ERROR_RES]]
@@ -3049,7 +3049,7 @@ func callNonMatching_f0(_ b: Bool) -> (Int, Float, Float) {
 // CHECK: [[SUCCESS]]:
 // CHECK:   ret { float, i64, float } { float 1.000000e+00, i64 1, float 2.000000e+00 }
 // CHECK: [[FAIL]]:
-// CHECK:   [[ERROR_RES0:%.*]] = load i64, ptr %.x1._value, align 8
+// CHECK:   [[ERROR_RES0:%.*]] = call swiftcc i64 @"$s16typed_throws_abi7OneWordVACycfC"()
 // CHECK:   store ptr inttoptr (i64 1 to ptr), ptr %2, align 8
 // CHECK:   [[ERROR_RES:%.*]] = insertvalue { float, i64, float } undef, i64 [[ERROR_RES0]], 1
 // CHECK:   ret { float, i64, float } [[ERROR_RES]]
@@ -3108,7 +3108,7 @@ func callNonMatching_f1(_ b: Bool) -> (Int, Float, Bool, Float) {
 // CHECK:   call i1 (ptr, i1, ...) @llvm.coro.end.async(ptr {{%.*}}, i1 false, ptr @"$s16typed_throws_abi20nonMatching_f0_asyncySf_SftSbYaAA7OneWordVYKF{{.*}}", ptr {{%.*}}, ptr {{%.*}}, float 1.000000e+00, float 2.000000e+00, i64 undef, ptr null)
 // CHECK:   unreachable
 // CHECK: 18:
-// CHECK:   [[ERROR_X:%.*]] = load i64, ptr %.x1._value, align 8
+// CHECK:   [[ERROR_X:%.*]] = call swiftcc i64 @"$s16typed_throws_abi7OneWordVACycfC"()
 // CHECK:   [[ERROR_RET:%.*]] = insertvalue { float, float, i64 } undef, i64 [[ERROR_X]], 2
 // CHECK:   [[ERROR_RET0:%.*]] = extractvalue { float, float, i64 } [[ERROR_RET]], 0
 // CHECK:   [[ERROR_RET1:%.*]] = extractvalue { float, float, i64 } [[ERROR_RET]], 1
@@ -3168,7 +3168,7 @@ func callNonMatching_f0_async(_ b: Bool) async -> (Int, Float, Float) {
 // CHECK:   call i1 (ptr, i1, ...) @llvm.coro.end.async(ptr {{%.*}}, i1 false, ptr @"$s16typed_throws_abi20nonMatching_f1_asyncySf_SbSftSbYaAA7OneWordVYKF{{.*}}", ptr {{%.*}}, ptr {{%.*}}, float 1.000000e+00, i64 1, float 2.000000e+00, ptr null)
 // CHECK:   unreachable
 // CHECK: [[ERROR]]:
-// CHECK:   [[ERROR_X:%.*]] = load i64, ptr %.x1._value, align 8
+// CHECK:   [[ERROR_X:%.*]] = call swiftcc i64 @"$s16typed_throws_abi7OneWordVACycfC"()
 // CHECK:   [[ERROR_RET:%.*]] = insertvalue { float, i64, float } undef, i64 [[ERROR_X]], 1
 // CHECK:   [[ERROR_RET0:%.*]] = extractvalue { float, i64, float } [[ERROR_RET]], 0
 // CHECK:   [[ERROR_RET1:%.*]] = extractvalue { float, i64, float } [[ERROR_RET]], 1

test/Interop/C/struct/foreign-reference.swift

@@ -16,7 +16,7 @@ public func blackHole<T>(_ _: T) {  }
 ReferenceCountedTestSuite.test("Local") {
     var x = createLocalCount()
 #if NO_OPTIMIZATIONS
-    expectEqual(x.value, 6) // This is 6 because of "var x" "x.value" * 2 and "(x, x, x)".
+    expectEqual(x.value, 2)
 #endif
 
     let t = (x, x, x)