[llvm] [InstCombine] Fold mul (lshr exact (X, 2^N + 1)), N -> add (X , lshr (X, N)) (PR #95042)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 11 07:28:00 PDT 2024
https://github.com/AtariDreams updated https://github.com/llvm/llvm-project/pull/95042
>From a2500047feeef654966aef6dfcff5a40269d153a Mon Sep 17 00:00:00 2001
From: Rose <gfunni234 at gmail.com>
Date: Mon, 10 Jun 2024 12:44:49 -0400
Subject: [PATCH 1/3] [InstCombine] Pre-commit test (NFC)
---
llvm/test/Transforms/InstCombine/ashr-lshr.ll | 122 ++++++++++++++++++
1 file changed, 122 insertions(+)
diff --git a/llvm/test/Transforms/InstCombine/ashr-lshr.ll b/llvm/test/Transforms/InstCombine/ashr-lshr.ll
index c2a4f35412670..682435ec5cb1b 100644
--- a/llvm/test/Transforms/InstCombine/ashr-lshr.ll
+++ b/llvm/test/Transforms/InstCombine/ashr-lshr.ll
@@ -862,4 +862,126 @@ define i32 @ashr_mul_times_5_div_4_exact_2(i32 %x) {
ret i32 %ashr
}
+define i32 @ashr_shift_mul(i32 %x) {
+; CHECK-LABEL: @ashr_shift_mul(
+; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = ashr exact i32 %x, 3
+ %res = mul i32 %a, 9
+ ret i32 %res
+}
+
+define i32 @ashr_shift_mul_nuw(i32 %x) {
+; CHECK-LABEL: @ashr_shift_mul_nuw(
+; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nuw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = ashr exact i32 %x, 3
+ %res = mul nuw i32 %a, 9
+ ret i32 %res
+}
+
+define i32 @ashr_shift_mul_nsw(i32 %x) {
+; CHECK-LABEL: @ashr_shift_mul_nsw(
+; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = ashr exact i32 %x, 3
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
+define i32 @lshr_shift_mul_nuw(i32 %x) {
+; CHECK-LABEL: @lshr_shift_mul_nuw(
+; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nuw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = lshr exact i32 %x, 3
+ %res = mul nuw i32 %a, 9
+ ret i32 %res
+}
+
+define i32 @lshr_shift_mul(i32 %x) {
+; CHECK-LABEL: @lshr_shift_mul(
+; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = lshr exact i32 %x, 3
+ %res = mul i32 %a, 9
+ ret i32 %res
+}
+
+define i32 @lshr_shift_mul_nsw(i32 %x) {
+; CHECK-LABEL: @lshr_shift_mul_nsw(
+; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = lshr exact i32 %x, 3
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
+; Negative test
+
+define i32 @lshr_no_exact(i32 %x) {
+; CHECK-LABEL: @lshr_no_exact(
+; CHECK-NEXT: [[A:%.*]] = lshr i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = lshr i32 %x, 3
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
+; Negative test
+
+define i32 @ashr_no_exact(i32 %x) {
+; CHECK-LABEL: @ashr_no_exact(
+; CHECK-NEXT: [[A:%.*]] = ashr i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = mul nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = ashr i32 %x, 3
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
+; Negative test
+
+define i32 @lshr_multiuse(i32 %x) {
+; CHECK-LABEL: @lshr_multiuse(
+; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: call void @use(i32 [[A]])
+; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = lshr exact i32 %x, 3
+ call void @use(i32 %a)
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
+; Negative test
+
+define i32 @ashr_multiuse(i32 %x) {
+; CHECK-LABEL: @ashr_multiuse(
+; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: call void @use(i32 [[A]])
+; CHECK-NEXT: [[RES:%.*]] = mul nsw i32 [[A]], 9
+; CHECK-NEXT: ret i32 [[RES]]
+;
+ %a = ashr exact i32 %x, 3
+ call void @use(i32 %a)
+ %res = mul nsw i32 %a, 9
+ ret i32 %res
+}
+
declare void @use(i32)
>From 8f3542c34cfdba53eee2d6ff412a801716530b48 Mon Sep 17 00:00:00 2001
From: Rose <gfunni234 at gmail.com>
Date: Mon, 10 Jun 2024 12:47:14 -0400
Subject: [PATCH 2/3] [InstCombine] Fold mul (lshr exact (X, 2^N + 1)), N ->
add (X , lshr (X, N))
Alive2 Proof:
https://alive2.llvm.org/ce/z/LVqGEo
---
.../InstCombine/InstCombineMulDivRem.cpp | 36 +++++++++++++++++
llvm/test/Transforms/InstCombine/ashr-lshr.ll | 40 +++++++++++--------
2 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index ca1b1921404d8..9248c902c1e90 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -255,6 +255,42 @@ Instruction *InstCombinerImpl::visitMul(BinaryOperator &I) {
}
}
+ {
+ // mul (lshr exact (X, 2^N + 1)), N -> add (X , lshr (X, N))
+ Value *NewOp;
+ const APInt *ShiftC;
+ const APInt *MulAP;
+ if (match(&I, m_Mul(m_CombineOr(m_LShr(m_Value(NewOp), m_APInt(ShiftC)),
+ m_AShr(m_Value(NewOp), m_APInt(ShiftC))),
+ m_APInt(MulAP)))) {
+ if (BitWidth > 2 && (*MulAP - 1).isPowerOf2() &&
+ MulAP->logBase2() == ShiftC->getZExtValue()) {
+ BinaryOperator *OpBO = cast<BinaryOperator>(Op0);
+ if (OpBO->isExact()) {
+ Value *AddOp;
+ if (!HasNUW && !HasNUW)
+ AddOp = Builder.CreateFreeze(NewOp);
+ else
+ AddOp = NewOp;
+
+ Value *BinOp;
+ if (OpBO->getOpcode() == Instruction::LShr ||
+ (OpBO->getOpcode() == Instruction::AShr && HasNUW)) {
+ BinOp = Builder.CreateLShr(
+ AddOp, ConstantInt::get(Ty, ShiftC->getZExtValue()), "", true);
+ } else {
+ BinOp = Builder.CreateAShr(
+ AddOp, ConstantInt::get(Ty, ShiftC->getZExtValue()), "", true);
+ }
+
+ auto *NewAdd = BinaryOperator::CreateAdd(AddOp, BinOp);
+ NewAdd->copyIRFlags(&I);
+ return NewAdd;
+ }
+ }
+ }
+ }
+
if (Op0->hasOneUse() && match(Op1, m_NegatedPower2())) {
// Interpret X * (-1<<C) as (-X) * (1<<C) and try to sink the negation.
// The "* (1<<C)" thus becomes a potential shifting opportunity.
diff --git a/llvm/test/Transforms/InstCombine/ashr-lshr.ll b/llvm/test/Transforms/InstCombine/ashr-lshr.ll
index 682435ec5cb1b..3309b18e0f11a 100644
--- a/llvm/test/Transforms/InstCombine/ashr-lshr.ll
+++ b/llvm/test/Transforms/InstCombine/ashr-lshr.ll
@@ -864,8 +864,9 @@ define i32 @ashr_mul_times_5_div_4_exact_2(i32 %x) {
define i32 @ashr_shift_mul(i32 %x) {
; CHECK-LABEL: @ashr_shift_mul(
-; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[TMP2:%.*]] = ashr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = ashr exact i32 %x, 3
@@ -875,8 +876,8 @@ define i32 @ashr_shift_mul(i32 %x) {
define i32 @ashr_shift_mul_nuw(i32 %x) {
; CHECK-LABEL: @ashr_shift_mul_nuw(
-; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul nuw i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nuw i32 [[TMP1]], [[X]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = ashr exact i32 %x, 3
@@ -886,8 +887,9 @@ define i32 @ashr_shift_mul_nuw(i32 %x) {
define i32 @ashr_shift_mul_nsw(i32 %x) {
; CHECK-LABEL: @ashr_shift_mul_nsw(
-; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul nsw i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[TMP2:%.*]] = ashr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nsw i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = ashr exact i32 %x, 3
@@ -897,8 +899,8 @@ define i32 @ashr_shift_mul_nsw(i32 %x) {
define i32 @lshr_shift_mul_nuw(i32 %x) {
; CHECK-LABEL: @lshr_shift_mul_nuw(
-; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul nuw i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nuw i32 [[TMP1]], [[X]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = lshr exact i32 %x, 3
@@ -908,8 +910,9 @@ define i32 @lshr_shift_mul_nuw(i32 %x) {
define i32 @lshr_shift_mul(i32 %x) {
; CHECK-LABEL: @lshr_shift_mul(
-; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[TMP2:%.*]] = lshr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = lshr exact i32 %x, 3
@@ -919,8 +922,9 @@ define i32 @lshr_shift_mul(i32 %x) {
define i32 @lshr_shift_mul_nsw(i32 %x) {
; CHECK-LABEL: @lshr_shift_mul_nsw(
-; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
-; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A]], 9
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[TMP2:%.*]] = lshr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nsw i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = lshr exact i32 %x, 3
@@ -958,9 +962,11 @@ define i32 @ashr_no_exact(i32 %x) {
define i32 @lshr_multiuse(i32 %x) {
; CHECK-LABEL: @lshr_multiuse(
-; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[A:%.*]] = lshr exact i32 [[TMP1]], 3
; CHECK-NEXT: call void @use(i32 [[A]])
-; CHECK-NEXT: [[RES:%.*]] = mul nuw nsw i32 [[A]], 9
+; CHECK-NEXT: [[TMP2:%.*]] = lshr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nsw i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = lshr exact i32 %x, 3
@@ -973,9 +979,11 @@ define i32 @lshr_multiuse(i32 %x) {
define i32 @ashr_multiuse(i32 %x) {
; CHECK-LABEL: @ashr_multiuse(
-; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[X:%.*]], 3
+; CHECK-NEXT: [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT: [[A:%.*]] = ashr exact i32 [[TMP1]], 3
; CHECK-NEXT: call void @use(i32 [[A]])
-; CHECK-NEXT: [[RES:%.*]] = mul nsw i32 [[A]], 9
+; CHECK-NEXT: [[TMP2:%.*]] = ashr exact i32 [[TMP1]], 3
+; CHECK-NEXT: [[RES:%.*]] = add nsw i32 [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret i32 [[RES]]
;
%a = ashr exact i32 %x, 3
>From 5c899c39404bfba8a1488c5fad6beabf50211f71 Mon Sep 17 00:00:00 2001
From: AtariDreams <gfunni234 at gmail.com>
Date: Tue, 11 Jun 2024 10:27:50 -0400
Subject: [PATCH 3/3] Make One Use
---
llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index 9248c902c1e90..1a22155cbc537 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -260,8 +260,8 @@ Instruction *InstCombinerImpl::visitMul(BinaryOperator &I) {
Value *NewOp;
const APInt *ShiftC;
const APInt *MulAP;
- if (match(&I, m_Mul(m_CombineOr(m_LShr(m_Value(NewOp), m_APInt(ShiftC)),
- m_AShr(m_Value(NewOp), m_APInt(ShiftC))),
+ if (match(&I, m_Mul(m_OneUse(m_CombineOr(m_LShr(m_Value(NewOp), m_APInt(ShiftC)),
+ m_AShr(m_Value(NewOp), m_APInt(ShiftC)))),
m_APInt(MulAP)))) {
if (BitWidth > 2 && (*MulAP - 1).isPowerOf2() &&
MulAP->logBase2() == ShiftC->getZExtValue()) {
More information about the llvm-commits
mailing list