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

intel/vec4: Handle scoped barriers with execution scope

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21634>
This commit is contained in:
Caio Oliveira 2023-03-02 14:12:58 -08:00 • committed by Marge Bot
parent db0a09c9e2
commit dfc34b1a65
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/compiler/brw_vec4_nir.cpp
View file

@ -718,7 +718,8 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
unreachable("expecting only nir_intrinsic_scoped_barrier");
case nir_intrinsic_scoped_barrier: {
assert(nir_intrinsic_execution_scope(instr) == NIR_SCOPE_NONE);
if (nir_intrinsic_memory_scope(instr) == NIR_SCOPE_NONE)
break;
const vec4_builder bld =
vec4_builder(this).at_end().annotate(current_annotation, base_ir);
const dst_reg tmp = bld.vgrf(BRW_REGISTER_TYPE_UD);

12
src/intel/compiler/brw_vec4_tcs.cpp
View file

@ -304,10 +304,16 @@ vec4_tcs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
break;
}
case nir_intrinsic_scoped_barrier:
case nir_intrinsic_control_barrier: {
dst_reg header = dst_reg(this, glsl_type::uvec4_type);
emit(TCS_OPCODE_CREATE_BARRIER_HEADER, header);
emit(SHADER_OPCODE_BARRIER, dst_null_ud(), src_reg(header));
const bool scoped = instr->intrinsic == nir_intrinsic_scoped_barrier;
if (scoped && nir_intrinsic_memory_scope(instr) != NIR_SCOPE_NONE)
vec4_visitor::nir_emit_intrinsic(instr);
if (!scoped || nir_intrinsic_execution_scope(instr) == NIR_SCOPE_WORKGROUP) {
dst_reg header = dst_reg(this, glsl_type::uvec4_type);
emit(TCS_OPCODE_CREATE_BARRIER_HEADER, header);
emit(SHADER_OPCODE_BARRIER, dst_null_ud(), src_reg(header));
}
break;
}