commit 95294127d0ef8264274a1cd9767b15295454af63
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Sat Dec 17 01:53:15 2016 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Sat Dec 17 01:53:15 2016 +0000
tree a2ffe51bab4eb916622e0e9d1be8af96f4f3742d
parent 982c6b24b04f5dfa28aeedfb3b2e370f2359348f

Revert "[GVNHoist] Move GVNHoist to function simplification part of pipeline."

This reverts r289696, which caused TSan perf regression.

See PR31382.

llvm-svn: 290030

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

diff --git a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
index b0e4b11..a663eed 100644
--- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
+++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
@@ -249,6 +249,8 @@
   FPM.add(createCFGSimplificationPass());
   FPM.add(createSROAPass());
   FPM.add(createEarlyCSEPass());
+  if(EnableGVNHoist)
+    FPM.add(createGVNHoistPass());
   FPM.add(createLowerExpectIntrinsicPass());
 }
 
@@ -293,8 +295,6 @@
   // 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.