maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reverting r306695 while investigating failing test case. 

Failing test case:
    Transforms/LoopVectorize.iv_outside_user.ll

llvm-svn: 306723
This commit is contained in:
Alexandre Isoard 2017-06-29 18:48:56 +00:00
parent cae83f78aa
commit 41044876fc
4 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/include/llvm/Analysis/ScalarEvolution.h
View File

@ -1244,7 +1244,6 @@ public:
} }
const SCEV *getUDivExpr(const SCEV *LHS, const SCEV *RHS); const SCEV *getUDivExpr(const SCEV *LHS, const SCEV *RHS);
const SCEV *getUDivExactExpr(const SCEV *LHS, const SCEV *RHS); const SCEV *getUDivExactExpr(const SCEV *LHS, const SCEV *RHS);
const SCEV *getURemExpr(const SCEV *LHS, const SCEV *RHS);
const SCEV *getAddRecExpr(const SCEV *Start, const SCEV *Step, const Loop *L, const SCEV *getAddRecExpr(const SCEV *Start, const SCEV *Step, const Loop *L,
SCEV::NoWrapFlags Flags); SCEV::NoWrapFlags Flags);
const SCEV *getAddRecExpr(SmallVectorImpl<const SCEV *> &Operands, const SCEV *getAddRecExpr(SmallVectorImpl<const SCEV *> &Operands,

26
llvm/lib/Analysis/ScalarEvolution.cpp
View File

@ -2935,29 +2935,6 @@ const SCEV *ScalarEvolution::getMulExpr(SmallVectorImpl<const SCEV *> &Ops,
return getOrCreateMulExpr(Ops, Flags); return getOrCreateMulExpr(Ops, Flags);
} }
/// Represents an unsigned remainder expression based on unsigned division.
const SCEV *ScalarEvolution::getURemExpr(const SCEV *LHS,
const SCEV *RHS) {
assert(getEffectiveSCEVType(LHS->getType()) ==
getEffectiveSCEVType(RHS->getType()) &&
"SCEVURemExpr operand types don't match!");
// TODO:
// - short circuit '%a = %x urem %x --> 0' (why is it not done for udiv?)
// - short circuit '%a = %x urem 0 --> %a' (same as for udiv)
// - update upper-bound and lower-bound cache for the final result
// (or improve how subtraction is estimated)
// Short-circuit easy cases
if (const SCEVConstant *RHSC = dyn_cast<SCEVConstant>(RHS))
if (RHSC->getValue()->equalsInt(1))
return getZero(LHS->getType()); // X urem 1 --> 0
const SCEV *UDiv = getUDivExpr(LHS, RHS);
const SCEV *Mult = getMulExpr(UDiv, RHS, SCEV::FlagNUW);
return getMinusSCEV(LHS, Mult, SCEV::FlagNUW);
}
/// Get a canonical unsigned division expression, or something simpler if /// Get a canonical unsigned division expression, or something simpler if
/// possible. /// possible.
const SCEV *ScalarEvolution::getUDivExpr(const SCEV *LHS, const SCEV *ScalarEvolution::getUDivExpr(const SCEV *LHS,
@ -4118,7 +4095,6 @@ static Optional<BinaryOp> MatchBinaryOp(Value *V, DominatorTree &DT) {
case Instruction::Sub: case Instruction::Sub:
case Instruction::Mul: case Instruction::Mul:
case Instruction::UDiv: case Instruction::UDiv:
case Instruction::URem:
case Instruction::And: case Instruction::And:
case Instruction::Or: case Instruction::Or:
case Instruction::AShr: case Instruction::AShr:
@ -5440,8 +5416,6 @@ const SCEV *ScalarEvolution::createSCEV(Value *V) {
} }
case Instruction::UDiv: case Instruction::UDiv:
return getUDivExpr(getSCEV(BO->LHS), getSCEV(BO->RHS)); return getUDivExpr(getSCEV(BO->LHS), getSCEV(BO->RHS));
case Instruction::URem:
return getURemExpr(getSCEV(BO->LHS), getSCEV(BO->RHS));
case Instruction::Sub: { case Instruction::Sub: {
SCEV::NoWrapFlags Flags = SCEV::FlagAnyWrap; SCEV::NoWrapFlags Flags = SCEV::FlagAnyWrap;
if (BO->Op) if (BO->Op)

22
llvm/test/Analysis/ScalarEvolution/flattened.ll
View File

@ -1,22 +0,0 @@
; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s
define void @foo([7 x i8]* %a) {
entry:
br label %bb
bb:
%idx = phi i64 [ 0, %entry ], [ %idx.incr, %bb ]
%i = udiv i64 %idx, 7
%j = urem i64 %idx, 7
%a.ptr = getelementptr [7 x i8], [7 x i8]* %a, i64 %i, i64 %j
; CHECK: %a.ptr
; CHECK-NEXT: --> {%a,+,1}<nw><%bb>
%val = load i8, i8* %a.ptr
%idx.incr = add i64 %idx, 1
%test = icmp ne i64 %idx.incr, 35
br i1 %test, label %bb, label %exit
exit:
ret void
}

15
llvm/test/Analysis/ScalarEvolution/urem-0.ll
View File

@ -1,15 +0,0 @@
; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s
define i8 @foo(i8 %a) {
%t0 = urem i8 %a, 27
; CHECK: %t0
; CHECK-NEXT: --> ((-27 * (%a /u 27)) + %a)
ret i8 %t0
}
define i8 @bar(i8 %a) {
%t1 = urem i8 %a, 1
; CHECK: %t1
; CHECK-NEXT: --> 0
ret i8 %t1
}