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

intel/tools: Don't hardcode notification register

Browse Source 
Previously we parsed a src non-terminal but did nothing with it. Since
the WAIT instruction is kind of weird, in that you have to give it the
same notification subregister for both destination and source, and it
always has an exec size of 1, let's parse a destination instead of a
source. This way, we can parse a writemask rather than a swizzle in
align16 mode, and easily convert the writemask to a swizzle to create
the source register.

Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5956>
This commit is contained in:
Matt Turner
2020-07-15 22:33:25 -07:00
parent 90c18ec8db
commit 63181df09b
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/tools/i965_gram.y
View File

@@ -883,15 +883,18 @@ ternaryopcodes:
/* Sync instruction */
syncinstruction:
WAIT execsize src instoptions
WAIT execsize dst instoptions
{
brw_next_insn(p, $1);
i965_asm_set_instruction_options(p, $4);
brw_inst_set_exec_size(p->devinfo, brw_last_inst, $2);
brw_set_default_access_mode(p, $4.access_mode);
struct brw_reg src = brw_notification_reg();
brw_set_dest(p, brw_last_inst, src);
brw_set_src0(p, brw_last_inst, src);
struct brw_reg dest = $3;
dest.swizzle = brw_swizzle_for_mask(dest.writemask);
if (dest.file != ARF || dest.nr != BRW_ARF_NOTIFICATION_COUNT)
error(&@1, "WAIT must use the notification register\n");
brw_set_dest(p, brw_last_inst, dest);
brw_set_src0(p, brw_last_inst, dest);
brw_set_src1(p, brw_last_inst, brw_null_reg());
brw_inst_set_mask_control(p->devinfo, brw_last_inst, BRW_MASK_DISABLE);
}
@@ -1474,6 +1477,7 @@ dstoperandex_typed:
| flagreg
| ipreg
| maskreg
| notifyreg
| performancereg
| statereg
;

2
src/intel/tools/tests/gen8/wait.asm
View File

@@ -1 +1 @@
wait(1) n0<0,1,0>UD { align1 WE_all 1N };
wait(1) n0<0>UD { align1 WE_all 1N };

2
src/intel/tools/tests/gen9/wait.asm
View File

@@ -1 +1 @@
wait(1) n0<0,1,0>UD { align1 WE_all 1N };
wait(1) n0<0>UD { align1 WE_all 1N };