lineage-rockchip/android_external_mesa3d
1
0
Fork 0
Code Activity Actions

nir: handle can_reorder robustly in nir_can_move_instr

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36357>
This commit is contained in:
Marek Olšák 2025-07-21 21:24:42 -04:00
parent c229c93540
commit 8d584586f5
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/compiler/nir/nir_opt_sink.c
View file

@ -111,6 +111,9 @@ can_sink_instr(nir_instr *instr, nir_move_options options, bool *can_mov_out_of_
case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (!nir_intrinsic_can_reorder(intrin))
return false;
*can_mov_out_of_loop = false;
switch (intrin->intrinsic) {
@ -128,7 +131,7 @@ can_sink_instr(nir_instr *instr, nir_move_options options, bool *can_mov_out_of_
case nir_intrinsic_load_global_bounded:
*can_mov_out_of_loop =
intrin->intrinsic == nir_intrinsic_load_global_bounded;
return options & nir_move_load_ssbo && nir_intrinsic_can_reorder(intrin);
return options & nir_move_load_ssbo;
case nir_intrinsic_load_input:
case nir_intrinsic_load_per_primitive_input: