RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:43:36 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[LoopUnroll] Properly update loop-info when cloning prologues and epilogues."

Browse Source 
This reverts commit r280901.

This caused a bunch of failures, reverting it until I investigate them.

llvm-svn: 280905
This commit is contained in:
Michael Zolotukhin 2016-09-08 03:51:30 +00:00
parent 109c858375
commit 00ccad14c6
2 changed files with 11 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/Transforms/Utils/LoopUnrollRuntime.cpp
View File

@ -291,10 +291,15 @@ static void CloneLoopBlocks(Loop *L, Value *NewIter,
Function *F = Header->getParent();
LoopBlocksDFS::RPOIterator BlockBegin = LoopBlocks.beginRPO();
LoopBlocksDFS::RPOIterator BlockEnd = LoopBlocks.endRPO();
Loop *NewLoop = nullptr;
Loop *ParentLoop = L->getParentLoop();
// The map from original loops to their cloned copies.
SmallDenseMap<const Loop *, Loop *, 4> NewLoops;
if (CreateRemainderLoop) {
NewLoop = new Loop();
if (ParentLoop)
ParentLoop->addChildLoop(NewLoop);
else
LI->addTopLevelLoop(NewLoop);
}
// For each block in the original loop, create a new copy,
// and update the value map with the newly created values.
@ -302,57 +307,10 @@ static void CloneLoopBlocks(Loop *L, Value *NewIter,
BasicBlock *NewBB = CloneBasicBlock(*BB, VMap, "." + suffix, F);
NewBlocks.push_back(NewBB);
// Figure out which loop NewBB is in.
auto findClonedLoop = [&](const Loop *OldLoop) {
Loop *&NewLoop = NewLoops[OldLoop];
// If we've encountered this loop before, return it right away.
if (NewLoop)
return NewLoop;
// If BB is from L, and we're not creating a remainder, the loop for
// NewBB will be ParentLoop, which might be null. Update NewLoops map and
// return ParentLoop.
if (OldLoop == L && !CreateRemainderLoop)
return (NewLoop = ParentLoop);
// Now we know that there should be a cloned counterpart for OldLoop, but
// we haven't seen it yet. Note that OldLoop might be L if we're
// generating a remainder loop, or it can be an inner loop of L - in this
// case we'll recreate the loop structure of L in its clone.
// This is a first block belonging to OldLoop encountered in our RPO
// traversal.
assert(*BB == OldLoop->getHeader() && "Header should be first in RPO");
NewLoop = new Loop;
Loop *OldLoopParent = OldLoop->getParentLoop();
// If OldLoop has a parent loop, we have two options:
// 1. ParentLoop is the parent of L. It won't be cloned, and it will
// be a parent for NewLoop too.
// 2. ParentLoop is not a parent of L. In this case, it should be one
// of the cloned loops and we should be able to find it in our map.
//
// If OldLoop doesn't have a parent, then NewLoop should be yet another
// top-level loop.
if (OldLoopParent) {
Loop *NewLoopParent = ParentLoop == OldLoopParent
? ParentLoop
: NewLoops.lookup(OldLoopParent);
assert(NewLoopParent && "Expected parent loop before sub-loop in RPO");
NewLoopParent->addChildLoop(NewLoop);
} else
LI->addTopLevelLoop(NewLoop);
return NewLoop;
};
Loop *NewLoop = findClonedLoop(LI->getLoopFor(*BB));
assert(NewLoop ||
(!CreateRemainderLoop && !ParentLoop) &&
"NewLoop can only be null if we are cloning top-level loop "
"without creating a remainder loop.");
if (NewLoop)
NewLoop->addBasicBlockToLoop(NewBB, *LI);
else if (ParentLoop)
ParentLoop->addBasicBlockToLoop(NewBB, *LI);
VMap[*BB] = NewBB;
if (Header == *BB) {
@ -411,8 +369,7 @@ static void CloneLoopBlocks(Loop *L, Value *NewIter,
NewPHI->setIncomingValue(idx, V);
}
}
if (CreateRemainderLoop) {
Loop *NewLoop = NewLoops[L];
if (NewLoop) {
// Add unroll disable metadata to disable future unrolling for this loop.
SmallVector<Metadata *, 4> MDs;
// Reserve first location for self reference to the LoopID metadata node.

44
test/Transforms/LoopUnroll/pr28888.ll
View File

@ -1,44 +0,0 @@
; RUN: opt -loop-unroll -verify-loop-info -unroll-runtime-epilog=false -unroll-count=4 -S < %s | FileCheck %s -check-prefix=PROLOG
; RUN: opt -loop-unroll -verify-loop-info -unroll-runtime-epilog=true -unroll-count=4 -S < %s | FileCheck %s -check-prefix=EPILOG
; PR28888
; Check that loop info is correct if we unroll an outer loop, and thus the
; remainder loop has a child loop.
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; PROLOG-LABEL: @foo
; EPILOG-LABEL: @foo
define void @foo(i1 %x) #0 {
bb:
br label %bb1
bb1:
br label %bb2
; PROLOG: bb2.prol:
; EPILOG: bb2.epil:
bb2:
%tmp = phi i64 [ 0, %bb1 ], [ %tmp2, %bb5 ]
br label %bb3
bb3:
br label %bb4
bb4:
br i1 %x, label %bb3, label %bb5
; PROLOG: bb5.3:
; EPILOG: bb5.3:
bb5:
%tmp2 = add nuw nsw i64 %tmp, 1
%tmp3 = trunc i64 %tmp2 to i32
%tmp4 = icmp eq i32 %tmp3, undef
br i1 %tmp4, label %bb6, label %bb2
bb6:
br label %bb1
}
attributes #0 = { "target-cpu"="x86-64" }