This is an archive of the discontinued LLVM Phabricator instance.

Differential D142090

[InstCombine] precommit tests for D140666
ClosedPublic

Authored by inclyc on Jan 19 2023, 1:23 AM.

Details

Reviewers
nikic
spatel
bcl5980
Commits
rG942c4cdac435: [InstCombine] precommit tests for D140666
Summary

Precommit tests for D140666.

Diff Detail

Event Timeline

inclyc created this revision.Jan 19 2023, 1:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 19 2023, 1:23 AM
inclyc requested review of this revision.Jan 19 2023, 1:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 19 2023, 1:23 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
inclyc added a child revision: D140666: [InstCombine] combine intersection for inequality icmps.Jan 19 2023, 1:24 AM
inclyc edited the summary of this revision. (Show Details)Jan 19 2023, 1:29 AM
inclyc added reviewers: nikic, spatel, bcl5980.
Herald added a subscriber: StephenFan. · View Herald TranscriptJan 19 2023, 1:29 AM
Harbormaster completed remote builds in B208684: Diff 490410.Jan 19 2023, 2:25 AM
bcl5980 added a comment.Jan 31 2023, 7:10 PM

I'm not sure if you should add negative tests for
(~B & C) == 0 && (~D & E) == 0,
But we may need some more negative tests. At least one more for

!ConstB->isSubsetOf(*ConstD) && !ConstD->isSubsetOf(*ConstB)

It's better you can try more different constants in the different tests.
And we need at least 1 vector test.

inclyc updated this revision to Diff 493815.Jan 31 2023, 8:50 PM

But we may need some more negative tests. At least one more for

Add:

