OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/compiler: use correct swizzle for replacement

Browse Source 
The optimization in 4cd1a0be76 introduced a replacement of :

cmp(8).z.f0.0 vgrf11.y:D, vgrf10.xxxx:D, vgrf2.xyyy:D
...
cmp(8).nz.f0.0 null.x:D, vgrf11.yyyy:D, 0D

By :

cmp(8).z.f0.0 vgrf15.x:D, vgrf10.xxxx:D, vgrf2.yyyy:D
...
mov(8) vgrf11.y:D, vgrf15.yyyy:D

The first cmp instruction is storing in x while the second mov is
sourcing from y. We need to take into account where the replacement on
the scan_inst destination is going to store thing so that the
replacement mov can source things from the correct location.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 4cd1a0be76 ("i965/vec4: Propagate conditional modifiers from more compares to other compares")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109759
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Lionel Landwerlin
2019-02-27 15:53:21 +00:00
parent 61e3188633
commit 6e184147dd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/intel/compiler/brw_vec4_cmod_propagation.cpp
View File

@@ -173,19 +173,19 @@ opt_cmod_propagation_local(bblock_t *block, vec4_visitor *v)
/* Given a sequence like:
*
* cmp.ge.f0(8) g21<1>.xF g20<4>.xF g18<4>.xF
* cmp.ge.f0(8) g21<1>.zF g20<4>.xF g18<4>.xF
* ...
* cmp.nz.f0(8) null<1>D g21<4>.xD 0D
* cmp.nz.f0(8) null<1>D g21<4>.zD 0D
*
* Replace it with something like:
*
* cmp.ge.f0(8) g22<1>F g20<4>.xF g18<4>.xF
* mov(8) g21<1>.xF g22<1>.xxxxF
* cmp.ge.f0(8) g22<1>.zF g20<4>.xF g18<4>.xF
* mov(8) g21<1>.xF g22<1>.zzzzF
*
* The added MOV will most likely be removed later. In the
* worst case, it should be cheaper to schedule.
*/
temp.swizzle = inst->src[0].swizzle;
temp.swizzle = brw_swizzle_for_mask(inst->dst.writemask);
temp.type = scan_inst->src[0].type;
vec4_instruction *mov = v->MOV(scan_inst->dst, temp);