Optimizer: run TempRValueElimination also at Onone

eeckstein · eeckstein · commit efc01b80d650 · 2025-05-22T16:00:04.000+02:00
Introduce a new pass MandatoryTempRValueElimination, which works as the original TempRValueElimination, except that it does not remove any alloc_stack instruction which are associated with source variables.

Running this pass at Onone helps to reduce copies of large structs, e.g. InlineArrays or structs containing InlineArrays.
Copying large structs can be a performance problem, even at Onone.

rdar://151629149
diff --git a/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/TempRValueElimination.swift b/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/TempRValueElimination.swift
@@ -36,7 +36,15 @@ import SIL
 ///
 let tempRValueElimination = FunctionPass(name: "temp-rvalue-elimination") {
   (function: Function, context: FunctionPassContext) in
+  removeTempRValues(in: function, keepDebugInfo: false, context)
+}
 
+let mandatoryTempRValueElimination = FunctionPass(name: "mandatory-temp-rvalue-elimination") {
+  (function: Function, context: FunctionPassContext) in
+  removeTempRValues(in: function, keepDebugInfo: true, context)
+}
+
+private func removeTempRValues(in function: Function, keepDebugInfo: Bool, _ context: FunctionPassContext) {
   for inst in function.instructions {
     switch inst {
     case let copy as CopyAddrInst:
@@ -45,12 +53,12 @@ let tempRValueElimination = FunctionPass(name: "temp-rvalue-elimination") {
         // copied the `alloc_stack` back to the source location.
         context.erase(instruction: copy)
       } else {
-        tryEliminate(copy: copy, context)
+        tryEliminate(copy: copy, keepDebugInfo: keepDebugInfo, context)
       }
     case let store as StoreInst:
       // Also handle `load`-`store` pairs which are basically the same thing as a `copy_addr`.
       if let load = store.source as? LoadInst, load.uses.isSingleUse, load.parentBlock == store.parentBlock {
-        tryEliminate(copy: store, context)
+        tryEliminate(copy: store, keepDebugInfo: keepDebugInfo, context)
       }
     default:
       break
@@ -82,9 +90,10 @@ extension StoreInst: CopyLikeInstruction {
   private var load: LoadInst { source as! LoadInst }
 }
 
-private func tryEliminate(copy: CopyLikeInstruction, _ context: FunctionPassContext) {
+private func tryEliminate(copy: CopyLikeInstruction, keepDebugInfo: Bool, _ context: FunctionPassContext) {
 
-  guard let (allocStack, lastUseOfAllocStack) = getRemovableAllocStackDestination(of: copy, context) else {
+  guard let (allocStack, lastUseOfAllocStack) =
+          getRemovableAllocStackDestination(of: copy, keepDebugInfo: keepDebugInfo, context) else {
     return
   }
 
@@ -138,18 +147,24 @@ private func tryEliminate(copy: CopyLikeInstruction, _ context: FunctionPassCont
 ///   %lastUseOfAllocStack = load %allocStack
 /// ```
 private func getRemovableAllocStackDestination(
-  of copy: CopyLikeInstruction, _ context: FunctionPassContext
+  of copy: CopyLikeInstruction, keepDebugInfo: Bool, _ context: FunctionPassContext
 ) -> (allocStack: AllocStackInst, lastUseOfAllocStack: Instruction)? {
   guard copy.isInitializationOfDestination,
         let allocStack = copy.destinationAddress as? AllocStackInst
   else {
     return nil
   }
 
-  // If the `allocStack` is lexical we can eliminate it if the source of the copy is lexical and
-  // it is live for longer than the `allocStack`.
-  if allocStack.isLexical && !copy.sourceAddress.accessBase.storageIsLexical {
-    return nil
+  if keepDebugInfo {
+    if allocStack.isFromVarDecl || allocStack.isLexical {
+      return nil
+    }
+  } else {
+    // If the `allocStack` is lexical we can eliminate it if the source of the copy is lexical and
+    // it is live for longer than the `allocStack`.
+    if allocStack.isLexical && !copy.sourceAddress.accessBase.storageIsLexical {
+      return nil
+    }
   }
 
   var allocStackUses = UseCollector(copy: copy, context)
diff --git a/SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift b/SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift
@@ -101,6 +101,7 @@ private func registerSwiftPasses() {
   registerPass(lifetimeDependenceScopeFixupPass, { lifetimeDependenceScopeFixupPass.run($0) })
   registerPass(copyToBorrowOptimization, { copyToBorrowOptimization.run($0) })
   registerPass(tempRValueElimination, { tempRValueElimination.run($0) })
+  registerPass(mandatoryTempRValueElimination, { mandatoryTempRValueElimination.run($0) })
   registerPass(generalClosureSpecialization, { generalClosureSpecialization.run($0) })
   registerPass(autodiffClosureSpecialization, { autodiffClosureSpecialization.run($0) })
 
diff --git a/include/swift/SILOptimizer/PassManager/Passes.def b/include/swift/SILOptimizer/PassManager/Passes.def
@@ -140,6 +140,8 @@ PASS(StackPromotion, "stack-promotion",
      "Stack Promotion of Class Objects")
 PASS(UpdateBorrowedFrom, "update-borrowed-from",
      "Test pass for update borrowed-from instructions")
+PASS(MandatoryTempRValueElimination, "mandatory-temp-rvalue-elimination",
+     "Mandatory remove short-lived immutable temporary copies")
 PASS(TempRValueElimination, "temp-rvalue-elimination",
      "Remove short-lived immutable temporary copies")
 
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -1082,6 +1082,9 @@ SILPassPipelinePlan::getOnonePassPipeline(const SILOptions &Options) {
   // Now that we have serialized, propagate debug info.
   P.addMovedAsyncVarDebugInfoPropagator();
 
+  // Even at Onone it's important to remove copies of structs, especially if they are large.
+  P.addMandatoryTempRValueElimination();
+
   // If we are asked to stop optimizing before lowering ownership, do so now.
   if (P.Options.StopOptimizationBeforeLoweringOwnership)
     return P;
diff --git a/test/AutoDiff/SILOptimizer/optional_pullback.swift b/test/AutoDiff/SILOptimizer/optional_pullback.swift
@@ -13,14 +13,9 @@ import _Differentiation
 // CHECK: apply %[[ZERO1]]<τ_0_0.TangentVector>(%[[RET_TAN_BUF]], %{{.*}})
 // CHECK: %[[ADJ_IN_BB:.+]] = alloc_stack $τ_0_0.TangentVector
 //
-// CHECK: %[[TAN_VAL_COPY:.+]] = alloc_stack $Optional<τ_0_0.TangentVector>
-// CHECK: %[[TAN_BUF:.+]] = alloc_stack $Optional<τ_0_0>.TangentVector
-
-// CHECK: copy_addr %[[OPT_TAN]] to [init] %[[TAN_BUF]] : $*Optional<τ_0_0>.TangentVector
-// CHECK: %[[TAN_VAL:.+]] = struct_element_addr %[[TAN_BUF]] : $*Optional<τ_0_0>.TangentVector, #Optional.TangentVector.value
-// CHECK: copy_addr %[[TAN_VAL]] to [init] %[[TAN_VAL_COPY]] : $*Optional<τ_0_0.TangentVector>
+// CHECK: %[[TAN_VAL:.+]] = struct_element_addr %[[OPT_TAN]] : $*Optional<τ_0_0>.TangentVector, #Optional.TangentVector.value
 //
-// CHECK: %[[TAN_DATA:.+]] = unchecked_take_enum_data_addr %[[TAN_VAL_COPY]] : $*Optional<τ_0_0.TangentVector>, #Optional.some!enumelt
+// CHECK: %[[TAN_DATA:.+]] = unchecked_take_enum_data_addr %[[TAN_VAL]] : $*Optional<τ_0_0.TangentVector>, #Optional.some!enumelt
 // CHECK: %[[PLUS_EQUAL:.+]] = witness_method $τ_0_0.TangentVector, #AdditiveArithmetic."+="
 // CHECK: apply %[[PLUS_EQUAL]]<τ_0_0.TangentVector>(%[[ADJ_IN_BB]], %[[TAN_DATA]], %{{.*}})
 
@@ -29,9 +24,6 @@ import _Differentiation
 // CHECK: destroy_addr %[[ADJ_IN_BB]] : $*τ_0_0.TangentVector
 
 // CHECK: copy_addr [take] %[[RET_TAN_BUF:.+]] to [init] %[[RET_TAN:.+]]
-// CHECK: destroy_addr %[[TAN_BUF]] : $*Optional<τ_0_0>.TangentVector
-// CHECK: dealloc_stack %[[TAN_BUF]] : $*Optional<τ_0_0>.TangentVector
-// CHECK: dealloc_stack %[[TAN_VAL_COPY]] : $*Optional<τ_0_0.TangentVector>
 // CHECK: dealloc_stack %[[RET_TAN_BUF]] : $*τ_0_0.TangentVector
 
 @differentiable(reverse)
diff --git a/test/DebugInfo/move_function_dbginfo_async.swift b/test/DebugInfo/move_function_dbginfo_async.swift
@@ -1,7 +1,7 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -g -emit-sil -o - %s | %FileCheck -check-prefix=SIL %s
-// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -g -emit-ir -o - %s | %FileCheck %s
-// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -g -c %s -o %t/out.o
+// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -g -emit-sil -o - %s | %FileCheck -check-prefix=SIL %s
+// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -g -emit-ir -o - %s | %FileCheck %s
+// RUN: %target-swift-frontend -parse-as-library -target %target-swift-5.1-abi-triple -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -g -c %s -o %t/out.o
 
 // This test checks that:
 //
diff --git a/test/IRGen/lifetime.sil b/test/IRGen/lifetime.sil
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-debugger-shadow-copies -gnone -emit-ir %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s -DINT=i%target-ptrsize
+// RUN: %target-swift-frontend -disable-debugger-shadow-copies -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -gnone -emit-ir %s | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s -DINT=i%target-ptrsize
 
 sil_stage canonical
 
diff --git a/test/IRGen/typelayout_based_value_operation.sil b/test/IRGen/typelayout_based_value_operation.sil
@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend -enable-type-layout %s -emit-ir -sil-verify-all | %FileCheck %s
-// RUNx: %target-swift-frontend -disable-type-layout %s -emit-ir -sil-verify-all | %FileCheck %s --check-prefix=NOTYPELAYOUT
+// RUN: %target-swift-frontend -enable-type-layout %s -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -emit-ir -sil-verify-all | %FileCheck %s
+// RUNx: %target-swift-frontend -disable-type-layout %s -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -emit-ir -sil-verify-all | %FileCheck %s --check-prefix=NOTYPELAYOUT
 
 sil_stage canonical
 import Builtin
diff --git a/test/IRGen/variadic_generic_fulfillment.swift b/test/IRGen/variadic_generic_fulfillment.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -target %target-swift-5.9-abi-triple | %FileCheck %s -DINT=i%target-ptrsize
+// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -emit-ir %s -target %target-swift-5.9-abi-triple | %FileCheck %s -DINT=i%target-ptrsize
 
 public struct G<T> {}
 
diff --git a/test/Interop/Cxx/class/closure-thunk-irgen.swift b/test/Interop/Cxx/class/closure-thunk-irgen.swift
@@ -21,12 +21,7 @@ public func testClosureToBlock() {
 }
 
 // CHECK: define internal void @"$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_To"(ptr %[[V0:.*]])
-// CHECK: %[[V1:.*]] = alloca %{{.*}}, align 8
-// CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 8, ptr %[[V1]])
-// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialC{{1|2}}ERKS_(ptr %[[V1]], ptr %[[V0]])
-// CHECK-NEXT: call swiftcc void @"$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_"(ptr noalias dereferenceable(8) %[[V1]])
-// CHECK-NEXT: call {{void|ptr}} @_ZN10NonTrivialD{{1|2}}Ev(ptr %[[V1]])
-// CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 8, ptr %[[V1]])
+// CHECK:      call swiftcc void @"$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_"(ptr noalias dereferenceable(8) %[[V0]])
 // CHECK-NEXT: ret void
 
 public func testClosureToFuncPtr() {
diff --git a/test/Interop/Cxx/class/closure-thunk.swift b/test/Interop/Cxx/class/closure-thunk.swift
@@ -44,12 +44,8 @@ public func testClosureToBlock() {
 
 // CHECK: sil private [thunk] @$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_To : $@convention(c) (@in_cxx NonTrivial) -> () {
 // CHECK: bb0(%[[V0:.*]] : $*NonTrivial):
-// CHECK: %[[V1:.*]] = alloc_stack $NonTrivial
-// CHECK: copy_addr %[[V0]] to [init] %[[V1]] : $*NonTrivial
 // CHECK: %[[V3:.*]] = function_ref @$s4main20testClosureToFuncPtryyFySo10NonTrivialVcfU_ : $@convention(thin) (@in_guaranteed NonTrivial) -> ()
-// CHECK: %[[V4:.*]] = apply %[[V3]](%[[V1]]) : $@convention(thin) (@in_guaranteed NonTrivial) -> ()
-// CHECK: destroy_addr %[[V1]] : $*NonTrivial
-// CHECK: dealloc_stack %[[V1]] : $*NonTrivial
+// CHECK: %[[V4:.*]] = apply %[[V3]](%[[V0]]) : $@convention(thin) (@in_guaranteed NonTrivial) -> ()
 // CHECK: return %[[V4]] : $()
 
 public func testClosureToFuncPtr() {
diff --git a/test/Interop/Cxx/class/move-only/move-only-cxx-value-type.swift b/test/Interop/Cxx/class/move-only/move-only-cxx-value-type.swift
@@ -1,8 +1,12 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -cxx-interoperability-mode=upcoming-swift)
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -cxx-interoperability-mode=upcoming-swift -D HAS_NONCOPYABLE_GENERICS)
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -cxx-interoperability-mode=swift-5.9 -O)
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -cxx-interoperability-mode=swift-6 -O)
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -cxx-interoperability-mode=swift-6 -O -D HAS_NONCOPYABLE_GENERICS)
+
+// Due to a bug in the move-only checker we need to disable the mandatory temp-rvalue elmination pass.
+// rdar://151841926
+
+// RUN: %target-run-simple-swift(-Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -I %S/Inputs/ -cxx-interoperability-mode=upcoming-swift)
+// RUN: %target-run-simple-swift(-Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -I %S/Inputs/ -cxx-interoperability-mode=upcoming-swift -D HAS_NONCOPYABLE_GENERICS)
+// RUN: %target-run-simple-swift(-Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -I %S/Inputs/ -cxx-interoperability-mode=swift-5.9 -O)
+// RUN: %target-run-simple-swift(-Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -I %S/Inputs/ -cxx-interoperability-mode=swift-6 -O)
+// RUN: %target-run-simple-swift(-Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -I %S/Inputs/ -cxx-interoperability-mode=swift-6 -O -D HAS_NONCOPYABLE_GENERICS)
 
 // REQUIRES: executable_test
 
diff --git a/test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift b/test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift
@@ -27,9 +27,10 @@ public func testStructWithCopyConstructorAndValue() -> Bool {
 // CHECK: [[MEMBER:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
 // CHECK: [[OBJ:%.*]] = alloca %TSo42StructWithSubobjectCopyConstructorAndValueV
 // CHECK: alloca %TSo33StructWithCopyConstructorAndValueV
-// CHECK: [[TMP:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
 // CHECK: call {{.*}}@{{_ZN33StructWithCopyConstructorAndValueC(1|2)Ei|"\?\?0StructWithCopyConstructorAndValue@@QEAA@H@Z"}}(ptr {{(noalias )?}}[[MEMBER]], i32 42)
-// CHECK: [[TEMP_MEMBER:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[TMP]], i32 0, i32 0
+// CHECK: getelementptr inbounds{{.*}} %TSo42StructWithSubobjectCopyConstructorAndValueV, ptr [[OBJ]]
+// CHECK: [[M1:%.*]] = getelementptr inbounds{{.*}} %TSo42StructWithSubobjectCopyConstructorAndValueV, ptr [[OBJ]], i32 0, i32 0
+// CHECK: [[TEMP_MEMBER:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[M1]], i32 0, i32 0
 // CHECK: [[TEMP_MEMBER_VALUE:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[TEMP_MEMBER]], i32 0, i32 0
 // CHECK: [[LHS:%.*]] = load i32, ptr [[TEMP_MEMBER_VALUE]]
 // CHECK: [[OUT:%.*]] = icmp eq i32 [[LHS]], 42
@@ -44,11 +45,11 @@ public func testStructWithSubobjectCopyConstructorAndValue() -> Bool {
 // CHECK: [[MEMBER:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
 // CHECK: [[OBJ:%.*]] = alloca %TSo037StructWithCopyConstructorAndSubobjectcdE5ValueV
 // CHECK: [[TEMP:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
-// CHECK: [[TEMP2:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
 // CHECK: call {{.*}}@{{_ZN33StructWithCopyConstructorAndValueC(1|2)Ei|"\?\?0StructWithCopyConstructorAndValue@@QEAA@H@Z"}}(ptr {{(noalias )?}}[[MEMBER]], i32 42)
 // CHECK: call {{.*}}@{{_ZN33StructWithCopyConstructorAndValueC(1|2)ERKS_|"\?\?0StructWithCopyConstructorAndValue@@QEAA@AEBU0@@Z"}}(ptr [[TEMP]], ptr [[MEMBER]])
 // CHECK: call {{.*}}@{{_ZN60StructWithCopyConstructorAndSubobjectCopyConstructorAndValueC(1|2)E33StructWithCopyConstructorAndValue|"\?\?0StructWithCopyConstructorAndSubobjectCopyConstructorAndValue@@QEAA@UStructWithCopyConstructorAndValue@@@Z"}}(ptr {{(noalias )?}}[[OBJ]], ptr [[TEMP]])
-// CHECK: [[TEMP_MEMBER:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[TEMP2]], i32 0, i32 0
+// CHECK: [[M1:%.*]] = getelementptr inbounds{{.*}} %TSo037StructWithCopyConstructorAndSubobjectcdE5ValueV, ptr [[OBJ]], i32 0, i32 0
+// CHECK: [[TEMP_MEMBER:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[M1]], i32 0, i32 0
 // CHECK: [[TEMP_MEMBER_VAL:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[TEMP_MEMBER]], i32 0, i32 0
 // CHECK: [[LHS:%.*]] = load i32, ptr [[TEMP_MEMBER_VAL]]
 // CHECK: [[OUT:%.*]] = icmp eq i32 [[LHS]], 42
@@ -73,9 +74,8 @@ public func test(obj: StructWithCopyConstructorAndValue) -> Bool {
 }
 
 // CHECK-LABEL: define {{.*}}i1 @"$s4main4test3objSbSo42StructWithSubobjectCopyConstructorAndValueV_tF"(ptr noalias dereferenceable(4) %0)
-// CHECK: [[TMP:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
 // CHECK: [[MEMBER:%.*]] = getelementptr inbounds{{.*}} %TSo42StructWithSubobjectCopyConstructorAndValueV, ptr %0, i32 0, i32 0
-// CHECK: [[VAL:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[TMP]], i32 0, i32 0
+// CHECK: [[VAL:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[MEMBER]], i32 0, i32 0
 // CHECK: [[VAL_VAL:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[VAL]], i32 0, i32 0
 // CHECK: [[LHS:%.*]] = load i32, ptr [[VAL_VAL]]
 // CHECK: [[OUT:%.*]] = icmp eq i32 [[LHS]], 42
@@ -85,7 +85,7 @@ public func test(obj: StructWithSubobjectCopyConstructorAndValue) -> Bool {
 }
 
 // CHECK-LABEL: define {{.*}}i1 @"$s4main4test3objSbSo037StructWithCopyConstructorAndSubobjectfgH5ValueV_tF"(ptr noalias dereferenceable(4) %0)
-// CHECK:[[TEMP:%.*]] = alloca %TSo33StructWithCopyConstructorAndValueV
+// CHECK:[[TEMP:%.*]] = getelementptr inbounds{{.*}} %TSo037StructWithCopyConstructorAndSubobjectcdE5ValueV, ptr %0, i32 0, i32 0
 // CHECK:[[VAL:%.*]] = getelementptr inbounds{{.*}} %TSo33StructWithCopyConstructorAndValueV, ptr [[TEMP]], i32 0, i32 0
 // CHECK:[[VAL_VAL:%.*]] = getelementptr inbounds{{.*}} %Ts5Int32V, ptr [[VAL]], i32 0, i32 0
 // CHECK:[[LHS:%.*]] = load i32, ptr [[VAL_VAL]]
diff --git a/test/Interop/Cxx/objc-correctness/call-to-generated-init-with-nsstring.swift b/test/Interop/Cxx/objc-correctness/call-to-generated-init-with-nsstring.swift
@@ -56,6 +56,6 @@ testSdump()
 // IR-TRIVIAL: }
 
 // IR-NONTRIVIAL-LABEL: define {{.*}} swiftcc void @"$s4main9testSdumpyyF"()
-// IR-NONTRIVIAL: call {{.*}} @_ZN1SC1ERKS_
 // IR-NONTRIVIAL: call {{.*}} @_ZNK1S4dumpEv
+// IR-NONTRIVIAL: call {{.*}} @_ZN1SC1ERKS_
 // IR-NONTRIVIAL: call {{.*}} @_ZN1SD1Ev
diff --git a/test/SILOptimizer/inline_arrays.swift b/test/SILOptimizer/inline_arrays.swift
@@ -1,12 +1,17 @@
-// RUN: %target-swift-frontend  -primary-file %s -O -disable-availability-checking -module-name=test -emit-sil | %FileCheck %s
+// RUN: %target-swift-frontend  -primary-file %s -O -disable-availability-checking -module-name=test -emit-sil | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-OPT
+// RUN: %target-swift-frontend  -primary-file %s -Onone -disable-availability-checking -module-name=test -emit-sil | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-ONONE
 
 // REQUIRES: swift_stdlib_no_asserts, optimized_stdlib
 
 // CHECK-LABEL: sil @$s4test0A9Subscriptys5UInt8Vs11InlineArrayVy$255_ADGz_SitF :
-// CHECK:          [[S:%.*]] = struct_element_addr %0, #InlineArray._storage
+// CHECK-OPT:      [[S:%.*]] = struct_element_addr %0, #InlineArray._storage
+// CHECK-ONONE:    [[ACC:%.*]] = begin_access [read] [static] %0
+// CHECK-ONONE:    [[S:%.*]] = struct_element_addr [[ACC]], #InlineArray._storage
 // CHECK:          [[BA:%.*]] = vector_base_addr [[S]]
 // CHECK:          [[EA:%.*]] = index_addr [stack_protection] [[BA]],
-// CHECK:          [[E:%.*]] = load [[EA]]
+// CHECK-OPT:      [[E:%.*]] = load [[EA]]
+// CHECK-ONONE:    [[ACC2:%.*]] = begin_access [read] [unsafe] [[EA]]
+// CHECK-ONONE:    [[E:%.*]] = load [[ACC2]]
 // CHECK:          return [[E]]
 // CHECK:       } // end sil function '$s4test0A9Subscriptys5UInt8Vs11InlineArrayVy$255_ADGz_SitF'
 public func testSubscript(_ a: inout InlineArray<256, UInt8>, _ i: Int) -> UInt8 {
@@ -25,11 +30,31 @@ public final class C {
   // CHECK:          [[S:%.*]] = struct_element_addr [[CA]], #InlineArray._storage
   // CHECK:          [[BA:%.*]] = vector_base_addr [[S]]
   // CHECK:          [[EA:%.*]] = index_addr [stack_protection] [[BA]],
-  // CHECK:          [[E:%.*]] = load [[EA]]
+  // CHECK-OPT:      [[E:%.*]] = load [[EA]]
+  // CHECK-ONONE:    [[ACC2:%.*]] = begin_access [read] [unsafe] [[EA]]
+  // CHECK-ONONE:    [[E:%.*]] = load [[ACC2]]
   // CHECK:          return [[E]]
   // CHECK:       } // end sil function '$s4test1CC0A9Subscriptys5UInt8VSiF'
   public func testSubscript(_ i: Int) -> UInt8 {
     return a[i]
   }
 }
 
+public struct S {
+  let a: InlineArray<7000, UInt8>
+
+  // CHECK-LABEL: sil @$s4test1SV0A9Subscriptys5UInt8VSiF :
+  // CHECK:          [[A:%.*]] = struct_element_addr %1, #S.a
+  // CHECK:          [[S:%.*]] = struct_element_addr [[A]], #InlineArray._storage
+  // CHECK:          [[BA:%.*]] = vector_base_addr [[S]]
+  // CHECK:          [[EA:%.*]] = index_addr [stack_protection] [[BA]],
+  // CHECK-OPT:      [[E:%.*]] = load [[EA]]
+  // CHECK-ONONE:    [[ACC2:%.*]] = begin_access [read] [unsafe] [[EA]]
+  // CHECK-ONONE:    [[E:%.*]] = load [[ACC2]]
+  // CHECK:          return [[E]]
+  // CHECK:       } // end sil function '$s4test1SV0A9Subscriptys5UInt8VSiF'
+  public func testSubscript(_ i: Int) -> UInt8 {
+    return a[i]
+  }
+}
+
diff --git a/test/SILOptimizer/temp_rvalue_opt_ossa.sil b/test/SILOptimizer/temp_rvalue_opt_ossa.sil

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -disable-debugger-shadow-copies -gnone -emit-ir %s \| %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s -DINT=i%target-ptrsize`
	`1`	`+// RUN: %target-swift-frontend -disable-debugger-shadow-copies -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -gnone -emit-ir %s \| %FileCheck --check-prefix=CHECK --check-prefix=CHECK-%target-cpu %s -DINT=i%target-ptrsize`
`2`	`2`
`3`	`3`	`sil_stage canonical`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -emit-ir %s -target %target-swift-5.9-abi-triple \| %FileCheck %s -DINT=i%target-ptrsize`
	`1`	`+// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=mandatory-temp-rvalue-elimination -emit-ir %s -target %target-swift-5.9-abi-triple \| %FileCheck %s -DINT=i%target-ptrsize`
`2`	`2`
`3`	`3`	`public struct G<T> {}`
`4`	`4`