nir: Handle fp16 rounding modes at nir_type_conversion_op

nir_type_conversion enables new operations to handle rounding modes to
convert to fp16 values. Two new opcodes are enabled nir_op_f2f16_rtne
and nir_op_f2f16_rtz.

The undefined behaviour doesn't has any effect and uses the original
nir_op_f2f16 operation.

v2: Indentation fixed (Jason Ekstrand)

v3: Use explicit case for undefined rounding and assert if
    rounding mode is used for non 16-bit float conversions
    (Jason Ekstrand)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jose Maria Casanova Crespo
2017-07-01 07:58:26 +02:00
parent 2af63683bc
commit 1f440d00d2
5 changed files with 28 additions and 6 deletions

View File

@@ -1575,7 +1575,8 @@ nir_visitor::visit(ir_expression *ir)
case ir_unop_u642i64: {
nir_alu_type src_type = nir_get_nir_type_for_glsl_base_type(types[0]);
nir_alu_type dst_type = nir_get_nir_type_for_glsl_base_type(out_type);
result = nir_build_alu(&b, nir_type_conversion_op(src_type, dst_type),
result = nir_build_alu(&b, nir_type_conversion_op(src_type, dst_type,
nir_rounding_mode_undef),
srcs[0], NULL, NULL, NULL);
/* b2i and b2f don't have fixed bit-size versions so the builder will
* just assume 32 and we have to fix it up here.

View File

@@ -761,7 +761,8 @@ nir_get_nir_type_for_glsl_type(const struct glsl_type *type)
return nir_get_nir_type_for_glsl_base_type(glsl_get_base_type(type));
}
nir_op nir_type_conversion_op(nir_alu_type src, nir_alu_type dst);
nir_op nir_type_conversion_op(nir_alu_type src, nir_alu_type dst,
nir_rounding_mode rnd);
typedef enum {
NIR_OP_IS_COMMUTATIVE = (1 << 0),

View File

@@ -179,6 +179,13 @@ for src_t in [tint, tuint, tfloat]:
else:
bit_sizes = [8, 16, 32, 64]
for bit_size in bit_sizes:
if bit_size == 16 and dst_t == tfloat and src_t == tfloat:
rnd_modes = ['rtne', 'rtz', 'undef']
for rnd_mode in rnd_modes:
unop_convert("{0}2{1}{2}_{3}".format(src_t[0], dst_t[0],
bit_size, rnd_mode),
dst_t + str(bit_size), src_t, "src0")
else:
unop_convert("{0}2{1}{2}".format(src_t[0], dst_t[0], bit_size),
dst_t + str(bit_size), src_t, "src0")

View File

@@ -30,7 +30,7 @@ template = Template("""
#include "nir.h"
nir_op
nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
nir_type_conversion_op(nir_alu_type src, nir_alu_type dst, nir_rounding_mode rnd)
{
nir_alu_type src_base = (nir_alu_type) nir_alu_type_get_base_type(src);
nir_alu_type dst_base = (nir_alu_type) nir_alu_type_get_base_type(dst);
@@ -64,7 +64,20 @@ nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
switch (dst_bit_size) {
% for dst_bits in [16, 32, 64]:
case ${dst_bits}:
% if src_t == 'float' and dst_t == 'float' and dst_bits == 16:
switch(rnd) {
% for rnd_t in ['rtne', 'rtz', 'undef']:
case nir_rounding_mode_${rnd_t}:
return ${'nir_op_{0}2{1}{2}_{3}'.format(src_t[0], dst_t[0],
dst_bits, rnd_t)};
% endfor
default:
unreachable("Invalid 16-bit nir rounding mode");
}
% else:
assert(rnd == nir_rounding_mode_undef);
return ${'nir_op_{0}2{1}{2}'.format(src_t[0], dst_t[0], dst_bits)};
% endif
% endfor
default:
unreachable("Invalid nir alu bit size");

View File

@@ -356,7 +356,7 @@ vtn_nir_alu_op_for_spirv_opcode(struct vtn_builder *b,
case SpvOpConvertUToF:
case SpvOpSConvert:
case SpvOpFConvert:
return nir_type_conversion_op(src, dst);
return nir_type_conversion_op(src, dst, nir_rounding_mode_undef);
/* Derivatives: */
case SpvOpDPdx: return nir_op_fddx;