From cf32f2bde17809e352d0eb939c004d2c43d44205 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 13 Aug 2010 20:17:14 +0000 Subject: [PATCH] When creating a symmetric SCEV with a constant operand, put the constant operand on the left, as that's where ScalarEvolution will end up canonicalizing to. llvm-svn: 111037 --- llvm/lib/Analysis/ScalarEvolution.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp index dee7a1f8d93e..048fe513a203 100644 --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/lib/Analysis/ScalarEvolution.cpp @@ -1383,7 +1383,7 @@ const SCEV *ScalarEvolution::getAddExpr(SmallVectorImpl &Ops, // Found a match, merge the two values into a multiply, and add any // remaining values to the result. const SCEV *Two = getConstant(Ty, 2); - const SCEV *Mul = getMulExpr(Ops[i], Two); + const SCEV *Mul = getMulExpr(Two, Ops[i]); if (Ops.size() == 2) return Mul; Ops[i] = Mul; @@ -1530,7 +1530,7 @@ const SCEV *ScalarEvolution::getAddExpr(SmallVectorImpl &Ops, InnerMul = getMulExpr(MulOps); } const SCEV *One = getConstant(Ty, 1); - const SCEV *AddOne = getAddExpr(InnerMul, One); + const SCEV *AddOne = getAddExpr(One, InnerMul); const SCEV *OuterMul = getMulExpr(AddOne, MulOpSCEV); if (Ops.size() == 2) return OuterMul; if (AddOp < Idx) { @@ -3538,7 +3538,7 @@ const SCEV *ScalarEvolution::createSCEV(Value *V) { const SCEV *LDiff = getMinusSCEV(LA, LS); const SCEV *RDiff = getMinusSCEV(RA, One); if (LDiff == RDiff) - return getAddExpr(getUMaxExpr(LS, One), LDiff); + return getAddExpr(getUMaxExpr(One, LS), LDiff); } break; case ICmpInst::ICMP_EQ: @@ -3553,7 +3553,7 @@ const SCEV *ScalarEvolution::createSCEV(Value *V) { const SCEV *LDiff = getMinusSCEV(LA, One); const SCEV *RDiff = getMinusSCEV(RA, LS); if (LDiff == RDiff) - return getAddExpr(getUMaxExpr(LS, One), LDiff); + return getAddExpr(getUMaxExpr(One, LS), LDiff); } break; default: