[llvm-branch-commits] [llvm-branch] r205795 - Merging r201104:

[Tom Stellard]

Author: tstellar
Date: Tue Apr  8 16:18:11 2014
New Revision: 205795

URL: http://llvm.org/viewvc/llvm-project?rev=205795&view=rev
Log:
Merging r201104:

------------------------------------------------------------------------
r201104 | chandlerc | 2014-02-10 14:39:35 -0500 (Mon, 10 Feb 2014) | 26 lines

[LPM] A terribly simple fix to a terribly complex bug: PR18773.

The crux of the issue is that LCSSA doesn't preserve stateful alias
analyses. Before r200067, LICM didn't cause LCSSA to run in the LTO pass
manager, where LICM runs essentially without any of the other loop
passes. As a consequence the globalmodref-aa pass run before that loop
pass manager was able to survive the loop pass manager and be used by
DSE to eliminate stores in the function called from the loop body in
Adobe-C++/loop_unroll (and similar patterns in other benchmarks).

When LICM was taught to preserve LCSSA it had to require it as well.
This caused it to be run in the loop pass manager and because it did not
preserve AA, the stateful AA was lost. Most of LLVM's AA isn't stateful
and so this didn't manifest in most cases. Also, in most cases LCSSA was
already running, and so there was no interesting change.

The real kicker is that LCSSA by its definition (injecting PHI nodes
only) trivially preserves AA! All we need to do is mark it, and then
everything goes back to working as intended. It probably was blocking
some other weird cases of stateful AA but the only one I have is
a 1000-line IR test case from loop_unroll, so I don't really have a good
test case here.

Hopefully this fixes the regressions on performance that have been seen
since that revision.

------------------------------------------------------------------------

Modified:
    llvm/branches/release_34/lib/Transforms/Utils/LCSSA.cpp

Modified: llvm/branches/release_34/lib/Transforms/Utils/LCSSA.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Transforms/Utils/LCSSA.cpp?rev=205795&r1=205794&r2=205795&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Transforms/Utils/LCSSA.cpp (original)
+++ llvm/branches/release_34/lib/Transforms/Utils/LCSSA.cpp Tue Apr  8 16:18:11 2014
@@ -32,6 +32,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/Dominators.h"
+#include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/LoopPass.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/IR/Constants.h"
@@ -70,6 +71,7 @@ namespace {
       AU.addRequired<DominatorTree>();
       AU.addRequired<LoopInfo>();
       AU.addPreservedID(LoopSimplifyID);
+      AU.addPreserved<AliasAnalysis>();
       AU.addPreserved<ScalarEvolution>();
     }
   private: