From e0667a8bd8029936aed5b97b5ceef7c58526e53c Mon Sep 17 00:00:00 2001 From: Jose Maria Casanova Crespo Date: Sat, 1 Jul 2017 08:05:55 +0200 Subject: [PATCH] spirv: Enable FPRoundingMode decorator to nir operations SpvOpFConvert now manages the FPRoundingMode decorator for the returning values enabling the nir_rounding_mode in the conversion operation to fp16 values. v2: Fixed breaking of specialization constants. (Jason Ekstrand) v3: Avoid nir_rounding_mode * casting. (Jason Ekstrand) Reviewed-by: Jason Ekstrand --- src/compiler/spirv/vtn_alu.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/compiler/spirv/vtn_alu.c b/src/compiler/spirv/vtn_alu.c index fa4dbfecddd..d0c9e316935 100644 --- a/src/compiler/spirv/vtn_alu.c +++ b/src/compiler/spirv/vtn_alu.c @@ -382,6 +382,27 @@ handle_no_contraction(struct vtn_builder *b, struct vtn_value *val, int member, b->nb.exact = true; } +static void +handle_rounding_mode(struct vtn_builder *b, struct vtn_value *val, int member, + const struct vtn_decoration *dec, void *_out_rounding_mode) +{ + nir_rounding_mode *out_rounding_mode = _out_rounding_mode; + assert(dec->scope == VTN_DEC_DECORATION); + if (dec->decoration != SpvDecorationFPRoundingMode) + return; + switch (dec->literals[0]) { + case SpvFPRoundingModeRTE: + *out_rounding_mode = nir_rounding_mode_rtne; + break; + case SpvFPRoundingModeRTZ: + *out_rounding_mode = nir_rounding_mode_rtz; + break; + default: + unreachable("Not supported rounding mode"); + break; + } +} + void vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, const uint32_t *w, unsigned count) @@ -571,6 +592,18 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode, vtn_handle_bitcast(b, val->ssa, src[0]); break; + case SpvOpFConvert: { + nir_alu_type src_alu_type = nir_get_nir_type_for_glsl_type(vtn_src[0]->type); + nir_alu_type dst_alu_type = nir_get_nir_type_for_glsl_type(type); + nir_rounding_mode rounding_mode = nir_rounding_mode_undef; + + vtn_foreach_decoration(b, val, handle_rounding_mode, &rounding_mode); + nir_op op = nir_type_conversion_op(src_alu_type, dst_alu_type, rounding_mode); + + val->ssa->def = nir_build_alu(&b->nb, op, src[0], src[1], NULL, NULL); + break; + } + default: { bool swap; nir_alu_type src_alu_type = nir_get_nir_type_for_glsl_type(vtn_src[0]->type);