From 65aeba70dedc4195ecc48b4920c51e745b69c1d8 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 28 Jun 2017 18:07:29 +0000 Subject: [PATCH] [InstCombine] Remove 64-bit bit width restriction from m_ConstantInt(uint64_t*&) I think we only need to make sure the value fits in 64-bits not that bit width is 64-bit. This helps places that use this for shift amounts since the shift amount needs to be the same bitwidth as the LHS, but can't be larger than the bit width. Differential Revision: https://reviews.llvm.org/D34737 llvm-svn: 306577 --- llvm/include/llvm/IR/PatternMatch.h | 2 +- llvm/test/Transforms/InstCombine/icmp.ll | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/llvm/include/llvm/IR/PatternMatch.h b/llvm/include/llvm/IR/PatternMatch.h index 6f6d28602d7c7..0450876c46734 100644 --- a/llvm/include/llvm/IR/PatternMatch.h +++ b/llvm/include/llvm/IR/PatternMatch.h @@ -402,7 +402,7 @@ struct bind_const_intval_ty { template bool match(ITy *V) { if (const auto *CV = dyn_cast(V)) - if (CV->getBitWidth() <= 64) { + if (CV->getValue().ule(UINT64_MAX)) { VR = CV->getZExtValue(); return true; } diff --git a/llvm/test/Transforms/InstCombine/icmp.ll b/llvm/test/Transforms/InstCombine/icmp.ll index 03a9f52755537..b12ee917a82d6 100644 --- a/llvm/test/Transforms/InstCombine/icmp.ll +++ b/llvm/test/Transforms/InstCombine/icmp.ll @@ -762,16 +762,11 @@ define i1 @test52(i32 %x1) { ret i1 %A } -; TODO we have a 64-bit or less restriction in the handling for this pattern. We should remove that and do the same thing we do above. define i1 @test52b(i128 %x1) { ; CHECK-LABEL: @test52b( -; CHECK-NEXT: [[CONV:%.*]] = and i128 [[X1:%.*]], 255 -; CHECK-NEXT: [[CMP:%.*]] = icmp eq i128 [[CONV]], 127 -; CHECK-NEXT: [[TMP2:%.*]] = lshr i128 [[X1]], 16 -; CHECK-NEXT: [[TMP3:%.*]] = trunc i128 [[TMP2]] to i8 -; CHECK-NEXT: [[CMP15:%.*]] = icmp eq i8 [[TMP3]], 76 -; CHECK-NEXT: [[A:%.*]] = and i1 [[CMP]], [[CMP15]] -; CHECK-NEXT: ret i1 [[A]] +; CHECK-NEXT: [[TMP1:%.*]] = and i128 [[X1:%.*]], 16711935 +; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i128 [[TMP1]], 4980863 +; CHECK-NEXT: ret i1 [[TMP2]] ; %conv = and i128 %x1, 255 %cmp = icmp eq i128 %conv, 127