[llvm] [InstCombine] Reassociate commutative binops over select/phi/minmax (PR #187493)
Mitch Briles via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 9 01:04:01 PDT 2026
https://github.com/MitchBriles updated https://github.com/llvm/llvm-project/pull/187493
>From 3cc2d865f8c91709b02fcc80104228cbebd48ba1 Mon Sep 17 00:00:00 2001
From: Mitch <mitchbriles at gmail.com>
Date: Thu, 19 Mar 2026 04:11:10 -0600
Subject: [PATCH 1/5] Pre-patch tests
---
.../commutative-operation-over-minmax.ll | 114 ++++++++++++++++++
1 file changed, 114 insertions(+)
create mode 100644 llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
diff --git a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
new file mode 100644
index 0000000000000..239946ad1a4e4
--- /dev/null
+++ b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
@@ -0,0 +1,114 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
+; RUN: opt -passes=instcombine -S < %s | FileCheck %s
+
+define i32 @sadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @sadd_min_max_assoc(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = add i32 %2, %4
+ %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
+ %7 = add i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @or_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @or_min_max_assoc(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = or i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = or i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = or i32 %2, %4
+ %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
+ %7 = or i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @smul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @smul_min_max_assoc(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = mul i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = mul i32 %2, %4
+ %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
+ %7 = mul i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @uadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @uadd_min_max_assoc(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.umin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
+ %5 = add i32 %2, %4
+ %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
+ %7 = add i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @umul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @umul_min_max_assoc(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.umin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = mul i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
+ %5 = mul i32 %2, %4
+ %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
+ %7 = mul i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @sadd_min_max_assoc_wrong1(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @sadd_min_max_assoc_wrong1(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = add i32 %2, %4
+ %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
+ %7 = add i32 %5, %6
+ ret i32 %7
+}
+
+define i32 @sadd_min_max_assoc_wrong2(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @sadd_min_max_assoc_wrong2(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = mul i32 %2, %4
+ %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
+ %7 = add i32 %5, %6
+ ret i32 %7
+}
>From 33278cb37a20461ff3f4ce8cfd5b4d0e3e20dbf9 Mon Sep 17 00:00:00 2001
From: Mitch <mitchbriles at gmail.com>
Date: Thu, 19 Mar 2026 06:04:36 -0600
Subject: [PATCH 2/5] [InstCombine] Reassociate commutative binops over
select/phi/minmax
---
.../InstCombine/InstructionCombining.cpp | 14 +++++++++
.../commutative-operation-over-minmax.ll | 30 +++++++------------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 2af6fa24a09d1..50f36eeae1d19 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -526,6 +526,20 @@ bool InstCombinerImpl::SimplifyAssociativeOrCommutative(BinaryOperator &I) {
Value *B = Op0->getOperand(1);
Value *C = I.getOperand(1);
+ // Form "A op V" when "B op C" is a symmetric pair
+ if (I.isCommutative()) {
+ if (auto Pair = matchSymmetricPair(B, C)) {
+ replaceOperand(*Op0, 0, Pair->first);
+ replaceOperand(*Op0, 1, Pair->second);
+ replaceOperand(I, 1, A);
+ I.swapOperands();
+ ClearSubclassDataAfterReassociation(I);
+ Changed = true;
+ ++NumReassoc;
+ continue;
+ }
+ }
+
// Does "B op C" simplify?
if (Value *V = simplifyBinOp(Opcode, B, C, SQ.getWithInstruction(&I))) {
// It simplifies to V. Form "A op V".
diff --git a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
index 239946ad1a4e4..dc85d3984c65b 100644
--- a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
+++ b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
@@ -4,11 +4,9 @@
define i32 @sadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @sadd_min_max_assoc(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP4:%.*]] = add i32 [[TMP0]], [[TMP1]]
; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
-; CHECK-NEXT: ret i32 [[TMP7]]
+; CHECK-NEXT: ret i32 [[TMP5]]
;
%4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
%5 = add i32 %2, %4
@@ -20,11 +18,9 @@ define i32 @sadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
define i32 @or_min_max_assoc(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @or_min_max_assoc(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP4:%.*]] = or i32 [[TMP0]], [[TMP1]]
; CHECK-NEXT: [[TMP5:%.*]] = or i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP7:%.*]] = or i32 [[TMP5]], [[TMP6]]
-; CHECK-NEXT: ret i32 [[TMP7]]
+; CHECK-NEXT: ret i32 [[TMP5]]
;
%4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
%5 = or i32 %2, %4
@@ -36,11 +32,9 @@ define i32 @or_min_max_assoc(i32 %0, i32 %1, i32 %2) {
define i32 @smul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @smul_min_max_assoc(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP4:%.*]] = mul i32 [[TMP0]], [[TMP1]]
; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP7:%.*]] = mul i32 [[TMP5]], [[TMP6]]
-; CHECK-NEXT: ret i32 [[TMP7]]
+; CHECK-NEXT: ret i32 [[TMP5]]
;
%4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
%5 = mul i32 %2, %4
@@ -52,11 +46,9 @@ define i32 @smul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
define i32 @uadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @uadd_min_max_assoc(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.umin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP4:%.*]] = add i32 [[TMP0]], [[TMP1]]
; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
-; CHECK-NEXT: ret i32 [[TMP7]]
+; CHECK-NEXT: ret i32 [[TMP5]]
;
%4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
%5 = add i32 %2, %4
@@ -68,11 +60,9 @@ define i32 @uadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
define i32 @umul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @umul_min_max_assoc(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.umin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP4:%.*]] = mul i32 [[TMP0]], [[TMP1]]
; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP7:%.*]] = mul i32 [[TMP5]], [[TMP6]]
-; CHECK-NEXT: ret i32 [[TMP7]]
+; CHECK-NEXT: ret i32 [[TMP5]]
;
%4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
%5 = mul i32 %2, %4
>From 57c64381a33f6586964f4bea59cef687fc9dc7b8 Mon Sep 17 00:00:00 2001
From: Mitch <mitchbriles at gmail.com>
Date: Thu, 19 Mar 2026 06:49:32 -0600
Subject: [PATCH 3/5] Fix test names
---
.../InstCombine/commutative-operation-over-minmax.ll | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
index dc85d3984c65b..0f29322c5b174 100644
--- a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
+++ b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
@@ -71,8 +71,8 @@ define i32 @umul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
ret i32 %7
}
-define i32 @sadd_min_max_assoc_wrong1(i32 %0, i32 %1, i32 %2) {
-; CHECK-LABEL: define i32 @sadd_min_max_assoc_wrong1(
+define i32 @add_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @add_min_max_assoc_wrong(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
@@ -87,8 +87,8 @@ define i32 @sadd_min_max_assoc_wrong1(i32 %0, i32 %1, i32 %2) {
ret i32 %7
}
-define i32 @sadd_min_max_assoc_wrong2(i32 %0, i32 %1, i32 %2) {
-; CHECK-LABEL: define i32 @sadd_min_max_assoc_wrong2(
+define i32 @mul_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
+; CHECK-LABEL: define i32 @mul_min_max_assoc_wrong(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
>From 35f1a80ed8e8f4fe3c7afc8ff18be5ae6d65c135 Mon Sep 17 00:00:00 2001
From: Mitch <mitchbriles at gmail.com>
Date: Tue, 24 Mar 2026 17:33:53 -0600
Subject: [PATCH 4/5] Check hasOneUse
---
.../InstCombine/InstructionCombining.cpp | 2 +-
.../commutative-operation-over-minmax.ll | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 50f36eeae1d19..6878d00526393 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -527,7 +527,7 @@ bool InstCombinerImpl::SimplifyAssociativeOrCommutative(BinaryOperator &I) {
Value *C = I.getOperand(1);
// Form "A op V" when "B op C" is a symmetric pair
- if (I.isCommutative()) {
+ if (I.isCommutative() && Op0->hasOneUse()) {
if (auto Pair = matchSymmetricPair(B, C)) {
replaceOperand(*Op0, 0, Pair->first);
replaceOperand(*Op0, 1, Pair->second);
diff --git a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
index 0f29322c5b174..2878b1dae4ffa 100644
--- a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
+++ b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
@@ -87,6 +87,24 @@ define i32 @add_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
ret i32 %7
}
+define i32 @add_min_max_assoc_wrong2(i32 %0, i32 %1, i32 %2, ptr %p) {
+; CHECK-LABEL: define i32 @add_min_max_assoc_wrong2(
+; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]], ptr [[P:%.*]]) {
+; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
+; CHECK-NEXT: store i32 [[TMP5]], ptr [[P]], align 4
+; CHECK-NEXT: ret i32 [[TMP7]]
+;
+ %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
+ %5 = add i32 %2, %4
+ %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
+ %7 = add i32 %5, %6
+ store i32 %5, ptr %p
+ ret i32 %7
+}
+
define i32 @mul_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
; CHECK-LABEL: define i32 @mul_min_max_assoc_wrong(
; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
>From af265f5fa4c1e4488f71dea4fe02c73939618d21 Mon Sep 17 00:00:00 2001
From: Mitch <mitchbriles at gmail.com>
Date: Thu, 9 Apr 2026 02:03:09 -0600
Subject: [PATCH 5/5] Drop `nuw`/`nsw` + fixup tests
---
.../InstCombine/InstructionCombining.cpp | 4 +
.../commutative-operation-over-minmax.ll | 180 ++++++++++--------
2 files changed, 108 insertions(+), 76 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 6878d00526393..10ab732d1558e 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -531,6 +531,10 @@ bool InstCombinerImpl::SimplifyAssociativeOrCommutative(BinaryOperator &I) {
if (auto Pair = matchSymmetricPair(B, C)) {
replaceOperand(*Op0, 0, Pair->first);
replaceOperand(*Op0, 1, Pair->second);
+ if (hasNoUnsignedWrap(*Op0))
+ Op0->setHasNoUnsignedWrap(false);
+ if (hasNoSignedWrap(*Op0))
+ Op0->setHasNoSignedWrap(false);
replaceOperand(I, 1, A);
I.swapOperands();
ClearSubclassDataAfterReassociation(I);
diff --git a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
index 2878b1dae4ffa..547aad7c6b164 100644
--- a/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
+++ b/llvm/test/Transforms/InstCombine/commutative-operation-over-minmax.ll
@@ -1,122 +1,150 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
; RUN: opt -passes=instcombine -S < %s | FileCheck %s
-define i32 @sadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+define i32 @sadd_min_max_assoc(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @sadd_min_max_assoc(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = add i32 [[TMP0]], [[TMP1]]
-; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = add i32 [[X]], [[Y]]
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[Z]], [[LHS]]
; CHECK-NEXT: ret i32 [[TMP5]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = add i32 %2, %4
- %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
- %7 = add i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = add i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @or_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+define i32 @or_min_max_assoc(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @or_min_max_assoc(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = or i32 [[TMP0]], [[TMP1]]
-; CHECK-NEXT: [[TMP5:%.*]] = or i32 [[TMP2]], [[TMP4]]
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = or i32 [[X]], [[Y]]
+; CHECK-NEXT: [[TMP5:%.*]] = or i32 [[Z]], [[LHS]]
; CHECK-NEXT: ret i32 [[TMP5]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = or i32 %2, %4
- %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
- %7 = or i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = or i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = or i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @smul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+define i32 @smul_min_max_assoc(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @smul_min_max_assoc(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = mul i32 [[TMP0]], [[TMP1]]
-; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = mul i32 [[X]], [[Y]]
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[Z]], [[LHS]]
; CHECK-NEXT: ret i32 [[TMP5]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = mul i32 %2, %4
- %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
- %7 = mul i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = mul i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = mul i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @uadd_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+define i32 @uadd_min_max_assoc(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @uadd_min_max_assoc(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = add i32 [[TMP0]], [[TMP1]]
-; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = add i32 [[X]], [[Y]]
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[Z]], [[LHS]]
; CHECK-NEXT: ret i32 [[TMP5]]
;
- %4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
- %5 = add i32 %2, %4
- %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
- %7 = add i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.umin.i32(i32 %x, i32 %y)
+ %lhs = add i32 %z, %min
+ %max = call i32 @llvm.umax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @umul_min_max_assoc(i32 %0, i32 %1, i32 %2) {
+define i32 @umul_min_max_assoc(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @umul_min_max_assoc(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = mul i32 [[TMP0]], [[TMP1]]
-; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = mul i32 [[X]], [[Y]]
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[Z]], [[LHS]]
; CHECK-NEXT: ret i32 [[TMP5]]
;
- %4 = call i32 @llvm.umin.i32(i32 %0, i32 %1)
- %5 = mul i32 %2, %4
- %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
- %7 = mul i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.umin.i32(i32 %x, i32 %y)
+ %lhs = mul i32 %z, %min
+ %max = call i32 @llvm.umax.i32(i32 %x, i32 %y)
+ %ret = mul i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @add_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
+define i32 @add_min_max_assoc_wrong(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @add_min_max_assoc_wrong(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[X]], i32 [[Y]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[Z]], [[MIN]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[X]], i32 [[Y]])
; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
; CHECK-NEXT: ret i32 [[TMP7]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = add i32 %2, %4
- %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
- %7 = add i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = add i32 %z, %min
+ %max = call i32 @llvm.umax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
}
-define i32 @add_min_max_assoc_wrong2(i32 %0, i32 %1, i32 %2, ptr %p) {
+define i32 @add_min_max_assoc_wrong2(i32 %x, i32 %y, i32 %z, ptr %p) {
; CHECK-LABEL: define i32 @add_min_max_assoc_wrong2(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]], ptr [[P:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]], ptr [[P:%.*]]) {
+; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[X]], i32 [[Y]])
+; CHECK-NEXT: [[TMP5:%.*]] = add i32 [[Z]], [[MIN]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.smax.i32(i32 [[X]], i32 [[Y]])
; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
; CHECK-NEXT: store i32 [[TMP5]], ptr [[P]], align 4
; CHECK-NEXT: ret i32 [[TMP7]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = add i32 %2, %4
- %6 = call i32 @llvm.smax.i32(i32 %0, i32 %1)
- %7 = add i32 %5, %6
- store i32 %5, ptr %p
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = add i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ store i32 %lhs, ptr %p
+ ret i32 %ret
}
-define i32 @mul_min_max_assoc_wrong(i32 %0, i32 %1, i32 %2) {
+define i32 @mul_min_max_assoc_wrong(i32 %x, i32 %y, i32 %z) {
; CHECK-LABEL: define i32 @mul_min_max_assoc_wrong(
-; CHECK-SAME: i32 [[TMP0:%.*]], i32 [[TMP1:%.*]], i32 [[TMP2:%.*]]) {
-; CHECK-NEXT: [[TMP4:%.*]] = call i32 @llvm.smin.i32(i32 [[TMP0]], i32 [[TMP1]])
-; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[TMP2]], [[TMP4]]
-; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[TMP0]], i32 [[TMP1]])
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[MIN:%.*]] = call i32 @llvm.smin.i32(i32 [[X]], i32 [[Y]])
+; CHECK-NEXT: [[TMP5:%.*]] = mul i32 [[Z]], [[MIN]]
+; CHECK-NEXT: [[TMP6:%.*]] = call i32 @llvm.umax.i32(i32 [[X]], i32 [[Y]])
; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP5]], [[TMP6]]
; CHECK-NEXT: ret i32 [[TMP7]]
;
- %4 = call i32 @llvm.smin.i32(i32 %0, i32 %1)
- %5 = mul i32 %2, %4
- %6 = call i32 @llvm.umax.i32(i32 %0, i32 %1)
- %7 = add i32 %5, %6
- ret i32 %7
+ %min = call i32 @llvm.smin.i32(i32 %x, i32 %y)
+ %lhs = mul i32 %z, %min
+ %max = call i32 @llvm.umax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
+}
+
+define i32 @sadd_nsw_min_max_assoc(i32 %x, i32 %y, i32 %z) {
+; CHECK-LABEL: define i32 @sadd_nsw_min_max_assoc(
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = add i32 [[Y]], [[X]]
+; CHECK-NEXT: [[RET:%.*]] = add i32 [[Z]], [[LHS]]
+; CHECK-NEXT: ret i32 [[RET]]
+;
+ %min = call i32 @llvm.smin.i32(i32 %y, i32 %x)
+ %lhs = add nsw i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
+}
+
+define i32 @sadd_nuw_min_max_assoc(i32 %x, i32 %y, i32 %z) {
+; CHECK-LABEL: define i32 @sadd_nuw_min_max_assoc(
+; CHECK-SAME: i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
+; CHECK-NEXT: [[LHS:%.*]] = add i32 [[Y]], [[X]]
+; CHECK-NEXT: [[RET:%.*]] = add i32 [[Z]], [[LHS]]
+; CHECK-NEXT: ret i32 [[RET]]
+;
+ %min = call i32 @llvm.smin.i32(i32 %y, i32 %x)
+ %lhs = add nuw i32 %z, %min
+ %max = call i32 @llvm.smax.i32(i32 %x, i32 %y)
+ %ret = add i32 %lhs, %max
+ ret i32 %ret
}
More information about the llvm-commits
mailing list