mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-05-14 11:36:09 +00:00
Code Issues Projects Releases Wiki Activity

[IRCE] Preserve DomTree and LCSSA

Browse Source 
This changes IRCE to "preserve" LCSSA and DomTree by recomputing them.
It still does not preserve LoopSimplify.

llvm-svn: 277505
This commit is contained in:
Sanjoy Das 2016-08-02 19:31:54 +00:00
parent 8a482b33fe
commit f45e03e201
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Transforms/Scalar/InductiveRangeCheckElimination.cpp
View File

@ -570,6 +570,7 @@ class LoopConstrainer {
Function &F; Function &F;
LLVMContext &Ctx; LLVMContext &Ctx;
ScalarEvolution &SE; ScalarEvolution &SE;
DominatorTree &DT;
// Information about the original loop we started out with. // Information about the original loop we started out with.
Loop &OriginalLoop; Loop &OriginalLoop;
@ -590,11 +591,12 @@ class LoopConstrainer {
public: public:
LoopConstrainer(Loop &L, LoopInfo &LI, const LoopStructure &LS, LoopConstrainer(Loop &L, LoopInfo &LI, const LoopStructure &LS,
ScalarEvolution &SE, InductiveRangeCheck::Range R) ScalarEvolution &SE, DominatorTree &DT,
InductiveRangeCheck::Range R)
: F(*L.getHeader()->getParent()), Ctx(L.getHeader()->getContext()), : F(*L.getHeader()->getParent()), Ctx(L.getHeader()->getContext()),
SE(SE), OriginalLoop(L), OriginalLoopInfo(LI), LatchTakenCount(nullptr), SE(SE), DT(DT), OriginalLoop(L), OriginalLoopInfo(LI),
OriginalPreheader(nullptr), MainLoopPreheader(nullptr), Range(R), LatchTakenCount(nullptr), OriginalPreheader(nullptr),
MainLoopStructure(LS) {} MainLoopPreheader(nullptr), Range(R), MainLoopStructure(LS) {}
// Entry point for the algorithm. Returns true on success. // Entry point for the algorithm. Returns true on success.
bool run(); bool run();
@ -1274,6 +1276,9 @@ bool LoopConstrainer::run() {
addToParentLoopIfNeeded(PreLoop.Blocks); addToParentLoopIfNeeded(PreLoop.Blocks);
addToParentLoopIfNeeded(PostLoop.Blocks); addToParentLoopIfNeeded(PostLoop.Blocks);
DT.recalculate(F);
formLCSSARecursively(OriginalLoop, DT, &OriginalLoopInfo, &SE);
return true; return true;
} }
@ -1444,8 +1449,9 @@ bool InductiveRangeCheckElimination::runOnLoop(Loop *L, LPPassManager &LPM) {
if (!SafeIterRange.hasValue()) if (!SafeIterRange.hasValue())
return false; return false;
auto &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();
LoopConstrainer LC(*L, getAnalysis<LoopInfoWrapperPass>().getLoopInfo(), LS, LoopConstrainer LC(*L, getAnalysis<LoopInfoWrapperPass>().getLoopInfo(), LS,
SE, SafeIterRange.getValue()); SE, DT, SafeIterRange.getValue());
bool Changed = LC.run(); bool Changed = LC.run();
if (Changed) { if (Changed) {

9
llvm/test/Transforms/IRCE/single-access-no-preloop.ll
View File

@ -31,12 +31,13 @@ define void @single_access_no_preloop_no_offset(i32 *%arr, i32 *%a_len_ptr, i32
; CHECK: br i1 true, label %in.bounds, label %out.of.bounds ; CHECK: br i1 true, label %in.bounds, label %out.of.bounds
; CHECK: main.exit.selector: ; CHECK: main.exit.selector:
; CHECK-NEXT: [[continue:%[^ ]+]] = icmp slt i32 %idx.next, %n ; CHECK-NEXT: %idx.next.lcssa = phi i32 [ %idx.next, %in.bounds ]
; CHECK-NEXT: [[continue:%[^ ]+]] = icmp slt i32 %idx.next.lcssa, %n
; CHECK-NEXT: br i1 [[continue]], label %main.pseudo.exit, label %exit.loopexit ; CHECK-NEXT: br i1 [[continue]], label %main.pseudo.exit, label %exit.loopexit
; CHECK: main.pseudo.exit: ; CHECK: main.pseudo.exit:
; CHECK-NEXT: %idx.copy = phi i32 [ 0, %loop.preheader ], [ %idx.next, %main.exit.selector ] ; CHECK-NEXT: %idx.copy = phi i32 [ 0, %loop.preheader ], [ %idx.next.lcssa, %main.exit.selector ]
; CHECK-NEXT: %indvar.end = phi i32 [ 0, %loop.preheader ], [ %idx.next, %main.exit.selector ] ; CHECK-NEXT: %indvar.end = phi i32 [ 0, %loop.preheader ], [ %idx.next.lcssa, %main.exit.selector ]
; CHECK-NEXT: br label %postloop ; CHECK-NEXT: br label %postloop
; CHECK: postloop: ; CHECK: postloop:
@ -102,7 +103,7 @@ define void @single_access_no_preloop_with_offset(i32 *%arr, i32 *%a_len_ptr, i3
; CHECK: br i1 [[continue_main_loop]], label %loop, label %main.exit.selector ; CHECK: br i1 [[continue_main_loop]], label %loop, label %main.exit.selector
; CHECK: main.pseudo.exit: ; CHECK: main.pseudo.exit:
; CHECK: %idx.copy = phi i32 [ 0, %loop.preheader ], [ %idx.next, %main.exit.selector ] ; CHECK: %idx.copy = phi i32 [ 0, %loop.preheader ], [ %idx.next.lcssa, %main.exit.selector ]
; CHECK: br label %postloop ; CHECK: br label %postloop
; CHECK: loop.postloop: ; CHECK: loop.postloop:

2
llvm/test/Transforms/IRCE/single-access-with-preloop.ll
View File

@ -53,7 +53,7 @@ define void @single_access_with_preloop(i32 *%arr, i32 *%a_len_ptr, i32 %n, i32
; CHECK: br i1 [[continue_mainloop_cond]], label %loop, label %main.exit.selector ; CHECK: br i1 [[continue_mainloop_cond]], label %loop, label %main.exit.selector
; CHECK: main.exit.selector: ; CHECK: main.exit.selector:
; CHECK: [[mainloop_its_left:[^ ]+]] = icmp slt i32 %idx.next, %n ; CHECK: [[mainloop_its_left:[^ ]+]] = icmp slt i32 %idx.next.lcssa, %n
; CHECK: br i1 [[mainloop_its_left]], label %main.pseudo.exit, label %exit.loopexit ; CHECK: br i1 [[mainloop_its_left]], label %main.pseudo.exit, label %exit.loopexit
; CHECK: in.bounds.preloop: ; CHECK: in.bounds.preloop: