diff options
| author | Sanjay Patel <spatel@rotateright.com> | 2016-08-21 16:35:34 +0000 |
|---|---|---|
| committer | Sanjay Patel <spatel@rotateright.com> | 2016-08-21 16:35:34 +0000 |
| commit | 7ffcde7422ae7b766a5534ba4ad63d8a67bef651 (patch) | |
| tree | 14d19483e0c583929312c7873cd0972bbf1b4872 /llvm | |
| parent | 7e09f13fed6fa16e71f4a24c1531e825ede54d32 (diff) | |
| download | bcm5719-llvm-7ffcde7422ae7b766a5534ba4ad63d8a67bef651.tar.gz bcm5719-llvm-7ffcde7422ae7b766a5534ba4ad63d8a67bef651.zip | |
[InstCombine] use m_APInt to allow icmp (shl X, Y), C folds for splat constant vectors, part 3
This is a partial enablement (move the ConstantInt guard down).
llvm-svn: 279399
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp | 12 | ||||
| -rw-r--r-- | llvm/test/Transforms/InstCombine/shift.ll | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp index 73dc141d97e..b36eadf6aad 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp @@ -2030,15 +2030,10 @@ Instruction *InstCombiner::foldICmpShlConstant(ICmpInst &Cmp, Instruction *Shl, if (cast<BinaryOperator>(Shl)->hasNoSignedWrap() && isSignTest(Pred, *C)) return new ICmpInst(Pred, X, Constant::getNullValue(X->getType())); - // FIXME: This check restricts all folds under here to scalar types. - ConstantInt *RHS = dyn_cast<ConstantInt>(Cmp.getOperand(1)); - if (!RHS) - return nullptr; - // Otherwise, if this is a comparison of the sign bit, simplify to and/test. bool TrueIfSigned = false; if (Shl->hasOneUse() && isSignBitCheck(Pred, *C, TrueIfSigned)) { - // (X << 31) <s 0 --> (X&1) != 0 + // (X << 31) <s 0 --> (X & 1) != 0 Constant *Mask = ConstantInt::get( X->getType(), APInt::getOneBitSet(TypeBits, TypeBits - ShiftAmt->getZExtValue() - 1)); @@ -2047,6 +2042,11 @@ Instruction *InstCombiner::foldICmpShlConstant(ICmpInst &Cmp, Instruction *Shl, And, Constant::getNullValue(And->getType())); } + // FIXME: This check restricts all folds under here to scalar types. + ConstantInt *RHS = dyn_cast<ConstantInt>(Cmp.getOperand(1)); + if (!RHS) + return nullptr; + // Transform (icmp pred iM (shl iM %v, N), CI) // -> (icmp pred i(M-N) (trunc %v iM to i(M-N)), (trunc (CI>>N)) // Transform the shl to a trunc if (trunc (CI>>N)) has no loss and M-N. diff --git a/llvm/test/Transforms/InstCombine/shift.ll b/llvm/test/Transforms/InstCombine/shift.ll index d5a00627010..c3945772eaa 100644 --- a/llvm/test/Transforms/InstCombine/shift.ll +++ b/llvm/test/Transforms/InstCombine/shift.ll @@ -608,8 +608,8 @@ define i1 @test33(i32 %X) { ; FIXME: Vectors should fold the same way. define <2 x i1> @test33vec(<2 x i32> %X) { ; CHECK-LABEL: @test33vec( -; CHECK-NEXT: [[TMP1:%.*]] = shl <2 x i32> %X, <i32 7, i32 7> -; CHECK-NEXT: [[TMP2:%.*]] = icmp slt <2 x i32> [[TMP1]], zeroinitializer +; CHECK-NEXT: [[TMP1_MASK:%.*]] = and <2 x i32> %X, <i32 16777216, i32 16777216> +; CHECK-NEXT: [[TMP2:%.*]] = icmp ne <2 x i32> [[TMP1_MASK]], zeroinitializer ; CHECK-NEXT: ret <2 x i1> [[TMP2]] ; %tmp1 = shl <2 x i32> %X, <i32 7, i32 7> |
