mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
Revert r286437 r286438, they caused PR30976
llvm-svn: 286483
This commit is contained in:
Nico Weber
parent
f8a50d283f
commit
443375fd3a
@ -198,23 +198,14 @@ Value *SCEVExpander::InsertBinop(Instruction::BinaryOps Opcode,
|
||||
DebugLoc Loc = Builder.GetInsertPoint()->getDebugLoc();
|
||||
SCEVInsertPointGuard Guard(Builder, this);
|
||||
|
||||
auto *RHSConst = dyn_cast<ConstantInt>(RHS);
|
||||
// Move the insertion point out of as many loops as we can.
|
||||
while (const Loop *L = SE.LI.getLoopFor(Builder.GetInsertBlock())) {
|
||||
if (!L->isLoopInvariant(LHS) || !L->isLoopInvariant(RHS)) break;
|
||||
BasicBlock *Preheader = L->getLoopPreheader();
|
||||
if (!Preheader) break;
|
||||
|
||||
if (Opcode != Instruction::UDiv || (RHSConst && !RHSConst->isZero())) {
|
||||
// FIXME: There is alredy similar logic in expandCodeFor, we should see if
|
||||
// this is actually needed here.
|
||||
|
||||
// Move the insertion point out of as many loops as we can.
|
||||
while (const Loop *L = SE.LI.getLoopFor(Builder.GetInsertBlock())) {
|
||||
if (!L->isLoopInvariant(LHS) || !L->isLoopInvariant(RHS))
|
||||
break;
|
||||
BasicBlock *Preheader = L->getLoopPreheader();
|
||||
if (!Preheader)
|
||||
break;
|
||||
|
||||
// Ok, move up a level.
|
||||
Builder.SetInsertPoint(Preheader->getTerminator());
|
||||
}
|
||||
// Ok, move up a level.
|
||||
Builder.SetInsertPoint(Preheader->getTerminator());
|
||||
}
|
||||
|
||||
// If we haven't found this binop, insert it.
|
||||
@ -1672,34 +1663,31 @@ Value *SCEVExpander::expand(const SCEV *S) {
|
||||
// Compute an insertion point for this SCEV object. Hoist the instructions
|
||||
// as far out in the loop nest as possible.
|
||||
Instruction *InsertPt = &*Builder.GetInsertPoint();
|
||||
if (!isa<SCEVUDivExpr>(S)) {
|
||||
for (Loop *L = SE.LI.getLoopFor(Builder.GetInsertBlock());;
|
||||
L = L->getParentLoop())
|
||||
if (SE.isLoopInvariant(S, L)) {
|
||||
if (!L)
|
||||
break;
|
||||
if (BasicBlock *Preheader = L->getLoopPreheader())
|
||||
InsertPt = Preheader->getTerminator();
|
||||
else {
|
||||
// LSR sets the insertion point for AddRec start/step values to the
|
||||
// block start to simplify value reuse, even though it's an invalid
|
||||
// position. SCEVExpander must correct for this in all cases.
|
||||
InsertPt = &*L->getHeader()->getFirstInsertionPt();
|
||||
}
|
||||
} else {
|
||||
// If the SCEV is computable at this level, insert it into the header
|
||||
// after the PHIs (and after any other instructions that we've inserted
|
||||
// there) so that it is guaranteed to dominate any user inside the loop.
|
||||
if (L && SE.hasComputableLoopEvolution(S, L) && !PostIncLoops.count(L))
|
||||
InsertPt = &*L->getHeader()->getFirstInsertionPt();
|
||||
while (InsertPt->getIterator() != Builder.GetInsertPoint() &&
|
||||
(isInsertedInstruction(InsertPt) ||
|
||||
isa<DbgInfoIntrinsic>(InsertPt))) {
|
||||
InsertPt = &*std::next(InsertPt->getIterator());
|
||||
}
|
||||
break;
|
||||
for (Loop *L = SE.LI.getLoopFor(Builder.GetInsertBlock());;
|
||||
L = L->getParentLoop())
|
||||
if (SE.isLoopInvariant(S, L)) {
|
||||
if (!L) break;
|
||||
if (BasicBlock *Preheader = L->getLoopPreheader())
|
||||
InsertPt = Preheader->getTerminator();
|
||||
else {
|
||||
// LSR sets the insertion point for AddRec start/step values to the
|
||||
// block start to simplify value reuse, even though it's an invalid
|
||||
// position. SCEVExpander must correct for this in all cases.
|
||||
InsertPt = &*L->getHeader()->getFirstInsertionPt();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// If the SCEV is computable at this level, insert it into the header
|
||||
// after the PHIs (and after any other instructions that we've inserted
|
||||
// there) so that it is guaranteed to dominate any user inside the loop.
|
||||
if (L && SE.hasComputableLoopEvolution(S, L) && !PostIncLoops.count(L))
|
||||
InsertPt = &*L->getHeader()->getFirstInsertionPt();
|
||||
while (InsertPt->getIterator() != Builder.GetInsertPoint() &&
|
||||
(isInsertedInstruction(InsertPt) ||
|
||||
isa<DbgInfoIntrinsic>(InsertPt))) {
|
||||
InsertPt = &*std::next(InsertPt->getIterator());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// Check to see if we already expanded this here.
|
||||
auto I = InsertedExpressions.find(std::make_pair(S, InsertPt));
|
||||
|
||||
@ -349,13 +349,6 @@ static Instruction *getInstructionByName(Function &F, StringRef Name) {
|
||||
llvm_unreachable("Expected to find instruction!");
|
||||
}
|
||||
|
||||
static Argument *getArgByName(Function &F, StringRef Name) {
|
||||
for (auto &A : F.args())
|
||||
if (A.getName() == Name)
|
||||
return &A;
|
||||
llvm_unreachable("Expected to find argument!");
|
||||
}
|
||||
|
||||
TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) {
|
||||
LLVMContext C;
|
||||
SMDiagnostic Err;
|
||||
@ -472,87 +465,5 @@ TEST_F(ScalarEvolutionsTest, CommutativeExprOperandOrder) {
|
||||
});
|
||||
}
|
||||
|
||||
TEST_F(ScalarEvolutionsTest, BadHoistingSCEVExpander_PR30942) {
|
||||
LLVMContext C;
|
||||
SMDiagnostic Err;
|
||||
std::unique_ptr<Module> M = parseAssemblyString(
|
||||
"target datalayout = \"e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128\" "
|
||||
" "
|
||||
"define void @f_1(i32 %x, i32 %y, i32 %n, i1* %cond_buf) "
|
||||
" local_unnamed_addr { "
|
||||
"entry: "
|
||||
" %entrycond = icmp sgt i32 %n, 0 "
|
||||
" br i1 %entrycond, label %loop.ph, label %for.end "
|
||||
" "
|
||||
"loop.ph: "
|
||||
" br label %loop "
|
||||
" "
|
||||
"loop: "
|
||||
" %iv1 = phi i32 [ %iv1.inc, %right ], [ 0, %loop.ph ] "
|
||||
" %iv1.inc = add nuw nsw i32 %iv1, 1 "
|
||||
" %cond = load volatile i1, i1* %cond_buf "
|
||||
" br i1 %cond, label %left, label %right "
|
||||
" "
|
||||
"left: "
|
||||
" %div = udiv i32 %x, %y "
|
||||
" br label %right "
|
||||
" "
|
||||
"right: "
|
||||
" %exitcond = icmp eq i32 %iv1.inc, %n "
|
||||
" br i1 %exitcond, label %for.end.loopexit, label %loop "
|
||||
" "
|
||||
"for.end.loopexit: "
|
||||
" br label %for.end "
|
||||
" "
|
||||
"for.end: "
|
||||
" ret void "
|
||||
"} ",
|
||||
Err, C);
|
||||
|
||||
assert(M && "Could not parse module?");
|
||||
assert(!verifyModule(*M) && "Must have been well formed!");
|
||||
|
||||
runWithFunctionAndSE(*M, "f_1", [&](Function &F, ScalarEvolution &SE) {
|
||||
SCEVExpander Expander(SE, M->getDataLayout(), "unittests");
|
||||
auto *DivInst = getInstructionByName(F, "div");
|
||||
|
||||
{
|
||||
auto *DivSCEV = SE.getSCEV(DivInst);
|
||||
auto *DivExpansion = Expander.expandCodeFor(
|
||||
DivSCEV, DivSCEV->getType(), DivInst->getParent()->getTerminator());
|
||||
auto *DivExpansionInst = dyn_cast<Instruction>(DivExpansion);
|
||||
ASSERT_NE(DivExpansionInst, nullptr);
|
||||
EXPECT_EQ(DivInst->getParent(), DivExpansionInst->getParent());
|
||||
}
|
||||
|
||||
{
|
||||
auto *ArgY = getArgByName(F, "y");
|
||||
auto *DivFromScratchSCEV =
|
||||
SE.getUDivExpr(SE.getOne(ArgY->getType()), SE.getSCEV(ArgY));
|
||||
|
||||
auto *DivFromScratchExpansion = Expander.expandCodeFor(
|
||||
DivFromScratchSCEV, DivFromScratchSCEV->getType(),
|
||||
DivInst->getParent()->getTerminator());
|
||||
auto *DivFromScratchExpansionInst =
|
||||
dyn_cast<Instruction>(DivFromScratchExpansion);
|
||||
ASSERT_NE(DivFromScratchExpansionInst, nullptr);
|
||||
EXPECT_EQ(DivInst->getParent(), DivFromScratchExpansionInst->getParent());
|
||||
}
|
||||
|
||||
{
|
||||
auto *ArgY = getArgByName(F, "y");
|
||||
auto *SafeDivSCEV =
|
||||
SE.getUDivExpr(SE.getSCEV(ArgY), SE.getConstant(APInt(32, 19)));
|
||||
|
||||
auto *SafeDivExpansion =
|
||||
Expander.expandCodeFor(SafeDivSCEV, SafeDivSCEV->getType(),
|
||||
DivInst->getParent()->getTerminator());
|
||||
auto *SafeDivExpansionInst = dyn_cast<Instruction>(SafeDivExpansion);
|
||||
ASSERT_NE(SafeDivExpansionInst, nullptr);
|
||||
EXPECT_EQ("loop.ph", SafeDivExpansionInst->getParent()->getName());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
} // end anonymous namespace
|
||||
} // end namespace llvm
|
||||
|
||||
Loading…
Reference in New Issue
Block a user