Author: nicholas
Date: Mon Feb 18 16:48:05 2008
New Revision: 47287
URL: http://llvm.org/viewvc/llvm-project?rev=47287&view=rev
Log:
Correctly fold divide-by-constant, even when faced with overflow.
Added:
llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
Modified:
llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=47287&r1=47286&r2=47287&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Mon Feb 18
16:48:05 2008
@@ -605,6 +605,28 @@
static ConstantInt *Multiply(ConstantInt *C1, ConstantInt *C2) {
return ConstantInt::get(C1->getValue() * C2->getValue());
}
+/// MultiplyOverflows - True if the multiply can not be expressed in an int
+/// this size.
+static bool MultiplyOverflows(ConstantInt *C1, ConstantInt *C2, bool sign) {
+ uint32_t W = C1->getBitWidth();
+ APInt LHSExt = C1->getValue(), RHSExt = C2->getValue();
+ if (sign) {
+ LHSExt.sext(W * 2);
+ RHSExt.sext(W * 2);
+ } else {
+ LHSExt.zext(W * 2);
+ RHSExt.zext(W * 2);
+ }
+
+ APInt MulExt = LHSExt * RHSExt;
+
+ if (sign) {
+ APInt Min = APInt::getSignedMinValue(W).sext(W * 2);
+ APInt Max = APInt::getSignedMaxValue(W).sext(W * 2);
+ return MulExt.slt(Min) || MulExt.sgt(Max);
+ } else
+ return MulExt.ugt(APInt::getLowBitsSet(W * 2, W));
+}
/// ComputeMaskedBits - Determine which of the bits specified in Mask are
/// known to be either zero or one and return them in the KnownZero/KnownOne
@@ -2632,8 +2654,11 @@
if (Instruction *LHS = dyn_cast<Instruction>(Op0))
if (Instruction::BinaryOps(LHS->getOpcode()) == I.getOpcode())
if (ConstantInt *LHSRHS = dyn_cast<ConstantInt>(LHS->getOperand(1))) {
- return BinaryOperator::create(I.getOpcode(), LHS->getOperand(0),
- Multiply(RHS, LHSRHS));
+ if (MultiplyOverflows(RHS, LHSRHS, I.getOpcode()==Instruction::SDiv))
+ return ReplaceInstUsesWith(I, Constant::getNullValue(I.getType()));
+ else
+ return BinaryOperator::create(I.getOpcode(), LHS->getOperand(0),
+ Multiply(RHS, LHSRHS));
}
if (!RHS->isZero()) { // avoid X udiv 0
Added: llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll?rev=47287&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll (added)
+++ llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll Mon Feb
18 16:48:05 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i.* 0} | count 2
+; PR2048
+
+define i32 @i(i32 %a) {
+ %tmp1 = sdiv i32 %a, -1431655765
+ %tmp2 = sdiv i32 %tmp1, 3
+ ret i32 %tmp2
+}
+
+define i8 @j(i8 %a) {
+ %tmp1 = sdiv i8 %a, 64
+ %tmp2 = sdiv i8 %tmp1, 3
+ ret i8 %tmp2
+}
Added: llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll?rev=47287&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll (added)
+++ llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll Mon Feb
18 16:48:05 2008
@@ -0,0 +1,9 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {sdiv i8 \%a, 9}
+; PR2048
+
+define i8 @i(i8 %a) {
+ %tmp1 = sdiv i8 %a, -3
+ %tmp2 = sdiv i8 %tmp1, -3
+ ret i8 %tmp2
+}
+
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
