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

nir/opt_uniform_atomics: don't preserve divergence information

Browse source 
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30787>
This commit is contained in:
Daniel Schürmann 2024-08-22 16:01:12 +02:00 • committed by Marge Bot
parent c25c63ebc0
commit ce0a3fe645
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/compiler/aco_instruction_selection_setup.cpp
View file

@ -370,8 +370,10 @@ init_context(isel_context* ctx, nir_shader* shader)
shader->options->divergence_analysis_options | nir_divergence_ignore_undef_if_phi_srcs;
nir_divergence_analysis_impl(impl, (nir_divergence_options)options);
shader->info.divergence_analysis_run = true;
if (nir_opt_uniform_atomics(shader, false) && nir_lower_int64(shader))
if (nir_opt_uniform_atomics(shader, false)) {
nir_lower_int64(shader);
nir_divergence_analysis_impl(impl, (nir_divergence_options)options);
}
apply_nuw_to_offsets(ctx, impl);

10
src/compiler/nir/nir_opt_uniform_atomics.c
View file

@ -33,7 +33,7 @@
* res = atomicAdd(addr, tmp);
* res = subgroupBroadcastFirst(res) + subgroupExclusiveAdd(1);
*
* This pass requires and preserves LCSSA and divergence information.
* This pass requires divergence information.
*/
#include "nir/nir.h"
@ -218,7 +218,6 @@ optimize_atomic(nir_builder *b, nir_intrinsic_instr *intrin, bool return_prev)
reduce_data(b, op, data, &reduce, combined_scan_reduce ? &scan : NULL);
nir_src_rewrite(&intrin->src[data_src], reduce);
nir_update_instr_divergence(b->shader, &intrin->instr);
nir_def *cond = nir_elect(b, 1);
@ -256,7 +255,6 @@ optimize_and_rewrite_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
helper_nif = nir_push_if(b, nir_inot(b, helper));
}
ASSERTED bool original_result_divergent = intrin->def.divergent;
bool return_prev = !nir_def_is_unused(&intrin->def);
nir_def old_result = intrin->def;
@ -275,7 +273,10 @@ optimize_and_rewrite_atomic(nir_builder *b, nir_intrinsic_instr *intrin,
}
if (result) {
assert(result->divergent == original_result_divergent);
/* It's possible the result is used as source for another atomic,
* so this needs to be correct.
*/
result->divergent = old_result.divergent;
nir_def_rewrite_uses(&old_result, result);
}
}
@ -285,7 +286,6 @@ opt_uniform_atomics(nir_function_impl *impl, bool fs_atomics_predicated)
{
bool progress = false;
nir_builder b = nir_builder_create(impl);
b.update_divergence = true;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {