[InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z #68863

XChy · 2023-10-12T08:34:02Z

Resolve #68857.
Alive2 proofs:
Proof1
Proof2
Edit:
Whole proofs

llvmbot · 2023-10-12T08:35:09Z

@llvm/pr-subscribers-llvm-transforms

Author: XChy (XChy)

Changes

Resolve #68857.
Alive2 proof.
For sdiv, it seems to be a refinement, so I handle the signed cases too.

Full diff: https://github.com/llvm/llvm-project/pull/68863.diff

2 Files Affected:

(modified) llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp (+20)
(modified) llvm/test/Transforms/InstCombine/div-shift.ll (+120)

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index 560c87b6efa7038..0247bbac32b64a0 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -980,6 +980,26 @@ static Instruction *foldIDivShl(BinaryOperator &I,
       Ret = BinaryOperator::CreateSDiv(X, Y);
   }
 
+  // If X << Y and X << Z does not overflow, then:
+  // (X << Y) / (X << Z) -> (1 << Y) / (1 << Z)
+  // Ignore it when X == 1, to avoid infinite loop.
+  if (match(Op0, m_Shl(m_Value(X), m_Value(Y))) &&
+      match(Op1, m_Shl(m_Specific(X), m_Value(Z))) && !match(X, m_One()) &&
+      (Op0->hasOneUse() || Op1->hasOneUse())) {
+    auto *Shl0 = cast<OverflowingBinaryOperator>(Op0);
+    auto *Shl1 = cast<OverflowingBinaryOperator>(Op1);
+
+    Constant *One = ConstantInt::get(
+        X->getType(), APInt(X->getType()->getScalarSizeInBits(), 1));
+
+    if (!IsSigned && (Shl0->hasNoUnsignedWrap() && Shl1->hasNoUnsignedWrap()))
+      Ret = BinaryOperator::CreateUDiv(Builder.CreateShl(One, Y, "common.shl"),
+                                       Builder.CreateShl(One, Z));
+    if (IsSigned && (Shl0->hasNoSignedWrap() && Shl1->hasNoSignedWrap()))
+      Ret = BinaryOperator::CreateSDiv(Builder.CreateShl(One, Y),
+                                       Builder.CreateShl(One, Z));
+  }
+
   if (!Ret)
     return nullptr;
 
diff --git a/llvm/test/Transforms/InstCombine/div-shift.ll b/llvm/test/Transforms/InstCombine/div-shift.ll
index 76c5328dc8499e0..9dac529bb80731b 100644
--- a/llvm/test/Transforms/InstCombine/div-shift.ll
+++ b/llvm/test/Transforms/InstCombine/div-shift.ll
@@ -2,6 +2,7 @@
 ; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 declare void @use(i8)
+declare void @use32(i32)
 
 declare i8 @llvm.umin.i8(i8, i8)
 declare i8 @llvm.umax.i8(i8, i8)
@@ -1025,3 +1026,122 @@ define i8 @udiv_shl_no_overflow(i8 %x, i8 %y) {
   %mul = udiv i8 %x, %min
   ret i8 %mul
 }
+
+define i32 @sdiv_shl_pair_const(i32 %a) {
+; CHECK-LABEL: @sdiv_shl_pair_const(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    ret i32 2
+;
+entry:
+  %lhs = shl nsw i32 %a, 2
+  %rhs = shl nsw i32 %a, 1
+  %div = sdiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @udiv_shl_pair_const(i32 %a) {
+; CHECK-LABEL: @udiv_shl_pair_const(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    ret i32 2
+;
+entry:
+  %lhs = shl nuw i32 %a, 2
+  %rhs = shl nuw i32 %a, 1
+  %div = udiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @sdiv_shl_pair(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @sdiv_shl_pair(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[TMP0:%.*]] = shl nuw i32 1, [[Y:%.*]]
+; CHECK-NEXT:    [[TMP1:%.*]] = shl nuw i32 1, [[X:%.*]]
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i32 [[TMP1]], [[TMP0]]
+; CHECK-NEXT:    ret i32 [[DIV]]
+;
+entry:
+  %lhs = shl nsw i32 %a, %x
+  %rhs = shl nsw i32 %a, %y
+  %div = sdiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @udiv_shl_pair(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @udiv_shl_pair(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[COMMON_SHL:%.*]] = shl nuw i32 1, [[X:%.*]]
+; CHECK-NEXT:    [[DIV1:%.*]] = lshr i32 [[COMMON_SHL]], [[Y:%.*]]
+; CHECK-NEXT:    ret i32 [[DIV1]]
+;
+entry:
+  %lhs = shl nuw nsw i32 %a, %x
+  %rhs = shl nuw nsw i32 %a, %y
+  %div = udiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @sdiv_shl_pair_overflow_fail(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @sdiv_shl_pair_overflow_fail(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[LHS:%.*]] = shl i32 [[A:%.*]], [[X:%.*]]
+; CHECK-NEXT:    [[RHS:%.*]] = shl nsw i32 [[A]], [[Y:%.*]]
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i32 [[LHS]], [[RHS]]
+; CHECK-NEXT:    ret i32 [[DIV]]
+;
+entry:
+  %lhs = shl i32 %a, %x
+  %rhs = shl nsw i32 %a, %y
+  %div = sdiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @sdiv_shl_pair_nuw_fail(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @sdiv_shl_pair_nuw_fail(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[LHS:%.*]] = shl nuw i32 [[A:%.*]], [[X:%.*]]
+; CHECK-NEXT:    [[RHS:%.*]] = shl nsw i32 [[A]], [[Y:%.*]]
+; CHECK-NEXT:    [[DIV:%.*]] = sdiv i32 [[LHS]], [[RHS]]
+; CHECK-NEXT:    ret i32 [[DIV]]
+;
+entry:
+  %lhs = shl nuw i32 %a, %x
+  %rhs = shl nsw i32 %a, %y
+  %div = sdiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @udiv_shl_pair_multi_use(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @udiv_shl_pair_multi_use(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[LHS:%.*]] = shl nuw i32 [[A:%.*]], [[X:%.*]]
+; CHECK-NEXT:    call void @use32(i32 [[LHS]])
+; CHECK-NEXT:    [[COMMON_SHL:%.*]] = shl nuw i32 1, [[X]]
+; CHECK-NEXT:    [[DIV1:%.*]] = lshr i32 [[COMMON_SHL]], [[Y:%.*]]
+; CHECK-NEXT:    ret i32 [[DIV1]]
+;
+entry:
+  %lhs = shl nuw i32 %a, %x
+  call void @use32(i32 %lhs)
+  %rhs = shl nuw i32 %a, %y
+  %div = udiv i32 %lhs, %rhs
+  ret i32 %div
+}
+
+define i32 @udiv_shl_pair_multi_use_fail(i32 %a, i32 %x, i32 %y) {
+; CHECK-LABEL: @udiv_shl_pair_multi_use_fail(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    [[LHS:%.*]] = shl nuw i32 [[A:%.*]], [[X:%.*]]
+; CHECK-NEXT:    [[RHS:%.*]] = shl nuw i32 [[A]], [[Y:%.*]]
+; CHECK-NEXT:    call void @use32(i32 [[LHS]])
+; CHECK-NEXT:    call void @use32(i32 [[RHS]])
+; CHECK-NEXT:    [[DIV:%.*]] = udiv i32 [[LHS]], [[RHS]]
+; CHECK-NEXT:    ret i32 [[DIV]]
+;
+entry:
+  %lhs = shl nuw i32 %a, %x
+  %rhs = shl nuw i32 %a, %y
+  call void @use32(i32 %lhs)
+  call void @use32(i32 %rhs)
+  %div = udiv i32 %lhs, %rhs
+  ret i32 %div
+}

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

XChy · 2023-10-12T09:39:17Z

Thanks for your review. Here is a more direct fold. Alive2.

dtcxzyw · 2023-10-12T11:00:11Z

Thanks for your review. Here is a more direct fold. Alive2.

Please update the PR title.

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

dtcxzyw

LGTM. Waiting for additional approval from other reviewers.

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

XChy · 2023-10-13T05:20:01Z

For udiv, nsw in dividend should be preserved too. Whole proofs

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

llvm/test/Transforms/InstCombine/div-shift.ll

nikic · 2023-10-13T07:53:51Z

This also needs a multi-use test.

XChy · 2023-10-13T14:55:51Z

llvm/test/Transforms/InstCombine/div-shift.ll

+  %rhs = shl nuw i32 %b, %y
+  %div = sdiv i32 %lhs, %rhs
+  ret i32 %div
+}


Different LHS test here.

goldsteinn · 2023-10-13T17:15:40Z

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

+    auto *Shl1 = cast<OverflowingBinaryOperator>(Op1);
+
+    if ((!IsSigned && Shl0->hasNoUnsignedWrap() && Shl1->hasNoUnsignedWrap()) ||
+        (IsSigned && Shl0->hasNoSignedWrap() && Shl1->hasNoSignedWrap())) {


nit: Would prefer ternary here i.e isSigned? (Shl0->Nsw && Shl1->Nsw) : (...Nuw)

nikic

LGTM

XChy requested review from dtcxzyw and goldsteinn October 12, 2023 08:34

XChy requested a review from nikic as a code owner October 12, 2023 08:34

llvmbot added the llvm:transforms label Oct 12, 2023

XChy force-pushed the instsimplify branch from f1e5117 to 842a4e0 Compare October 12, 2023 08:43

dtcxzyw requested changes Oct 12, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

XChy force-pushed the instsimplify branch from 842a4e0 to 510706f Compare October 12, 2023 11:21

XChy changed the title ~~[InstCombine] Fold (X << Y) / (X << Z) -> (1 << Y) / (1 << Z)~~ [InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z Oct 12, 2023

XChy force-pushed the instsimplify branch from 510706f to 6ff3024 Compare October 12, 2023 11:29

dtcxzyw requested changes Oct 12, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

XChy force-pushed the instsimplify branch from 6ff3024 to b81eeb9 Compare October 12, 2023 11:54

dtcxzyw approved these changes Oct 12, 2023

View reviewed changes

nikic reviewed Oct 12, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

goldsteinn reviewed Oct 12, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

goldsteinn reviewed Oct 12, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

XChy force-pushed the instsimplify branch from b81eeb9 to cf9b3b9 Compare October 13, 2023 05:36

dtcxzyw requested changes Oct 13, 2023

View reviewed changes

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp Outdated Show resolved Hide resolved

XChy force-pushed the instsimplify branch 3 times, most recently from 6cf28f2 to ec1412e Compare October 13, 2023 06:56

nikic reviewed Oct 13, 2023

View reviewed changes

llvm/test/Transforms/InstCombine/div-shift.ll Show resolved Hide resolved

llvm/test/Transforms/InstCombine/div-shift.ll Show resolved Hide resolved

XChy force-pushed the instsimplify branch 3 times, most recently from b6b2d50 to d4af312 Compare October 13, 2023 14:49

[InstCombine][NFC] Precommit tests for PR68857

ec0fe25

XChy force-pushed the instsimplify branch from d4af312 to f73c1cc Compare October 13, 2023 14:54

XChy commented Oct 13, 2023

View reviewed changes

goldsteinn reviewed Oct 13, 2023

View reviewed changes

nikic approved these changes Oct 13, 2023

View reviewed changes

XChy force-pushed the instsimplify branch from f73c1cc to 58b95e4 Compare October 15, 2023 14:50

[InstCombine] Fold (A<<X)/(A<<Y) -> 1<<X>>Y

3ab9161

XChy force-pushed the instsimplify branch from 58b95e4 to 3ab9161 Compare October 15, 2023 14:51

XChy merged commit 0823cb7 into llvm:main Oct 15, 2023
2 of 3 checks passed

madhur13490 mentioned this pull request Oct 20, 2023

Revert commit ba8565fbcb975e2d067ce3ae5a7dbaae4953edd3 madhur13490/llvm-project#3

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z #68863

[InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z #68863

XChy commented Oct 12, 2023 •

edited

llvmbot commented Oct 12, 2023

XChy commented Oct 12, 2023 •

edited

dtcxzyw commented Oct 12, 2023

dtcxzyw left a comment

XChy commented Oct 13, 2023

nikic commented Oct 13, 2023

XChy Oct 13, 2023

goldsteinn Oct 13, 2023

nikic left a comment

[InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z #68863

[InstCombine] Fold (X << Y) / (X << Z) -> 1 << Y >> Z #68863

Conversation

XChy commented Oct 12, 2023 • edited

llvmbot commented Oct 12, 2023

XChy commented Oct 12, 2023 • edited

dtcxzyw commented Oct 12, 2023

dtcxzyw left a comment

Choose a reason for hiding this comment

XChy commented Oct 13, 2023

nikic commented Oct 13, 2023

XChy Oct 13, 2023

Choose a reason for hiding this comment

goldsteinn Oct 13, 2023

Choose a reason for hiding this comment

nikic left a comment

Choose a reason for hiding this comment

XChy commented Oct 12, 2023 •

edited

XChy commented Oct 12, 2023 •

edited