Patches 2 & 3: Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
Patch 4: Acked-by: Nicolai Hähnle <nicolai.haeh...@amd.com> On 01.08.2017 04:24, Connor Abbott wrote:
From: Connor Abbott <cwabbo...@gmail.com> --- src/compiler/spirv/nir_spirv.h | 2 + src/compiler/spirv/spirv_to_nir.c | 79 ++++++++++++++++++++++++++++++++++++++ src/compiler/spirv/vtn_variables.c | 28 ++++++++++++++ 3 files changed, 109 insertions(+) diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index 83577fb..9d90a4d 100644 --- a/src/compiler/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h @@ -52,6 +52,8 @@ struct nir_spirv_supported_extensions { bool int64; bool multiview; bool variable_pointers; + bool shader_ballot; + bool shader_group_vote; };nir_function *spirv_to_nir(const uint32_t *words, size_t word_count,diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 4b9c121..84f2db6 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -2602,6 +2602,69 @@ vtn_handle_barrier(struct vtn_builder *b, SpvOp opcode, nir_builder_instr_insert(&b->nb, &intrin->instr); }+static void+vtn_handle_subgroup(struct vtn_builder *b, SpvOp opcode, + const uint32_t *w, unsigned count) +{ + nir_intrinsic_op intrinsic_op; + switch (opcode) { + case SpvOpSubgroupBallotKHR: + intrinsic_op = nir_intrinsic_ballot; + break; + case SpvOpSubgroupFirstInvocationKHR: + intrinsic_op = nir_intrinsic_read_first_invocation; + break; + case SpvOpSubgroupReadInvocationKHR: + intrinsic_op = nir_intrinsic_read_invocation; + break; + case SpvOpSubgroupAllKHR: + intrinsic_op = nir_intrinsic_vote_all; + break; + case SpvOpSubgroupAnyKHR: + intrinsic_op = nir_intrinsic_vote_any; + break; + case SpvOpSubgroupAllEqualKHR: + intrinsic_op = nir_intrinsic_vote_eq; + break; + default: + unreachable("unknown subgroup instruction"); + break; + } + + nir_intrinsic_instr *intrin = + nir_intrinsic_instr_create(b->shader, intrinsic_op); + + intrin->src[0] = nir_src_for_ssa(vtn_ssa_value(b, w[3])->def); + + if (opcode == SpvOpSubgroupReadInvocationKHR) { + intrin->src[1] = nir_src_for_ssa(vtn_ssa_value(b, w[4])->def); + } + + intrin->num_components = intrin->src[0].ssa->num_components; + nir_ssa_dest_init(&intrin->instr, &intrin->dest, + intrin->num_components, + (opcode == SpvOpSubgroupBallotKHR) ? 64 : 32, + NULL); + nir_builder_instr_insert(&b->nb, &intrin->instr); + + nir_ssa_def *result = &intrin->dest.ssa; + + if (opcode == SpvOpSubgroupBallotKHR) { + /* convert from 64-bit to 4 32-bit components */ + nir_ssa_def *tmp = nir_unpack_64_2x32(&b->nb, result); + nir_ssa_def *zero = nir_imm_int(&b->nb, 0); + result = nir_vec4(&b->nb, nir_channel(&b->nb, tmp, 0), + nir_channel(&b->nb, tmp, 1), + zero, zero); + } + + struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa); + const struct glsl_type *result_type = + vtn_value(b, w[1], vtn_value_type_type)->type->type; + val->ssa = vtn_create_ssa_value(b, result_type); + val->ssa->def = result; +} + static unsigned gl_primitive_from_spv_execution_mode(SpvExecutionMode mode) { @@ -2787,6 +2850,13 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, case SpvCapabilityVariablePointersStorageBuffer: case SpvCapabilityVariablePointers: spv_check_supported(variable_pointers, cap); + + case SpvCapabilitySubgroupBallotKHR: + spv_check_supported(shader_ballot, cap); + break; + + case SpvCapabilitySubgroupVoteKHR: + spv_check_supported(shader_ballot, cap); break;default:@@ -3307,6 +3377,15 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, vtn_handle_barrier(b, opcode, w, count); break;+ case SpvOpSubgroupBallotKHR:+ case SpvOpSubgroupFirstInvocationKHR: + case SpvOpSubgroupReadInvocationKHR: + case SpvOpSubgroupAllKHR: + case SpvOpSubgroupAnyKHR: + case SpvOpSubgroupAllEqualKHR: + vtn_handle_subgroup(b, opcode, w, count); + break; + default: unreachable("Unhandled opcode"); } diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 4432e72..abb5515 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1161,6 +1161,34 @@ vtn_get_builtin_location(struct vtn_builder *b, *location = SYSTEM_VALUE_VIEW_INDEX; set_mode_system_value(mode); break; + case SpvBuiltInSubgroupSize: + *location = SYSTEM_VALUE_SUBGROUP_SIZE; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupLocalInvocationId: + *location = SYSTEM_VALUE_SUBGROUP_INVOCATION; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupEqMaskKHR: + *location = SYSTEM_VALUE_SUBGROUP_EQ_MASK_32BIT; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupGeMaskKHR: + *location = SYSTEM_VALUE_SUBGROUP_GE_MASK_32BIT; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupGtMaskKHR: + *location = SYSTEM_VALUE_SUBGROUP_GT_MASK_32BIT; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupLeMaskKHR: + *location = SYSTEM_VALUE_SUBGROUP_LE_MASK_32BIT; + set_mode_system_value(mode); + break; + case SpvBuiltInSubgroupLtMaskKHR: + *location = SYSTEM_VALUE_SUBGROUP_LT_MASK_32BIT; + set_mode_system_value(mode); + break; case SpvBuiltInHelperInvocation: default: unreachable("unsupported builtin");
-- Lerne, wie die Welt wirklich ist, Aber vergiss niemals, wie sie sein sollte. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
