mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-03-04 01:40:30 +01:00
ac/nir: add support for all intrinsics. (v2)
This is derived from tgsi/radeonsi code from the GLSL intrinsics. This should pre-fix radv for the upcoming spirv patches. v2: actually use wait_cnt, sleep deprived dad time! (Bas) Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
87f02ddfd1
commit
6bec8bcd79
1 changed files with 31 additions and 1 deletions
|
|
@ -3654,6 +3654,31 @@ static void emit_waitcnt(struct nir_to_llvm_context *ctx,
|
|||
ctx->ac.voidt, args, 1, 0);
|
||||
}
|
||||
|
||||
static void emit_membar(struct nir_to_llvm_context *ctx,
|
||||
const nir_intrinsic_instr *instr)
|
||||
{
|
||||
unsigned waitcnt = NOOP_WAITCNT;
|
||||
|
||||
switch (instr->intrinsic) {
|
||||
case nir_intrinsic_memory_barrier:
|
||||
case nir_intrinsic_group_memory_barrier:
|
||||
waitcnt &= VM_CNT & LGKM_CNT;
|
||||
break;
|
||||
case nir_intrinsic_memory_barrier_atomic_counter:
|
||||
case nir_intrinsic_memory_barrier_buffer:
|
||||
case nir_intrinsic_memory_barrier_image:
|
||||
waitcnt &= VM_CNT;
|
||||
break;
|
||||
case nir_intrinsic_memory_barrier_shared:
|
||||
waitcnt &= LGKM_CNT;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (waitcnt != NOOP_WAITCNT)
|
||||
emit_waitcnt(ctx, waitcnt);
|
||||
}
|
||||
|
||||
static void emit_barrier(struct nir_to_llvm_context *ctx)
|
||||
{
|
||||
/* SI only (thanks to a hw bug workaround):
|
||||
|
|
@ -4144,7 +4169,12 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
|
|||
emit_discard_if(ctx, instr);
|
||||
break;
|
||||
case nir_intrinsic_memory_barrier:
|
||||
emit_waitcnt(ctx->nctx, VM_CNT);
|
||||
case nir_intrinsic_group_memory_barrier:
|
||||
case nir_intrinsic_memory_barrier_atomic_counter:
|
||||
case nir_intrinsic_memory_barrier_buffer:
|
||||
case nir_intrinsic_memory_barrier_image:
|
||||
case nir_intrinsic_memory_barrier_shared:
|
||||
emit_membar(ctx->nctx, instr);
|
||||
break;
|
||||
case nir_intrinsic_barrier:
|
||||
emit_barrier(ctx->nctx);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue