OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ntt: Use scoped barriers

Browse Source 
In addition to bringing us one backend closer to the scoped-only future, this
improves the generated code in cases like:

   memoryBarrierBuffer();
   memoryBarrierShared();
   controlBarrier();

With scoped_barriers + nir_opt_combine_barriers, we now emit only one MEMBAR
instruction (and a BARRIER) rather than two MEMBARs.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
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-05-23 13:55:43 -04:00
committed by Marge Bot
parent d3aca1a758
commit 749b4817ad
6 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/gallium/auxiliary/nir/nir_to_tgsi.c
View File

@@ -2340,6 +2340,50 @@ ntt_emit_load_sysval(struct ntt_compile *c, nir_intrinsic_instr *instr)
ntt_store(c, &instr->dest, sv);
}
static void
ntt_emit_barrier(struct ntt_compile *c, nir_intrinsic_instr *intr)
{
bool compute = gl_shader_stage_is_compute(c->s->info.stage);
if (nir_intrinsic_memory_scope(intr) != NIR_SCOPE_NONE) {
nir_variable_mode modes = nir_intrinsic_memory_modes(intr);
unsigned membar = 0;
if (modes & nir_var_image)
membar |= TGSI_MEMBAR_SHADER_IMAGE;
if (modes & nir_var_mem_shared)
membar |= TGSI_MEMBAR_SHARED;
/* Atomic counters are lowered to SSBOs, there's no NIR mode corresponding
* exactly to atomics. Take the closest match.
*/
if (modes & nir_var_mem_ssbo)
membar |= TGSI_MEMBAR_SHADER_BUFFER | TGSI_MEMBAR_ATOMIC_BUFFER;
if (modes & nir_var_mem_global)
membar |= TGSI_MEMBAR_SHADER_BUFFER;
/* If we only need workgroup scope (not device-scope), we might be able to
* optimize a bit.
*/
if (membar && compute &&
nir_intrinsic_memory_scope(intr) == NIR_SCOPE_WORKGROUP) {
membar |= TGSI_MEMBAR_THREAD_GROUP;
}
/* Only emit a memory barrier if there are any relevant modes */
if (membar)
ntt_MEMBAR(c, ureg_imm1u(c->ureg, membar));
}
if (nir_intrinsic_execution_scope(intr) != NIR_SCOPE_NONE) {
assert(compute || c->s->info.stage == MESA_SHADER_TESS_CTRL);
ntt_BARRIER(c);
}
}
static void
ntt_emit_intrinsic(struct ntt_compile *c, nir_intrinsic_instr *instr)
{
@@ -2491,42 +2535,8 @@ ntt_emit_intrinsic(struct ntt_compile *c, nir_intrinsic_instr *instr)
ntt_emit_image_load_store(c, instr);
break;
case nir_intrinsic_control_barrier:
case nir_intrinsic_memory_barrier_tcs_patch:
ntt_BARRIER(c);
break;
case nir_intrinsic_memory_barrier:
ntt_MEMBAR(c, ureg_imm1u(c->ureg,
TGSI_MEMBAR_SHADER_BUFFER |
TGSI_MEMBAR_ATOMIC_BUFFER |
TGSI_MEMBAR_SHADER_IMAGE |
TGSI_MEMBAR_SHARED));
break;
case nir_intrinsic_memory_barrier_atomic_counter:
ntt_MEMBAR(c, ureg_imm1u(c->ureg, TGSI_MEMBAR_ATOMIC_BUFFER));
break;
case nir_intrinsic_memory_barrier_buffer:
ntt_MEMBAR(c, ureg_imm1u(c->ureg, TGSI_MEMBAR_SHADER_BUFFER));
break;
case nir_intrinsic_memory_barrier_image:
ntt_MEMBAR(c, ureg_imm1u(c->ureg, TGSI_MEMBAR_SHADER_IMAGE));
break;
case nir_intrinsic_memory_barrier_shared:
ntt_MEMBAR(c, ureg_imm1u(c->ureg, TGSI_MEMBAR_SHARED));
break;
case nir_intrinsic_group_memory_barrier:
ntt_MEMBAR(c, ureg_imm1u(c->ureg,
TGSI_MEMBAR_SHADER_BUFFER |
TGSI_MEMBAR_ATOMIC_BUFFER |
TGSI_MEMBAR_SHADER_IMAGE |
TGSI_MEMBAR_SHARED |
TGSI_MEMBAR_THREAD_GROUP));
case nir_intrinsic_scoped_barrier:
ntt_emit_barrier(c, instr);
break;
case nir_intrinsic_end_primitive:
@@ -3824,6 +3834,8 @@ const void *nir_to_tgsi_options(struct nir_shader *s,
}
} while (progress);
NIR_PASS_V(s, nir_opt_combine_barriers, NULL, NULL);
if (screen->get_shader_param(screen,
pipe_shader_type_from_mesa(s->info.stage),
PIPE_SHADER_CAP_INTEGERS)) {
@@ -3942,6 +3954,7 @@ static const nir_shader_compiler_options nir_to_tgsi_compiler_options = {
.lower_vector_cmp = true,
.lower_int64_options = nir_lower_imul_2x32_64,
.use_interpolated_input_intrinsics = true,
.use_scoped_barrier = true,
/* TGSI doesn't have a semantic for local or global index, just local and
* workgroup id.