From: Jose Maria Casanova Crespo Date: Mon, 24 Jul 2017 20:42:59 +0000 (+0200) Subject: i965/fs: Use untyped_surface_read for 16-bit load_ssbo X-Git-Tag: upstream/18.1.0~3405 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1e257a5bfaa0e1b3bbfd9846311b8f419d4c626;p=platform%2Fupstream%2Fmesa.git i965/fs: Use untyped_surface_read for 16-bit load_ssbo SSBO loads were using byte_scattered read messages as they allow reading 16-bit size components. byte_scattered messages can only operate one component at a time so we needed to emit as many messages as components. But for vec2 and vec4 of 16-bit, being multiple of 32-bit we can use the untyped_surface_read message to read pairs of 16-bit components using only one message. Once each pair is read it is unshuffled to return the proper 16-bit components. vec3 case is assimilated to vec4 but the 4th component is ignored. 16-bit scalars are read using one byte_scattered_read message. v2: Removed use of stride = 2 on sources (Jason Ekstrand) Rework optimization using unshuffle 16 reads (Chema Casanova) v3: Use W and D types insead of HF and F in shuffle to avoid rounding erros (Jason Ekstrand) Use untyped_surface_read for 16-bit vec3. (Jason Ekstrand) v4: Use subscript insead of chaging type and stride (Jason Ekstrand) Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index e11e75e..01651dd 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -2303,16 +2303,29 @@ do_untyped_vector_read(const fs_builder &bld, unsigned num_components) { if (type_sz(dest.type) <= 2) { - fs_reg read_offset = bld.vgrf(BRW_REGISTER_TYPE_UD); - bld.MOV(read_offset, offset_reg); - for (unsigned i = 0; i < num_components; i++) { - fs_reg read_reg = - emit_byte_scattered_read(bld, surf_index, read_offset, + assert(dest.stride == 1); + + if (num_components > 1) { + /* Pairs of 16-bit components can be read with untyped read, for 16-bit + * vec3 4th component is ignored. + */ + fs_reg read_result = + emit_untyped_read(bld, surf_index, offset_reg, + 1 /* dims */, DIV_ROUND_UP(num_components, 2), + BRW_PREDICATE_NONE); + shuffle_32bit_load_result_to_16bit_data(bld, + retype(dest, BRW_REGISTER_TYPE_W), + retype(read_result, BRW_REGISTER_TYPE_D), + num_components); + } else { + assert(num_components == 1); + /* scalar 16-bit are read using one byte_scattered_read message */ + fs_reg read_result = + emit_byte_scattered_read(bld, surf_index, offset_reg, 1 /* dims */, 1, type_sz(dest.type) * 8 /* bit_size */, BRW_PREDICATE_NONE); - bld.MOV(offset(dest, bld, i), subscript(read_reg, dest.type, 0)); - bld.ADD(read_offset, read_offset, brw_imm_ud(type_sz(dest.type))); + bld.MOV(dest, subscript(read_result, dest.type, 0)); } } else if (type_sz(dest.type) == 4) { fs_reg read_result = emit_untyped_read(bld, surf_index, offset_reg,