Disable retain release code motion. There is some nondeterminism in

how we insert the new retain release instructions

Author: trentxintong

Diff for: lib/SILOptimizer/ARC/ARCMatchingSet.cpp

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

Diff for: lib/SILOptimizer/Transforms/RetainReleaseCodeMotion.cpp

@@ -93,6 +93,8 @@ 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));
+
 //===----------------------------------------------------------------------===//
 //                             Utility 
 //===----------------------------------------------------------------------===//
@@ -1030,6 +1032,9 @@ class RRCodeMotion : public SILFunctionTransform {
 
   /// The entry point to the transformation.
   void run() override {
+    if (DisableRRCodeMotion)
+      return;
+
     // Respect function no.optimize.
     SILFunction *F = getFunction();
     if (!F->shouldOptimize())

Diff for: 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(true));
+llvm::cl::opt<bool> DisableSILRRCodeMotion("disable-sil-cm-rr-cm", llvm::cl::init(false));
 
 using namespace swift;
 

Diff for: 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 | FileCheck %s
+// RUN: %target-sil-opt -enable-sil-verify-all -retain-sinking -late-release-hoisting %s
 
 import Builtin
 import Swift