Skip to content

Commit e5638c5

Browse files
choikwachoikwa
authored
[AMDGPU] Use correct number of bits needed for div/rem shrinking (#80622)
There was an error where dividend of type i64 and actual used number of bits of 32 fell into path that assumes only 24 bits being used. Check that AtLeast field is used correctly when using computeNumSignBits and add necessary extend/trunc for 32 bits path. Regolden and update testcases. @jrbyrnes @bcahoon @arsenm @rampitec
1 parent 9ea34be commit e5638c5

File tree

11 files changed

+1158
-858
lines changed

11 files changed

+1158
-858
lines changed

‎llvm/lib/Target/AMDGPU/AMDGPUCodeGenPrepare.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,10 @@ Value *AMDGPUCodeGenPrepareImpl::expandDivRem24(IRBuilder<> &Builder,
12131213
BinaryOperator &I, Value *Num,
12141214
Value *Den, bool IsDiv,
12151215
bool IsSigned) const {
1216-
int DivBits = getDivNumBits(I, Num, Den, 9, IsSigned);
1216+
unsigned SSBits = Num->getType()->getScalarSizeInBits();
1217+
// If Num bits <= 24, assume 0 signbits.
1218+
unsigned AtLeast = (SSBits <= 24) ? 0 : (SSBits - 24 + IsSigned);
1219+
int DivBits = getDivNumBits(I, Num, Den, AtLeast, IsSigned);
12171220
if (DivBits == -1)
12181221
return nullptr;
12191222
return expandDivRem24Impl(Builder, I, Num, Den, DivBits, IsDiv, IsSigned);
@@ -1385,13 +1388,13 @@ Value *AMDGPUCodeGenPrepareImpl::expandDivRem32(IRBuilder<> &Builder,
13851388
Type *I32Ty = Builder.getInt32Ty();
13861389
Type *F32Ty = Builder.getFloatTy();
13871390

1388-
if (Ty->getScalarSizeInBits() < 32) {
1391+
if (Ty->getScalarSizeInBits() != 32) {
13891392
if (IsSigned) {
1390-
X = Builder.CreateSExt(X, I32Ty);
1391-
Y = Builder.CreateSExt(Y, I32Ty);
1393+
X = Builder.CreateSExtOrTrunc(X, I32Ty);
1394+
Y = Builder.CreateSExtOrTrunc(Y, I32Ty);
13921395
} else {
1393-
X = Builder.CreateZExt(X, I32Ty);
1394-
Y = Builder.CreateZExt(Y, I32Ty);
1396+
X = Builder.CreateZExtOrTrunc(X, I32Ty);
1397+
Y = Builder.CreateZExtOrTrunc(Y, I32Ty);
13951398
}
13961399
}
13971400

@@ -1482,10 +1485,10 @@ Value *AMDGPUCodeGenPrepareImpl::expandDivRem32(IRBuilder<> &Builder,
14821485
if (IsSigned) {
14831486
Res = Builder.CreateXor(Res, Sign);
14841487
Res = Builder.CreateSub(Res, Sign);
1488+
Res = Builder.CreateSExtOrTrunc(Res, Ty);
1489+
} else {
1490+
Res = Builder.CreateZExtOrTrunc(Res, Ty);
14851491
}
1486-
1487-
Res = Builder.CreateTrunc(Res, Ty);
1488-
14891492
return Res;
14901493
}
14911494

‎llvm/test/CodeGen/AMDGPU/GlobalISel/sdiv.i64.ll

Lines changed: 67 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,19 +3055,29 @@ define i64 @v_sdiv_i64_24bit(i64 %num, i64 %den) {
30553055
; CGP-LABEL: v_sdiv_i64_24bit:
30563056
; CGP: ; %bb.0:
30573057
; CGP-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
3058-
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v2
3059-
; CGP-NEXT: v_cvt_f32_i32_e32 v1, v1
3060-
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
3061-
; CGP-NEXT: v_cvt_f32_i32_e32 v0, v0
3062-
; CGP-NEXT: v_rcp_f32_e32 v2, v1
3063-
; CGP-NEXT: v_mul_f32_e32 v2, v0, v2
3064-
; CGP-NEXT: v_trunc_f32_e32 v2, v2
3065-
; CGP-NEXT: v_mad_f32 v0, -v2, v1, v0
3066-
; CGP-NEXT: v_cvt_i32_f32_e32 v2, v2
3067-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v0|, |v1|
3068-
; CGP-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[4:5]
3069-
; CGP-NEXT: v_add_i32_e32 v0, vcc, v2, v0
3070-
; CGP-NEXT: v_bfe_i32 v0, v0, 0, 25
3058+
; CGP-NEXT: v_and_b32_e32 v3, 0xffffff, v2
3059+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v3
3060+
; CGP-NEXT: v_and_b32_e32 v5, 0xffffff, v0
3061+
; CGP-NEXT: v_rcp_f32_e32 v1, v1
3062+
; CGP-NEXT: v_mul_f32_e32 v1, 0x4f7ffffe, v1
3063+
; CGP-NEXT: v_cvt_u32_f32_e32 v4, v1
3064+
; CGP-NEXT: v_sub_i32_e32 v1, vcc, 0, v3
3065+
; CGP-NEXT: v_mul_lo_u32 v1, v1, v4
3066+
; CGP-NEXT: v_mad_u64_u32 v[1:2], s[4:5], v4, v1, 0
3067+
; CGP-NEXT: v_mov_b32_e32 v0, v2
3068+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v4, v0
3069+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v5, v0, 0
3070+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3071+
; CGP-NEXT: v_mul_lo_u32 v1, v0, v3
3072+
; CGP-NEXT: v_add_i32_e32 v2, vcc, 1, v0
3073+
; CGP-NEXT: v_sub_i32_e32 v1, vcc, v5, v1
3074+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v1, v3
3075+
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v2, vcc
3076+
; CGP-NEXT: v_sub_i32_e64 v2, s[4:5], v1, v3
3077+
; CGP-NEXT: v_cndmask_b32_e32 v1, v1, v2, vcc
3078+
; CGP-NEXT: v_add_i32_e32 v2, vcc, 1, v0
3079+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v1, v3
3080+
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v2, vcc
30713081
; CGP-NEXT: v_ashrrev_i32_e32 v1, 31, v0
30723082
; CGP-NEXT: s_setpc_b64 s[30:31]
30733083
%num.mask = and i64 %num, 16777215
@@ -3335,32 +3345,52 @@ define <2 x i64> @v_sdiv_v2i64_24bit(<2 x i64> %num, <2 x i64> %den) {
33353345
; CGP-LABEL: v_sdiv_v2i64_24bit:
33363346
; CGP: ; %bb.0:
33373347
; CGP-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
3338-
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v4
3339-
; CGP-NEXT: v_cvt_f32_i32_e32 v1, v1
3340-
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
3341-
; CGP-NEXT: v_cvt_f32_i32_e32 v0, v0
3348+
; CGP-NEXT: v_and_b32_e32 v3, 0xffffff, v4
3349+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v3
33423350
; CGP-NEXT: v_and_b32_e32 v4, 0xffffff, v6
3343-
; CGP-NEXT: v_rcp_f32_e32 v3, v1
3344-
; CGP-NEXT: v_cvt_f32_i32_e32 v4, v4
3351+
; CGP-NEXT: v_sub_i32_e32 v6, vcc, 0, v3
3352+
; CGP-NEXT: v_rcp_f32_e32 v1, v1
3353+
; CGP-NEXT: v_and_b32_e32 v7, 0xffffff, v0
33453354
; CGP-NEXT: v_and_b32_e32 v2, 0xffffff, v2
3346-
; CGP-NEXT: v_cvt_f32_i32_e32 v2, v2
3347-
; CGP-NEXT: v_mul_f32_e32 v3, v0, v3
3348-
; CGP-NEXT: v_trunc_f32_e32 v3, v3
3349-
; CGP-NEXT: v_mad_f32 v0, -v3, v1, v0
3350-
; CGP-NEXT: v_cvt_i32_f32_e32 v3, v3
3351-
; CGP-NEXT: v_rcp_f32_e32 v5, v4
3352-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v0|, |v1|
3353-
; CGP-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[4:5]
3354-
; CGP-NEXT: v_add_i32_e32 v0, vcc, v3, v0
3355-
; CGP-NEXT: v_mul_f32_e32 v3, v2, v5
3356-
; CGP-NEXT: v_trunc_f32_e32 v3, v3
3357-
; CGP-NEXT: v_mad_f32 v2, -v3, v4, v2
3358-
; CGP-NEXT: v_cvt_i32_f32_e32 v3, v3
3359-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v2|, |v4|
3360-
; CGP-NEXT: v_cndmask_b32_e64 v2, 0, 1, s[4:5]
3361-
; CGP-NEXT: v_bfe_i32 v0, v0, 0, 25
3362-
; CGP-NEXT: v_add_i32_e32 v2, vcc, v3, v2
3363-
; CGP-NEXT: v_bfe_i32 v2, v2, 0, 25
3355+
; CGP-NEXT: v_mul_f32_e32 v1, 0x4f7ffffe, v1
3356+
; CGP-NEXT: v_cvt_u32_f32_e32 v5, v1
3357+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v4
3358+
; CGP-NEXT: v_mul_lo_u32 v6, v6, v5
3359+
; CGP-NEXT: v_rcp_f32_e32 v8, v1
3360+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v5, v6, 0
3361+
; CGP-NEXT: v_mul_f32_e32 v0, 0x4f7ffffe, v8
3362+
; CGP-NEXT: v_cvt_u32_f32_e32 v6, v0
3363+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3364+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v5, v0
3365+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v7, v0, 0
3366+
; CGP-NEXT: v_sub_i32_e32 v0, vcc, 0, v4
3367+
; CGP-NEXT: v_mov_b32_e32 v5, v1
3368+
; CGP-NEXT: v_mul_lo_u32 v0, v0, v6
3369+
; CGP-NEXT: v_mul_lo_u32 v1, v5, v3
3370+
; CGP-NEXT: v_add_i32_e32 v8, vcc, 1, v5
3371+
; CGP-NEXT: v_sub_i32_e32 v7, vcc, v7, v1
3372+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v6, v0, 0
3373+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v7, v3
3374+
; CGP-NEXT: v_cndmask_b32_e32 v5, v5, v8, vcc
3375+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3376+
; CGP-NEXT: v_add_i32_e64 v0, s[4:5], v6, v0
3377+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v2, v0, 0
3378+
; CGP-NEXT: v_sub_i32_e64 v8, s[4:5], v7, v3
3379+
; CGP-NEXT: v_cndmask_b32_e32 v0, v7, v8, vcc
3380+
; CGP-NEXT: v_mov_b32_e32 v7, v1
3381+
; CGP-NEXT: v_mul_lo_u32 v8, v7, v4
3382+
; CGP-NEXT: v_add_i32_e32 v6, vcc, 1, v5
3383+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v3
3384+
; CGP-NEXT: v_cndmask_b32_e32 v0, v5, v6, vcc
3385+
; CGP-NEXT: v_sub_i32_e32 v2, vcc, v2, v8
3386+
; CGP-NEXT: v_add_i32_e32 v3, vcc, 1, v7
3387+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v2, v4
3388+
; CGP-NEXT: v_cndmask_b32_e32 v3, v7, v3, vcc
3389+
; CGP-NEXT: v_sub_i32_e64 v5, s[4:5], v2, v4
3390+
; CGP-NEXT: v_cndmask_b32_e32 v2, v2, v5, vcc
3391+
; CGP-NEXT: v_add_i32_e32 v5, vcc, 1, v3
3392+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v2, v4
3393+
; CGP-NEXT: v_cndmask_b32_e32 v2, v3, v5, vcc
33643394
; CGP-NEXT: v_ashrrev_i32_e32 v1, 31, v0
33653395
; CGP-NEXT: v_ashrrev_i32_e32 v3, 31, v2
33663396
; CGP-NEXT: s_setpc_b64 s[30:31]

‎llvm/test/CodeGen/AMDGPU/GlobalISel/srem.i64.ll

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3000,21 +3000,27 @@ define i64 @v_srem_i64_24bit(i64 %num, i64 %den) {
30003000
; CGP-LABEL: v_srem_i64_24bit:
30013001
; CGP: ; %bb.0:
30023002
; CGP-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
3003-
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v2
3004-
; CGP-NEXT: v_cvt_f32_i32_e32 v2, v1
3005-
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
3006-
; CGP-NEXT: v_cvt_f32_i32_e32 v3, v0
3007-
; CGP-NEXT: v_rcp_f32_e32 v4, v2
3008-
; CGP-NEXT: v_mul_f32_e32 v4, v3, v4
3009-
; CGP-NEXT: v_trunc_f32_e32 v4, v4
3010-
; CGP-NEXT: v_mad_f32 v3, -v4, v2, v3
3011-
; CGP-NEXT: v_cvt_i32_f32_e32 v4, v4
3012-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v3|, |v2|
3013-
; CGP-NEXT: v_cndmask_b32_e64 v2, 0, 1, s[4:5]
3014-
; CGP-NEXT: v_add_i32_e32 v2, vcc, v4, v2
3015-
; CGP-NEXT: v_mul_lo_u32 v1, v2, v1
3016-
; CGP-NEXT: v_sub_i32_e32 v0, vcc, v0, v1
3017-
; CGP-NEXT: v_bfe_i32 v0, v0, 0, 25
3003+
; CGP-NEXT: v_and_b32_e32 v3, 0xffffff, v2
3004+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v3
3005+
; CGP-NEXT: v_and_b32_e32 v5, 0xffffff, v0
3006+
; CGP-NEXT: v_rcp_f32_e32 v1, v1
3007+
; CGP-NEXT: v_mul_f32_e32 v1, 0x4f7ffffe, v1
3008+
; CGP-NEXT: v_cvt_u32_f32_e32 v4, v1
3009+
; CGP-NEXT: v_sub_i32_e32 v1, vcc, 0, v3
3010+
; CGP-NEXT: v_mul_lo_u32 v1, v1, v4
3011+
; CGP-NEXT: v_mad_u64_u32 v[1:2], s[4:5], v4, v1, 0
3012+
; CGP-NEXT: v_mov_b32_e32 v0, v2
3013+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v4, v0
3014+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v5, v0, 0
3015+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3016+
; CGP-NEXT: v_mul_lo_u32 v0, v0, v3
3017+
; CGP-NEXT: v_sub_i32_e32 v0, vcc, v5, v0
3018+
; CGP-NEXT: v_sub_i32_e32 v1, vcc, v0, v3
3019+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v3
3020+
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v1, vcc
3021+
; CGP-NEXT: v_sub_i32_e32 v1, vcc, v0, v3
3022+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v3
3023+
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v1, vcc
30183024
; CGP-NEXT: v_ashrrev_i32_e32 v1, 31, v0
30193025
; CGP-NEXT: s_setpc_b64 s[30:31]
30203026
%num.mask = and i64 %num, 16777215
@@ -3282,37 +3288,47 @@ define <2 x i64> @v_srem_v2i64_24bit(<2 x i64> %num, <2 x i64> %den) {
32823288
; CGP-LABEL: v_srem_v2i64_24bit:
32833289
; CGP: ; %bb.0:
32843290
; CGP-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
3285-
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v4
3286-
; CGP-NEXT: v_cvt_f32_i32_e32 v3, v1
3287-
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
3288-
; CGP-NEXT: v_cvt_f32_i32_e32 v4, v0
3289-
; CGP-NEXT: v_and_b32_e32 v6, 0xffffff, v6
3290-
; CGP-NEXT: v_rcp_f32_e32 v5, v3
3291+
; CGP-NEXT: v_and_b32_e32 v3, 0xffffff, v4
3292+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v3
3293+
; CGP-NEXT: v_and_b32_e32 v4, 0xffffff, v6
3294+
; CGP-NEXT: v_sub_i32_e32 v6, vcc, 0, v3
3295+
; CGP-NEXT: v_rcp_f32_e32 v1, v1
3296+
; CGP-NEXT: v_and_b32_e32 v7, 0xffffff, v0
32913297
; CGP-NEXT: v_and_b32_e32 v2, 0xffffff, v2
3292-
; CGP-NEXT: v_mul_f32_e32 v5, v4, v5
3293-
; CGP-NEXT: v_trunc_f32_e32 v5, v5
3294-
; CGP-NEXT: v_mad_f32 v4, -v5, v3, v4
3295-
; CGP-NEXT: v_cvt_i32_f32_e32 v5, v5
3296-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v4|, |v3|
3297-
; CGP-NEXT: v_cvt_f32_i32_e32 v4, v6
3298-
; CGP-NEXT: v_cndmask_b32_e64 v3, 0, 1, s[4:5]
3299-
; CGP-NEXT: v_add_i32_e32 v3, vcc, v5, v3
3300-
; CGP-NEXT: v_mul_lo_u32 v1, v3, v1
3301-
; CGP-NEXT: v_cvt_f32_i32_e32 v3, v2
3302-
; CGP-NEXT: v_rcp_f32_e32 v5, v4
3303-
; CGP-NEXT: v_sub_i32_e32 v0, vcc, v0, v1
3304-
; CGP-NEXT: v_mul_f32_e32 v1, v3, v5
3305-
; CGP-NEXT: v_trunc_f32_e32 v1, v1
3306-
; CGP-NEXT: v_mad_f32 v3, -v1, v4, v3
3307-
; CGP-NEXT: v_cvt_i32_f32_e32 v1, v1
3308-
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v3|, |v4|
3309-
; CGP-NEXT: v_cndmask_b32_e64 v3, 0, 1, s[4:5]
3310-
; CGP-NEXT: v_bfe_i32 v0, v0, 0, 25
3311-
; CGP-NEXT: v_add_i32_e32 v1, vcc, v1, v3
3312-
; CGP-NEXT: v_mul_lo_u32 v3, v1, v6
3298+
; CGP-NEXT: v_mul_f32_e32 v1, 0x4f7ffffe, v1
3299+
; CGP-NEXT: v_cvt_u32_f32_e32 v5, v1
3300+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v4
3301+
; CGP-NEXT: v_mul_lo_u32 v6, v6, v5
3302+
; CGP-NEXT: v_rcp_f32_e32 v8, v1
3303+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v5, v6, 0
3304+
; CGP-NEXT: v_mul_f32_e32 v0, 0x4f7ffffe, v8
3305+
; CGP-NEXT: v_cvt_u32_f32_e32 v6, v0
3306+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3307+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v5, v0
3308+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v7, v0, 0
3309+
; CGP-NEXT: v_sub_i32_e32 v0, vcc, 0, v4
3310+
; CGP-NEXT: v_mul_lo_u32 v0, v0, v6
3311+
; CGP-NEXT: v_mul_lo_u32 v5, v1, v3
3312+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v6, v0, 0
3313+
; CGP-NEXT: v_sub_i32_e32 v5, vcc, v7, v5
3314+
; CGP-NEXT: v_mov_b32_e32 v0, v1
3315+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v6, v0
3316+
; CGP-NEXT: v_mad_u64_u32 v[0:1], s[4:5], v2, v0, 0
3317+
; CGP-NEXT: v_sub_i32_e32 v7, vcc, v5, v3
3318+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v5, v3
3319+
; CGP-NEXT: v_mul_lo_u32 v6, v1, v4
3320+
; CGP-NEXT: v_cndmask_b32_e32 v0, v5, v7, vcc
3321+
; CGP-NEXT: v_sub_i32_e32 v5, vcc, v0, v3
3322+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v3
3323+
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v5, vcc
3324+
; CGP-NEXT: v_sub_i32_e32 v2, vcc, v2, v6
3325+
; CGP-NEXT: v_sub_i32_e32 v3, vcc, v2, v4
3326+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v2, v4
3327+
; CGP-NEXT: v_cndmask_b32_e32 v2, v2, v3, vcc
3328+
; CGP-NEXT: v_sub_i32_e32 v3, vcc, v2, v4
3329+
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v2, v4
3330+
; CGP-NEXT: v_cndmask_b32_e32 v2, v2, v3, vcc
33133331
; CGP-NEXT: v_ashrrev_i32_e32 v1, 31, v0
3314-
; CGP-NEXT: v_sub_i32_e32 v2, vcc, v2, v3
3315-
; CGP-NEXT: v_bfe_i32 v2, v2, 0, 25
33163332
; CGP-NEXT: v_ashrrev_i32_e32 v3, 31, v2
33173333
; CGP-NEXT: s_setpc_b64 s[30:31]
33183334
%num.mask = and <2 x i64> %num, <i64 16777215, i64 16777215>

‎llvm/test/CodeGen/AMDGPU/GlobalISel/udiv.i32.ll

Lines changed: 31 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -415,25 +415,17 @@ define i32 @v_udiv_i32_24bit(i32 %num, i32 %den) {
415415
; CGP-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
416416
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
417417
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v1
418-
; CGP-NEXT: v_cvt_f32_u32_e32 v2, v1
419-
; CGP-NEXT: v_sub_i32_e32 v3, vcc, 0, v1
420-
; CGP-NEXT: v_rcp_f32_e32 v2, v2
421-
; CGP-NEXT: v_mul_f32_e32 v2, 0x4f7ffffe, v2
418+
; CGP-NEXT: v_cvt_f32_u32_e32 v0, v0
419+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v1
420+
; CGP-NEXT: v_rcp_f32_e32 v2, v1
421+
; CGP-NEXT: v_mul_f32_e32 v2, v0, v2
422+
; CGP-NEXT: v_trunc_f32_e32 v2, v2
423+
; CGP-NEXT: v_fma_f32 v0, -v2, v1, v0
422424
; CGP-NEXT: v_cvt_u32_f32_e32 v2, v2
423-
; CGP-NEXT: v_mul_lo_u32 v3, v3, v2
424-
; CGP-NEXT: v_mul_hi_u32 v3, v2, v3
425-
; CGP-NEXT: v_add_i32_e32 v2, vcc, v2, v3
426-
; CGP-NEXT: v_mul_hi_u32 v2, v0, v2
427-
; CGP-NEXT: v_mul_lo_u32 v3, v2, v1
428-
; CGP-NEXT: v_add_i32_e32 v4, vcc, 1, v2
429-
; CGP-NEXT: v_sub_i32_e32 v0, vcc, v0, v3
430-
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v1
431-
; CGP-NEXT: v_cndmask_b32_e32 v2, v2, v4, vcc
432-
; CGP-NEXT: v_sub_i32_e64 v3, s[4:5], v0, v1
433-
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v3, vcc
434-
; CGP-NEXT: v_add_i32_e32 v3, vcc, 1, v2
435-
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v1
436-
; CGP-NEXT: v_cndmask_b32_e32 v0, v2, v3, vcc
425+
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v0|, v1
426+
; CGP-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[4:5]
427+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v2, v0
428+
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
437429
; CGP-NEXT: s_setpc_b64 s[30:31]
438430
%num.mask = and i32 %num, 16777215
439431
%den.mask = and i32 %den, 16777215
@@ -496,44 +488,28 @@ define <2 x i32> @v_udiv_v2i32_24bit(<2 x i32> %num, <2 x i32> %den) {
496488
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v1
497489
; CGP-NEXT: v_and_b32_e32 v2, 0xffffff, v2
498490
; CGP-NEXT: v_and_b32_e32 v3, 0xffffff, v3
499-
; CGP-NEXT: v_cvt_f32_u32_e32 v4, v2
500-
; CGP-NEXT: v_sub_i32_e32 v5, vcc, 0, v2
501-
; CGP-NEXT: v_cvt_f32_u32_e32 v6, v3
502-
; CGP-NEXT: v_sub_i32_e32 v7, vcc, 0, v3
503-
; CGP-NEXT: v_rcp_f32_e32 v4, v4
504-
; CGP-NEXT: v_rcp_f32_e32 v6, v6
505-
; CGP-NEXT: v_mul_f32_e32 v4, 0x4f7ffffe, v4
506-
; CGP-NEXT: v_mul_f32_e32 v6, 0x4f7ffffe, v6
491+
; CGP-NEXT: v_cvt_f32_u32_e32 v0, v0
492+
; CGP-NEXT: v_cvt_f32_u32_e32 v2, v2
493+
; CGP-NEXT: v_cvt_f32_u32_e32 v1, v1
494+
; CGP-NEXT: v_cvt_f32_u32_e32 v3, v3
495+
; CGP-NEXT: v_rcp_f32_e32 v4, v2
496+
; CGP-NEXT: v_rcp_f32_e32 v5, v3
497+
; CGP-NEXT: v_mul_f32_e32 v4, v0, v4
498+
; CGP-NEXT: v_mul_f32_e32 v5, v1, v5
499+
; CGP-NEXT: v_trunc_f32_e32 v4, v4
500+
; CGP-NEXT: v_trunc_f32_e32 v5, v5
501+
; CGP-NEXT: v_fma_f32 v0, -v4, v2, v0
507502
; CGP-NEXT: v_cvt_u32_f32_e32 v4, v4
508-
; CGP-NEXT: v_cvt_u32_f32_e32 v6, v6
509-
; CGP-NEXT: v_mul_lo_u32 v5, v5, v4
510-
; CGP-NEXT: v_mul_lo_u32 v7, v7, v6
511-
; CGP-NEXT: v_mul_hi_u32 v5, v4, v5
512-
; CGP-NEXT: v_mul_hi_u32 v7, v6, v7
513-
; CGP-NEXT: v_add_i32_e32 v4, vcc, v4, v5
514-
; CGP-NEXT: v_add_i32_e32 v5, vcc, v6, v7
515-
; CGP-NEXT: v_mul_hi_u32 v4, v0, v4
516-
; CGP-NEXT: v_mul_hi_u32 v5, v1, v5
517-
; CGP-NEXT: v_mul_lo_u32 v6, v4, v2
518-
; CGP-NEXT: v_add_i32_e32 v7, vcc, 1, v4
519-
; CGP-NEXT: v_mul_lo_u32 v8, v5, v3
520-
; CGP-NEXT: v_add_i32_e32 v9, vcc, 1, v5
521-
; CGP-NEXT: v_sub_i32_e32 v0, vcc, v0, v6
522-
; CGP-NEXT: v_sub_i32_e32 v1, vcc, v1, v8
523-
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v2
524-
; CGP-NEXT: v_cndmask_b32_e32 v4, v4, v7, vcc
525-
; CGP-NEXT: v_sub_i32_e64 v6, s[4:5], v0, v2
526-
; CGP-NEXT: v_cmp_ge_u32_e64 s[4:5], v1, v3
527-
; CGP-NEXT: v_cndmask_b32_e64 v5, v5, v9, s[4:5]
528-
; CGP-NEXT: v_sub_i32_e64 v7, s[6:7], v1, v3
529-
; CGP-NEXT: v_cndmask_b32_e32 v0, v0, v6, vcc
530-
; CGP-NEXT: v_add_i32_e32 v6, vcc, 1, v4
531-
; CGP-NEXT: v_cndmask_b32_e64 v1, v1, v7, s[4:5]
532-
; CGP-NEXT: v_add_i32_e32 v7, vcc, 1, v5
533-
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v0, v2
534-
; CGP-NEXT: v_cndmask_b32_e32 v0, v4, v6, vcc
535-
; CGP-NEXT: v_cmp_ge_u32_e32 vcc, v1, v3
536-
; CGP-NEXT: v_cndmask_b32_e32 v1, v5, v7, vcc
503+
; CGP-NEXT: v_fma_f32 v1, -v5, v3, v1
504+
; CGP-NEXT: v_cvt_u32_f32_e32 v5, v5
505+
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v0|, v2
506+
; CGP-NEXT: v_cndmask_b32_e64 v0, 0, 1, s[4:5]
507+
; CGP-NEXT: v_cmp_ge_f32_e64 s[4:5], |v1|, v3
508+
; CGP-NEXT: v_cndmask_b32_e64 v1, 0, 1, s[4:5]
509+
; CGP-NEXT: v_add_i32_e32 v0, vcc, v4, v0
510+
; CGP-NEXT: v_add_i32_e32 v1, vcc, v5, v1
511+
; CGP-NEXT: v_and_b32_e32 v0, 0xffffff, v0
512+
; CGP-NEXT: v_and_b32_e32 v1, 0xffffff, v1
537513
; CGP-NEXT: s_setpc_b64 s[30:31]
538514
%num.mask = and <2 x i32> %num, <i32 16777215, i32 16777215>
539515
%den.mask = and <2 x i32> %den, <i32 16777215, i32 16777215>

0 commit comments

Comments
 (0)