From 4b720718fbda1194f925e0a9d931bc220e8b0e3a Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 2 Feb 2011 20:52:00 +0000 Subject: [PATCH] Reenable the transform "(X*Y)/Y->X" when the multiplication is known not to overflow (nsw flag), which was disabled because it breaks 254.gap. I have informed the GAP authors of the mistake in their code, and arranged for the testsuite to use -fwrapv when compiling this benchmark. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124746 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/InstructionSimplify.cpp | 10 +++++----- test/Transforms/InstSimplify/2010-12-20-Reassociate.ll | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp index 6ca4dddcf36..4b9b648aa6c 100644 --- a/lib/Analysis/InstructionSimplify.cpp +++ b/lib/Analysis/InstructionSimplify.cpp @@ -798,11 +798,11 @@ static Value *SimplifyDiv(unsigned Opcode, Value *Op0, Value *Op1, Value *X = 0, *Y = 0; if (match(Op0, m_Mul(m_Value(X), m_Value(Y))) && (X == Op1 || Y == Op1)) { if (Y != Op1) std::swap(X, Y); // Ensure expression is (X * Y) / Y, Y = Op1 -// BinaryOperator *Mul = cast(Op0); -// // If the Mul knows it does not overflow, then we are good to go. -// if ((isSigned && Mul->hasNoSignedWrap()) || -// (!isSigned && Mul->hasNoUnsignedWrap())) -// return X; + BinaryOperator *Mul = cast(Op0); + // If the Mul knows it does not overflow, then we are good to go. + if ((isSigned && Mul->hasNoSignedWrap()) || + (!isSigned && Mul->hasNoUnsignedWrap())) + return X; // If X has the form X = A / Y then X * Y cannot overflow. if (BinaryOperator *Div = dyn_cast(X)) if (Div->getOpcode() == Opcode && Div->getOperand(1) == Y) diff --git a/test/Transforms/InstSimplify/2010-12-20-Reassociate.ll b/test/Transforms/InstSimplify/2010-12-20-Reassociate.ll index c0ae257dcdc..928442ac56c 100644 --- a/test/Transforms/InstSimplify/2010-12-20-Reassociate.ll +++ b/test/Transforms/InstSimplify/2010-12-20-Reassociate.ll @@ -92,10 +92,12 @@ define i32 @sub3(i32 %x, i32 %y) { } define i32 @sdiv1(i32 %x, i32 %y) { +; CHECK: @sdiv1 ; (no overflow X * Y) / Y -> X %mul = mul nsw i32 %x, %y %r = sdiv i32 %mul, %y ret i32 %r +; CHECK: ret i32 %x } define i32 @sdiv2(i32 %x, i32 %y) { @@ -136,10 +138,12 @@ define i32 @sdiv5(i32 %x, i32 %y) { } define i32 @udiv1(i32 %x, i32 %y) { +; CHECK: @udiv1 ; (no overflow X * Y) / Y -> X %mul = mul nuw i32 %x, %y %r = udiv i32 %mul, %y ret i32 %r +; CHECK: ret i32 %x } define i32 @udiv2(i32 %x, i32 %y) {