fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rusticl/kernel: recalculate scratch and shared memory after opts

Browse source 
Turns out we have to do it regardless as opts after explicit_types could
get rid of even more scratch and shared memory.

Fixes: ea023ff5cd ("rusticl/kernel: no need to reset the scratch size anymore")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27634>
This commit is contained in:
Karol Herbst 2024-02-15 14:29:20 +01:00 • committed by Marge Bot
parent ad5fbc4407
commit 53df391d27
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/frontends/rusticl/core/kernel.rs
View file

@ -634,6 +634,24 @@ fn lower_and_optimize_nir(
opt_nir(nir, dev, true); opt_nir(nir, dev, true);
nir_pass!(nir, nir_lower_memcpy); nir_pass!(nir, nir_lower_memcpy);
// we might have got rid of more function_temp or shared memory
nir.reset_scratch_size();
nir.reset_shared_size();
nir_pass!(
nir,
nir_remove_dead_variables,
nir_variable_mode::nir_var_function_temp | nir_variable_mode::nir_var_mem_shared,
&dv_opts,
);
nir_pass!(
nir,
nir_lower_vars_to_explicit_types,
nir_variable_mode::nir_var_function_temp
| nir_variable_mode::nir_var_mem_shared
| nir_variable_mode::nir_var_mem_generic,
Some(glsl_get_cl_type_size_align),
);
nir_pass!( nir_pass!(
nir, nir,
nir_lower_explicit_io, nir_lower_explicit_io,

11
src/gallium/frontends/rusticl/mesa/compiler/nir.rs
View file

@ -308,10 +308,21 @@ impl NirShader {
unsafe { (*self.nir.as_ptr()).info.num_textures } unsafe { (*self.nir.as_ptr()).info.num_textures }
} }
pub fn reset_scratch_size(&mut self) {
unsafe {
(*self.nir.as_ptr()).scratch_size = 0;
}
}
pub fn scratch_size(&self) -> u32 { pub fn scratch_size(&self) -> u32 {
unsafe { (*self.nir.as_ptr()).scratch_size } unsafe { (*self.nir.as_ptr()).scratch_size }
} }
pub fn reset_shared_size(&mut self) {
unsafe {
(*self.nir.as_ptr()).info.shared_size = 0;
}
}
pub fn shared_size(&self) -> u32 { pub fn shared_size(&self) -> u32 {
unsafe { (*self.nir.as_ptr()).info.shared_size } unsafe { (*self.nir.as_ptr()).info.shared_size }
} }