Update LoopSimplify and LoopUnswitch to use the new makeLoopInvariant

function.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75584 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2009-07-14 01:37:59 +00:00
parent 6084326c3c
commit 0df6e09d43
3 changed files with 17 additions and 17 deletions

View File

@ -168,9 +168,14 @@ static Value *FindLIVLoopCondition(Value *Cond, Loop *L, bool &Changed) {
if (isa<Constant>(Cond)) return 0;
// TODO: Handle: br (VARIANT|INVARIANT).
// TODO: Hoist simple expressions out of loops.
if (L->isLoopInvariant(Cond)) return Cond;
// Hoist simple values out.
if (L->makeLoopInvariant(Cond)) {
Changed = true;
return Cond;
}
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Cond))
if (BO->getOpcode() == Instruction::And ||
BO->getOpcode() == Instruction::Or) {

View File

@ -91,7 +91,7 @@ namespace {
private:
bool ProcessLoop(Loop *L);
BasicBlock *RewriteLoopExitBlock(Loop *L, BasicBlock *Exit);
void InsertPreheaderForLoop(Loop *L);
BasicBlock *InsertPreheaderForLoop(Loop *L);
Loop *SeparateNestedLoop(Loop *L);
void InsertUniqueBackedgeBlock(Loop *L);
void PlaceSplitBlockCarefully(BasicBlock *NewBB,
@ -193,8 +193,9 @@ ReprocessLoop:
"Header isn't first block in loop?");
// Does the loop already have a preheader? If so, don't insert one.
if (L->getLoopPreheader() == 0) {
InsertPreheaderForLoop(L);
BasicBlock *Preheader = L->getLoopPreheader();
if (!Preheader) {
Preheader = InsertPreheaderForLoop(L);
NumInserted++;
Changed = true;
}
@ -287,19 +288,11 @@ ReprocessLoop:
Instruction *Inst = I++;
if (Inst == CI)
continue;
if (Inst->isTrapping()) {
if (!L->makeLoopInvariant(Inst, Preheader->getTerminator())) {
AllInvariant = false;
Changed = true;
break;
}
for (unsigned j = 0, f = Inst->getNumOperands(); j != f; ++j)
if (!L->isLoopInvariant(Inst->getOperand(j))) {
AllInvariant = false;
break;
}
if (!AllInvariant)
break;
// Hoist.
Inst->moveBefore(L->getLoopPreheader()->getTerminator());
}
if (!AllInvariant) continue;
@ -340,7 +333,7 @@ ReprocessLoop:
/// preheader, this method is called to insert one. This method has two phases:
/// preheader insertion and analysis updating.
///
void LoopSimplify::InsertPreheaderForLoop(Loop *L) {
BasicBlock *LoopSimplify::InsertPreheaderForLoop(Loop *L) {
BasicBlock *Header = L->getHeader();
// Compute the set of predecessors of the loop that are not in the loop.
@ -367,6 +360,8 @@ void LoopSimplify::InsertPreheaderForLoop(Loop *L) {
// Make sure that NewBB is put someplace intelligent, which doesn't mess up
// code layout too horribly.
PlaceSplitBlockCarefully(NewBB, OutsideBlocks, L);
return NewBB;
}
/// RewriteLoopExitBlock - Ensure that the loop preheader dominates all exit

View File

@ -1,6 +1,6 @@
; RUN: llvm-as < %s | opt -indvars | llvm-dis > %t
; RUN: grep {\[%\]tmp5.lcssa = phi i8 \\\[ 63, \[%\]cc70a02__complex_integers__Oadd.153.exit.i \\\]} %t
; RUN: grep {\[%\]tmp4.lcssa = phi i8 \\\[ -28, \[%\]cc70a02__complex_integers__Oadd.153.exit.i \\\]} %t
; RUN: grep {\[%\]tmp7 = icmp eq i8 -28, -28} %t
; RUN: grep {\[%\]tmp8 = icmp eq i8 63, 63} %t
; PR4477
; Indvars should compute the exit values in loop.