Skip to content

Commit 0f2a469

Browse files
committed
Revert "[AMDGPU] remove move instruction if there is no user of it (#136735)"
This reverts commit 883afa4 since it is not technically sound.
1 parent 57a90ed commit 0f2a469

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ MachineInstr *SIShrinkInstructions::matchSwap(MachineInstr &MovT) const {
797797
dropInstructionKeepingImpDefs(*MovY);
798798
MachineInstr *Next = &*std::next(MovT.getIterator());
799799

800-
if (MRI->use_nodbg_empty(T)) {
800+
if (T.isVirtual() && MRI->use_nodbg_empty(T)) {
801801
dropInstructionKeepingImpDefs(MovT);
802802
} else {
803803
Xop.setIsKill(false);

llvm/test/CodeGen/AMDGPU/v_swap_b16.ll

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ define half @swap(half %a, half %b, i32 %i) {
3232
; GFX11-FAKE16-NEXT: s_mov_b32 s0, 0
3333
; GFX11-FAKE16-NEXT: .LBB0_1: ; %loop
3434
; GFX11-FAKE16-NEXT: ; =>This Inner Loop Header: Depth=1
35-
; GFX11-FAKE16-NEXT: v_add_nc_u32_e32 v2, -1, v2
35+
; GFX11-FAKE16-NEXT: s_delay_alu instid0(VALU_DEP_2) | instskip(SKIP_1) | instid1(VALU_DEP_2)
36+
; GFX11-FAKE16-NEXT: v_dual_mov_b32 v3, v1 :: v_dual_add_nc_u32 v2, -1, v2
3637
; GFX11-FAKE16-NEXT: v_swap_b32 v1, v0
37-
; GFX11-FAKE16-NEXT: s_delay_alu instid0(VALU_DEP_2) | instskip(SKIP_1) | instid1(SALU_CYCLE_1)
3838
; GFX11-FAKE16-NEXT: v_cmp_eq_u32_e32 vcc_lo, 0, v2
3939
; GFX11-FAKE16-NEXT: s_or_b32 s0, vcc_lo, s0
40+
; GFX11-FAKE16-NEXT: s_delay_alu instid0(SALU_CYCLE_1)
4041
; GFX11-FAKE16-NEXT: s_and_not1_b32 exec_lo, exec_lo, s0
4142
; GFX11-FAKE16-NEXT: s_cbranch_execnz .LBB0_1
4243
; GFX11-FAKE16-NEXT: ; %bb.2: ; %ret
@@ -80,7 +81,7 @@ define half @swap(half %a, half %b, i32 %i) {
8081
; GFX12-FAKE16-NEXT: s_mov_b32 s0, 0
8182
; GFX12-FAKE16-NEXT: .LBB0_1: ; %loop
8283
; GFX12-FAKE16-NEXT: ; =>This Inner Loop Header: Depth=1
83-
; GFX12-FAKE16-NEXT: v_add_nc_u32_e32 v2, -1, v2
84+
; GFX12-FAKE16-NEXT: v_dual_mov_b32 v3, v1 :: v_dual_add_nc_u32 v2, -1, v2
8485
; GFX12-FAKE16-NEXT: v_swap_b32 v1, v0
8586
; GFX12-FAKE16-NEXT: s_delay_alu instid0(VALU_DEP_2)
8687
; GFX12-FAKE16-NEXT: v_cmp_eq_u32_e32 vcc_lo, 0, v2

llvm/test/CodeGen/AMDGPU/v_swap_b32.mir

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# RUN: llc -simplify-mir -mtriple=amdgcn -mcpu=gfx900 -run-pass=si-shrink-instructions -verify-machineinstrs %s -o - | FileCheck -check-prefix=GCN %s
2+
# RUN: llc -simplify-mir -mtriple=amdgcn -mcpu=gfx900 -passes=si-shrink-instructions -verify-machineinstrs %s -o - | FileCheck -check-prefix=GCN %s
23

34
# GCN-LABEL: name: swap_phys_condensed
45
# GCN: bb.0:
56
# GCN-NEXT: liveins:
67
# GCN-NEXT: {{^[ ]*$}}
8+
# GCN-NEXT: $vgpr2 = V_MOV_B32_e32 $vgpr0, implicit $exec
79
# GCN-NEXT: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
810
# GCN-NEXT: S_SETPC_B64_return
911
---
@@ -22,6 +24,7 @@ body: |
2224
# GCN: bb.0:
2325
# GCN-NEXT: liveins:
2426
# GCN-NEXT: {{^[ ]*$}}
27+
# GCN-NEXT: $vgpr2 = V_MOV_B32_e32 $vgpr0, implicit $exec
2528
# GCN-NEXT: $vgpr3 = V_MOV_B32_e32 killed $vgpr4, implicit $exec
2629
# GCN-NEXT: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
2730
# GCN-NEXT: $vgpr5 = V_MOV_B32_e32 killed $vgpr6, implicit $exec
@@ -44,6 +47,7 @@ body: |
4447
# GCN: bb.0:
4548
# GCN-NEXT: liveins:
4649
# GCN-NEXT: {{^[ ]*$}}
50+
# GCN-NEXT: $vgpr2 = V_MOV_B32_e32 $vgpr0, implicit $exec
4751
# GCN-NEXT: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
4852
# GCN-NEXT: S_SETPC_B64_return
4953
---
@@ -62,6 +66,7 @@ body: |
6266
# GCN: bb.0:
6367
# GCN-NEXT: liveins:
6468
# GCN-NEXT: {{^[ ]*$}}
69+
# GCN-NEXT: $vgpr2 = V_MOV_B32_e32 $vgpr0, implicit $exec
6570
# GCN-NEXT: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
6671
# GCN-NEXT: S_SETPC_B64_return
6772
---
@@ -80,6 +85,7 @@ body: |
8085
# GCN: bb.0:
8186
# GCN-NEXT: liveins:
8287
# GCN-NEXT: {{^[ ]*$}}
88+
# GCN-NEXT: $vgpr4_vgpr5 = COPY $vgpr0_vgpr1
8389
# GCN-NEXT: $vgpr0, $vgpr2 = V_SWAP_B32 $vgpr2, $vgpr0, implicit $exec
8490
# GCN-NEXT: $vgpr1, $vgpr3 = V_SWAP_B32 $vgpr3, $vgpr1, implicit $exec
8591
---
@@ -930,7 +936,8 @@ body: |
930936
...
931937

932938
# GCN-LABEL: implicit_ops_mov_t_swap_b32
933-
# GCN: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
939+
# GCN: $vgpr3 = V_MOV_B32_e32 $vgpr0, implicit $exec, implicit $vgpr2, implicit killed $vgpr1_vgpr2, implicit-def $vgpr1
940+
# GCN-NEXT: $vgpr0, $vgpr1 = V_SWAP_B32 $vgpr1, $vgpr0, implicit $exec
934941

935942
---
936943
name: implicit_ops_mov_t_swap_b32

0 commit comments

Comments
 (0)