From 68a6a3b51acc0f8ad54f47ff10e30141697d404c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 23 Feb 2018 13:54:59 +0100 Subject: [PATCH] spirv: handle AMD_gcn_shader extended instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Dave Airlie Signed-off-by: Daniel Schürmann Reviewed-by: Bas Nieuwenhuizen --- src/compiler/nir/meson.build | 1 + src/compiler/shader_info.h | 5 +++ src/compiler/spirv/nir_spirv.h | 1 + src/compiler/spirv/spirv_to_nir.c | 3 ++ src/compiler/spirv/vtn_amd.c | 57 +++++++++++++++++++++++++++++++ src/compiler/spirv/vtn_private.h | 3 ++ 6 files changed, 70 insertions(+) create mode 100644 src/compiler/spirv/vtn_amd.c diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 7a7d6fd07aa..a70c236b958 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -189,6 +189,7 @@ files_libnir = files( '../spirv/spirv_info.h', '../spirv/spirv_to_nir.c', '../spirv/vtn_alu.c', + '../spirv/vtn_amd.c', '../spirv/vtn_cfg.c', '../spirv/vtn_glsl450.c', '../spirv/vtn_private.h', diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index 4cbe461d381..b1e200070f7 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -53,6 +53,11 @@ struct spirv_supported_capabilities { bool subgroup_vote; }; +/* The supported extensions which add extended instructions */ +struct spirv_supported_extensions { + bool AMD_gcn_shader; +}; + typedef struct shader_info { const char *name; diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index a2c40e57d18..2b0bdaec013 100644 --- a/src/compiler/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h @@ -59,6 +59,7 @@ struct spirv_to_nir_options { bool lower_workgroup_access_to_offsets; struct spirv_supported_capabilities caps; + struct spirv_supported_extensions exts; struct { void (*func)(void *private_data, diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 19862ab612f..6a358c59731 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -373,6 +373,9 @@ vtn_handle_extension(struct vtn_builder *b, SpvOp opcode, struct vtn_value *val = vtn_push_value(b, w[1], vtn_value_type_extension); if (strcmp((const char *)&w[2], "GLSL.std.450") == 0) { val->ext_handler = vtn_handle_glsl450_instruction; + } else if ((strcmp((const char *)&w[2], "SPV_AMD_gcn_shader") == 0) + && (b->options && b->options->exts.AMD_gcn_shader)) { + val->ext_handler = vtn_handle_amd_gcn_shader_instruction; } else { vtn_fail("Unsupported extension"); } diff --git a/src/compiler/spirv/vtn_amd.c b/src/compiler/spirv/vtn_amd.c new file mode 100644 index 00000000000..b2b3e055f0a --- /dev/null +++ b/src/compiler/spirv/vtn_amd.c @@ -0,0 +1,57 @@ +/* + * Copyright © 2018 Valve Corporation + * Copyright © 2017 Red Hat + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include "vtn_private.h" +#include "GLSL.ext.AMD.h" + +bool +vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, uint32_t ext_opcode, + const uint32_t *w, unsigned count) +{ + const struct glsl_type *dest_type = + vtn_value(b, w[1], vtn_value_type_type)->type->type; + struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa); + val->ssa = vtn_create_ssa_value(b, dest_type); + + switch ((enum GcnShaderAMD)ext_opcode) { + case CubeFaceIndexAMD: + val->ssa->def = nir_cube_face_index(&b->nb, vtn_ssa_value(b, w[5])->def); + break; + case CubeFaceCoordAMD: + val->ssa->def = nir_cube_face_coord(&b->nb, vtn_ssa_value(b, w[5])->def); + break; + case TimeAMD: { + nir_intrinsic_instr *intrin = nir_intrinsic_instr_create(b->nb.shader, + nir_intrinsic_shader_clock); + nir_ssa_dest_init(&intrin->instr, &intrin->dest, 2, 32, NULL); + nir_builder_instr_insert(&b->nb, &intrin->instr); + val->ssa->def = nir_pack_64_2x32(&b->nb, &intrin->dest.ssa); + break; + } + default: + unreachable("Invalid opcode"); + } + return true; +} diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 316def08027..a8fa612384f 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -732,4 +732,7 @@ vtn_u64_literal(const uint32_t *w) return (uint64_t)w[1] << 32 | w[0]; } +bool vtn_handle_amd_gcn_shader_instruction(struct vtn_builder *b, uint32_t ext_opcode, + const uint32_t *words, unsigned count); + #endif /* _VTN_PRIVATE_H_ */