[llvm] r296872 - Revert "Re-apply "[GVNHoist] Move GVNHoist to function simplification part of pipeline.""

[Benjamin Kramer via llvm-commits]

Author: d0k
Date: Fri Mar  3 08:27:53 2017
New Revision: 296872

URL: http://llvm.org/viewvc/llvm-project?rev=296872&view=rev
Log:
Revert "Re-apply "[GVNHoist] Move GVNHoist to function simplification part of pipeline.""

This reverts commit r296759. Miscompiles bash.

Removed:
    llvm/trunk/test/Transforms/GVNHoist/hoist-inline.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp

Modified: llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp?rev=296872&r1=296871&r2=296872&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp Fri Mar  3 08:27:53 2017
@@ -244,6 +244,8 @@ void PassManagerBuilder::populateFunctio
   FPM.add(createCFGSimplificationPass());
   FPM.add(createSROAPass());
   FPM.add(createEarlyCSEPass());
+  if(EnableGVNHoist)
+    FPM.add(createGVNHoistPass());
   FPM.add(createLowerExpectIntrinsicPass());
 }
 
@@ -288,8 +290,6 @@ void PassManagerBuilder::addFunctionSimp
   // Break up aggregate allocas, using SSAUpdater.
   MPM.add(createSROAPass());
   MPM.add(createEarlyCSEPass());              // Catch trivial redundancies
-  if(EnableGVNHoist)
-    MPM.add(createGVNHoistPass());
   // Speculative execution if the target has divergent branches; otherwise nop.
   MPM.add(createSpeculativeExecutionIfHasBranchDivergencePass());
   MPM.add(createJumpThreadingPass());         // Thread jumps.

Removed: llvm/trunk/test/Transforms/GVNHoist/hoist-inline.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVNHoist/hoist-inline.ll?rev=296871&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/GVNHoist/hoist-inline.ll (original)
+++ llvm/trunk/test/Transforms/GVNHoist/hoist-inline.ll (removed)
@@ -1,38 +0,0 @@
-; RUN: opt -S -O2 < %s | FileCheck %s
-
-; Check that the inlined loads are hoisted.
-; CHECK-LABEL: define i32 @fun(
-; CHECK-LABEL: entry:
-; CHECK: load i32, i32* @A
-; CHECK: if.then:
-
- at A = external global i32
- at B = external global i32
- at C = external global i32
-
-define i32 @loadA() {
-   %a = load i32, i32* @A
-   ret i32 %a
-}
-
-define i32 @fun(i1 %c) {
-entry:
-  br i1 %c, label %if.then, label %if.else
-
-if.then:
-  store i32 1, i32* @B
-  %call1 = call i32 @loadA()
-  store i32 2, i32* @C
-  br label %if.endif
-
-if.else:
-  store i32 2, i32* @C
-  %call2 = call i32 @loadA()
-  store i32 1, i32* @B
-  br label %if.endif
-
-if.endif:
-  %ret = phi i32 [ %call1, %if.then ], [ %call2, %if.else ]
-  ret i32 %ret
-}
-