Skip to content

Commit 4665f3c

Browse files
author
Serguei Katkov
committed
Revert "[InstCombine] Add support for max(a,b) + min(a,b) => a + b."
Revert commit due to failure on buildbot: error: 'match_combine_or' may not intend to support class template argument deduction This reverts commit b86a06e.
1 parent b86a06e commit 4665f3c

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

‎llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,14 +1554,6 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
15541554
if (Instruction *Ashr = foldAddToAshr(I))
15551555
return Ashr;
15561556

1557-
// min(A, B) + max(A, B) => A + B.
1558-
if (match(&I,
1559-
match_combine_or(m_c_Add(m_SMax(m_Value(A), m_Value(B)),
1560-
m_c_SMin(m_Deferred(A), m_Deferred(B))),
1561-
m_c_Add(m_UMax(m_Value(A), m_Value(B)),
1562-
m_c_UMin(m_Deferred(A), m_Deferred(B))))))
1563-
return BinaryOperator::CreateWithCopiedFlags(Instruction::Add, A, B, &I);
1564-
15651557
// TODO(jingyue): Consider willNotOverflowSignedAdd and
15661558
// willNotOverflowUnsignedAdd to reduce the number of invocations of
15671559
// computeKnownBits.

‎llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,14 +471,6 @@ Instruction *InstCombinerImpl::visitMul(BinaryOperator &I) {
471471
if (Instruction *Ext = narrowMathIfNoOverflow(I))
472472
return Ext;
473473

474-
// min(X, Y) * max(X, Y) => X * Y.
475-
if (match(&I,
476-
match_combine_or(m_c_Mul(m_SMax(m_Value(X), m_Value(Y)),
477-
m_c_SMin(m_Deferred(X), m_Deferred(Y))),
478-
m_c_Mul(m_UMax(m_Value(X), m_Value(Y)),
479-
m_c_UMin(m_Deferred(X), m_Deferred(Y))))))
480-
return BinaryOperator::CreateWithCopiedFlags(Instruction::Mul, X, Y, &I);
481-
482474
bool Changed = false;
483475
if (!HasNSW && willNotOverflowSignedMul(Op0, Op1, I)) {
484476
Changed = true;

‎llvm/test/Transforms/InstCombine/add-min-max.ll

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ declare i32 @llvm.umin.i32(i32 %a, i32 %b)
99
define i32 @uadd_min_max(i32 %a, i32 %b) {
1010
; CHECK-LABEL: @uadd_min_max(
1111
; CHECK-NEXT: entry:
12-
; CHECK-NEXT: [[RES:%.*]] = add i32 [[A:%.*]], [[B:%.*]]
12+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
13+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
14+
; CHECK-NEXT: [[RES:%.*]] = add i32 [[MIN]], [[MAX]]
1315
; CHECK-NEXT: ret i32 [[RES]]
1416
;
1517
entry:
@@ -22,7 +24,9 @@ entry:
2224
define i32 @uadd_min_max_comm(i32 %a, i32 %b) {
2325
; CHECK-LABEL: @uadd_min_max_comm(
2426
; CHECK-NEXT: entry:
25-
; CHECK-NEXT: [[RES:%.*]] = add i32 [[B:%.*]], [[A:%.*]]
27+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[B:%.*]], i32 [[A:%.*]])
28+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
29+
; CHECK-NEXT: [[RES:%.*]] = add i32 [[MIN]], [[MAX]]
2630
; CHECK-NEXT: ret i32 [[RES]]
2731
;
2832
entry:
@@ -35,7 +39,9 @@ entry:
3539
define i32 @uadd_min_max_nuw_nsw(i32 %a, i32 %b) {
3640
; CHECK-LABEL: @uadd_min_max_nuw_nsw(
3741
; CHECK-NEXT: entry:
38-
; CHECK-NEXT: [[RES:%.*]] = add nuw nsw i32 [[A:%.*]], [[B:%.*]]
42+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
43+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
44+
; CHECK-NEXT: [[RES:%.*]] = add nuw nsw i32 [[MIN]], [[MAX]]
3945
; CHECK-NEXT: ret i32 [[RES]]
4046
;
4147
entry:
@@ -48,7 +54,9 @@ entry:
4854
define i32 @sadd_min_max(i32 %a, i32 %b) {
4955
; CHECK-LABEL: @sadd_min_max(
5056
; CHECK-NEXT: entry:
51-
; CHECK-NEXT: [[RES:%.*]] = add i32 [[A:%.*]], [[B:%.*]]
57+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
58+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
59+
; CHECK-NEXT: [[RES:%.*]] = add i32 [[MIN]], [[MAX]]
5260
; CHECK-NEXT: ret i32 [[RES]]
5361
;
5462
entry:
@@ -61,7 +69,9 @@ entry:
6169
define i32 @sadd_min_max_comm(i32 %a, i32 %b) {
6270
; CHECK-LABEL: @sadd_min_max_comm(
6371
; CHECK-NEXT: entry:
64-
; CHECK-NEXT: [[RES:%.*]] = add i32 [[B:%.*]], [[A:%.*]]
72+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[B:%.*]], i32 [[A:%.*]])
73+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
74+
; CHECK-NEXT: [[RES:%.*]] = add i32 [[MIN]], [[MAX]]
6575
; CHECK-NEXT: ret i32 [[RES]]
6676
;
6777
entry:
@@ -74,7 +84,9 @@ entry:
7484
define i32 @sadd_min_max_nuw_nsw(i32 %a, i32 %b) {
7585
; CHECK-LABEL: @sadd_min_max_nuw_nsw(
7686
; CHECK-NEXT: entry:
77-
; CHECK-NEXT: [[RES:%.*]] = add nuw nsw i32 [[A:%.*]], [[B:%.*]]
87+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
88+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
89+
; CHECK-NEXT: [[RES:%.*]] = add nuw nsw i32 [[MIN]], [[MAX]]
7890
; CHECK-NEXT: ret i32 [[RES]]
7991
;
8092
entry:

‎llvm/test/Transforms/InstCombine/mul-min-max.ll

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ declare i32 @llvm.umin.i32(i32 %a, i32 %b)
99
define i32 @umul_min_max(i32 %a, i32 %b) {
1010
; CHECK-LABEL: @umul_min_max(
1111
; CHECK-NEXT: entry:
12-
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A:%.*]], [[B:%.*]]
12+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
13+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
14+
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[MIN]], [[MAX]]
1315
; CHECK-NEXT: ret i32 [[RES]]
1416
;
1517
entry:
@@ -22,7 +24,9 @@ entry:
2224
define i32 @umul_min_max_comm(i32 %a, i32 %b) {
2325
; CHECK-LABEL: @umul_min_max_comm(
2426
; CHECK-NEXT: entry:
25-
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[B:%.*]], [[A:%.*]]
27+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[B:%.*]], i32 [[A:%.*]])
28+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
29+
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[MIN]], [[MAX]]
2630
; CHECK-NEXT: ret i32 [[RES]]
2731
;
2832
entry:
@@ -35,7 +39,9 @@ entry:
3539
define i32 @umul_min_max_nuw_nsw(i32 %a, i32 %b) {
3640
; CHECK-LABEL: @umul_min_max_nuw_nsw(
3741
; CHECK-NEXT: entry:
38-
; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A:%.*]], [[B:%.*]]
42+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.umax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
43+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.umin.i32(i32 [[A]], i32 [[B]])
44+
; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[MIN]], [[MAX]]
3945
; CHECK-NEXT: ret i32 [[RES]]
4046
;
4147
entry:
@@ -48,7 +54,9 @@ entry:
4854
define i32 @smul_min_max(i32 %a, i32 %b) {
4955
; CHECK-LABEL: @smul_min_max(
5056
; CHECK-NEXT: entry:
51-
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A:%.*]], [[B:%.*]]
57+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
58+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
59+
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[MIN]], [[MAX]]
5260
; CHECK-NEXT: ret i32 [[RES]]
5361
;
5462
entry:
@@ -61,7 +69,9 @@ entry:
6169
define i32 @smul_min_max_comm(i32 %a, i32 %b) {
6270
; CHECK-LABEL: @smul_min_max_comm(
6371
; CHECK-NEXT: entry:
64-
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[B:%.*]], [[A:%.*]]
72+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[B:%.*]], i32 [[A:%.*]])
73+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
74+
; CHECK-NEXT: [[RES:%.*]] = mul i32 [[MIN]], [[MAX]]
6575
; CHECK-NEXT: ret i32 [[RES]]
6676
;
6777
entry:
@@ -74,7 +84,9 @@ entry:
7484
define i32 @smul_min_max_nuw_nsw(i32 %a, i32 %b) {
7585
; CHECK-LABEL: @smul_min_max_nuw_nsw(
7686
; CHECK-NEXT: entry:
77-
; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A:%.*]], [[B:%.*]]
87+
; CHECK-NEXT: [[MAX:%.*]] = call i32 @llvm.smax.i32(i32 [[A:%.*]], i32 [[B:%.*]])
88+
; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[A]], i32 [[B]])
89+
; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[MIN]], [[MAX]]
7890
; CHECK-NEXT: ret i32 [[RES]]
7991
;
8092
entry:

0 commit comments

Comments
 (0)