Skip to content

Commit 1b83f10

Browse files
authored
[AMDGPU] Fix to prevent sinking of PERMLANE_SWAP instruction (#144423)
Permlane_swap instruction depends on exec mask, added isConvergent flag to prevent sinking of instruction. Fixes: SWDEV-537232
1 parent e5559ca commit 1b83f10

File tree

3 files changed

+73
-1
lines changed

3 files changed

+73
-1
lines changed

llvm/lib/Target/AMDGPU/VOP1Instructions.td

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,8 @@ defm V_PRNG_B32 : VOP1Inst <"v_prng_b32", VOP_I32_I32, int_amdgcn_prng_b32>;
774774

775775
let Constraints = "$vdst = $vdst_in, $src0_out = $src0",
776776
DisableEncoding="$vdst_in,$src0_out",
777-
SchedRW = [Write32Bit, Write32Bit] in {
777+
SchedRW = [Write32Bit, Write32Bit],
778+
isConvergent = 1 in {
778779
let SubtargetPredicate = HasPermlane16Swap in {
779780
defm V_PERMLANE16_SWAP_B32 : VOP1Inst<"v_permlane16_swap_b32", VOP_PERMLANE_SWAP>;
780781
}
@@ -1549,8 +1550,11 @@ defm V_CVT_PK_F32_FP8 : VOP1_Real_NoDstSel_SDWA_gfx9<0x56>;
15491550
defm V_CVT_PK_F32_BF8 : VOP1_Real_NoDstSel_SDWA_gfx9<0x57>;
15501551

15511552
defm V_PRNG_B32 : VOP1_Real_gfx9 <0x58>;
1553+
1554+
let isConvergent = 1 in {
15521555
defm V_PERMLANE16_SWAP_B32 : VOP1_OpSel_Real_e32e64_gfx9<0x059>;
15531556
defm V_PERMLANE32_SWAP_B32 : VOP1_OpSel_Real_e32e64_gfx9<0x05a>;
1557+
}
15541558

15551559
class MovDPP8Pattern<Predicate Pred, Instruction Inst, ValueType vt> : GCNPat <
15561560
(vt (int_amdgcn_mov_dpp8 vt:$src, timm:$dpp8)),

llvm/lib/Target/AMDGPU/VOPInstructions.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class LetDummies {
1515
bit isConvertibleToThreeAddress;
1616
bit isMoveImm;
1717
bit isReMaterializable;
18+
bit isConvergent;
1819
bit isAsCheapAsAMove;
1920
bit FPDPRounding;
2021
Predicate SubtargetPredicate;

llvm/test/CodeGen/AMDGPU/machine-sink-ignorable-exec-use.mir

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,3 +733,70 @@ body: |
733733
liveins: $vgpr0, $vgpr1, $vgpr2_vgpr3, $vcc
734734
S_ENDPGM 0
735735
...
736+
---
737+
name: test_no_sink_permlane_swap
738+
tracksRegLiveness: true
739+
machineFunctionInfo:
740+
isEntryFunction: true
741+
body: |
742+
; GFX9-LABEL: name: test_no_sink_permlane_swap
743+
; GFX9: bb.0:
744+
; GFX9-NEXT: successors: %bb.2(0x40000000), %bb.1(0x40000000)
745+
; GFX9-NEXT: liveins: $vgpr0
746+
; GFX9-NEXT: {{ $}}
747+
; GFX9-NEXT: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
748+
; GFX9-NEXT: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
749+
; GFX9-NEXT: [[S_MOV_B64_:%[0-9]+]]:sreg_64 = S_MOV_B64 0
750+
; GFX9-NEXT: [[COPY1:%[0-9]+]]:vreg_64 = COPY [[S_MOV_B64_]]
751+
; GFX9-NEXT: [[GLOBAL_LOAD_DWORD:%[0-9]+]]:vgpr_32 = GLOBAL_LOAD_DWORD killed [[COPY1]], 0, 0, implicit $exec :: (load (s32), addrspace 1)
752+
; GFX9-NEXT: [[V_PERMLANE32_SWAP_B32_e64_:%[0-9]+]]:vgpr_32, [[V_PERMLANE32_SWAP_B32_e64_1:%[0-9]+]]:vgpr_32 = V_PERMLANE32_SWAP_B32_e64 [[GLOBAL_LOAD_DWORD]], [[GLOBAL_LOAD_DWORD]], 0, 0, implicit $exec
753+
; GFX9-NEXT: [[COPY2:%[0-9]+]]:vgpr_32 = COPY $vgpr0
754+
; GFX9-NEXT: [[S_MOV_B32_:%[0-9]+]]:sreg_32 = S_MOV_B32 1
755+
; GFX9-NEXT: [[V_CMP_LT_I32_e64_:%[0-9]+]]:sreg_64 = V_CMP_LT_I32_e64 [[COPY2]], [[S_MOV_B32_]], implicit $exec
756+
; GFX9-NEXT: [[SI_IF:%[0-9]+]]:sreg_64 = SI_IF [[V_CMP_LT_I32_e64_]], %bb.2, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
757+
; GFX9-NEXT: S_BRANCH %bb.1
758+
; GFX9-NEXT: {{ $}}
759+
; GFX9-NEXT: bb.1:
760+
; GFX9-NEXT: successors: %bb.2(0x80000000)
761+
; GFX9-NEXT: {{ $}}
762+
; GFX9-NEXT: [[V_MAX_I32_e64_:%[0-9]+]]:vgpr_32 = V_MAX_I32_e64 [[V_PERMLANE32_SWAP_B32_e64_]], [[V_PERMLANE32_SWAP_B32_e64_1]], implicit $exec
763+
; GFX9-NEXT: {{ $}}
764+
; GFX9-NEXT: bb.2:
765+
; GFX9-NEXT: successors: %bb.3(0x80000000)
766+
; GFX9-NEXT: {{ $}}
767+
; GFX9-NEXT: [[PHI:%[0-9]+]]:vgpr_32 = PHI [[V_MOV_B32_e32_]], %bb.0, [[V_MAX_I32_e64_]], %bb.1
768+
; GFX9-NEXT: SI_END_CF [[SI_IF]], implicit-def dead $exec, implicit-def dead $scc, implicit $exec
769+
; GFX9-NEXT: {{ $}}
770+
; GFX9-NEXT: bb.3:
771+
; GFX9-NEXT: S_ENDPGM 0, implicit [[PHI]]
772+
bb.0:
773+
successors: %bb.2(0x40000000), %bb.1(0x40000000)
774+
liveins: $vgpr0
775+
776+
%0:vgpr_32 = COPY $vgpr0
777+
%1:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
778+
%2:sreg_64 = S_MOV_B64 0
779+
%3:vreg_64 = COPY %2
780+
%4:vgpr_32 = GLOBAL_LOAD_DWORD killed %3, 0, 0, implicit $exec :: (load (s32), addrspace 1)
781+
%5:vgpr_32, %6:vgpr_32 = V_PERMLANE32_SWAP_B32_e64 %4, %4, 0, 0, implicit $exec
782+
%7:vgpr_32 = COPY $vgpr0
783+
%8:sreg_32 = S_MOV_B32 1
784+
%9:sreg_64 = V_CMP_LT_I32_e64 %7, %8, implicit $exec
785+
%10:sreg_64 = COPY %9
786+
%11:sreg_64 = SI_IF %10, %bb.2, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
787+
S_BRANCH %bb.1
788+
789+
bb.1:
790+
successors: %bb.2(0x80000000)
791+
792+
%12:vgpr_32 = V_MAX_I32_e64 %5, %6, implicit $exec
793+
794+
bb.2:
795+
successors: %bb.3(0x80000000)
796+
797+
%13:vgpr_32 = PHI %1, %bb.0, %12, %bb.1
798+
SI_END_CF %11, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
799+
800+
bb.3:
801+
S_ENDPGM 0, implicit %13
802+
...

0 commit comments

Comments
 (0)