[llvm] 9a9421a - Reapply [InstCombine] Fold multiuse shr eq zero
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Sat May 22 05:47:08 PDT 2021
Author: Nikita Popov
Date: 2021-05-22T14:46:50+02:00
New Revision: 9a9421a461166482465e786a46f8cced63cd2e9f
URL: https://github.com/llvm/llvm-project/commit/9a9421a461166482465e786a46f8cced63cd2e9f
DIFF: https://github.com/llvm/llvm-project/commit/9a9421a461166482465e786a46f8cced63cd2e9f.diff
LOG: Reapply [InstCombine] Fold multiuse shr eq zero
This was reverted due to performance regressions in ARM benchmarks,
which have since been addressed by D101196 (SCEV analysis improvement)
and D101778 (CGP reverse transform).
-----
The single-use case is handled implicity by converting the icmp
into a mask check first. When comparing with zero in particular,
we don't need the one-use restriction, as we only produce a single
icmp.
https://alive2.llvm.org/ce/z/MSixcm
https://alive2.llvm.org/ce/z/GwpG0M
Added:
Modified:
llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
llvm/test/Transforms/InstCombine/icmp-shr.ll
llvm/test/Transforms/InstCombine/icmp_sdiv_with_and_without_range.ll
llvm/test/Transforms/PhaseOrdering/X86/ctlz-loop.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index 46d58a0fd82f4..9e4d88899b19e 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -2280,6 +2280,16 @@ Instruction *InstCombinerImpl::foldICmpShrConstant(ICmpInst &Cmp,
if (Shr->isExact())
return new ICmpInst(Pred, X, ConstantInt::get(ShrTy, C << ShAmtVal));
+ if (C.isNullValue()) {
+ // == 0 is u< 1.
+ if (Pred == CmpInst::ICMP_EQ)
+ return new ICmpInst(CmpInst::ICMP_ULT, X,
+ ConstantInt::get(ShrTy, (C + 1).shl(ShAmtVal)));
+ else
+ return new ICmpInst(CmpInst::ICMP_UGT, X,
+ ConstantInt::get(ShrTy, (C + 1).shl(ShAmtVal) - 1));
+ }
+
if (Shr->hasOneUse()) {
// Canonicalize the shift into an 'and':
// icmp eq/ne (shr X, ShAmt), C --> icmp eq/ne (and X, HiMask), (C << ShAmt)
diff --git a/llvm/test/Transforms/InstCombine/icmp-shr.ll b/llvm/test/Transforms/InstCombine/icmp-shr.ll
index 486c51864877e..d0f72717f50c3 100644
--- a/llvm/test/Transforms/InstCombine/icmp-shr.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-shr.ll
@@ -875,7 +875,7 @@ define i1 @lshr_eq_0_multiuse(i8 %x) {
; CHECK-LABEL: @lshr_eq_0_multiuse(
; CHECK-NEXT: [[S:%.*]] = lshr i8 [[X:%.*]], 2
; CHECK-NEXT: call void @use(i8 [[S]])
-; CHECK-NEXT: [[C:%.*]] = icmp eq i8 [[S]], 0
+; CHECK-NEXT: [[C:%.*]] = icmp ult i8 [[X]], 4
; CHECK-NEXT: ret i1 [[C]]
;
%s = lshr i8 %x, 2
@@ -888,7 +888,7 @@ define i1 @lshr_ne_0_multiuse(i8 %x) {
; CHECK-LABEL: @lshr_ne_0_multiuse(
; CHECK-NEXT: [[S:%.*]] = lshr i8 [[X:%.*]], 2
; CHECK-NEXT: call void @use(i8 [[S]])
-; CHECK-NEXT: [[C:%.*]] = icmp ne i8 [[S]], 0
+; CHECK-NEXT: [[C:%.*]] = icmp ugt i8 [[X]], 3
; CHECK-NEXT: ret i1 [[C]]
;
%s = lshr i8 %x, 2
@@ -901,7 +901,7 @@ define i1 @ashr_eq_0_multiuse(i8 %x) {
; CHECK-LABEL: @ashr_eq_0_multiuse(
; CHECK-NEXT: [[S:%.*]] = ashr i8 [[X:%.*]], 2
; CHECK-NEXT: call void @use(i8 [[S]])
-; CHECK-NEXT: [[C:%.*]] = icmp eq i8 [[S]], 0
+; CHECK-NEXT: [[C:%.*]] = icmp ult i8 [[X]], 4
; CHECK-NEXT: ret i1 [[C]]
;
%s = ashr i8 %x, 2
@@ -914,7 +914,7 @@ define i1 @ashr_ne_0_multiuse(i8 %x) {
; CHECK-LABEL: @ashr_ne_0_multiuse(
; CHECK-NEXT: [[S:%.*]] = ashr i8 [[X:%.*]], 2
; CHECK-NEXT: call void @use(i8 [[S]])
-; CHECK-NEXT: [[C:%.*]] = icmp ne i8 [[S]], 0
+; CHECK-NEXT: [[C:%.*]] = icmp ugt i8 [[X]], 3
; CHECK-NEXT: ret i1 [[C]]
;
%s = ashr i8 %x, 2
diff --git a/llvm/test/Transforms/InstCombine/icmp_sdiv_with_and_without_range.ll b/llvm/test/Transforms/InstCombine/icmp_sdiv_with_and_without_range.ll
index 174c4b906e31b..dde8bef70a6db 100644
--- a/llvm/test/Transforms/InstCombine/icmp_sdiv_with_and_without_range.ll
+++ b/llvm/test/Transforms/InstCombine/icmp_sdiv_with_and_without_range.ll
@@ -2,7 +2,7 @@
; RUN: opt -instcombine -S < %s | FileCheck %s
; Test that presence of range does not cause unprofitable transforms with bit
-; arithmetics, and instcombine behaves exactly the same as without the range.
+; arithmetics.
define i1 @without_range(i32* %A) {
; CHECK-LABEL: @without_range(
@@ -18,9 +18,8 @@ define i1 @without_range(i32* %A) {
define i1 @with_range(i32* %A) {
; CHECK-LABEL: @with_range(
-; CHECK-NEXT: [[A_VAL:%.*]] = load i32, i32* [[A:%.*]], align 8, !range !0
-; CHECK-NEXT: [[B_MASK:%.*]] = and i32 [[A_VAL]], 2147483646
-; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[B_MASK]], 0
+; CHECK-NEXT: [[A_VAL:%.*]] = load i32, i32* [[A:%.*]], align 8, !range [[RNG0:![0-9]+]]
+; CHECK-NEXT: [[C:%.*]] = icmp ult i32 [[A_VAL]], 2
; CHECK-NEXT: ret i1 [[C]]
;
%A.val = load i32, i32* %A, align 8, !range !0
diff --git a/llvm/test/Transforms/PhaseOrdering/X86/ctlz-loop.ll b/llvm/test/Transforms/PhaseOrdering/X86/ctlz-loop.ll
index 67aa30fabe7d1..6cb8702ba1bd0 100644
--- a/llvm/test/Transforms/PhaseOrdering/X86/ctlz-loop.ll
+++ b/llvm/test/Transforms/PhaseOrdering/X86/ctlz-loop.ll
@@ -32,7 +32,7 @@ define i32 @ctlz_loop_with_abs(i32 %n) {
; CHECK-NEXT: [[I_02:%.*]] = phi i32 [ [[INC:%.*]], [[WHILE_BODY]] ], [ 0, [[WHILE_BODY_PREHEADER]] ]
; CHECK-NEXT: [[TMP1]] = lshr i32 [[N_ADDR_03]], 1
; CHECK-NEXT: [[INC]] = add nuw nsw i32 [[I_02]], 1
-; CHECK-NEXT: [[TOBOOL_NOT:%.*]] = icmp eq i32 [[TMP1]], 0
+; CHECK-NEXT: [[TOBOOL_NOT:%.*]] = icmp ult i32 [[N_ADDR_03]], 2
; CHECK-NEXT: br i1 [[TOBOOL_NOT]], label [[WHILE_END]], label [[WHILE_BODY]]
; CHECK: while.end:
; CHECK-NEXT: [[I_0_LCSSA:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[INC]], [[WHILE_BODY]] ]
More information about the llvm-commits
mailing list