From ba2fbbf1c0dacfad45ad59b32de6297239c0f88d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 20 Jun 2017 22:37:43 -0700 Subject: [PATCH] nir: Add intrinsics from ARB_shader_group_vote These are intrinsics rather than opcodes, because they operate across channels. Reviewed-by: Connor Abbott Reviewed-by: Kenneth Graunke --- src/compiler/glsl/glsl_to_nir.cpp | 22 ++++++++++++++++++++++ src/compiler/nir/nir_intrinsics.h | 5 +++++ 2 files changed, 27 insertions(+) diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 21530040a96..01166f68655 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -799,6 +799,15 @@ nir_visitor::visit(ir_call *ir) case ir_intrinsic_shared_atomic_comp_swap: op = nir_intrinsic_shared_atomic_comp_swap; break; + case ir_intrinsic_vote_any: + op = nir_intrinsic_vote_any; + break; + case ir_intrinsic_vote_all: + op = nir_intrinsic_vote_all; + break; + case ir_intrinsic_vote_eq: + op = nir_intrinsic_vote_eq; + break; default: unreachable("not reached"); } @@ -1135,6 +1144,19 @@ nir_visitor::visit(ir_call *ir) nir_builder_instr_insert(&b, &instr->instr); break; } + case nir_intrinsic_vote_any: + case nir_intrinsic_vote_all: + case nir_intrinsic_vote_eq: { + nir_ssa_dest_init(&instr->instr, &instr->dest, 1, 32, NULL); + + instr->variables[0] = evaluate_deref(&instr->instr, ir->return_deref); + + ir_rvalue *value = (ir_rvalue *) ir->actual_parameters.get_head(); + instr->src[0] = nir_src_for_ssa(evaluate_rvalue(value)); + + nir_builder_instr_insert(&b, &instr->instr); + break; + } default: unreachable("not reached"); } diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h index 21e7d904b78..8a838df0279 100644 --- a/src/compiler/nir/nir_intrinsics.h +++ b/src/compiler/nir/nir_intrinsics.h @@ -107,6 +107,11 @@ BARRIER(memory_barrier_shared) /** A conditional discard, with a single boolean source. */ INTRINSIC(discard_if, 1, ARR(1), false, 0, 0, 0, xx, xx, xx, 0) +/** ARB_shader_group_vote intrinsics */ +INTRINSIC(vote_any, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(vote_all, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) +INTRINSIC(vote_eq, 1, ARR(1), true, 1, 1, 0, xx, xx, xx, NIR_INTRINSIC_CAN_ELIMINATE) + /** * Basic Geometry Shader intrinsics. * -- 2.30.2