[llvm] [InstCombine] Fold `icmp spred (X *nsw Z), (Y *nsw Z) -> icmp pred Z, 0` if `scmp(X, Y)` is known (PR #118726)
Yingwei Zheng via llvm-commits
llvm-commits at lists.llvm.org
Wed Dec 4 17:18:53 PST 2024
https://github.com/dtcxzyw created https://github.com/llvm/llvm-project/pull/118726
```
icmp spred (X *nsw Z), (Y *nsw Z) -> icmp swap(spred) Z, 0 if X s< Y
icmp spred (X *nsw Z), (Y *nsw Z) -> icmp spred Z, 0 if X s> Y
```
Alive2: https://alive2.llvm.org/ce/z/F2D0GE
>From adde6a83ab284a7acbdbd4aa45fd7bc729c41ff0 Mon Sep 17 00:00:00 2001
From: Yingwei Zheng <dtcxzyw2333 at gmail.com>
Date: Thu, 5 Dec 2024 09:06:16 +0800
Subject: [PATCH 1/2] [InstCombine] Add pre-commit tests. NFC.
---
llvm/test/Transforms/InstCombine/icmp-mul.ll | 119 +++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/llvm/test/Transforms/InstCombine/icmp-mul.ll b/llvm/test/Transforms/InstCombine/icmp-mul.ll
index c9f9b6d809e8a5..1f7b08ae2f316e 100644
--- a/llvm/test/Transforms/InstCombine/icmp-mul.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-mul.ll
@@ -1464,3 +1464,122 @@ entry:
%cmp = icmp slt i8 %mul1, %mul2
ret i1 %cmp
}
+
+define i1 @test_icmp_slt_mul_known_sgt(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_slt_mul_known_sgt(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul nsw i64 %x, %z
+ %mul2 = mul nsw i64 %y, %z
+ %cmp = icmp slt i64 %mul1, %mul2
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_sle_mul_known_sgt(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_sle_mul_known_sgt(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp sle i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul nsw i64 %x, %z
+ %mul2 = mul nsw i64 %y, %z
+ %cmp = icmp sle i64 %mul1, %mul2
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_mul_known_slt(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_mul_known_slt(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL2]], [[MUL1]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul nsw i64 %x, %z
+ %mul2 = mul nsw i64 %y, %z
+ %cmp = icmp slt i64 %mul2, %mul1
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_slt_mul_known_sgt_commuted1(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_slt_mul_known_sgt_commuted1(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[Z:%.*]], [[X]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul nsw i64 %z, %x
+ %mul2 = mul nsw i64 %y, %z
+ %cmp = icmp slt i64 %mul1, %mul2
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_slt_mul_known_sgt_commuted2(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_slt_mul_known_sgt_commuted2(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Z]], [[Y]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul nsw i64 %x, %z
+ %mul2 = mul nsw i64 %z, %y
+ %cmp = icmp slt i64 %mul1, %mul2
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_slt_mul_unknown(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_slt_mul_unknown(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Z]], [[Y]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add i64 %x, 1
+ %mul1 = mul nsw i64 %x, %z
+ %mul2 = mul nsw i64 %z, %y
+ %cmp = icmp slt i64 %mul1, %mul2
+ ret i1 %cmp
+}
+
+define i1 @test_icmp_slt_mul_no_nsw(i64 %x, i64 %z) {
+; CHECK-LABEL: @test_icmp_slt_mul_no_nsw(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
+; CHECK-NEXT: [[MUL1:%.*]] = mul i64 [[X]], [[Z:%.*]]
+; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Z]], [[Y]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: ret i1 [[CMP]]
+;
+entry:
+ %y = add nsw i64 %x, 1
+ %mul1 = mul i64 %x, %z
+ %mul2 = mul nsw i64 %z, %y
+ %cmp = icmp slt i64 %mul1, %mul2
+ ret i1 %cmp
+}
>From cb460c2551bc6ae50dbb579900109e9ac90e0dc9 Mon Sep 17 00:00:00 2001
From: Yingwei Zheng <dtcxzyw2333 at gmail.com>
Date: Thu, 5 Dec 2024 09:15:31 +0800
Subject: [PATCH 2/2] [InstCombine] Fold `icmp spred (X *nsw Z), (Y *nsw Z) i->
icmp pred Z, 0` if `scmp(X, Y)` is known
---
.../InstCombine/InstCombineCompares.cpp | 9 +++++++
llvm/test/Transforms/InstCombine/icmp-mul.ll | 25 ++++---------------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index fed21db393ed22..e31af8104e147c 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -5337,6 +5337,15 @@ Instruction *InstCombinerImpl::foldICmpBinOp(ICmpInst &I,
return new ICmpInst(Pred, X, Y);
if (ZKnown.isNegative())
return new ICmpInst(ICmpInst::getSwappedPredicate(Pred), X, Y);
+ Value *LessThan = simplifyICmpInst(ICmpInst::ICMP_SLT, X, Y,
+ SQ.getWithInstruction(&I));
+ if (LessThan && match(LessThan, m_One()))
+ return new ICmpInst(ICmpInst::getSwappedPredicate(Pred), Z,
+ Constant::getNullValue(Z->getType()));
+ Value *GreaterThan = simplifyICmpInst(ICmpInst::ICMP_SGT, X, Y,
+ SQ.getWithInstruction(&I));
+ if (GreaterThan && match(GreaterThan, m_One()))
+ return new ICmpInst(Pred, Z, Constant::getNullValue(Z->getType()));
}
} else {
bool NonZero;
diff --git a/llvm/test/Transforms/InstCombine/icmp-mul.ll b/llvm/test/Transforms/InstCombine/icmp-mul.ll
index 1f7b08ae2f316e..49e1e11fe6c36f 100644
--- a/llvm/test/Transforms/InstCombine/icmp-mul.ll
+++ b/llvm/test/Transforms/InstCombine/icmp-mul.ll
@@ -1468,10 +1468,7 @@ entry:
define i1 @test_icmp_slt_mul_known_sgt(i64 %x, i64 %z) {
; CHECK-LABEL: @test_icmp_slt_mul_known_sgt(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
-; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
-; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i64 [[Z:%.*]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
entry:
@@ -1485,10 +1482,7 @@ entry:
define i1 @test_icmp_sle_mul_known_sgt(i64 %x, i64 %z) {
; CHECK-LABEL: @test_icmp_sle_mul_known_sgt(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
-; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
-; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp sle i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i64 [[Z:%.*]], -1
; CHECK-NEXT: ret i1 [[CMP]]
;
entry:
@@ -1502,10 +1496,7 @@ entry:
define i1 @test_icmp_mul_known_slt(i64 %x, i64 %z) {
; CHECK-LABEL: @test_icmp_mul_known_slt(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
-; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
-; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL2]], [[MUL1]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[Z:%.*]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
entry:
@@ -1519,10 +1510,7 @@ entry:
define i1 @test_icmp_slt_mul_known_sgt_commuted1(i64 %x, i64 %z) {
; CHECK-LABEL: @test_icmp_slt_mul_known_sgt_commuted1(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
-; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[Z:%.*]], [[X]]
-; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Y]], [[Z]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i64 [[Z:%.*]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
entry:
@@ -1536,10 +1524,7 @@ entry:
define i1 @test_icmp_slt_mul_known_sgt_commuted2(i64 %x, i64 %z) {
; CHECK-LABEL: @test_icmp_slt_mul_known_sgt_commuted2(
; CHECK-NEXT: entry:
-; CHECK-NEXT: [[Y:%.*]] = add nsw i64 [[X:%.*]], 1
-; CHECK-NEXT: [[MUL1:%.*]] = mul nsw i64 [[X]], [[Z:%.*]]
-; CHECK-NEXT: [[MUL2:%.*]] = mul nsw i64 [[Z]], [[Y]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp slt i64 [[MUL1]], [[MUL2]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i64 [[Z:%.*]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
entry:
More information about the llvm-commits
mailing list