[llvm] 8abb2ac - Revert "Re-apply "[AArch64] Enable "sink-and-fold" in MachineSink by default (#67432)""

[Caroline Tice via llvm-commits]

Author: Caroline Tice
Date: 2023-10-06T20:51:48-07:00
New Revision: 8abb2ace888bdd04a1bdb4ac2f2fc25d57a5760a

URL: https://github.com/llvm/llvm-project/commit/8abb2ace888bdd04a1bdb4ac2f2fc25d57a5760a
DIFF: https://github.com/llvm/llvm-project/commit/8abb2ace888bdd04a1bdb4ac2f2fc25d57a5760a.diff

LOG: Revert "Re-apply "[AArch64] Enable "sink-and-fold" in MachineSink by default (#67432)""

This reverts commit a9d0ab2ee572f179f80483f3ebbbcdd03c3b4481.
That commit is causing clang crashes.

Added: 
    

Modified: 
    llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
    llvm/test/CodeGen/AArch64/sink-and-fold.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index fcc30a7cfceaf47..3d818c76bd4b7d7 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -200,7 +200,7 @@ static cl::opt<bool> EnableGISelLoadStoreOptPostLegal(
 static cl::opt<bool>
     EnableSinkFold("aarch64-enable-sink-fold",
                    cl::desc("Enable sinking and folding of instruction copies"),
-                   cl::init(true), cl::Hidden);
+                   cl::init(false), cl::Hidden);
 
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAArch64Target() {
   // Register the target.

diff  --git a/llvm/test/CodeGen/AArch64/sink-and-fold.ll b/llvm/test/CodeGen/AArch64/sink-and-fold.ll
index 52007221e12a7b5..632fdb391053121 100644
--- a/llvm/test/CodeGen/AArch64/sink-and-fold.ll
+++ b/llvm/test/CodeGen/AArch64/sink-and-fold.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc < %s | FileCheck %s
+; RUN: llc -aarch64-enable-sink-fold=true < %s | FileCheck %s
 target triple = "aarch64-linux"
 
 declare i32 @use(...)