From b290294cc9700c373d58d40e963751195c052d84 Mon Sep 17 00:00:00 2001 From: Bruno Cardoso Lopes Date: Thu, 4 Aug 2016 04:16:24 +0000 Subject: [PATCH] Revert "GVN-hoist: enable by default" & "Make GVN Hoisting obey optnone/bisect." This reverts commits r277685 & r277688. r277685 broke compiler-rt compilation http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/23335 and r277685 is a followup from it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@277690 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/PassManagerBuilder.cpp | 4 ++-- test/Feature/optnone-opt.ll | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/IPO/PassManagerBuilder.cpp b/lib/Transforms/IPO/PassManagerBuilder.cpp index 2bf88703d2a..99fb422e254 100644 --- a/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -138,8 +138,8 @@ static cl::opt PreInlineThreshold( "(default = 75)")); static cl::opt EnableGVNHoist( - "enable-gvn-hoist", cl::init(true), cl::Hidden, - cl::desc("Enable the GVN hoisting pass (default = on)")); + "enable-gvn-hoist", cl::init(false), cl::Hidden, + cl::desc("Enable the experimental GVN Hoisting pass")); PassManagerBuilder::PassManagerBuilder() { OptLevel = 2; diff --git a/test/Feature/optnone-opt.ll b/test/Feature/optnone-opt.ll index a00013ec179..f53877d4aea 100644 --- a/test/Feature/optnone-opt.ll +++ b/test/Feature/optnone-opt.ll @@ -41,7 +41,6 @@ attributes #0 = { optnone noinline } ; OPT-O1-DAG: Skipping pass 'Combine redundant instructions' ; OPT-O1-DAG: Skipping pass 'Dead Store Elimination' ; OPT-O1-DAG: Skipping pass 'Early CSE' -; OPT-O1-DAG: Skipping pass 'Early GVN Hoisting of Expressions' ; OPT-O1-DAG: Skipping pass 'Jump Threading' ; OPT-O1-DAG: Skipping pass 'MemCpy Optimization' ; OPT-O1-DAG: Skipping pass 'Reassociate expressions'