[llvm] [InstCombine] Propagate disjoint flags during shl-binop transform (PR #91333)
via llvm-commits
llvm-commits at lists.llvm.org
Sun May 12 13:31:43 PDT 2024
https://github.com/AtariDreams updated https://github.com/llvm/llvm-project/pull/91333
>From 6f337cfbec988fa984af447158f91e84aae0765a Mon Sep 17 00:00:00 2001
From: Rose <gfunni234 at gmail.com>
Date: Tue, 7 May 2024 09:58:21 -0400
Subject: [PATCH 1/3] [InstCombine] Pre-commit tests (NFC)
[InstCombine] Pre-commit tests (NFC)
---
llvm/test/Transforms/InstCombine/shl-bo.ll | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/llvm/test/Transforms/InstCombine/shl-bo.ll b/llvm/test/Transforms/InstCombine/shl-bo.ll
index d33d27c912d6b..5f7526ef85862 100644
--- a/llvm/test/Transforms/InstCombine/shl-bo.ll
+++ b/llvm/test/Transforms/InstCombine/shl-bo.ll
@@ -294,6 +294,23 @@ define i8 @lshr_and_or(i8 %a, i8 %y) {
ret i8 %l
}
+define i8 @lshr_and_or_disjoint(i8 %a, i8 %y) {
+; CHECK-LABEL: @lshr_and_or_disjoint(
+; CHECK-NEXT: [[X:%.*]] = srem i8 [[A:%.*]], 42
+; CHECK-NEXT: [[B1:%.*]] = shl i8 [[X]], 2
+; CHECK-NEXT: [[Y_MASK:%.*]] = and i8 [[Y:%.*]], 52
+; CHECK-NEXT: [[L:%.*]] = or i8 [[Y_MASK]], [[B1]]
+; CHECK-NEXT: ret i8 [[L]]
+;
+ %x = srem i8 %a, 42 ; thwart complexity-based canonicalization
+ %r = lshr i8 %y, 2
+ %m = and i8 %r, 13
+ %b = or disjoint i8 %x, %m
+ %l = shl i8 %b, 2
+ ret i8 %l
+}
+
+
define <2 x i8> @lshr_and_or_commute_splat(<2 x i8> %a, <2 x i8> %y) {
; CHECK-LABEL: @lshr_and_or_commute_splat(
; CHECK-NEXT: [[X:%.*]] = srem <2 x i8> [[A:%.*]], <i8 42, i8 42>
>From f0e68ba9fff6531c688ea86954afe8523c89ca00 Mon Sep 17 00:00:00 2001
From: Rose <gfunni234 at gmail.com>
Date: Tue, 7 May 2024 09:54:34 -0400
Subject: [PATCH 2/3] [InstCombine] Propogate disjoint flags during shl-binop
transform
Proof: https://alive2.llvm.org/ce/z/7YWJ69
---
llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp | 6 +++++-
llvm/test/Transforms/InstCombine/shl-bo.ll | 6 +++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp
index 1cb21a1d81af4..2dcc878757d15 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp
@@ -1174,7 +1174,11 @@ Instruction *InstCombinerImpl::visitShl(BinaryOperator &I) {
// X & (CC << C)
Value *M = Builder.CreateAnd(X, ConstantInt::get(Ty, CC->shl(*C)),
X->getName() + ".mask");
- return BinaryOperator::Create(Op0BO->getOpcode(), M, YS);
+ auto *NewOp = BinaryOperator::Create(Op0BO->getOpcode(), M, YS);
+ if (auto *Disjoint = dyn_cast<PossiblyDisjointInst>(Op0BO);
+ Disjoint && Disjoint->isDisjoint())
+ cast<PossiblyDisjointInst>(NewOp)->setIsDisjoint(true);
+ return NewOp;
}
}
diff --git a/llvm/test/Transforms/InstCombine/shl-bo.ll b/llvm/test/Transforms/InstCombine/shl-bo.ll
index 5f7526ef85862..ff78dcc708d63 100644
--- a/llvm/test/Transforms/InstCombine/shl-bo.ll
+++ b/llvm/test/Transforms/InstCombine/shl-bo.ll
@@ -299,7 +299,7 @@ define i8 @lshr_and_or_disjoint(i8 %a, i8 %y) {
; CHECK-NEXT: [[X:%.*]] = srem i8 [[A:%.*]], 42
; CHECK-NEXT: [[B1:%.*]] = shl i8 [[X]], 2
; CHECK-NEXT: [[Y_MASK:%.*]] = and i8 [[Y:%.*]], 52
-; CHECK-NEXT: [[L:%.*]] = or i8 [[Y_MASK]], [[B1]]
+; CHECK-NEXT: [[L:%.*]] = or disjoint i8 [[Y_MASK]], [[B1]]
; CHECK-NEXT: ret i8 [[L]]
;
%x = srem i8 %a, 42 ; thwart complexity-based canonicalization
@@ -631,8 +631,8 @@ define <8 x i16> @test_FoldShiftByConstant_CreateSHL2(<8 x i16> %in) {
define <16 x i8> @test_FoldShiftByConstant_CreateAnd(<16 x i8> %in0) {
; CHECK-LABEL: @test_FoldShiftByConstant_CreateAnd(
-; CHECK-NEXT: [[TMP1:%.*]] = mul <16 x i8> [[IN0:%.*]], <i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33>
-; CHECK-NEXT: [[VSHL_N:%.*]] = and <16 x i8> [[TMP1]], <i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32>
+; CHECK-NEXT: [[VSRA_N2:%.*]] = mul <16 x i8> [[IN0:%.*]], <i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33, i8 33>
+; CHECK-NEXT: [[VSHL_N:%.*]] = and <16 x i8> [[VSRA_N2]], <i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32, i8 -32>
; CHECK-NEXT: ret <16 x i8> [[VSHL_N]]
;
%vsra_n = ashr <16 x i8> %in0, <i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5, i8 5>
>From d193328fe570c3ed2abfa57b1cb5407034c13102 Mon Sep 17 00:00:00 2001
From: Rose <gfunni234 at gmail.com>
Date: Sun, 12 May 2024 16:31:17 -0400
Subject: [PATCH 3/3] Add ashr test
---
llvm/test/Transforms/InstCombine/shl-bo.ll | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/llvm/test/Transforms/InstCombine/shl-bo.ll b/llvm/test/Transforms/InstCombine/shl-bo.ll
index ff78dcc708d63..ab6e8c28cf9fc 100644
--- a/llvm/test/Transforms/InstCombine/shl-bo.ll
+++ b/llvm/test/Transforms/InstCombine/shl-bo.ll
@@ -310,6 +310,22 @@ define i8 @lshr_and_or_disjoint(i8 %a, i8 %y) {
ret i8 %l
}
+define i8 @ashr_and_or_disjoint(i8 %a, i8 %y) {
+; CHECK-LABEL: @ashr_and_or_disjoint(
+; CHECK-NEXT: [[X:%.*]] = srem i8 [[A:%.*]], 42
+; CHECK-NEXT: [[B1:%.*]] = shl i8 [[X]], 2
+; CHECK-NEXT: [[Y_MASK:%.*]] = and i8 [[Y:%.*]], 52
+; CHECK-NEXT: [[L:%.*]] = or disjoint i8 [[Y_MASK]], [[B1]]
+; CHECK-NEXT: ret i8 [[L]]
+;
+ %x = srem i8 %a, 42 ; thwart complexity-based canonicalization
+ %r = ashr i8 %y, 2
+ %m = and i8 %r, 13
+ %b = or disjoint i8 %x, %m
+ %l = shl i8 %b, 2
+ ret i8 %l
+}
+
define <2 x i8> @lshr_and_or_commute_splat(<2 x i8> %a, <2 x i8> %y) {
; CHECK-LABEL: @lshr_and_or_commute_splat(
More information about the llvm-commits
mailing list