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

nir: Assume use_scoped_barrier

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23191>
This commit is contained in:
Alyssa Rosenzweig 2023-06-06 16:44:41 -04:00 • committed by Marge Bot
parent 5dfa8e4537
commit 7173cbccbf
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/nir/nir_lower_atomics_to_ssbo.c
View file

@ -59,15 +59,11 @@ lower_instr(nir_intrinsic_instr *instr, unsigned ssbo_offset, nir_builder *b, un
/* Atomic counters are now SSBOs so memoryBarrierAtomicCounter() is now
* memoryBarrierBuffer().
*/
if (b->shader->options->use_scoped_barrier) {
instr->intrinsic = nir_intrinsic_scoped_barrier;
nir_intrinsic_set_execution_scope(instr, NIR_SCOPE_NONE);
nir_intrinsic_set_memory_scope(instr, NIR_SCOPE_DEVICE);
nir_intrinsic_set_memory_semantics(instr, NIR_MEMORY_ACQ_REL);
nir_intrinsic_set_memory_modes(instr, nir_var_mem_ssbo);
} else {
instr->intrinsic = nir_intrinsic_memory_barrier_buffer;
}
instr->intrinsic = nir_intrinsic_scoped_barrier;
nir_intrinsic_set_execution_scope(instr, NIR_SCOPE_NONE);
nir_intrinsic_set_memory_scope(instr, NIR_SCOPE_DEVICE);
nir_intrinsic_set_memory_semantics(instr, NIR_MEMORY_ACQ_REL);
nir_intrinsic_set_memory_modes(instr, nir_var_mem_ssbo);
return true;
case nir_intrinsic_atomic_counter_inc:

8
src/compiler/nir/nir_lower_variable_initializers.c
View file

@ -191,12 +191,8 @@ nir_zero_initialize_shared_memory(nir_shader *shader,
}
nir_pop_loop(&b, loop);
if (shader->options->use_scoped_barrier) {
nir_scoped_barrier(&b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_WORKGROUP,
NIR_MEMORY_ACQ_REL, nir_var_mem_shared);
} else {
nir_memory_barrier_shared(&b);
}
nir_scoped_barrier(&b, NIR_SCOPE_WORKGROUP, NIR_SCOPE_WORKGROUP,
NIR_MEMORY_ACQ_REL, nir_var_mem_shared);
nir_metadata_preserve(nir_shader_get_entrypoint(shader), nir_metadata_none);