Skip to content

[MachineCopyPropagation] Make use of lane mask info in basic block liveins #140248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions llvm/lib/CodeGen/MachineCopyPropagation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,12 @@ void MachineCopyPropagation::readSuccessorLiveIns(
// If a copy result is livein to a successor, it is not dead.
for (const MachineBasicBlock *Succ : MBB.successors()) {
for (const auto &LI : Succ->liveins()) {
for (MCRegUnit Unit : TRI->regunits(LI.PhysReg)) {
if (MachineInstr *Copy = Tracker.findCopyForUnit(Unit, *TRI))
MaybeDeadCopies.remove(Copy);
for (MCRegUnitMaskIterator U(LI.PhysReg, TRI); U.isValid(); ++U) {
auto [Unit, Mask] = *U;
if ((Mask & LI.LaneMask).any()) {
if (MachineInstr *Copy = Tracker.findCopyForUnit(Unit, *TRI))
MaybeDeadCopies.remove(Copy);
}
}
}
}
Expand Down
18 changes: 0 additions & 18 deletions llvm/test/CodeGen/AMDGPU/atomic_optimizations_local_pointer.ll
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@ define amdgpu_kernel void @add_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: s_cbranch_execz .LBB2_2
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_add_rtn_u32 v0, v4, v0
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -980,7 +979,6 @@ define amdgpu_kernel void @add_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: s_cbranch_execz .LBB2_2
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_add_rtn_u32 v0, v4, v0
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -4282,7 +4280,6 @@ define amdgpu_kernel void @sub_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: s_cbranch_execz .LBB10_2
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_sub_rtn_u32 v0, v4, v0
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -4387,7 +4384,6 @@ define amdgpu_kernel void @sub_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: s_cbranch_execz .LBB10_2
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_sub_rtn_u32 v0, v4, v0
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -6691,7 +6687,6 @@ define amdgpu_kernel void @and_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1064_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_and_rtn_b32 v0, v0, v4
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -6796,7 +6791,6 @@ define amdgpu_kernel void @and_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1164_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_and_rtn_b32 v0, v0, v4
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -8052,7 +8046,6 @@ define amdgpu_kernel void @or_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: s_cbranch_execz .LBB17_2
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_or_rtn_b32 v0, v4, v0
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -8157,7 +8150,6 @@ define amdgpu_kernel void @or_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: s_cbranch_execz .LBB17_2
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_or_rtn_b32 v0, v4, v0
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -9412,7 +9404,6 @@ define amdgpu_kernel void @xor_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: s_cbranch_execz .LBB19_2
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_xor_rtn_b32 v0, v4, v0
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -9517,7 +9508,6 @@ define amdgpu_kernel void @xor_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: s_cbranch_execz .LBB19_2
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_xor_rtn_b32 v0, v4, v0
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -10772,7 +10762,6 @@ define amdgpu_kernel void @max_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1064_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_max_rtn_i32 v0, v0, v4
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -10877,7 +10866,6 @@ define amdgpu_kernel void @max_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1164_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_max_rtn_i32 v0, v0, v4
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -12600,7 +12588,6 @@ define amdgpu_kernel void @min_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1064_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_min_rtn_i32 v0, v0, v4
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -12705,7 +12692,6 @@ define amdgpu_kernel void @min_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1164_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_min_rtn_i32 v0, v0, v4
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -14428,7 +14414,6 @@ define amdgpu_kernel void @umax_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: s_cbranch_execz .LBB27_2
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_max_rtn_u32 v0, v4, v0
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -14533,7 +14518,6 @@ define amdgpu_kernel void @umax_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: s_cbranch_execz .LBB27_2
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_max_rtn_u32 v0, v4, v0
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -16243,7 +16227,6 @@ define amdgpu_kernel void @umin_i32_varying(ptr addrspace(1) %out) {
; GFX1064_DPP-NEXT: ; %bb.1:
; GFX1064_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1064_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1064_DPP-NEXT: s_mov_b32 s3, s6
; GFX1064_DPP-NEXT: ds_min_rtn_u32 v0, v0, v4
; GFX1064_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1064_DPP-NEXT: buffer_gl0_inv
Expand Down Expand Up @@ -16348,7 +16331,6 @@ define amdgpu_kernel void @umin_i32_varying(ptr addrspace(1) %out) {
; GFX1164_DPP-NEXT: ; %bb.1:
; GFX1164_DPP-NEXT: v_mov_b32_e32 v0, 0
; GFX1164_DPP-NEXT: v_mov_b32_e32 v4, s6
; GFX1164_DPP-NEXT: s_mov_b32 s3, s6
; GFX1164_DPP-NEXT: ds_min_rtn_u32 v0, v0, v4
; GFX1164_DPP-NEXT: s_waitcnt lgkmcnt(0)
; GFX1164_DPP-NEXT: buffer_gl0_inv
Expand Down
Loading