fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-21 06:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: fix pathological case in LdsDirectVALUHazard

Browse source 
Similar to bfd4ac4581.

No fossil-db changes.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Fixes: 296b4d95a3 ("aco/gfx11: workaround LdsDirectVALUHazard")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21423>
(cherry picked from commit 94abccf3ce)
This commit is contained in:
Rhys Perry 2023-02-20 14:37:33 +00:00 • committed by Eric Engestrom
parent 2ae6719029
commit 2d0b4d36a3
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -7627,7 +7627,7 @@
"description": "aco: fix pathological case in LdsDirectVALUHazard",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "296b4d95a3e35b2ab62ebcbd7e3a578fcbdd5b26"
},

13
src/amd/compiler/aco_insert_NOPs.cpp
View file

@ -1044,6 +1044,9 @@ struct LdsDirectVALUHazardGlobalState {
struct LdsDirectVALUHazardBlockState {
unsigned num_valu = 0;
bool has_trans = false;
unsigned num_instrs = 0;
unsigned num_blocks = 0;
};
bool
@ -1076,6 +1079,14 @@ handle_lds_direct_valu_hazard_instr(LdsDirectVALUHazardGlobalState& global_state
if (parse_vdst_wait(instr) == 0)
return true;
block_state.num_instrs++;
if (block_state.num_instrs > 256 || block_state.num_blocks > 32) {
/* Exit to limit compile times and set wait_vdst to be safe. */
global_state.wait_vdst =
MIN2(global_state.wait_vdst, block_state.has_trans ? 0 : block_state.num_valu);
return true;
}
return block_state.num_valu >= global_state.wait_vdst;
}
@ -1089,6 +1100,8 @@ handle_lds_direct_valu_hazard_block(LdsDirectVALUHazardGlobalState& global_state
global_state.loop_headers_visited.insert(block->index);
}
block_state.num_blocks++;
return true;
}