[llvm-commits] [polly] r143692 - /polly/trunk/lib/Analysis/ScopDetection.cpp
Sebastian Pop
spop at codeaurora.org
Tue Nov 15 20:55:05 PST 2011
On Fri, Nov 4, 2011 at 5:08 AM, Tobias Grosser
<grosser at fim.uni-passau.de> wrote:
> Author: grosser
> Date: Fri Nov 4 05:08:08 2011
> New Revision: 143692
>
> URL: http://llvm.org/viewvc/llvm-project?rev=143692&view=rev
> Log:
> ScopDetection: Small fixes and improvements for the SCEVValidator
>
> These fixes were part of a code audit of the SCEVValidator.
>
> Modified:
> polly/trunk/lib/Analysis/ScopDetection.cpp
>
> Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
> URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=143692&r1=143691&r2=143692&view=diff
> ==============================================================================
> --- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
> +++ polly/trunk/lib/Analysis/ScopDetection.cpp Fri Nov 4 05:08:08 2011
> @@ -145,8 +145,9 @@
> SCEVType::TYPE visitTruncateExpr(const SCEVTruncateExpr* Expr) {
> SCEVType::TYPE Op = visit(Expr->getOperand());
>
> - // We cannot represent this as a affine expression yet. If it is constant
> - // during Scop execution treat this as a parameter, otherwise bail out.
> + // We currently do not represent a truncate expression as an affine
> + // expression. If it is constant during Scop execution, we treat it as a
> + // parameter, otherwise we bail out.
> if (Op == SCEVType::INT || Op == SCEVType::PARAM)
> return SCEVType::PARAM;
>
> @@ -156,8 +157,9 @@
> SCEVType::TYPE visitZeroExtendExpr(const SCEVZeroExtendExpr * Expr) {
> SCEVType::TYPE Op = visit(Expr->getOperand());
>
> - // We cannot represent this as a affine expression yet. If it is constant
> - // during Scop execution treat this as a parameter, otherwise bail out.
> + // We currently do not represent a zero extend expression as an affine
> + // expression. If it is constant during Scop execution, we treat it as a
> + // parameter, otherwise we bail out.
> if (Op == SCEVType::INT || Op == SCEVType::PARAM)
> return SCEVType::PARAM;
>
> @@ -165,8 +167,10 @@
> }
>
> SCEVType::TYPE visitSignExtendExpr(const SCEVSignExtendExpr* Expr) {
> - // Assuming the value is signed, a sign extension is basically a noop.
> - // TODO: Reconsider this as soon as we support unsigned values.
> + // We currently allow only signed SCEV expressions. In the case of a
> + // signed value, a sign extend is a noop.
> + //
> + // TODO: Reconsider this when we add support for unsigned values.
> return visit(Expr->getOperand());
> }
>
> @@ -175,6 +179,10 @@
>
> for (int i = 0, e = Expr->getNumOperands(); i < e; ++i) {
> SCEVType::TYPE OpType = visit(Expr->getOperand(i));
> +
> + if (OpType == SCEVType::INVALID)
> + return SCEVType::INVALID;
> +
> Return = std::max(Return, OpType);
> }
>
> @@ -188,26 +196,13 @@
> for (int i = 0, e = Expr->getNumOperands(); i < e; ++i) {
> SCEVType::TYPE OpType = visit(Expr->getOperand(i));
>
> - if (OpType == SCEVType::INVALID)
> - return SCEVType::INVALID;
> -
> - if (OpType == SCEVType::IV) {
> - if (Return == SCEVType::PARAM || Return == SCEVType::IV)
> - return SCEVType::INVALID;
> -
> - Return = OpType;
> + if (OpType == SCEVType::INT)
> continue;
> - }
> -
> - if (OpType == SCEVType::PARAM) {
> - if (Return == SCEVType::PARAM)
> - return SCEVType::INVALID;
>
> - Return = SCEVType::PARAM;
> - continue;
> - }
> + if (OpType == SCEVType::INVALID || Return != SCEVType::INT)
> + return SCEVType::INVALID;
>
> - // OpType == SCEVType::INT, no need to change anything.
> + Return = OpType;
> }
>
> // TODO: Check for NSW and NUW.
> @@ -215,7 +210,16 @@
> }
>
> SCEVType::TYPE visitUDivExpr(const SCEVUDivExpr* Expr) {
> - // We do not yet support unsigned operations.
> + SCEVType::TYPE LHS = visit(Expr->getLHS());
> + SCEVType::TYPE RHS = visit(Expr->getRHS());
> +
> + // We currently do not represent a unsigned devision as an affine
s/a unsigned/an unsigned/
> + // expression. If the division is constant during Scop execution we treat it
> + // as a parameter, otherwise we bail out.
> + if (LHS == SCEVType::INT || LHS == SCEVType::PARAM ||
> + RHS == SCEVType::INT || RHS == SCEVType::PARAM)
> + return SCEVType::PARAM;
> +
> return SCEVType::INVALID;
> }
>
> @@ -224,15 +228,24 @@
> return SCEVType::INVALID;
>
> SCEVType::TYPE Start = visit(Expr->getStart());
> + SCEVType::TYPE Recurrence = visit(Expr->getStepRecurrence(SE));
>
> - if (Start == SCEVType::INVALID)
> - return Start;
> + if (Start == SCEVType::INVALID ||
> + Recurrence == SCEVType::INVALID ||
> + Recurrence == SCEVType::IV)
> + return SCEVType::INVALID;
> +
> + if (!R->contains(Expr->getLoop())) {
> + if (Start == SCEVType::IV)
> + return SCEVType::INVALID;
> + else
> + return SCEVType::PARAM;
> + }
>
> - SCEVType::TYPE Recurrence = visit(Expr->getStepRecurrence(SE));
> if (Recurrence != SCEVType::INT)
> return SCEVType::INVALID;
>
> - return SCEVType::PARAM;
> + return SCEVType::IV;
Good!
I see that you got this one corrected.
> }
>
> SCEVType::TYPE visitSMaxExpr(const SCEVSMaxExpr* Expr) {
> @@ -243,32 +256,31 @@
>
> if (OpType == SCEVType::INVALID)
> return SCEVType::INVALID;
> - if (OpType == SCEVType::PARAM)
> - Return = SCEVType::PARAM;
> +
> + Return = std::max(Return, OpType);
> }
>
> return Return;
> }
>
> SCEVType::TYPE visitUMaxExpr(const SCEVUMaxExpr* Expr) {
> - // We do not yet support unsigned operations. If 'Expr' is constant
> - // during Scop execution treat this as a parameter, otherwise bail out.
> + // We do not support unsigned operations. If 'Expr' is constant during Scop
> + // execution we treat this as a parameter, otherwise we bail out.
> for (int i = 0, e = Expr->getNumOperands(); i < e; ++i) {
> SCEVType::TYPE OpType = visit(Expr->getOperand(i));
>
> if (OpType != SCEVType::INT && OpType != SCEVType::PARAM)
> - return SCEVType::PARAM;
> + return SCEVType::INVALID;
And this one as well looks good after this change.
> }
>
> return SCEVType::PARAM;
> }
>
> SCEVType::TYPE visitUnknown(const SCEVUnknown* Expr) {
> -
> Value *V = Expr->getValue();
>
> if (isa<UndefValue>(V))
> - return SCEVType::INVALID;
> + return SCEVType::INVALID;
>
> if (BaseAddress) {
> if (*BaseAddress)
> @@ -280,6 +292,7 @@
> if (Instruction *I = dyn_cast<Instruction>(Expr->getValue()))
> if (R->contains(I))
> return SCEVType::INVALID;
> +
> return SCEVType::PARAM;
> }
> };
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
--
Sebastian Pop
--
Qualcomm Innovation Center, Inc is a member of Code Aurora Forum
More information about the llvm-commits
mailing list