fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 18:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/fs: Lower integer multiply correctly when destination stride equals 4.

Browse source 
Because the "low" temporary needs to be accessed with word type and
twice the original stride, attempting to preserve the alignment of the
original destination can potentially lead to instructions with illegal
destination stride greater than four.  Because the CHV/BXT alignment
restrictions are now being enforced by the regioning lowering pass run
after lower_integer_multiplication(), there is no real need to
preserve the original strides anymore.

Note that this bug can be reproduced on stable branches, but
back-porting would be non-trivial, because the fix relies on the
regioning lowering pass recently introduced.

Tested-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Francisco Jerez 2019-01-16 19:01:04 -08:00
parent c3c27762f7
commit e2f475ddff
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/intel/compiler/brw_fs.cpp
View file

@ -3996,18 +3996,22 @@ fs_visitor::lower_integer_multiplication()
bool needs_mov = false; bool needs_mov = false;
fs_reg orig_dst = inst->dst; fs_reg orig_dst = inst->dst;
/* Get a new VGRF for the "low" 32x16-bit multiplication result if
* reusing the original destination is impossible due to hardware
* restrictions, source/destination overlap, or it being the null
* register.
*/
fs_reg low = inst->dst; fs_reg low = inst->dst;
if (orig_dst.is_null() || orig_dst.file == MRF || if (orig_dst.is_null() || orig_dst.file == MRF ||
regions_overlap(inst->dst, inst->size_written, regions_overlap(inst->dst, inst->size_written,
inst->src[0], inst->size_read(0)) || inst->src[0], inst->size_read(0)) ||
regions_overlap(inst->dst, inst->size_written, regions_overlap(inst->dst, inst->size_written,
inst->src[1], inst->size_read(1))) { inst->src[1], inst->size_read(1)) ||
inst->dst.stride >= 4) {
needs_mov = true; needs_mov = true;
/* Get a new VGRF but keep the same stride as inst->dst */
low = fs_reg(VGRF, alloc.allocate(regs_written(inst)), low = fs_reg(VGRF, alloc.allocate(regs_written(inst)),
inst->dst.type); inst->dst.type);
low.stride = inst->dst.stride;
low.offset = inst->dst.offset % REG_SIZE;
} }
/* Get a new VGRF but keep the same stride as inst->dst */ /* Get a new VGRF but keep the same stride as inst->dst */