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

nir: Properly preserve metadata in more cases

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5171>
This commit is contained in:
Jason Ekstrand 2020-05-21 22:34:37 -05:00 • committed by Marge Bot
parent 5e1c42d85f
commit 2b676b2ce8
11 changed files with 78 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/glsl/gl_nir_lower_images.c
View file

@ -107,9 +107,19 @@ gl_nir_lower_images(nir_shader *shader, bool bindless_only)
nir_builder b;
nir_builder_init(&b, function->impl);
bool impl_progress = false;
nir_foreach_block(block, function->impl)
nir_foreach_instr(instr, block)
progress |= lower_impl(&b, instr, bindless_only);
impl_progress |= lower_impl(&b, instr, bindless_only);
if (impl_progress) {
nir_metadata_preserve(function->impl,
nir_metadata_block_index |
nir_metadata_dominance);
progress = true;
} else {
nir_metadata_preserve(function->impl, nir_metadata_all);
}
}
}

7
src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
View file

@ -331,6 +331,13 @@ lower_impl(nir_function_impl *impl, struct lower_samplers_as_deref_state *state)
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}

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

@ -116,16 +116,6 @@ combine_clip_cull(nir_shader *nir,
cull->data.location_frac = clip_array_size % 4;
}
nir_foreach_function(function, nir) {
if (function->impl) {
nir_metadata_preserve(function->impl,
nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_ssa_defs |
nir_metadata_loop_analysis);
}
}
return true;
}
@ -140,5 +130,20 @@ nir_lower_clip_cull_distance_arrays(nir_shader *nir)
if (nir->info.stage > MESA_SHADER_VERTEX)
progress |= combine_clip_cull(nir, &nir->inputs, false);
nir_foreach_function(function, nir) {
if (!function->impl)
continue;
if (progress) {
nir_metadata_preserve(function->impl,
nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_ssa_defs |
nir_metadata_loop_analysis);
} else {
nir_metadata_preserve(function->impl, nir_metadata_all);
}
}
return progress;
}

7
src/compiler/nir/nir_lower_samplers.c
View file

@ -133,6 +133,13 @@ lower_impl(nir_function_impl *impl)
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}

12
src/compiler/nir/nir_opt_conditional_discard.c
View file

@ -124,8 +124,18 @@ nir_opt_conditional_discard(nir_shader *shader)
nir_foreach_function(function, shader) {
if (function->impl) {
nir_builder_init(&builder, function->impl);
bool impl_progress = false;
nir_foreach_block_safe(block, function->impl) {
progress |= nir_opt_conditional_discard_block(&builder, block);
if (nir_opt_conditional_discard_block(&builder, block))
impl_progress = true;
}
if (impl_progress) {
nir_metadata_preserve(function->impl, nir_metadata_none);
progress = true;
} else {
nir_metadata_preserve(function->impl, nir_metadata_all);
}
}
}

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

@ -179,8 +179,10 @@ nir_opt_large_constants(nir_shader *shader,
unsigned num_locals = exec_list_length(&impl->locals);
nir_index_vars(shader, impl, nir_var_function_temp);
if (num_locals == 0)
if (num_locals == 0) {
nir_shader_preserve_all_metadata(shader);
return false;
}
struct var_info *var_infos = ralloc_array(NULL, struct var_info, num_locals);
nir_foreach_variable(var, &impl->locals) {
@ -302,6 +304,7 @@ nir_opt_large_constants(nir_shader *shader,
}
if (shader->constant_data_size == 0) {
nir_shader_preserve_all_metadata(shader);
ralloc_free(var_infos);
return false;
}

6
src/compiler/nir/nir_opt_loop_unroll.c
View file

@ -963,8 +963,12 @@ nir_opt_loop_unroll_impl(nir_function_impl *impl,
progress |= process_loops_in_block(impl->function->shader, &impl->body,
&has_nested_loop);
if (progress)
if (progress) {
nir_metadata_preserve(impl, nir_metadata_none);
nir_lower_regs_to_ssa_impl(impl);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}

16
src/compiler/nir/nir_remove_dead_variables.c
View file

@ -213,14 +213,16 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes,
}
}
if (progress) {
remove_dead_var_writes(shader, live);
nir_foreach_function(function, shader) {
if (!function->impl)
continue;
nir_foreach_function(function, shader) {
if (function->impl) {
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance);
}
if (progress) {
remove_dead_var_writes(shader, live);
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(function->impl, nir_metadata_all);
}
}

4
src/compiler/nir/nir_search.c
View file

@ -913,8 +913,10 @@ nir_algebraic_impl(nir_function_impl *impl,
* anything other than constants and ALU instructions.
*/
struct util_dynarray states = {0};
if (!util_dynarray_resize(&states, uint16_t, impl->ssa_alloc))
if (!util_dynarray_resize(&states, uint16_t, impl->ssa_alloc)) {
nir_metadata_preserve(impl, nir_metadata_all);
return false;
}
memset(states.data, 0, states.size);
struct hash_table *range_ht = _mesa_pointer_hash_table_create(NULL);

4
src/compiler/nir/nir_split_per_member_structs.c
View file

@ -202,6 +202,10 @@ nir_split_per_member_structs(nir_shader *shader)
}
}
}
nir_metadata_preserve(function->impl,
nir_metadata_block_index |
nir_metadata_dominance);
}
ralloc_free(dead_ctx);

2
src/compiler/nir/nir_split_vars.c
View file

@ -887,6 +887,7 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
/* If we failed to find any arrays of arrays, bail early. */
if (!has_any_array) {
ralloc_free(mem_ctx);
nir_shader_preserve_all_metadata(shader);
return false;
}
@ -1634,6 +1635,7 @@ nir_shrink_vec_array_vars(nir_shader *shader, nir_variable_mode modes)
}
if (!has_vars_to_shrink) {
ralloc_free(mem_ctx);
nir_shader_preserve_all_metadata(shader);
return false;
}