mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
Undo commit 258700 due to missing commit message
llvm-svn: 258708
This commit is contained in:
Lawrence Hu
parent
d9e4b63bf8
commit
0572a631ee
@ -396,7 +396,6 @@ namespace {
|
||||
bool instrDependsOn(Instruction *I,
|
||||
UsesTy::iterator Start,
|
||||
UsesTy::iterator End);
|
||||
void replaceIV(Instruction *Inst, Instruction *IV, const SCEV *IterCount);
|
||||
|
||||
LoopReroll *Parent;
|
||||
|
||||
@ -461,48 +460,6 @@ static bool hasUsesOutsideLoop(Instruction *I, Loop *L) {
|
||||
return false;
|
||||
}
|
||||
|
||||
static const SCEVConstant *getIncrmentFactorSCEV(ScalarEvolution *SE,
|
||||
const SCEV *SCEVExpr,
|
||||
Instruction &IV) {
|
||||
const SCEVMulExpr *MulSCEV = dyn_cast<SCEVMulExpr>(SCEVExpr);
|
||||
|
||||
// If StepRecurrence of a SCEVExpr is a constant (c1 * c2, c2 = sizeof(ptr)),
|
||||
// Return c1.
|
||||
if (!MulSCEV && IV.getType()->isPointerTy())
|
||||
if (const SCEVConstant *IncSCEV = dyn_cast<SCEVConstant>(SCEVExpr)) {
|
||||
const PointerType *PTy = cast<PointerType>(IV.getType());
|
||||
Type *ElTy = PTy->getElementType();
|
||||
const SCEV *SizeOfExpr =
|
||||
SE->getSizeOfExpr(SE->getEffectiveSCEVType(IV.getType()), ElTy);
|
||||
if (IncSCEV->getValue()->getValue().isNegative()) {
|
||||
const SCEV *NewSCEV =
|
||||
SE->getUDivExpr(SE->getNegativeSCEV(SCEVExpr), SizeOfExpr);
|
||||
return dyn_cast<SCEVConstant>(SE->getNegativeSCEV(NewSCEV));
|
||||
} else {
|
||||
return dyn_cast<SCEVConstant>(SE->getUDivExpr(SCEVExpr, SizeOfExpr));
|
||||
}
|
||||
}
|
||||
|
||||
if (!MulSCEV)
|
||||
return nullptr;
|
||||
|
||||
// If StepRecurrence of a SCEVExpr is a c * sizeof(x), where c is constant,
|
||||
// Return c.
|
||||
const SCEVConstant *CIncSCEV = nullptr;
|
||||
for (const SCEV *Operand : MulSCEV->operands()) {
|
||||
if (const SCEVConstant *Constant = dyn_cast<SCEVConstant>(Operand)) {
|
||||
CIncSCEV = Constant;
|
||||
} else if (const SCEVUnknown *Unknown = dyn_cast<SCEVUnknown>(Operand)) {
|
||||
Type *AllocTy;
|
||||
if (!Unknown->isSizeOf(AllocTy))
|
||||
break;
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
return CIncSCEV;
|
||||
}
|
||||
|
||||
// Collect the list of loop induction variables with respect to which it might
|
||||
// be possible to reroll the loop.
|
||||
void LoopReroll::collectPossibleIVs(Loop *L,
|
||||
@ -512,7 +469,7 @@ void LoopReroll::collectPossibleIVs(Loop *L,
|
||||
IE = Header->getFirstInsertionPt(); I != IE; ++I) {
|
||||
if (!isa<PHINode>(I))
|
||||
continue;
|
||||
if (!I->getType()->isIntegerTy() && !I->getType()->isPointerTy())
|
||||
if (!I->getType()->isIntegerTy())
|
||||
continue;
|
||||
|
||||
if (const SCEVAddRecExpr *PHISCEV =
|
||||
@ -521,14 +478,9 @@ void LoopReroll::collectPossibleIVs(Loop *L,
|
||||
continue;
|
||||
if (!PHISCEV->isAffine())
|
||||
continue;
|
||||
const SCEVConstant *IncSCEV = nullptr;
|
||||
if (I->getType()->isPointerTy())
|
||||
IncSCEV =
|
||||
getIncrmentFactorSCEV(SE, PHISCEV->getStepRecurrence(*SE), *I);
|
||||
else
|
||||
IncSCEV = dyn_cast<SCEVConstant>(PHISCEV->getStepRecurrence(*SE));
|
||||
if (IncSCEV) {
|
||||
const APInt &AInt = IncSCEV->getValue()->getValue().abs();
|
||||
if (const SCEVConstant *IncSCEV =
|
||||
dyn_cast<SCEVConstant>(PHISCEV->getStepRecurrence(*SE))) {
|
||||
const APInt &AInt = IncSCEV->getAPInt().abs();
|
||||
if (IncSCEV->getValue()->isZero() || AInt.uge(MaxInc))
|
||||
continue;
|
||||
IVToIncMap[&*I] = IncSCEV->getValue()->getSExtValue();
|
||||
@ -699,12 +651,10 @@ static bool isSimpleArithmeticOp(User *IVU) {
|
||||
|
||||
static bool isLoopIncrement(User *U, Instruction *IV) {
|
||||
BinaryOperator *BO = dyn_cast<BinaryOperator>(U);
|
||||
|
||||
if ((BO && BO->getOpcode() != Instruction::Add) ||
|
||||
(!BO && !isa<GetElementPtrInst>(U)))
|
||||
if (!BO || BO->getOpcode() != Instruction::Add)
|
||||
return false;
|
||||
|
||||
for (auto *UU : U->users()) {
|
||||
for (auto *UU : BO->users()) {
|
||||
PHINode *PN = dyn_cast<PHINode>(UU);
|
||||
if (PN && PN == IV)
|
||||
return true;
|
||||
@ -1322,84 +1272,61 @@ void LoopReroll::DAGRootTracker::replace(const SCEV *IterCount) {
|
||||
|
||||
++J;
|
||||
}
|
||||
bool Negative = IVToIncMap[IV] < 0;
|
||||
const DataLayout &DL = Header->getModule()->getDataLayout();
|
||||
|
||||
// We need to create a new induction variable for each different BaseInst.
|
||||
for (auto &DRS : RootSets)
|
||||
for (auto &DRS : RootSets) {
|
||||
// Insert the new induction variable.
|
||||
replaceIV(DRS.BaseInst, IV, IterCount);
|
||||
const SCEVAddRecExpr *RealIVSCEV =
|
||||
cast<SCEVAddRecExpr>(SE->getSCEV(DRS.BaseInst));
|
||||
const SCEV *Start = RealIVSCEV->getStart();
|
||||
const SCEVAddRecExpr *H = cast<SCEVAddRecExpr>(SE->getAddRecExpr(
|
||||
Start, SE->getConstant(RealIVSCEV->getType(), Negative ? -1 : 1), L,
|
||||
SCEV::FlagAnyWrap));
|
||||
{ // Limit the lifetime of SCEVExpander.
|
||||
SCEVExpander Expander(*SE, DL, "reroll");
|
||||
Value *NewIV = Expander.expandCodeFor(H, IV->getType(), &Header->front());
|
||||
|
||||
SimplifyInstructionsInBlock(Header, TLI);
|
||||
DeleteDeadPHIs(Header, TLI);
|
||||
}
|
||||
for (auto &KV : Uses) {
|
||||
if (KV.second.find_first() == 0)
|
||||
KV.first->replaceUsesOfWith(DRS.BaseInst, NewIV);
|
||||
}
|
||||
|
||||
void LoopReroll::DAGRootTracker::replaceIV(Instruction *Inst,
|
||||
Instruction *InstIV,
|
||||
const SCEV *IterCount) {
|
||||
BasicBlock *Header = L->getHeader();
|
||||
int64_t Inc = IVToIncMap[InstIV];
|
||||
bool Negative = Inc < 0;
|
||||
if (BranchInst *BI = dyn_cast<BranchInst>(Header->getTerminator())) {
|
||||
// FIXME: Why do we need this check?
|
||||
if (Uses[BI].find_first() == IL_All) {
|
||||
const SCEV *ICSCEV = RealIVSCEV->evaluateAtIteration(IterCount, *SE);
|
||||
|
||||
const SCEVAddRecExpr *RealIVSCEV = cast<SCEVAddRecExpr>(SE->getSCEV(Inst));
|
||||
const SCEV *Start = RealIVSCEV->getStart();
|
||||
// Iteration count SCEV minus 1
|
||||
const SCEV *ICMinus1SCEV = SE->getMinusSCEV(
|
||||
ICSCEV, SE->getConstant(ICSCEV->getType(), Negative ? -1 : 1));
|
||||
|
||||
const SCEV *SizeOfExpr = nullptr;
|
||||
const SCEV *IncrExpr =
|
||||
SE->getConstant(RealIVSCEV->getType(), Negative ? -1 : 1);
|
||||
if (auto *PTy = dyn_cast<PointerType>(Inst->getType())) {
|
||||
Type *ElTy = PTy->getElementType();
|
||||
SizeOfExpr =
|
||||
SE->getSizeOfExpr(SE->getEffectiveSCEVType(Inst->getType()), ElTy);
|
||||
IncrExpr = SE->getMulExpr(IncrExpr, SizeOfExpr);
|
||||
}
|
||||
const SCEV *NewIVSCEV =
|
||||
SE->getAddRecExpr(Start, IncrExpr, L, SCEV::FlagAnyWrap);
|
||||
Value *ICMinus1; // Iteration count minus 1
|
||||
if (isa<SCEVConstant>(ICMinus1SCEV)) {
|
||||
ICMinus1 = Expander.expandCodeFor(ICMinus1SCEV, NewIV->getType(), BI);
|
||||
} else {
|
||||
BasicBlock *Preheader = L->getLoopPreheader();
|
||||
if (!Preheader)
|
||||
Preheader = InsertPreheaderForLoop(L, DT, LI, PreserveLCSSA);
|
||||
|
||||
{ // Limit the lifetime of SCEVExpander.
|
||||
const DataLayout &DL = Header->getModule()->getDataLayout();
|
||||
SCEVExpander Expander(*SE, DL, "reroll");
|
||||
Value *NewIV =
|
||||
Expander.expandCodeFor(NewIVSCEV, InstIV->getType(), &Header->front());
|
||||
ICMinus1 = Expander.expandCodeFor(ICMinus1SCEV, NewIV->getType(),
|
||||
Preheader->getTerminator());
|
||||
}
|
||||
|
||||
for (auto &KV : Uses)
|
||||
if (KV.second.find_first() == 0)
|
||||
KV.first->replaceUsesOfWith(Inst, NewIV);
|
||||
Value *Cond =
|
||||
new ICmpInst(BI, CmpInst::ICMP_EQ, NewIV, ICMinus1, "exitcond");
|
||||
BI->setCondition(Cond);
|
||||
|
||||
if (BranchInst *BI = dyn_cast<BranchInst>(Header->getTerminator())) {
|
||||
// FIXME: Why do we need this check?
|
||||
if (Uses[BI].find_first() == IL_All) {
|
||||
const SCEV *ICSCEV = RealIVSCEV->evaluateAtIteration(IterCount, *SE);
|
||||
|
||||
// Iteration count SCEV minus or plus 1
|
||||
const SCEV *MinusPlus1SCEV =
|
||||
SE->getConstant(ICSCEV->getType(), Negative ? -1 : 1);
|
||||
if (Inst->getType()->isPointerTy()) {
|
||||
assert(SizeOfExpr && "SizeOfExpr is not initialized");
|
||||
MinusPlus1SCEV = SE->getMulExpr(MinusPlus1SCEV, SizeOfExpr);
|
||||
if (BI->getSuccessor(1) != Header)
|
||||
BI->swapSuccessors();
|
||||
}
|
||||
|
||||
const SCEV *ICMinusPlus1SCEV = SE->getMinusSCEV(ICSCEV, MinusPlus1SCEV);
|
||||
// Iteration count minus 1
|
||||
Value *ICMinusPlus1 = nullptr;
|
||||
if (isa<SCEVConstant>(ICMinusPlus1SCEV)) {
|
||||
ICMinusPlus1 =
|
||||
Expander.expandCodeFor(ICMinusPlus1SCEV, NewIV->getType(), BI);
|
||||
} else {
|
||||
BasicBlock *Preheader = L->getLoopPreheader();
|
||||
if (!Preheader)
|
||||
Preheader = InsertPreheaderForLoop(L, DT, LI, PreserveLCSSA);
|
||||
ICMinusPlus1 = Expander.expandCodeFor(
|
||||
ICMinusPlus1SCEV, NewIV->getType(), Preheader->getTerminator());
|
||||
}
|
||||
|
||||
Value *Cond =
|
||||
new ICmpInst(BI, CmpInst::ICMP_EQ, NewIV, ICMinusPlus1, "exitcond");
|
||||
BI->setCondition(Cond);
|
||||
|
||||
if (BI->getSuccessor(1) != Header)
|
||||
BI->swapSuccessors();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SimplifyInstructionsInBlock(Header, TLI);
|
||||
DeleteDeadPHIs(Header, TLI);
|
||||
}
|
||||
|
||||
// Validate the selected reductions. All iterations must have an isomorphic
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
; RUN: opt -S -loop-reroll %s | FileCheck %s
|
||||
target triple = "aarch64--linux-gnu"
|
||||
|
||||
define i32 @test(i32* readonly %buf, i32* readnone %end) #0 {
|
||||
entry:
|
||||
%cmp.9 = icmp eq i32* %buf, %end
|
||||
br i1 %cmp.9, label %while.end, label %while.body.preheader
|
||||
|
||||
while.body.preheader:
|
||||
br label %while.body
|
||||
|
||||
while.body:
|
||||
;CHECK-LABEL: while.body:
|
||||
;CHECK-NEXT: %indvar = phi i64 [ %indvar.next, %while.body ], [ 0, %while.body.preheader ]
|
||||
;CHECK-NEXT: %S.011 = phi i32 [ %add, %while.body ], [ undef, %while.body.preheader ]
|
||||
;CHECK-NEXT: %scevgep = getelementptr i32, i32* %buf, i64 %indvar
|
||||
;CHECK-NEXT: %4 = load i32, i32* %scevgep, align 4
|
||||
;CHECK-NEXT: %add = add nsw i32 %4, %S.011
|
||||
;CHECK-NEXT: %indvar.next = add i64 %indvar, 1
|
||||
;CHECK-NEXT: %exitcond = icmp eq i32* %scevgep, %scevgep5
|
||||
;CHECK-NEXT: br i1 %exitcond, label %while.end.loopexit, label %while.body
|
||||
|
||||
%S.011 = phi i32 [ %add2, %while.body ], [ undef, %while.body.preheader ]
|
||||
%buf.addr.010 = phi i32* [ %add.ptr, %while.body ], [ %buf, %while.body.preheader ]
|
||||
%0 = load i32, i32* %buf.addr.010, align 4
|
||||
%add = add nsw i32 %0, %S.011
|
||||
%arrayidx1 = getelementptr inbounds i32, i32* %buf.addr.010, i64 1
|
||||
%1 = load i32, i32* %arrayidx1, align 4
|
||||
%add2 = add nsw i32 %add, %1
|
||||
%add.ptr = getelementptr inbounds i32, i32* %buf.addr.010, i64 2
|
||||
%cmp = icmp eq i32* %add.ptr, %end
|
||||
br i1 %cmp, label %while.end.loopexit, label %while.body
|
||||
|
||||
while.end.loopexit:
|
||||
%add2.lcssa = phi i32 [ %add2, %while.body ]
|
||||
br label %while.end
|
||||
|
||||
while.end:
|
||||
%S.0.lcssa = phi i32 [ undef, %entry ], [ %add2.lcssa, %while.end.loopexit ]
|
||||
ret i32 %S.0.lcssa
|
||||
}
|
||||
|
||||
define i32 @test2(i32* readonly %buf, i32* readnone %end) #0 {
|
||||
entry:
|
||||
%cmp.9 = icmp eq i32* %buf, %end
|
||||
br i1 %cmp.9, label %while.end, label %while.body.preheader
|
||||
|
||||
while.body.preheader:
|
||||
br label %while.body
|
||||
|
||||
while.body:
|
||||
;CHECK-LABEL: while.body:
|
||||
;CHECK-NEXT: %indvar = phi i64 [ %indvar.next, %while.body ], [ 0, %while.body.preheader ]
|
||||
;CHECK-NEXT: %S.011 = phi i32 [ %add, %while.body ], [ undef, %while.body.preheader ]
|
||||
;CHECK-NEXT: %4 = mul i64 %indvar, -1
|
||||
;CHECK-NEXT: %scevgep = getelementptr i32, i32* %buf, i64 %4
|
||||
;CHECK-NEXT: %5 = load i32, i32* %scevgep, align 4
|
||||
;CHECK-NEXT: %add = add nsw i32 %5, %S.011
|
||||
;CHECK-NEXT: %indvar.next = add i64 %indvar, 1
|
||||
;CHECK-NEXT: %exitcond = icmp eq i32* %scevgep, %scevgep5
|
||||
;CHECK-NEXT: br i1 %exitcond, label %while.end.loopexit, label %while.body
|
||||
|
||||
%S.011 = phi i32 [ %add2, %while.body ], [ undef, %while.body.preheader ]
|
||||
%buf.addr.010 = phi i32* [ %add.ptr, %while.body ], [ %buf, %while.body.preheader ]
|
||||
%0 = load i32, i32* %buf.addr.010, align 4
|
||||
%add = add nsw i32 %0, %S.011
|
||||
%arrayidx1 = getelementptr inbounds i32, i32* %buf.addr.010, i64 -1
|
||||
%1 = load i32, i32* %arrayidx1, align 4
|
||||
%add2 = add nsw i32 %add, %1
|
||||
%add.ptr = getelementptr inbounds i32, i32* %buf.addr.010, i64 -2
|
||||
%cmp = icmp eq i32* %add.ptr, %end
|
||||
br i1 %cmp, label %while.end.loopexit, label %while.body
|
||||
|
||||
while.end.loopexit:
|
||||
%add2.lcssa = phi i32 [ %add2, %while.body ]
|
||||
br label %while.end
|
||||
|
||||
while.end:
|
||||
%S.0.lcssa = phi i32 [ undef, %entry ], [ %add2.lcssa, %while.end.loopexit ]
|
||||
ret i32 %S.0.lcssa
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user