fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 23:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: restore m0/exec before exiting the trap handler

Browse source 
Dumping VGPRs will overwrite m0 and exec and they need to be restored
if we want to return to the shader.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32090>
This commit is contained in:
Samuel Pitoiset 2024-11-12 12:32:38 +01:00 • committed by Marge Bot
parent 185a165a85
commit 034014a165
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -12434,6 +12434,10 @@ select_trap_handler_shader(Program* program, ac_shader_config* config,
restore_vgprs_from_mem(&ctx, Operand(tma_rsrc, s4));
}
/* Restore m0 and exec. */
bld.copy(Definition(m0, s1), Operand(save_m0, s1));
bld.copy(Definition(exec, bld.lm), Operand(save_exec, bld.lm));
/* Restore SCC which is the first bit of SQ_WAVE_STATUS. */
bld.sopc(aco_opcode::s_bitcmp1_b32, bld.def(s1, scc), Operand(save_wave_status, s1),
Operand::c32(0u));