fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/fs: Correctly handle multiply of fsign with a source modifier

Browse source 
The other source of the multiply will be interpreted as a uint32_t in an
XOR instruction.  Any source modifiers with either not be interpreted at
all or will be misinterpreted due to the differing types.

If the other operand of the multiplication has a source modifier, just
emit an extra move to resolve the source modifiers.

The negation source modifier problem is difficult to reproduce due to an
algebraic optimization that changes (-a*b) to -(a*b).  However, changes
in MR !1359 push the negations back down.

On Gen7+ it might be possible to do slightly better for an abs() source
modifier by using BFI2 as a glorified copysign().

On Gen8+ it might be possible to do slightly better for a neg() source
modifier by emitting (~a ^ b).

There were no shader-db changes on any Intel platform, so I think we can
deal with that problem when it arises.

See also piglit!224.

Fixes: 06d2c11641 ("intel/fs: Add a scale factor to emit_fsign")
Reviewed-by: Matt Turner <mattst88@gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3780>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3780>
(cherry picked from commit 273b8cd1ca)
This commit is contained in:
Ian Romanick 2020-02-11 12:00:00 -08:00 • committed by Dylan Baker
parent d43407e622
commit 01020aef25
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -76,7 +76,7 @@
"description": "intel/fs: Correctly handle multiply of fsign with a source modifier",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "06d2c116415c0ab163a57ed7f2522342ed43e4d4"
},

10
src/intel/compiler/brw_fs_nir.cpp
View file

@ -881,6 +881,16 @@ fs_visitor::emit_fsign(const fs_builder &bld, const nir_alu_instr *instr,
}
op[0] = offset(op[0], bld, fsign_instr->src[0].swizzle[channel]);
/* Resolve any source modifiers. We could do slightly better on Gen8+
* if the only source modifier is negation, but *shrug*.
*/
if (op[1].negate || op[1].abs) {
fs_reg tmp = bld.vgrf(op[1].type);
bld.MOV(tmp, op[1]);
op[1] = tmp;
}
} else {
assert(!instr->dest.saturate);
}