diff options
| -rw-r--r-- | llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/StraightLineStrengthReduce/slsr-mul.ll | 21 |
2 files changed, 23 insertions, 2 deletions
diff --git a/llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp index afe0c9d2fc4..a68a828736b 100644 --- a/llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp +++ b/llvm/lib/Transforms/Scalar/StraightLineStrengthReduce.cpp @@ -408,8 +408,8 @@ void StraightLineStrengthReduce::allocateCandidatesAndFindBasisForMul( Value *LHS, Value *RHS, Instruction *I) { Value *B = nullptr; ConstantInt *Idx = nullptr; - // Only handle the canonical operand ordering. - if (match(LHS, m_Add(m_Value(B), m_ConstantInt(Idx)))) { + if (match(LHS, m_Add(m_Value(B), m_ConstantInt(Idx))) || + match(LHS, m_Add(m_ConstantInt(Idx), m_Value(B)))) { // If LHS is in the form of "Base + Index", then I is in the form of // "(Base + Index) * RHS". allocateCandidatesAndFindBasis(Candidate::Mul, SE->getSCEV(B), Idx, RHS, I); diff --git a/llvm/test/Transforms/StraightLineStrengthReduce/slsr-mul.ll b/llvm/test/Transforms/StraightLineStrengthReduce/slsr-mul.ll index 97e68d5bf51..9b9fc9de4ff 100644 --- a/llvm/test/Transforms/StraightLineStrengthReduce/slsr-mul.ll +++ b/llvm/test/Transforms/StraightLineStrengthReduce/slsr-mul.ll @@ -23,6 +23,27 @@ define void @slsr1(i32 %b, i32 %s) { ret void } +define void @non_canonicalized(i32 %b, i32 %s) { +; CHECK-LABEL: @non_canonicalized( + ; foo(b * s); + %mul0 = mul i32 %b, %s +; CHECK: mul i32 +; CHECK-NOT: mul i32 + call void @foo(i32 %mul0) + + ; foo((1 + b) * s); + %b1 = add i32 1, %b + %mul1 = mul i32 %b1, %s + call void @foo(i32 %mul1) + + ; foo((2 + b) * s); + %b2 = add i32 2, %b + %mul2 = mul i32 %b2, %s + call void @foo(i32 %mul2) + + ret void +} + ; foo(a * b) ; foo((a + 1) * b) ; foo(a * (b + 1)) |
