[llvm-branch-commits] [llvm-branch] r297165 - Merging r297075:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Mar  7 11:36:53 2017
New Revision: 297165

URL: http://llvm.org/viewvc/llvm-project?rev=297165&view=rev
Log:
Merging r297075:
------------------------------------------------------------------------
r297075 | hans | 2017-03-06 13:10:40 -0800 (Mon, 06 Mar 2017) | 1 line

Disable gvn-hoist (PR32153)
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/docs/ReleaseNotes.rst
    llvm/branches/release_40/lib/Transforms/IPO/PassManagerBuilder.cpp
    llvm/branches/release_40/test/Feature/optnone-opt.ll

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  7 11:36:53 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292167,292169-292170,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,292949,293017,293021,293025,293124,293230,293259,293273,293291,293293,293309,293345,293417,293522,293542,293629,293635,293658,293673,293727,293730,294003,294102,294129,294203,294267,294318,294348-294349,294357,294527,294551,294982,295018,295116,295213,295215,295230,295486,295490,295512,295762,295990,296003,296030,296093,296260,296642,296992
+/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292167,292169-292170,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,292949,293017,293021,293025,293124,293230,293259,293273,293291,293293,293309,293345,293417,293522,293542,293629,293635,293658,293673,293727,293730,294003,294102,294129,294203,294267,294318,294348-294349,294357,294527,294551,294982,295018,295116,295213,295215,295230,295486,295490,295512,295762,295990,296003,296030,296093,296260,296642,296992,297075

Modified: llvm/branches/release_40/docs/ReleaseNotes.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/docs/ReleaseNotes.rst?rev=297165&r1=297164&r2=297165&view=diff
==============================================================================
--- llvm/branches/release_40/docs/ReleaseNotes.rst (original)
+++ llvm/branches/release_40/docs/ReleaseNotes.rst Tue Mar  7 11:36:53 2017
@@ -57,13 +57,6 @@ Non-comprehensive list of changes in thi
   with LLVM option ``-adce-remove-loops`` when the loop body otherwise has
   no live operations.
 
-* The GVNHoist pass is now enabled by default. The new pass based on Global
-  Value Numbering detects similar computations in branch code and replaces
-  multiple instances of the same computation with a unique expression.  The
-  transform benefits code size and generates better schedules.  GVNHoist is
-  more aggressive at ``-Os`` and ``-Oz``, hoisting more expressions at the
-  expense of execution time degradations.
-
  * The llvm-cov tool can now export coverage data as json. Its html output mode
    has also improved.
 

Modified: llvm/branches/release_40/lib/Transforms/IPO/PassManagerBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/Transforms/IPO/PassManagerBuilder.cpp?rev=297165&r1=297164&r2=297165&view=diff
==============================================================================
--- llvm/branches/release_40/lib/Transforms/IPO/PassManagerBuilder.cpp (original)
+++ llvm/branches/release_40/lib/Transforms/IPO/PassManagerBuilder.cpp Tue Mar  7 11:36:53 2017
@@ -141,8 +141,8 @@ static cl::opt<int> PreInlineThreshold(
              "(default = 75)"));
 
 static cl::opt<bool> 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 GVN hoisting pass"));
 
 static cl::opt<bool>
     DisableLibCallsShrinkWrap("disable-libcalls-shrinkwrap", cl::init(false),

Modified: llvm/branches/release_40/test/Feature/optnone-opt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Feature/optnone-opt.ll?rev=297165&r1=297164&r2=297165&view=diff
==============================================================================
--- llvm/branches/release_40/test/Feature/optnone-opt.ll (original)
+++ llvm/branches/release_40/test/Feature/optnone-opt.ll Tue Mar  7 11:36:53 2017
@@ -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'