KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spirv: convert some operands for bitwise shift and bitwise ops to uint32 

SPIR-V allows to define the shift, offset and count operands for
shift and bitfield opcodes with a bit-size different than 32 bits,
but in NIR the opcodes have that limitation. As agreed in the
mailing list, this patch adds a conversion to 32 bits to fix this.

For more info, see:

https://lists.freedesktop.org/archives/mesa-dev/2018-April/193026.html

v2:
- src_bit_size will have zero value for variable bit-size operands (Jason).

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Samuel Iglesias Gonsálvez 2018-04-25 11:55:49 +02:00
parent 58c05ede96
commit b291a3a4a3
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/compiler/spirv/vtn_alu.c
View File

@ -635,6 +635,41 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode,
break;
}
case SpvOpBitFieldInsert:
case SpvOpBitFieldSExtract:
case SpvOpBitFieldUExtract:
case SpvOpShiftLeftLogical:
case SpvOpShiftRightArithmetic:
case SpvOpShiftRightLogical: {
bool swap;
unsigned src0_bit_size = glsl_get_bit_size(vtn_src[0]->type);
unsigned dst_bit_size = glsl_get_bit_size(type);
nir_op op = vtn_nir_alu_op_for_spirv_opcode(b, opcode, &swap,
src0_bit_size, dst_bit_size);
assert (op == nir_op_ushr || op == nir_op_ishr || op == nir_op_ishl ||
op == nir_op_bitfield_insert || op == nir_op_ubitfield_extract ||
op == nir_op_ibitfield_extract);
for (unsigned i = 0; i < nir_op_infos[op].num_inputs; i++) {
unsigned src_bit_size =
nir_alu_type_get_type_size(nir_op_infos[op].input_types[i]);
if (src_bit_size == 0)
continue;
if (src_bit_size != src[i]->bit_size) {
assert(src_bit_size == 32);
/* Convert the Shift, Offset and Count operands to 32 bits, which is the bitsize
* supported by the NIR instructions. See discussion here:
*
* https://lists.freedesktop.org/archives/mesa-dev/2018-April/193026.html
*/
src[i] = nir_u2u32(&b->nb, src[i]);
}
}
val->ssa->def = nir_build_alu(&b->nb, op, src[0], src[1], src[2], src[3]);
break;
}
default: {
bool swap;
unsigned src_bit_size = glsl_get_bit_size(vtn_src[0]->type);