RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-15 00:16:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert r314984: revert r314698 - [InstCombine] remove one-use restriction for icmp (shr exact X, C1), C2 --> icmp X, (C2<<C1)

Browse Source 
Recommitting r314698. The bug exposed by this change should be fixed with:
https://reviews.llvm.org/rL315579 



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315857 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sanjay Patel 2017-10-15 15:39:15 +00:00
parent 1afb3de399
commit 53bdccfd61
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Transforms/InstCombine/InstCombineCompares.cpp
View File

@ -2060,15 +2060,15 @@ Instruction *InstCombiner::foldICmpShrConstant(ICmpInst &Cmp,
(!IsAShr && C.shl(ShAmtVal).lshr(ShAmtVal) == C)) &&
"Expected icmp+shr simplify did not occur.");
// Check if the bits shifted out are known to be zero. If so, we can compare
// against the unshifted value:
// If the bits shifted out are known zero, compare the unshifted value:
// (X & 4) >> 1 == 2 --> (X & 4) == 4.
Constant *ShiftedCmpRHS = ConstantInt::get(ShrTy, C << ShAmtVal);
if (Shr->hasOneUse()) {
if (Shr->isExact())
return new ICmpInst(Pred, X, ShiftedCmpRHS);
if (Shr->isExact())
return new ICmpInst(Pred, X, ShiftedCmpRHS);
// Otherwise strength reduce the shift into an 'and'.
if (Shr->hasOneUse()) {
// Canonicalize the shift into an 'and':
// icmp eq/ne (shr X, ShAmt), C --> icmp eq/ne (and X, HiMask), (C << ShAmt)
APInt Val(APInt::getHighBitsSet(TypeBits, TypeBits - ShAmtVal));
Constant *Mask = ConstantInt::get(ShrTy, Val);
Value *And = Builder.CreateAnd(X, Mask, Shr->getName() + ".mask");

2
test/Transforms/InstCombine/icmp-shr.ll
View File

@ -483,7 +483,7 @@ declare void @foo(i32)
define i1 @exact_multiuse(i32 %x) {
; CHECK-LABEL: @exact_multiuse(
; CHECK-NEXT: [[SH:%.*]] = lshr exact i32 %x, 7
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[SH]], 1024
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 %x, 131072
; CHECK-NEXT: call void @foo(i32 [[SH]])
; CHECK-NEXT: ret i1 [[CMP]]
;