This is an archive of the discontinued LLVM Phabricator instance.

Differential D146348

[InstCombine] Add more tests for folding irem/idiv/mul with select; NFC
Needs ReviewPublic

Authored by goldstein.w.n on Mar 17 2023, 7:04 PM.

Details

Reviewers
nikic
spatel
majnemer

Diff Detail

Unit TestsFailed

TimeTest
190 msx64 debian > Flang.Driver::code-gen-rv64.f90

Event Timeline

goldstein.w.n created this revision.Mar 17 2023, 7:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 17 2023, 7:04 PM
goldstein.w.n requested review of this revision.Mar 17 2023, 7:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 17 2023, 7:04 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
goldstein.w.n added reviewers: nikic, spatel, majnemer.Mar 17 2023, 7:06 PM
Herald added a subscriber: StephenFan. · View Herald TranscriptMar 17 2023, 7:06 PM
goldstein.w.n added a child revision: D146350: [InstCombine] More aggressively try and fold irem/idiv/mul into selects..Mar 17 2023, 7:07 PM
goldstein.w.n added a parent revision: D146349: [InstCombine] Make `FoldOpIntoSelect` handle non-constants and use condition to deduce constants..
Harbormaster completed remote builds in B220192: Diff 506258.Mar 17 2023, 7:50 PM
goldstein.w.n updated this revision to Diff 506322.Mar 18 2023, 1:51 PM

Rebase

goldstein.w.n updated this revision to Diff 506329.Mar 18 2023, 2:00 PM

Rebase

Harbormaster completed remote builds in B220250: Diff 506329.Mar 18 2023, 2:44 PM
goldstein.w.n updated this revision to Diff 512054.Apr 9 2023, 5:15 PM

Add a few more tests + rebase

goldstein.w.n added a parent revision: D147900: [ValueTracking] Use `select` condition to help determine if `select` is non-zero.Apr 9 2023, 5:20 PM
goldstein.w.n removed a parent revision: D147900: [ValueTracking] Use `select` condition to help determine if `select` is non-zero.
Harbormaster completed remote builds in B224502: Diff 512054.Apr 9 2023, 5:46 PM
goldstein.w.n updated this revision to Diff 512998.Apr 12 2023, 4:03 PM

Rebase

Harbormaster completed remote builds in B225204: Diff 512998.Apr 12 2023, 4:04 PM
goldstein.w.n updated this revision to Diff 518395.Apr 30 2023, 10:00 PM

Rebase + add test for missing case with proper speculatation test

Harbormaster completed remote builds in B229189: Diff 518395.Apr 30 2023, 10:51 PM
goldstein.w.n updated this revision to Diff 518808.May 2 2023, 11:12 AM

Add some additional mul tests

goldstein.w.n edited parent revisions, added: D147900: [ValueTracking] Use `select` condition to help determine if `select` is non-zero; removed: D146349: [InstCombine] Make `FoldOpIntoSelect` handle non-constants and use condition to deduce constants..May 19 2023, 2:27 PM
goldstein.w.n added a parent revision: D149423: [ValueTracking] Use knownbits interface for determining if `div`/`rem` are safe to speculate.May 19 2023, 2:30 PM
goldstein.w.n removed a parent revision: D147900: [ValueTracking] Use `select` condition to help determine if `select` is non-zero.
goldstein.w.n updated this revision to Diff 524140.May 21 2023, 5:29 PM

Rebase

Harbormaster completed remote builds in B233459: Diff 524140.May 21 2023, 6:21 PM
goldstein.w.n updated this revision to Diff 525822.May 25 2023, 2:45 PM

Rebase

Harbormaster completed remote builds in B234665: Diff 525822.May 25 2023, 3:35 PM
goldstein.w.n removed a parent revision: D149423: [ValueTracking] Use knownbits interface for determining if `div`/`rem` are safe to speculate.Jun 27 2023, 11:36 AM
goldstein.w.n updated this revision to Diff 535086.Jun 27 2023, 11:47 AM

