This is an archive of the discontinued LLVM Phabricator instance.

Differential D152567

[InstCombine] Add tests for (binop (binop (lshift X,Amt),Mask),(lshift Y,Amt)); NFC
ClosedPublic

Authored by goldstein.w.n on Jun 9 2023, 11:02 AM.

Details

Reviewers
nikic
RKSimon
Commits
rGb7f34cea5a22: [InstCombine] Add tests for (binop (binop (lshift X,Amt),Mask),(lshift Y,Amt))…

Diff Detail

Event Timeline

goldstein.w.n created this revision.Jun 9 2023, 11:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 9 2023, 11:02 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
goldstein.w.n requested review of this revision.Jun 9 2023, 11:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 9 2023, 11:02 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
goldstein.w.n added a child revision: D152568: [InstCombine] Transform `(binop1 (binop2 (lshift X,Amt),Mask),(lshift Y,Amt))`.Jun 9 2023, 11:02 AM
Harbormaster completed remote builds in B237816: Diff 530023.Jun 9 2023, 12:19 PM
goldstein.w.n updated this revision to Diff 530181.Jun 10 2023, 1:07 AM

Update tests for new impl

goldstein.w.n retitled this revision from [InstCombine] Add tests for (bitwise (bitwise (lshift X,C),C1),(lshift Y,C)); NFC to [InstCombine] Add tests for (binop (binop (lshift X,Amt),Mask),(lshift Y,Amt)); NFC.Jun 10 2023, 1:08 AM
Harbormaster completed remote builds in B237935: Diff 530181.Jun 10 2023, 2:02 AM
goldstein.w.n updated this revision to Diff 530323.Jun 11 2023, 12:41 PM

New tests for new impl details

Harbormaster completed remote builds in B238046: Diff 530323.Jun 11 2023, 1:29 PM
nikic added a comment.Jun 11 2023, 1:36 PM

I think we're missing some test coverage for different opcode combinations here. I'm not sure if need to test all 46 valid opcode combinations, but I think we at least need more coverage for the invalid combinations. Things like lshr + add on binop1/binop2 etc.

goldstein.w.n added a comment.Jun 11 2023, 1:53 PM
In D152567#4412292, @nikic wrote:

I think we're missing some test coverage for different opcode combinations here. I'm not sure if need to test all 46 valid opcode combinations, but I think we at least need more coverage for the invalid combinations. Things like lshr + add on binop1/binop2 etc.

Done.

goldstein.w.n updated this revision to Diff 530337.Jun 11 2023, 1:53 PM

More failure tests

Harbormaster completed remote builds in B238057: Diff 530337.Jun 11 2023, 2:48 PM
goldstein.w.n updated this revision to Diff 530393.Jun 11 2023, 11:27 PM

Add more add tests

Harbormaster completed remote builds in B238102: Diff 530393.Jun 12 2023, 12:04 AM
goldstein.w.n updated this revision to Diff 530601.Jun 12 2023, 11:06 AM

Rebase

nikic accepted this revision.Jun 12 2023, 12:08 PM

LGTM

