KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/compiler: Handle invalid compacted immediates 

16-bit immediates need to be replicated through the 32-bit immediate
field, so we should never see one that isn't.

This does happen however in the fuzzer unit test, so returning false
allows the fuzzer to reject this case.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2635>
This commit is contained in:
Matt Turner 2019-11-06 10:05:48 -08:00 committed by Marge Bot
parent 205cb8a139
commit 40f0ade68e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/intel/compiler/brw_eu_compact.c
View File

@ -1413,6 +1413,20 @@ compact_immediate(const struct gen_device_info *devinfo,
enum brw_reg_type type, unsigned imm)
{
if (devinfo->gen >= 12) {
/* 16-bit immediates need to be replicated through the 32-bit immediate
* field
*/
switch (type) {
case BRW_REGISTER_TYPE_W:
case BRW_REGISTER_TYPE_UW:
case BRW_REGISTER_TYPE_HF:
if ((imm >> 16) != (imm & 0xffff))
return -1;
break;
default:
break;
}
switch (type) {
case BRW_REGISTER_TYPE_F:
/* We get the high 12-bits as-is; rest must be zero */
@ -1453,7 +1467,7 @@ compact_immediate(const struct gen_device_info *devinfo,
case BRW_REGISTER_TYPE_UQ:
case BRW_REGISTER_TYPE_B:
case BRW_REGISTER_TYPE_UB:
unreachable("not reached");
return -1;
}
} else {
/* We get the low 12 bits as-is; 13th is replicated */