RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

[AMDGPU] fixed scheduler crash in gfx908

Browse Source 
For some reason scheduler can send down an SUnit without an
instruction.

Differential Revision: https://reviews.llvm.org/D64709

llvm-svn: 366074
This commit is contained in:
Stanislav Mekhanoshin 2019-07-15 15:34:05 +00:00
parent dd84d5a9be
commit 6d5b6edfdc
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Target/AMDGPU/AMDGPUSubtarget.cpp
View File

@ -765,8 +765,8 @@ struct FillMFMAShadowMutation : ScheduleDAGMutation {
FillMFMAShadowMutation(const SIInstrInfo *tii) : TII(tii) {}
bool isSALU(const SUnit *SU) const {
const MachineInstr &MI = *SU->getInstr();
return TII->isSALU(MI) && !MI.isTerminator();
const MachineInstr *MI = SU->getInstr();
return MI && TII->isSALU(*MI) && !MI->isTerminator();
}
bool canAddEdge(const SUnit *Succ, const SUnit *Pred) const {

22
test/CodeGen/AMDGPU/power-sched-no-instr-sunit.mir Normal file
View File

@ -0,0 +1,22 @@
# RUN: llc -march=amdgcn -mcpu=gfx908 %s -run-pass=post-RA-sched -o - | FileCheck -check-prefix=GCN %s
# GCN-LABEL: name: test
# GCN: V_MFMA_F32_32X32X1F32
# GCN: S_BARRIER
# GCN: S_NOP 0
# GCN: V_ACCVGPR_READ_B32
# GCN: BUFFER_STORE_DWORD_OFFEN
---
name: test
body: |
bb.0.entry:
$sgpr6 = S_MOV_B32 $sgpr5
$sgpr10_sgpr11 = S_MOV_B64 $sgpr2_sgpr3, implicit-def $sgpr8_sgpr9_sgpr10_sgpr11, implicit $sgpr0_sgpr1_sgpr2_sgpr3
$sgpr8_sgpr9 = S_MOV_B64 $sgpr0_sgpr1, implicit killed $sgpr0_sgpr1_sgpr2_sgpr3
S_BARRIER
$agpr0_agpr1_agpr2_agpr3_agpr4_agpr5_agpr6_agpr7_agpr8_agpr9_agpr10_agpr11_agpr12_agpr13_agpr14_agpr15_agpr16_agpr17_agpr18_agpr19_agpr20_agpr21_agpr22_agpr23_agpr24_agpr25_agpr26_agpr27_agpr28_agpr29_agpr30_agpr31 = V_MFMA_F32_32X32X1F32 undef $vgpr0, undef $vgpr0, 0, 0, 0, 2, implicit $exec
$vgpr0 = V_ACCVGPR_READ_B32 $agpr31, implicit $exec
BUFFER_STORE_DWORD_OFFEN killed $vgpr0, undef $vgpr0, $sgpr8_sgpr9_sgpr10_sgpr11, $sgpr6, 0, 0, 0, 0, 0, implicit $exec
...