AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler/clc: Stop using deprecated NIR_PASS_V macro.

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33609>
This commit is contained in:
Timur Kristóf
2025-02-18 17:21:39 +01:00
parent ce8317194c
commit 093e68b518
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/clc/nir_load_libclc.c
View File

@@ -252,9 +252,11 @@ nir_can_find_libclc(unsigned ptr_bit_size)
* every function that works on global memory and make it also work on generic
* memory.
*/
static void
static bool
libclc_add_generic_variants(nir_shader *shader)
{
bool progress = false;
nir_foreach_function(func, shader) {
/* These don't need generic variants */
if (strstr(func->name, "async_work_group_strided_copy"))
@@ -299,8 +301,20 @@ libclc_add_generic_variants(nir_shader *shader)
}
}
nir_metadata_preserve(gfunc->impl, nir_metadata_none);
progress = true;
nir_metadata_preserve(func->impl, nir_metadata_none);
}
if (progress) {
nir_foreach_function_impl(impl, shader) {
if (impl->valid_metadata & nir_metadata_not_properly_reset) {
/* Preserve all metadata for functions that we didn't modify. */
nir_metadata_preserve(impl, nir_metadata_all);
}
}
}
return progress;
}
nir_shader *
@@ -355,16 +369,16 @@ nir_load_libclc_shader(unsigned ptr_bit_size,
* initializers and lower any early returns.
*/
nir->info.internal = true;
NIR_PASS_V(nir, nir_lower_variable_initializers, nir_var_function_temp);
NIR_PASS_V(nir, nir_lower_returns);
NIR_PASS(_, nir, nir_lower_variable_initializers, nir_var_function_temp);
NIR_PASS(_, nir, nir_lower_returns);
NIR_PASS_V(nir, libclc_add_generic_variants);
NIR_PASS(_, nir, libclc_add_generic_variants);
/* Run some optimization passes. Those used here should be considered safe
* for all use cases and drivers.
*/
if (optimize) {
NIR_PASS_V(nir, nir_split_var_copies);
NIR_PASS(_, nir, nir_split_var_copies);
bool progress;
do {