mirror of
https://github.com/RPCS3/llvm.git
synced 2025-02-24 21:00:36 +00:00
[IRCE] Preserve DomTree and LCSSA
This changes IRCE to "preserve" LCSSA and DomTree by recomputing them. It still does not preserve LoopSimplify. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@277505 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
87d298325f
commit
ee53c92338
lib/Transforms/Scalar
test/Transforms/IRCE
@ -570,6 +570,7 @@ class LoopConstrainer {
|
||||
Function &F;
|
||||
LLVMContext &Ctx;
|
||||
ScalarEvolution &SE;
|
||||
DominatorTree &DT;
|
||||
|
||||
// Information about the original loop we started out with.
|
||||
Loop &OriginalLoop;
|
||||
@ -590,11 +591,12 @@ class LoopConstrainer {
|
||||
|
||||
public:
|
||||
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()),
|
||||
SE(SE), OriginalLoop(L), OriginalLoopInfo(LI), LatchTakenCount(nullptr),
|
||||
OriginalPreheader(nullptr), MainLoopPreheader(nullptr), Range(R),
|
||||
MainLoopStructure(LS) {}
|
||||
SE(SE), DT(DT), OriginalLoop(L), OriginalLoopInfo(LI),
|
||||
LatchTakenCount(nullptr), OriginalPreheader(nullptr),
|
||||
MainLoopPreheader(nullptr), Range(R), MainLoopStructure(LS) {}
|
||||
|
||||
// Entry point for the algorithm. Returns true on success.
|
||||
bool run();
|
||||
@ -1274,6 +1276,9 @@ bool LoopConstrainer::run() {
|
||||
addToParentLoopIfNeeded(PreLoop.Blocks);
|
||||
addToParentLoopIfNeeded(PostLoop.Blocks);
|
||||
|
||||
DT.recalculate(F);
|
||||
formLCSSARecursively(OriginalLoop, DT, &OriginalLoopInfo, &SE);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1444,8 +1449,9 @@ bool InductiveRangeCheckElimination::runOnLoop(Loop *L, LPPassManager &LPM) {
|
||||
if (!SafeIterRange.hasValue())
|
||||
return false;
|
||||
|
||||
auto &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();
|
||||
LoopConstrainer LC(*L, getAnalysis<LoopInfoWrapperPass>().getLoopInfo(), LS,
|
||||
SE, SafeIterRange.getValue());
|
||||
SE, DT, SafeIterRange.getValue());
|
||||
bool Changed = LC.run();
|
||||
|
||||
if (Changed) {
|
||||
|
@ -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: 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: main.pseudo.exit:
|
||||
; CHECK-NEXT: %idx.copy = phi i32 [ 0, %loop.preheader ], [ %idx.next, %main.exit.selector ]
|
||||
; CHECK-NEXT: %indvar.end = 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.lcssa, %main.exit.selector ]
|
||||
; CHECK-NEXT: br label %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: 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: loop.postloop:
|
||||
|
@ -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: 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: in.bounds.preloop:
|
||||
|
Loading…
x
Reference in New Issue
Block a user