From a75f967388b3224fb4da02f5bd01916018b639d4 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Fri, 4 May 2018 09:55:55 +0200 Subject: [PATCH] intel/compiler: handle 16-bit to 64-bit conversions in BSW platforms These are subject to the general restriction that anything that is converted to 64-bit needs to be aligned to 64-bit. We had this already in place for 32-bit to 64-bit conversions, so this patch generalizes the implementation to take effect on any conversion to 64-bit from a source smaller than 64-bit. Fixes assembly validation errors in the following CTS tests in BSW: dEQP-VK.spirv_assembly.instruction.compute.sconvert.int16_to_int64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.sconvert.int16_to_uint64 Tested-by: Mark Janes Reviewed-by: Matt Turner Reviewed-by: Jason Ekstrand --- src/intel/compiler/brw_fs_nir.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index f9fde145a16..c7f7bc21b8a 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -785,12 +785,12 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr) * the same qword. * (...)" * - * This means that 32-bit to 64-bit conversions need to have the 32-bit - * data elements aligned to 64-bit. This restriction does not apply to - * BDW and later. + * This means that conversions from bit-sizes smaller than 64-bit to + * 64-bit need to have the source data elements aligned to 64-bit. + * This restriction does not apply to BDW and later. */ if (nir_dest_bit_size(instr->dest.dest) == 64 && - nir_src_bit_size(instr->src[0].src) == 32 && + nir_src_bit_size(instr->src[0].src) < 64 && (devinfo->is_cherryview || gen_device_info_is_9lp(devinfo))) { fs_reg tmp = bld.vgrf(result.type, 1); tmp = subscript(tmp, op[0].type, 0); -- 2.30.2