Skip to content

Commit 80fd3ed

Browse files
authored
AMDGPU: Fix constrain register logic for physregs (#161794)
We do not need to reconstrain physical registers. Enables an additional fold for constant physregs.
1 parent e3d23f8 commit 80fd3ed

File tree

6 files changed

+652
-941
lines changed

6 files changed

+652
-941
lines changed

llvm/lib/Target/AMDGPU/SIFoldOperands.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,8 @@ bool SIFoldOperandsImpl::updateOperand(FoldCandidate &Fold) const {
722722
return false;
723723
}
724724

725-
if (!MRI->constrainRegClass(New->getReg(), ConstrainRC)) {
725+
if (New->getReg().isVirtual() &&
726+
!MRI->constrainRegClass(New->getReg(), ConstrainRC)) {
726727
LLVM_DEBUG(dbgs() << "Cannot constrain " << printReg(New->getReg(), TRI)
727728
<< TRI->getRegClassName(ConstrainRC) << '\n');
728729
return false;

llvm/test/CodeGen/AMDGPU/addrspacecast-gas.ll

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ target triple = "amdgcn-amd-amdhsa"
99
define amdgpu_kernel void @use_private_to_flat_addrspacecast(ptr addrspace(5) %ptr) {
1010
; GFX1250-SDAG-LABEL: use_private_to_flat_addrspacecast:
1111
; GFX1250-SDAG: ; %bb.0:
12-
; GFX1250-SDAG-NEXT: s_load_b32 s2, s[4:5], 0x24
12+
; GFX1250-SDAG-NEXT: s_load_b32 s0, s[4:5], 0x24
1313
; GFX1250-SDAG-NEXT: v_mbcnt_lo_u32_b32 v0, -1, 0
14-
; GFX1250-SDAG-NEXT: s_mov_b64 s[0:1], src_flat_scratch_base_lo
1514
; GFX1250-SDAG-NEXT: s_wait_kmcnt 0x0
1615
; GFX1250-SDAG-NEXT: s_delay_alu instid0(VALU_DEP_1) | instskip(SKIP_2) | instid1(VALU_DEP_1)
17-
; GFX1250-SDAG-NEXT: v_dual_mov_b32 v0, s2 :: v_dual_lshlrev_b32 v1, 20, v0
18-
; GFX1250-SDAG-NEXT: s_cmp_lg_u32 s2, -1
16+
; GFX1250-SDAG-NEXT: v_dual_mov_b32 v0, s0 :: v_dual_lshlrev_b32 v1, 20, v0
17+
; GFX1250-SDAG-NEXT: s_cmp_lg_u32 s0, -1
1918
; GFX1250-SDAG-NEXT: s_cselect_b32 vcc_lo, -1, 0
20-
; GFX1250-SDAG-NEXT: v_add_nc_u64_e32 v[0:1], s[0:1], v[0:1]
19+
; GFX1250-SDAG-NEXT: v_add_nc_u64_e32 v[0:1], src_flat_scratch_base_lo, v[0:1]
2120
; GFX1250-SDAG-NEXT: s_delay_alu instid0(VALU_DEP_1) | instskip(NEXT) | instid1(VALU_DEP_2)
2221
; GFX1250-SDAG-NEXT: v_dual_mov_b32 v2, 0 :: v_dual_cndmask_b32 v1, 0, v1
2322
; GFX1250-SDAG-NEXT: v_cndmask_b32_e32 v0, 0, v0, vcc_lo
@@ -56,13 +55,11 @@ define amdgpu_kernel void @use_private_to_flat_addrspacecast_nonnull(ptr addrspa
5655
; GFX1250-SDAG: ; %bb.0:
5756
; GFX1250-SDAG-NEXT: s_load_b32 s0, s[4:5], 0x24
5857
; GFX1250-SDAG-NEXT: v_mbcnt_lo_u32_b32 v0, -1, 0
59-
; GFX1250-SDAG-NEXT: s_delay_alu instid0(VALU_DEP_1)
58+
; GFX1250-SDAG-NEXT: s_delay_alu instid0(VALU_DEP_1) | instskip(SKIP_2) | instid1(VALU_DEP_1)
6059
; GFX1250-SDAG-NEXT: v_dual_mov_b32 v2, 0 :: v_dual_lshlrev_b32 v1, 20, v0
6160
; GFX1250-SDAG-NEXT: s_wait_kmcnt 0x0
6261
; GFX1250-SDAG-NEXT: v_mov_b32_e32 v0, s0
63-
; GFX1250-SDAG-NEXT: s_mov_b64 s[0:1], src_flat_scratch_base_lo
64-
; GFX1250-SDAG-NEXT: s_delay_alu instid0(VALU_DEP_1) | instid1(SALU_CYCLE_1)
65-
; GFX1250-SDAG-NEXT: v_add_nc_u64_e32 v[0:1], s[0:1], v[0:1]
62+
; GFX1250-SDAG-NEXT: v_add_nc_u64_e32 v[0:1], src_flat_scratch_base_lo, v[0:1]
6663
; GFX1250-SDAG-NEXT: flat_store_b32 v[0:1], v2 scope:SCOPE_SYS
6764
; GFX1250-SDAG-NEXT: s_wait_storecnt 0x0
6865
; GFX1250-SDAG-NEXT: s_endpgm
@@ -91,10 +88,9 @@ define amdgpu_kernel void @use_flat_to_private_addrspacecast(ptr %ptr) {
9188
; GFX1250-LABEL: use_flat_to_private_addrspacecast:
9289
; GFX1250: ; %bb.0:
9390
; GFX1250-NEXT: s_load_b64 s[0:1], s[4:5], 0x24
94-
; GFX1250-NEXT: s_mov_b32 s2, src_flat_scratch_base_lo
9591
; GFX1250-NEXT: v_mov_b32_e32 v0, 0
9692
; GFX1250-NEXT: s_wait_kmcnt 0x0
97-
; GFX1250-NEXT: s_sub_co_i32 s2, s0, s2
93+
; GFX1250-NEXT: s_sub_co_i32 s2, s0, src_flat_scratch_base_lo
9894
; GFX1250-NEXT: s_cmp_lg_u64 s[0:1], 0
9995
; GFX1250-NEXT: s_cselect_b32 s0, s2, -1
10096
; GFX1250-NEXT: scratch_store_b32 off, v0, s0 scope:SCOPE_SYS
@@ -110,9 +106,8 @@ define amdgpu_kernel void @use_flat_to_private_addrspacecast_nonnull(ptr %ptr) {
110106
; GFX1250-SDAG: ; %bb.0:
111107
; GFX1250-SDAG-NEXT: s_load_b32 s0, s[4:5], 0x24
112108
; GFX1250-SDAG-NEXT: v_mov_b32_e32 v0, 0
113-
; GFX1250-SDAG-NEXT: s_mov_b32 s1, src_flat_scratch_base_lo
114109
; GFX1250-SDAG-NEXT: s_wait_kmcnt 0x0
115-
; GFX1250-SDAG-NEXT: s_sub_co_i32 s0, s0, s1
110+
; GFX1250-SDAG-NEXT: s_sub_co_i32 s0, s0, src_flat_scratch_base_lo
116111
; GFX1250-SDAG-NEXT: scratch_store_b32 off, v0, s0 scope:SCOPE_SYS
117112
; GFX1250-SDAG-NEXT: s_wait_storecnt 0x0
118113
; GFX1250-SDAG-NEXT: s_endpgm
@@ -122,9 +117,7 @@ define amdgpu_kernel void @use_flat_to_private_addrspacecast_nonnull(ptr %ptr) {
122117
; GFX1250-GISEL-NEXT: s_load_b64 s[0:1], s[4:5], 0x24
123118
; GFX1250-GISEL-NEXT: v_mov_b32_e32 v0, 0
124119
; GFX1250-GISEL-NEXT: s_wait_kmcnt 0x0
125-
; GFX1250-GISEL-NEXT: s_mov_b32 s1, src_flat_scratch_base_lo
126-
; GFX1250-GISEL-NEXT: s_delay_alu instid0(SALU_CYCLE_1)
127-
; GFX1250-GISEL-NEXT: s_sub_co_i32 s0, s0, s1
120+
; GFX1250-GISEL-NEXT: s_sub_co_i32 s0, s0, src_flat_scratch_base_lo
128121
; GFX1250-GISEL-NEXT: scratch_store_b32 off, v0, s0 scope:SCOPE_SYS
129122
; GFX1250-GISEL-NEXT: s_wait_storecnt 0x0
130123
; GFX1250-GISEL-NEXT: s_endpgm

0 commit comments

Comments
 (0)