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

aco: remove isel for GLSL-style barriers

Browse Source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5980>
This commit is contained in:
Rhys Perry
2020-07-20 14:34:21 +01:00
committed by Marge Bot
parent cc3bc9493c
commit 9a49d4c2db
1 changed files with 23 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -6719,61 +6719,33 @@ sync_scope translate_nir_scope(nir_scope scope)
unreachable("invalid scope"); unreachable("invalid scope");
} }
void emit_memory_barrier(isel_context *ctx, nir_intrinsic_instr *instr) { void emit_scoped_barrier(isel_context *ctx, nir_intrinsic_instr *instr) {
Builder bld(ctx->program, ctx->block); Builder bld(ctx->program, ctx->block);
storage_class all_mem = (storage_class)(storage_buffer | storage_image | storage_atomic_counter | storage_shared);
switch(instr->intrinsic) {
case nir_intrinsic_group_memory_barrier:
bld.barrier(aco_opcode::p_barrier,
memory_sync_info(all_mem, semantic_acqrel, scope_workgroup));
break;
case nir_intrinsic_memory_barrier:
bld.barrier(aco_opcode::p_barrier,
memory_sync_info(all_mem, semantic_acqrel, scope_device));
break;
case nir_intrinsic_memory_barrier_buffer:
bld.barrier(aco_opcode::p_barrier,
memory_sync_info((storage_class)storage_buffer, semantic_acqrel, scope_device));
case nir_intrinsic_memory_barrier_image:
bld.barrier(aco_opcode::p_barrier,
memory_sync_info((storage_class)storage_image, semantic_acqrel, scope_device));
break;
case nir_intrinsic_memory_barrier_tcs_patch:
case nir_intrinsic_memory_barrier_shared:
bld.barrier(aco_opcode::p_barrier,
memory_sync_info(storage_shared, semantic_acqrel, scope_workgroup));
break;
case nir_intrinsic_scoped_barrier: {
unsigned semantics = 0;
unsigned storage = 0;
sync_scope mem_scope = translate_nir_scope(nir_intrinsic_memory_scope(instr));
sync_scope exec_scope = translate_nir_scope(nir_intrinsic_execution_scope(instr));
unsigned nir_storage = nir_intrinsic_memory_modes(instr); unsigned semantics = 0;
if (nir_storage & (nir_var_mem_ssbo | nir_var_mem_global)) unsigned storage = 0;
storage |= storage_buffer | storage_image; //TODO: split this when NIR gets nir_var_mem_image sync_scope mem_scope = translate_nir_scope(nir_intrinsic_memory_scope(instr));
if (ctx->shader->info.stage == MESA_SHADER_COMPUTE && (nir_storage & nir_var_mem_shared)) sync_scope exec_scope = translate_nir_scope(nir_intrinsic_execution_scope(instr));
storage |= storage_shared;
if (ctx->shader->info.stage == MESA_SHADER_TESS_CTRL && (nir_storage & nir_var_shader_out))
storage |= storage_shared;
unsigned nir_semantics = nir_intrinsic_memory_semantics(instr); unsigned nir_storage = nir_intrinsic_memory_modes(instr);
if (nir_semantics & NIR_MEMORY_ACQUIRE) if (nir_storage & (nir_var_mem_ssbo | nir_var_mem_global))
semantics |= semantic_acquire | semantic_release; storage |= storage_buffer | storage_image; //TODO: split this when NIR gets nir_var_mem_image
if (nir_semantics & NIR_MEMORY_RELEASE) if (ctx->shader->info.stage == MESA_SHADER_COMPUTE && (nir_storage & nir_var_mem_shared))
semantics |= semantic_acquire | semantic_release; storage |= storage_shared;
if (ctx->shader->info.stage == MESA_SHADER_TESS_CTRL && (nir_storage & nir_var_shader_out))
storage |= storage_shared;
assert(!(nir_semantics & (NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_MAKE_VISIBLE))); unsigned nir_semantics = nir_intrinsic_memory_semantics(instr);
if (nir_semantics & NIR_MEMORY_ACQUIRE)
semantics |= semantic_acquire | semantic_release;
if (nir_semantics & NIR_MEMORY_RELEASE)
semantics |= semantic_acquire | semantic_release;
bld.barrier(aco_opcode::p_barrier, assert(!(nir_semantics & (NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_MAKE_VISIBLE)));
memory_sync_info((storage_class)storage, (memory_semantics)semantics, mem_scope),
exec_scope); bld.barrier(aco_opcode::p_barrier,
break; memory_sync_info((storage_class)storage, (memory_semantics)semantics, mem_scope),
} exec_scope);
default:
unreachable("Unimplemented memory barrier intrinsic");
break;
}
} }
void visit_load_shared(isel_context *ctx, nir_intrinsic_instr *instr) void visit_load_shared(isel_context *ctx, nir_intrinsic_instr *instr)
@@ -7601,18 +7573,8 @@ void visit_intrinsic(isel_context *ctx, nir_intrinsic_instr *instr)
case nir_intrinsic_get_buffer_size: case nir_intrinsic_get_buffer_size:
visit_get_buffer_size(ctx, instr); visit_get_buffer_size(ctx, instr);
break; break;
case nir_intrinsic_control_barrier: {
bld.barrier(aco_opcode::p_barrier, memory_sync_info(0, 0, scope_invocation), scope_workgroup);
break;
}
case nir_intrinsic_memory_barrier_tcs_patch:
case nir_intrinsic_group_memory_barrier:
case nir_intrinsic_memory_barrier:
case nir_intrinsic_memory_barrier_buffer:
case nir_intrinsic_memory_barrier_image:
case nir_intrinsic_memory_barrier_shared:
case nir_intrinsic_scoped_barrier: case nir_intrinsic_scoped_barrier:
emit_memory_barrier(ctx, instr); emit_scoped_barrier(ctx, instr);
break; break;
case nir_intrinsic_load_num_work_groups: { case nir_intrinsic_load_num_work_groups: {
Temp dst = get_ssa_temp(ctx, &instr->dest.ssa); Temp dst = get_ssa_temp(ctx, &instr->dest.ssa);