diff options
author | Geoff Berry <gberry@codeaurora.org> | 2017-04-13 15:36:25 +0000 |
---|---|---|
committer | Geoff Berry <gberry@codeaurora.org> | 2017-04-13 15:36:25 +0000 |
commit | 85a530fb599458666bfa9b492075df1841bdd7a5 (patch) | |
tree | 5fbe0c4e8133e2bdd571a6c604026b24e1f19d78 /llvm/lib/Transforms/IPO/PassManagerBuilder.cpp | |
parent | 5619952ee1c7f5ccf54e94202905f0d35d999293 (diff) | |
download | bcm5719-llvm-85a530fb599458666bfa9b492075df1841bdd7a5.tar.gz bcm5719-llvm-85a530fb599458666bfa9b492075df1841bdd7a5.zip |
Re-apply "[GVNHoist] Move GVNHoist to function simplification part of pipeline."
This reverts commit r296872 now that PR32153 has been fixed.
llvm-svn: 300200
Diffstat (limited to 'llvm/lib/Transforms/IPO/PassManagerBuilder.cpp')
-rw-r--r-- | llvm/lib/Transforms/IPO/PassManagerBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp index 6cc6d3b63f4..f11b58d1adc 100644 --- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -245,8 +245,6 @@ void PassManagerBuilder::populateFunctionPassManager( FPM.add(createCFGSimplificationPass()); FPM.add(createSROAPass()); FPM.add(createEarlyCSEPass()); - if (EnableGVNHoist) - FPM.add(createGVNHoistPass()); FPM.add(createLowerExpectIntrinsicPass()); } @@ -291,6 +289,8 @@ void PassManagerBuilder::addFunctionSimplificationPasses( // 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. |