mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-28 04:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

aco/gfx11: fix RT prolog scratch initialization

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Friedrich Vock <friedrich.vock@gmx.de>
Fixes: 6446b79168 ("aco: implement select_rt_prolog()")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21961>
This commit is contained in:
Rhys Perry 2023-03-16 16:47:16 +00:00 committed by Marge Bot
parent 2ead574abe
commit 184cf1cb79
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/amd/compiler/aco_instruction_selection.cpp
View File

@ -11799,7 +11799,9 @@ select_rt_prolog(Program* program, ac_shader_config* config,
PhysReg in_wg_id_x = get_arg_reg(in_args, in_args->workgroup_ids[0]);
PhysReg in_wg_id_y = get_arg_reg(in_args, in_args->workgroup_ids[1]);
PhysReg in_wg_id_z = get_arg_reg(in_args, in_args->workgroup_ids[2]);
PhysReg in_scratch_offset = get_arg_reg(in_args, in_args->scratch_offset);
PhysReg in_scratch_offset;
if (options->gfx_level < GFX11)
in_scratch_offset = get_arg_reg(in_args, in_args->scratch_offset);
PhysReg in_local_ids[2] = {
get_arg_reg(in_args, in_args->local_invocation_ids),
get_arg_reg(in_args, in_args->local_invocation_ids).advance(4),
@ -11839,13 +11841,13 @@ select_rt_prolog(Program* program, ac_shader_config* config,
assert(in_local_ids[0] == out_launch_ids[0]);
/* init scratch */
if (options->gfx_level >= GFX9) {
hw_init_scratch(bld, Definition(in_ring_offsets, s1), Operand(in_ring_offsets, s2),
Operand(in_scratch_offset, s1));
} else {
if (options->gfx_level < GFX9) {
/* copy ring offsets to temporary location*/
bld.sop1(aco_opcode::s_mov_b64, Definition(tmp_ring_offsets, s2),
Operand(in_ring_offsets, s2));
} else if (options->gfx_level < GFX11) {
hw_init_scratch(bld, Definition(in_ring_offsets, s1), Operand(in_ring_offsets, s2),
Operand(in_scratch_offset, s1));
}
/* set stack ptr */