define i1 @masked_not_subset_notoptimized(i32 %A) {
; CHECK-LABEL: @masked_not_subset_notoptimized(
; CHECK-NEXT:    [[MASK1:%.*]] = and i32 [[A:%.*]], 254
; CHECK-NEXT:    [[TST1:%.*]] = icmp ne i32 [[MASK1]], 252
; CHECK-NEXT:    [[MASK2:%.*]] = and i32 [[A]], 253
; CHECK-NEXT:    [[TST2:%.*]] = icmp ne i32 [[MASK2]], 252
; CHECK-NEXT:    [[RES:%.*]] = and i1 [[TST1]], [[TST2]]
; CHECK-NEXT:    ret i1 [[RES]]
;
  %mask1 = and i32 %A, 254 ; 0xfe
  %tst1 = icmp ne i32 %mask1, 252 ; 0xfc
  %mask2 = and i32 %A, 253 ; 0xfd
  %tst2 = icmp ne i32 %mask2, 252 ; 0xfc
  %res = and i1 %tst1, %tst2
  ret i1 %res
}

And we need at least 1 vector test.

I may not understand what you mean :(. We are doing an optimization on scalar right now?

bcl5980 added a comment.Jan 31 2023, 9:16 PM
In D142090#4095523, @inclyc wrote:

But we may need some more negative tests. At least one more for

Add:

define i1 @masked_not_subset_notoptimized(i32 %A) {
; CHECK-LABEL: @masked_not_subset_notoptimized(
; CHECK-NEXT:    [[MASK1:%.*]] = and i32 [[A:%.*]], 254
; CHECK-NEXT:    [[TST1:%.*]] = icmp ne i32 [[MASK1]], 252
; CHECK-NEXT:    [[MASK2:%.*]] = and i32 [[A]], 253
; CHECK-NEXT:    [[TST2:%.*]] = icmp ne i32 [[MASK2]], 252
; CHECK-NEXT:    [[RES:%.*]] = and i1 [[TST1]], [[TST2]]
; CHECK-NEXT:    ret i1 [[RES]]
;
  %mask1 = and i32 %A, 254 ; 0xfe
  %tst1 = icmp ne i32 %mask1, 252 ; 0xfc
  %mask2 = and i32 %A, 253 ; 0xfd
  %tst2 = icmp ne i32 %mask2, 252 ; 0xfc
  %res = and i1 %tst1, %tst2
  ret i1 %res
}

And we need at least 1 vector test.

I may not understand what you mean :(. We are doing an optimization on scalar right now?

Take a look @masked_and_notallzeroes_splat in this file.
And it's better to add a test that replace one of the value to poison for splat constant also.
Another example in recent patch D142783:
@dec_zext_add_nonzero_vec , @dec_zext_add_nonzero_vec_poison1

Harbormaster completed remote builds in B211135: Diff 493815.Jan 31 2023, 9:33 PM
inclyc updated this revision to Diff 494134.Feb 1 2023, 6:12 PM
  • add splat vector tests
Harbormaster completed remote builds in B211364: Diff 494134.Feb 1 2023, 7:03 PM
bcl5980 accepted this revision.Feb 2 2023, 2:23 AM

LGTM

This revision is now accepted and ready to land.Feb 2 2023, 2:23 AM
inclyc mentioned this in D140666: [InstCombine] combine intersection for inequality icmps.Feb 8 2023, 11:47 PM
Closed by commit rG942c4cdac435: [InstCombine] precommit tests for D140666 (authored by inclyc). · Explain WhyFeb 9 2023, 8:50 PM
This revision was automatically updated to reflect the committed changes.
inclyc added a commit: rG942c4cdac435: [InstCombine] precommit tests for D140666.

Revision Contents

PathSize
llvm/
test/
Transforms/
InstCombine/
148 lines

Diff 496324

llvm/test/Transforms/InstCombine/icmp-logical.ll

Show First 20 Lines • Show All 1,737 Lines • ▼ Show 20 Lines
; ;
%t1 = and i32 %x, 6 %t1 = and i32 %x, 6
%t2 = icmp eq i32 %t1, 0 %t2 = icmp eq i32 %t1, 0
%t3 = and i32 %x, 15 %t3 = and i32 %x, 15
%t4 = icmp ne i32 %t3, 8 %t4 = icmp ne i32 %t3, 8
%t5 = select i1 %t4, i1 true, i1 %t2 %t5 = select i1 %t4, i1 true, i1 %t2
ret i1 %t5 ret i1 %t5
} }
define i1 @masked_icmps_bmask_notmixed_or(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_or(
; CHECK-NEXT: [[MASK1:%.*]] = and i32 [[A:%.*]], 15
; CHECK-NEXT: [[TST1:%.*]] = icmp eq i32 [[MASK1]], 3
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A]], 255
; CHECK-NEXT: [[TST2:%.*]] = icmp eq i32 [[MASK2]], 243
; CHECK-NEXT: [[RES:%.*]] = or i1 [[TST1]], [[TST2]]
; CHECK-NEXT: ret i1 [[RES]]
;
%mask1 = and i32 %A, 15 ; 0x0f
%tst1 = icmp eq i32 %mask1, 3 ; 0x03
%mask2 = and i32 %A, 255 ; 0xff
%tst2 = icmp eq i32 %mask2, 243; 0xf3
%res = or i1 %tst1, %tst2
ret i1 %res
}
define <2 x i1> @masked_icmps_bmask_notmixed_or_vec(<2 x i8> %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_or_vec(
; CHECK-NEXT: [[MASK1:%.*]] = and <2 x i8> [[A:%.*]], <i8 15, i8 15>
; CHECK-NEXT: [[TST1:%.*]] = icmp eq <2 x i8> [[MASK1]], <i8 3, i8 3>
; CHECK-NEXT: [[TST2:%.*]] = icmp eq <2 x i8> [[A]], <i8 -13, i8 -13>
; CHECK-NEXT: [[RES:%.*]] = or <2 x i1> [[TST1]], [[TST2]]
; CHECK-NEXT: ret <2 x i1> [[RES]]
;
%mask1 = and <2 x i8> %A, <i8 15, i8 15> ; 0x0f
%tst1 = icmp eq <2 x i8> %mask1, <i8 3, i8 3> ; 0x03
%mask2 = and <2 x i8> %A, <i8 255, i8 255> ; 0xff
%tst2 = icmp eq <2 x i8> %mask2, <i8 243, i8 243> ; 0xf3
%res = or <2 x i1> %tst1, %tst2
ret <2 x i1> %res
}
define <2 x i1> @masked_icmps_bmask_notmixed_or_vec_poison1(<2 x i8> %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_or_vec_poison1(
; CHECK-NEXT: [[MASK1:%.*]] = and <2 x i8> [[A:%.*]], <i8 15, i8 15>
; CHECK-NEXT: [[TST1:%.*]] = icmp eq <2 x i8> [[MASK1]], <i8 3, i8 poison>
; CHECK-NEXT: [[TST2:%.*]] = icmp eq <2 x i8> [[A]], <i8 -13, i8 -13>
; CHECK-NEXT: [[RES:%.*]] = or <2 x i1> [[TST1]], [[TST2]]
; CHECK-NEXT: ret <2 x i1> [[RES]]
;
%mask1 = and <2 x i8> %A, <i8 15, i8 15> ; 0x0f
%tst1 = icmp eq <2 x i8> %mask1, <i8 3, i8 poison> ; 0x03
%mask2 = and <2 x i8> %A, <i8 255, i8 255> ; 0xff
%tst2 = icmp eq <2 x i8> %mask2, <i8 243, i8 243> ; 0xf3
%res = or <2 x i1> %tst1, %tst2
ret <2 x i1> %res
}
define <2 x i1> @masked_icmps_bmask_notmixed_or_vec_poison2(<2 x i8> %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_or_vec_poison2(
; CHECK-NEXT: [[MASK1:%.*]] = and <2 x i8> [[A:%.*]], <i8 15, i8 15>
; CHECK-NEXT: [[TST1:%.*]] = icmp eq <2 x i8> [[MASK1]], <i8 3, i8 3>
; CHECK-NEXT: [[TST2:%.*]] = icmp eq <2 x i8> [[A]], <i8 -13, i8 poison>
; CHECK-NEXT: [[RES:%.*]] = or <2 x i1> [[TST1]], [[TST2]]
; CHECK-NEXT: ret <2 x i1> [[RES]]
;
%mask1 = and <2 x i8> %A, <i8 15, i8 15> ; 0x0f
%tst1 = icmp eq <2 x i8> %mask1, <i8 3, i8 3> ; 0x03
%mask2 = and <2 x i8> %A, <i8 255, i8 255> ; 0xff
%tst2 = icmp eq <2 x i8> %mask2, <i8 243, i8 poison> ; 0xf3
%res = or <2 x i1> %tst1, %tst2
ret <2 x i1> %res
}
define i1 @masked_icmps_bmask_notmixed_or_contradict_notoptimized(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_or_contradict_notoptimized(
; CHECK-NEXT: [[MASK1:%.*]] = and i32 [[A:%.*]], 15
; CHECK-NEXT: [[TST1:%.*]] = icmp eq i32 [[MASK1]], 3
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A]], 255
; CHECK-NEXT: [[TST2:%.*]] = icmp eq i32 [[MASK2]], 242
; CHECK-NEXT: [[RES:%.*]] = or i1 [[TST1]], [[TST2]]
; CHECK-NEXT: ret i1 [[RES]]
;
%mask1 = and i32 %A, 15 ; 0x0f
%tst1 = icmp eq i32 %mask1, 3 ; 0x03
%mask2 = and i32 %A, 255 ; 0xff
%tst2 = icmp eq i32 %mask2, 242; 0xf2
%res = or i1 %tst1, %tst2
ret i1 %res
}
define i1 @masked_icmps_bmask_notmixed_and(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_and(
; CHECK-NEXT: [[MASK1:%.*]] = and i32 [[A:%.*]], 15
; CHECK-NEXT: [[TST1:%.*]] = icmp ne i32 [[MASK1]], 3
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A]], 255
; CHECK-NEXT: [[TST2:%.*]] = icmp ne i32 [[MASK2]], 243
; CHECK-NEXT: [[RES:%.*]] = and i1 [[TST1]], [[TST2]]
; CHECK-NEXT: ret i1 [[RES]]
;
%mask1 = and i32 %A, 15 ; 0x0f
%tst1 = icmp ne i32 %mask1, 3 ; 0x03
%mask2 = and i32 %A, 255 ; 0xff
%tst2 = icmp ne i32 %mask2, 243 ; 0xf3
%res = and i1 %tst1, %tst2
ret i1 %res
}
define i1 @masked_icmps_bmask_notmixed_and_contradict_notoptimized(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_and_contradict_notoptimized(
; CHECK-NEXT: [[MASK1:%.*]] = and i32 [[A:%.*]], 15
; CHECK-NEXT: [[TST1:%.*]] = icmp ne i32 [[MASK1]], 3
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A]], 255
; CHECK-NEXT: [[TST2:%.*]] = icmp ne i32 [[MASK2]], 242
; CHECK-NEXT: [[RES:%.*]] = and i1 [[TST1]], [[TST2]]
; CHECK-NEXT: ret i1 [[RES]]
;
%mask1 = and i32 %A, 15 ; 0x0f
%tst1 = icmp ne i32 %mask1, 3 ; 0x03
%mask2 = and i32 %A, 255 ; 0xff
%tst2 = icmp ne i32 %mask2, 242 ; 0xf2
%res = and i1 %tst1, %tst2
ret i1 %res
}
define i1 @masked_icmps_bmask_notmixed_and_expected_false(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_and_expected_false(
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A:%.*]], 255
; CHECK-NEXT: [[TST2:%.*]] = icmp ne i32 [[MASK2]], 242
; CHECK-NEXT: ret i1 [[TST2]]
;
%mask1 = and i32 %A, 3 ; 0x0f
%tst1 = icmp ne i32 %mask1, 15 ; 0x03
%mask2 = and i32 %A, 255 ; 0xff
%tst2 = icmp ne i32 %mask2, 242 ; 0xf2
%res = and i1 %tst1, %tst2
ret i1 %res
}
define i1 @masked_icmps_bmask_notmixed_not_subset_notoptimized(i32 %A) {
; CHECK-LABEL: @masked_icmps_bmask_notmixed_not_subset_notoptimized(
; CHECK-NEXT: [[MASK1:%.*]] = and i32 [[A:%.*]], 254
; CHECK-NEXT: [[TST1:%.*]] = icmp ne i32 [[MASK1]], 252
; CHECK-NEXT: [[MASK2:%.*]] = and i32 [[A]], 253
; CHECK-NEXT: [[TST2:%.*]] = icmp ne i32 [[MASK2]], 252
; CHECK-NEXT: [[RES:%.*]] = and i1 [[TST1]], [[TST2]]
; CHECK-NEXT: ret i1 [[RES]]
;
%mask1 = and i32 %A, 254 ; 0xfe
%tst1 = icmp ne i32 %mask1, 252 ; 0xfc
%mask2 = and i32 %A, 253 ; 0xfd
%tst2 = icmp ne i32 %mask2, 252 ; 0xfc
%res = and i1 %tst1, %tst2
ret i1 %res
}