Merge pull request #2249 from trentxintong/CodeMotion

Fix a non-deterministic retain/release insertion in RRCodeMotion

Author: trentxintong

lib/SILOptimizer/ARC/ARCMatchingSet.cpp

@@ -33,7 +33,7 @@
 
 using namespace swift;
 
-llvm::cl::opt<bool> DisableARCRRMotion("disable-code-motion-arc", llvm::cl::init(false));
+llvm::cl::opt<bool> DisableARCRRMotion("disable-code-motion-arc", llvm::cl::init(true));
 
 //===----------------------------------------------------------------------===//
 //                          ARC Matching Set Builder

lib/SILOptimizer/Transforms/RetainReleaseCodeMotion.cpp

@@ -93,7 +93,7 @@ using namespace swift;
 STATISTIC(NumRetainsSunk, "Number of retains sunk");
 STATISTIC(NumReleasesHoisted, "Number of releases hoisted");
 
-llvm::cl::opt<bool> DisableRRCodeMotion("disable-rr-cm", llvm::cl::init(true));
+llvm::cl::opt<bool> DisableRRCodeMotion("disable-rr-cm", llvm::cl::init(false));
 
 //===----------------------------------------------------------------------===//
 //                             Utility 
@@ -503,9 +503,12 @@ void RetainCodeMotionContext::computeCodeMotionGenKillSet() {
 bool RetainCodeMotionContext::performCodeMotion() {
   bool Changed = false;
   // Create the new retain instructions.
-  for (auto RC : InsertPoints) {
-    for (auto IP : RC.second) {
-      createIncrementBefore(RC.first, IP);
+  for (auto RC : RCRootVault) {
+    auto Iter = InsertPoints.find(RC);
+    if (Iter == InsertPoints.end())
+      continue;
+    for (auto IP : Iter->second) {
+      createIncrementBefore(Iter->first, IP);
       Changed = true;
     }
   }
@@ -870,9 +873,12 @@ void ReleaseCodeMotionContext::mergeBBDataFlowStates(SILBasicBlock *BB) {
 bool ReleaseCodeMotionContext::performCodeMotion() {
   bool Changed = false;
   // Create the new releases at each anchor point.
-  for (auto RC : InsertPoints) {
-    for (auto IP : RC.second) {
-      createDecrementBefore(RC.first, IP);
+  for (auto RC : RCRootVault) {
+    auto Iter = InsertPoints.find(RC);
+    if (Iter == InsertPoints.end())
+      continue;
+    for (auto IP : Iter->second) {
+      createDecrementBefore(Iter->first, IP);
       Changed = true;
     }
   }

lib/SILOptimizer/Transforms/SILCodeMotion.cpp

@@ -35,7 +35,7 @@ STATISTIC(NumSunk, "Number of instructions sunk");
 STATISTIC(NumRefCountOpsSimplified, "Number of enum ref count ops simplified");
 STATISTIC(NumHoisted, "Number of instructions hoisted");
 
-llvm::cl::opt<bool> DisableSILRRCodeMotion("disable-sil-cm-rr-cm", llvm::cl::init(false));
+llvm::cl::opt<bool> DisableSILRRCodeMotion("disable-sil-cm-rr-cm", llvm::cl::init(true));
 
 using namespace swift;
 

test/SILOptimizer/retain_release_code_motion.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-sil-verify-all -retain-sinking -late-release-hoisting %s
+// RUN: %target-sil-opt -enable-sil-verify-all -retain-sinking -late-release-hoisting %s | FileCheck %s
 
 import Builtin
 import Swift
@@ -215,6 +215,25 @@ bb0(%0 : $*Builtin.NativeObject):
   return %9999 : $()
 }
 
+// Make sure that is_unique stops code motion.
+// CHECK-LABEL: sil @retain_inserted_deterministically : $@convention(thin)
+// CHECK: bb0([[IN0:%[0-9]+]] : $Builtin.NativeObject, [[IN1:%[0-9]+]] : $Builtin.NativeObject, [[IN2:%[0-9]+]] : $Builtin.NativeObject, [[IN3:%[0-9]+]] : $Builtin.NativeObject):
+// CHECK: strong_retain [[IN1]] : $Builtin.NativeObject
+// CHECK: strong_retain [[IN3]] : $Builtin.NativeObject
+// CHECK: strong_retain [[IN2]] : $Builtin.NativeObject
+// CHECK: strong_retain [[IN0]] : $Builtin.NativeObject
+sil @retain_inserted_deterministically : $@convention(thin) (@owned Builtin.NativeObject, @owned Builtin.NativeObject, @owned Builtin.NativeObject, @owned Builtin.NativeObject) -> () {
+bb0(%0 : $Builtin.NativeObject, %1 : $Builtin.NativeObject, %2 : $Builtin.NativeObject, %3 : $Builtin.NativeObject):
+  strong_retain %1 : $Builtin.NativeObject
+  strong_retain %3 : $Builtin.NativeObject
+  strong_retain %2 : $Builtin.NativeObject
+  strong_retain %0 : $Builtin.NativeObject
+  %9999 = tuple()
+  %9998 = function_ref @blocker : $@convention(thin) () -> ()
+  apply %9998() : $@convention(thin) () -> ()
+  return %9999 : $()
+}
+
 // CHECK-LABEL: sil @sink_retain_partially_block : $@convention(thin) (Builtin.NativeObject) -> () {
 // CHECK: bb3:
 // CHECK-NOT: string_retain