llvm/test/Transforms/InstCombine/binop-and-shifts.ll
214 ↗(On Diff #530601)

Stray llvm.assume

This revision is now accepted and ready to land.Jun 12 2023, 12:08 PM
Harbormaster completed remote builds in B238258: Diff 530601.Jun 12 2023, 1:18 PM
goldstein.w.n updated this revision to Diff 530685.Jun 12 2023, 3:32 PM

Remove stray assume

Harbormaster completed remote builds in B238319: Diff 530685.Jun 12 2023, 5:10 PM
goldstein.w.n updated this revision to Diff 530737.Jun 12 2023, 5:57 PM

Rebase

Harbormaster completed remote builds in B238363: Diff 530737.Jun 12 2023, 7:46 PM
Closed by commit rGb7f34cea5a22: [InstCombine] Add tests for (binop (binop (lshift X,Amt),Mask),(lshift Y,Amt))… (authored by goldstein.w.n). · Explain WhyJun 13 2023, 6:08 PM
This revision was automatically updated to reflect the committed changes.
goldstein.w.n added a commit: rGb7f34cea5a22: [InstCombine] Add tests for (binop (binop (lshift X,Amt),Mask),(lshift Y,Amt))….

Revision Contents

PathSize
llvm/
test/
Transforms/
InstCombine/
167 lines

Diff 530023

llvm/test/Transforms/InstCombine/bitwise-and-shifts.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt < %s -passes=instcombine -S | FileCheck %s
define i8 @shl_and_and(i8 %x, i8 %y) {
; CHECK-LABEL: @shl_and_and(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl i8 [[X:%.*]], 4
; CHECK-NEXT: [[SHIFT2:%.*]] = shl i8 [[Y:%.*]], 4
; CHECK-NEXT: [[BW2:%.*]] = and i8 [[SHIFT2]], 80
; CHECK-NEXT: [[BW1:%.*]] = and i8 [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = shl i8 %x, 4
%shift2 = shl i8 %y, 4
%bw2 = and i8 %shift2, 88
%bw1 = and i8 %shift1, %bw2
ret i8 %bw1
}
define i8 @shl_and_and_fail(i8 %x, i8 %y) {
; CHECK-LABEL: @shl_and_and_fail(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl i8 [[X:%.*]], 4
; CHECK-NEXT: [[SHIFT2:%.*]] = shl i8 [[Y:%.*]], 5
; CHECK-NEXT: [[BW2:%.*]] = and i8 [[SHIFT2]], 64
; CHECK-NEXT: [[BW1:%.*]] = and i8 [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = shl i8 %x, 4
%shift2 = shl i8 %y, 5
%bw2 = and i8 %shift2, 88
%bw1 = and i8 %shift1, %bw2
ret i8 %bw1
}
define i8 @shl_and_and_fail2(i8 %x, i8 %y) {
; CHECK-LABEL: @shl_and_and_fail2(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl i8 4, [[X:%.*]]
; CHECK-NEXT: [[SHIFT2:%.*]] = shl i8 4, [[Y:%.*]]
; CHECK-NEXT: [[BW2:%.*]] = and i8 [[SHIFT2]], 88
; CHECK-NEXT: [[BW1:%.*]] = and i8 [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = shl i8 4, %x
%shift2 = shl i8 4, %y
%bw2 = and i8 %shift2, 88
%bw1 = and i8 %shift1, %bw2
ret i8 %bw1
}
define <2 x i8> @lshr_and_or(<2 x i8> %x, <2 x i8> %y) {
; CHECK-LABEL: @lshr_and_or(
; CHECK-NEXT: [[SHIFT1:%.*]] = lshr <2 x i8> [[X:%.*]], <i8 4, i8 5>
; CHECK-NEXT: [[SHIFT2:%.*]] = lshr <2 x i8> [[Y:%.*]], <i8 4, i8 5>
; CHECK-NEXT: [[BW2:%.*]] = and <2 x i8> [[SHIFT1]], <i8 44, i8 99>
; CHECK-NEXT: [[BW1:%.*]] = or <2 x i8> [[SHIFT2]], [[BW2]]
; CHECK-NEXT: ret <2 x i8> [[BW1]]
;
%shift1 = lshr <2 x i8> %x, <i8 4, i8 5>
%shift2 = lshr <2 x i8> %y, <i8 4, i8 5>
%bw2 = and <2 x i8> %shift1, <i8 44, i8 99>
%bw1 = or <2 x i8> %shift2, %bw2
ret <2 x i8> %bw1
}
define <2 x i8> @lshr_and_or_fail(<2 x i8> %x, <2 x i8> %y) {
; CHECK-LABEL: @lshr_and_or_fail(
; CHECK-NEXT: [[SHIFT1:%.*]] = lshr <2 x i8> [[X:%.*]], <i8 4, i8 5>
; CHECK-NEXT: [[SHIFT2:%.*]] = lshr <2 x i8> [[Y:%.*]], <i8 5, i8 4>
; CHECK-NEXT: [[BW2:%.*]] = and <2 x i8> [[SHIFT2]], <i8 44, i8 99>
; CHECK-NEXT: [[BW1:%.*]] = or <2 x i8> [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret <2 x i8> [[BW1]]
;
%shift1 = lshr <2 x i8> %x, <i8 4, i8 5>
%shift2 = lshr <2 x i8> %y, <i8 5, i8 4>
%bw2 = and <2 x i8> %shift2, <i8 44, i8 99>
%bw1 = or <2 x i8> %shift1, %bw2
ret <2 x i8> %bw1
}
define i8 @shl_and_xor(i8 %x, i8 %y) {
; CHECK-LABEL: @shl_and_xor(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl i8 [[X:%.*]], 1
; CHECK-NEXT: [[SHIFT2:%.*]] = shl i8 [[Y:%.*]], 1
; CHECK-NEXT: [[BW2:%.*]] = and i8 [[SHIFT1]], 20
; CHECK-NEXT: [[BW1:%.*]] = xor i8 [[SHIFT2]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = shl i8 %x, 1
%shift2 = shl i8 %y, 1
%bw2 = and i8 %shift1, 20
%bw1 = xor i8 %shift2, %bw2
ret i8 %bw1
}
define i8 @shl_and_add_fail(i8 %x, i8 %y) {
; CHECK-LABEL: @shl_and_add_fail(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl i8 [[X:%.*]], 1
; CHECK-NEXT: [[SHIFT2:%.*]] = shl i8 [[Y:%.*]], 1
; CHECK-NEXT: [[BW2:%.*]] = and i8 [[SHIFT2]], 18
; CHECK-NEXT: [[BW1:%.*]] = add i8 [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = shl i8 %x, 1
%shift2 = shl i8 %y, 1
%bw2 = and i8 %shift2, 18
%bw1 = add i8 %shift1, %bw2
ret i8 %bw1
}
define i8 @lshr_or_and(i8 %x, i8 %y) {
; CHECK-LABEL: @lshr_or_and(
; CHECK-NEXT: [[SHIFT1:%.*]] = lshr i8 [[X:%.*]], 5
; CHECK-NEXT: [[SHIFT2:%.*]] = lshr i8 [[Y:%.*]], 5
; CHECK-NEXT: [[BW2:%.*]] = or i8 [[SHIFT1]], 6
; CHECK-NEXT: [[BW1:%.*]] = and i8 [[BW2]], [[SHIFT2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = lshr i8 %x, 5
%shift2 = lshr i8 %y, 5
%bw2 = or i8 %shift1, 198
%bw1 = and i8 %bw2, %shift2
ret i8 %bw1
}
define i8 @lshr_or_or_fail(i8 %x, i8 %y) {
; CHECK-LABEL: @lshr_or_or_fail(
; CHECK-NEXT: [[SHIFT1:%.*]] = lshr i8 [[X:%.*]], 5
; CHECK-NEXT: [[SHIFT2:%.*]] = lshr i8 [[Y:%.*]], 5
; CHECK-NEXT: [[BW2:%.*]] = or i8 [[SHIFT2]], -58
; CHECK-NEXT: [[BW1:%.*]] = or i8 [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret i8 [[BW1]]
;
%shift1 = lshr i8 %x, 5
%shift2 = lshr i8 %y, 5
%bw2 = or i8 %shift2, 198
%bw1 = or i8 %shift1, %bw2
ret i8 %bw1
}
define <2 x i8> @shl_xor_and(<2 x i8> %x, <2 x i8> %y) {
; CHECK-LABEL: @shl_xor_and(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl <2 x i8> [[X:%.*]], <i8 2, i8 undef>
; CHECK-NEXT: [[SHIFT2:%.*]] = shl <2 x i8> [[Y:%.*]], <i8 2, i8 undef>
; CHECK-NEXT: [[BW2:%.*]] = xor <2 x i8> [[SHIFT2]], <i8 44, i8 undef>
; CHECK-NEXT: [[BW1:%.*]] = and <2 x i8> [[BW2]], [[SHIFT1]]
; CHECK-NEXT: ret <2 x i8> [[BW1]]
;
%shift1 = shl <2 x i8> %x, <i8 2, i8 undef>
%shift2 = shl <2 x i8> %y, <i8 2, i8 undef>
%bw2 = xor <2 x i8> %shift2, <i8 44, i8 undef>
%bw1 = and <2 x i8> %bw2, %shift1
ret <2 x i8> %bw1
}
define <2 x i8> @shl_xor_and_fail(<2 x i8> %x, <2 x i8> %y) {
; CHECK-LABEL: @shl_xor_and_fail(
; CHECK-NEXT: [[SHIFT1:%.*]] = shl <2 x i8> [[X:%.*]], <i8 2, i8 undef>
; CHECK-NEXT: [[SHIFT2:%.*]] = shl <2 x i8> [[Y:%.*]], <i8 undef, i8 2>
; CHECK-NEXT: [[BW2:%.*]] = xor <2 x i8> [[SHIFT2]], <i8 44, i8 undef>
; CHECK-NEXT: [[BW1:%.*]] = and <2 x i8> [[SHIFT1]], [[BW2]]
; CHECK-NEXT: ret <2 x i8> [[BW1]]
;
%shift1 = shl <2 x i8> %x, <i8 2, i8 undef>
%shift2 = shl <2 x i8> %y, <i8 undef, i8 2>
%bw2 = xor <2 x i8> %shift2, <i8 44, i8 undef>
%bw1 = and <2 x i8> %shift1, %bw2
ret <2 x i8> %bw1
}