Rebase

goldstein.w.n updated this revision to Diff 535094.Jun 27 2023, 12:19 PM

Rebase

Harbormaster completed remote builds in B241573: Diff 535094.Jun 27 2023, 3:02 PM

Revision Contents

PathSize
llvm/
test/
Transforms/
InstCombine/
136 lines

Diff 506258

llvm/test/Transforms/InstCombine/binop-select.ll

Show First 20 Lines • Show All 315 Lines • ▼ Show 20 Lines
; CHECK-NEXT: [[R:%.*]] = ashr i32 -2, [[S]] ; CHECK-NEXT: [[R:%.*]] = ashr i32 -2, [[S]]
; CHECK-NEXT: ret i32 [[R]] ; CHECK-NEXT: ret i32 [[R]]
; ;
%s = select i1 %b, i32 2, i32 0 %s = select i1 %b, i32 2, i32 0
call void @use(i32 %s) call void @use(i32 %s)
%r = ashr i32 -2, %s %r = ashr i32 -2, %s
ret i32 %r ret i32 %r
} }
define <2 x i32> @test_udiv_to_const_shr(i1 %c, <2 x i32> %x, <2 x i32> %yy) {
; CHECK-LABEL: @test_udiv_to_const_shr(
; CHECK-NEXT: [[Y:%.*]] = shl nuw <2 x i32> <i32 1, i32 1>, [[YY:%.*]]
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C:%.*]], <2 x i32> <i32 7, i32 8>, <2 x i32> [[Y]]
; CHECK-NEXT: [[DIV:%.*]] = udiv <2 x i32> <i32 42, i32 42>, [[COND]]
; CHECK-NEXT: ret <2 x i32> [[DIV]]
;
%y = shl <2 x i32> <i32 1, i32 1>, %yy
%cond = select i1 %c, <2 x i32> <i32 7, i32 8>, <2 x i32> %y
%div = udiv <2 x i32> <i32 42, i32 42>, %cond
ret <2 x i32> %div
}
define i32 @test_udiv_to_const_shr_fail_multiuse(i1 %c, i32 %x, i32 %yy) {
; CHECK-LABEL: @test_udiv_to_const_shr_fail_multiuse(
; CHECK-NEXT: [[Y:%.*]] = shl nuw i32 1, [[YY:%.*]]
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C:%.*]], i32 7, i32 [[Y]]
; CHECK-NEXT: [[DIV:%.*]] = udiv i32 42, [[COND]]
; CHECK-NEXT: call void @use(i32 [[COND]])
; CHECK-NEXT: ret i32 [[DIV]]
;
%y = shl i32 1, %yy
%cond = select i1 %c, i32 7, i32 %y
%div = udiv i32 42, %cond
call void @use(i32 %cond)
ret i32 %div
}
define i32 @test_udiv_to_const_Cudiv(i32 %x) {
; CHECK-LABEL: @test_udiv_to_const_Cudiv(
; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[X:%.*]], 90
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C]], i32 7, i32 19
; CHECK-NEXT: [[DIV:%.*]] = udiv i32 [[X]], [[COND]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%c = icmp eq i32 %x, 90
%cond = select i1 %c, i32 7, i32 19
%div = udiv i32 %x, %cond
ret i32 %div
}
define i32 @test_udiv_to_const_Cudiv_fail_non_equality(i32 %x) {
; CHECK-LABEL: @test_udiv_to_const_Cudiv_fail_non_equality(
; CHECK-NEXT: [[C:%.*]] = icmp ult i32 [[X:%.*]], 91
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C]], i32 7, i32 19
; CHECK-NEXT: [[DIV:%.*]] = udiv i32 [[X]], [[COND]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%c = icmp ule i32 %x, 90
%cond = select i1 %c, i32 7, i32 19
%div = udiv i32 %x, %cond
ret i32 %div
}
define <2 x i32> @test_sdiv_to_const_Csdiv(<2 x i32> %x) {
; CHECK-LABEL: @test_sdiv_to_const_Csdiv(
; CHECK-NEXT: [[C_NOT:%.*]] = icmp eq <2 x i32> [[X:%.*]], <i32 90, i32 91>
; CHECK-NEXT: [[COND:%.*]] = select <2 x i1> [[C_NOT]], <2 x i32> <i32 16, i32 4>, <2 x i32> <i32 7, i32 9>
; CHECK-NEXT: [[DIV:%.*]] = sdiv <2 x i32> [[X]], [[COND]]
; CHECK-NEXT: ret <2 x i32> [[DIV]]
;
%c = icmp ne <2 x i32> %x, <i32 90, i32 91>
%cond = select <2 x i1> %c, <2 x i32> <i32 7, i32 9>, <2 x i32> <i32 16, i32 4>
%div = sdiv <2 x i32> %x, %cond
ret <2 x i32> %div
}
define i32 @test_srem_to_const_Csrem(i32 %x) {
; CHECK-LABEL: @test_srem_to_const_Csrem(
; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[X:%.*]], 24
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C]], i32 7, i32 16
; CHECK-NEXT: [[DIV:%.*]] = srem i32 [[X]], [[COND]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%c = icmp eq i32 %x, 24
%cond = select i1 %c, i32 7, i32 16
%div = srem i32 %x, %cond
ret i32 %div
}
define i32 @test_srem_to_const_Csrem_fail_multiuse(i32 %x) {
; CHECK-LABEL: @test_srem_to_const_Csrem_fail_multiuse(
; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[X:%.*]], 24
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C]], i32 7, i32 16
; CHECK-NEXT: [[DIV:%.*]] = srem i32 [[X]], [[COND]]
; CHECK-NEXT: call void @use(i32 [[COND]])
; CHECK-NEXT: ret i32 [[DIV]]
;
%c = icmp eq i32 %x, 24
%cond = select i1 %c, i32 7, i32 16
%div = srem i32 %x, %cond
call void @use(i32 %cond)
ret i32 %div
}
define i32 @test_urem_to_const_and_todo_need_to_accept_non_const_ops(i32 %x, i32 %yy) {
; CHECK-LABEL: @test_urem_to_const_and_todo_need_to_accept_non_const_ops(
; CHECK-NEXT: [[Y:%.*]] = shl nuw i32 1, [[YY:%.*]]
; CHECK-NEXT: [[C_NOT:%.*]] = icmp eq i32 [[X:%.*]], 24
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C_NOT]], i32 19, i32 [[Y]]
; CHECK-NEXT: [[DIV:%.*]] = urem i32 [[X]], [[COND]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%y = shl i32 1, %yy
%c = icmp ne i32 %x, 24
%cond = select i1 %c, i32 %y, i32 19
%div = urem i32 %x, %cond
ret i32 %div
}
define i32 @test_urem_to_const_and(i1 %c, i32 %yy) {
; CHECK-LABEL: @test_urem_to_const_and(
; CHECK-NEXT: [[Y:%.*]] = shl nuw i32 1, [[YY:%.*]]
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C:%.*]], i32 [[Y]], i32 19
; CHECK-NEXT: [[DIV:%.*]] = urem i32 44, [[COND]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%y = shl i32 1, %yy
%cond = select i1 %c, i32 %y, i32 19
%div = urem i32 44, %cond
ret i32 %div
}
define i32 @test_mul_to_const_Cmul(i32 %x) {
; CHECK-LABEL: @test_mul_to_const_Cmul(
; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[X:%.*]], 61
; CHECK-NEXT: [[COND:%.*]] = select i1 [[C]], i32 9, i32 14
; CHECK-NEXT: [[DIV:%.*]] = mul i32 [[COND]], [[X]]
; CHECK-NEXT: ret i32 [[DIV]]
;
%c = icmp eq i32 %x, 61
%cond = select i1 %c, i32 9, i32 14
%div = mul i32 %x, %cond
ret i32 %div
}