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 <jason@jlekstrand.net>
This commit is contained in:
Jose Maria Casanova Crespo 2017-07-01 08:05:55 +02:00
parent 549894a681
commit e0667a8bd8
1 changed files with 33 additions and 0 deletions

View File

@ -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);