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

nir/lower_scratch_to_var: handle multi-function shaders

Browse source 
It's not at all clear how this pass should work with real function calls (if at
all), but at least this is enough to handle collections of self-contained
functions which vtn_bindgen2 wants.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33099>
This commit is contained in:
Alyssa Rosenzweig 2025-01-30 09:32:08 -05:00 • committed by Marge Bot
parent 50428f3c8a
commit 7e467daac4
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/compiler/nir/nir_lower_scratch_to_var.c
View file

@ -93,13 +93,26 @@ nir_lower_scratch_to_var(nir_shader *nir)
NIR_PASS(_, nir, nir_lower_mem_access_bit_sizes, &lower_mem_access_options);
/* Then, back scratch by an array of words and turn all scratch access into
* array access.
* array access. We do this per-function, treating scratch as a
* function-local stack. This is correct for single-function shaders (the
* fully-inlined graphics case) and for collections of single-function
* shaders (the vtn_bindgen2 case). It is sketchy for drivers supporting true
* function calls, but before we can support that properly, we need to fix
* NIR's definition of scratch to instead be stack. So this is what we need
* for now, and hopefully this whole pass can be deleted someday.
*/
nir_foreach_function_impl(impl, nir) {
const glsl_type *type_ = glsl_array_type(glsl_uint_type(), words, 1);
nir_variable *var = nir_local_variable_create(impl, type_, "scratch");
nir_function_intrinsics_pass(impl, lower_scratch_to_var,
nir_metadata_control_flow, var);
}
/* After lowering, we've eliminated all scratch in the shader. Really, this
* should be per-function. Again, scratch is ill-defined in NIR for
* multi-function and we need deeper fixes to NIR. This whole pass is a
* bandage.
*/
nir_function_impl *entry = nir_shader_get_entrypoint(nir);
const glsl_type *type_ = glsl_array_type(glsl_uint_type(), words, 1);
nir_variable *var = nir_local_variable_create(entry, type_, "scratch");
nir_shader_intrinsics_pass(nir, lower_scratch_to_var,
nir_metadata_control_flow, var);
nir->scratch_size = 0;
/* Now clean up the mess we made */