fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 03:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_shader_calls: remove empty phis

Browse source 
This is confusing opt_cse.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 8dfb240b1f ("nir: Add raytracing shader call lowering pass.")
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11953>
(cherry picked from commit 01b0935d31)
This commit is contained in:
Lionel Landwerlin 2021-07-19 19:33:12 +03:00 • committed by Dylan Baker
parent bcf16071a7
commit 6d2727b2dc
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4,7 +4,7 @@
"description": "nir/lower_shader_calls: remove empty phis",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "8dfb240b1f063307aa5e53fb1bd0865105eef986"
},

3
src/compiler/nir/nir_lower_shader_calls.c
View file

@ -1108,6 +1108,8 @@ nir_lower_shader_calls(nir_shader *shader,
NIR_PASS_V(shader, spill_ssa_defs_and_lower_shader_calls,
num_calls, address_format, stack_alignment);
nir_opt_remove_phis(shader);
/* Make N copies of our shader */
nir_shader **resume_shaders = ralloc_array(mem_ctx, nir_shader *, num_calls);
for (unsigned i = 0; i < num_calls; i++)
@ -1117,6 +1119,7 @@ nir_lower_shader_calls(nir_shader *shader,
for (unsigned i = 0; i < num_calls; i++) {
nir_instr *resume_instr = lower_resume(resume_shaders[i], i);
replace_resume_with_halt(resume_shaders[i], resume_instr);
nir_opt_remove_phis(resume_shaders[i]);
}
*resume_shaders_out = resume_shaders;