From 63181df09bc6fd833d2e22ce8ce80e17a5fa57d4 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 15 Jul 2020 22:33:25 -0700 Subject: [PATCH] intel/tools: Don't hardcode notification register 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 Part-of: --- src/intel/tools/i965_gram.y | 12 ++++++++---- src/intel/tools/tests/gen8/wait.asm | 2 +- src/intel/tools/tests/gen9/wait.asm | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/intel/tools/i965_gram.y b/src/intel/tools/i965_gram.y index d2cb05cfb9b..0db574ca173 100644 --- a/src/intel/tools/i965_gram.y +++ b/src/intel/tools/i965_gram.y @@ -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 ; diff --git a/src/intel/tools/tests/gen8/wait.asm b/src/intel/tools/tests/gen8/wait.asm index 8cb494e8f90..0c8fbc3bef4 100644 --- a/src/intel/tools/tests/gen8/wait.asm +++ b/src/intel/tools/tests/gen8/wait.asm @@ -1 +1 @@ -wait(1) n0<0,1,0>UD { align1 WE_all 1N }; +wait(1) n0<0>UD { align1 WE_all 1N }; diff --git a/src/intel/tools/tests/gen9/wait.asm b/src/intel/tools/tests/gen9/wait.asm index 8cb494e8f90..0c8fbc3bef4 100644 --- a/src/intel/tools/tests/gen9/wait.asm +++ b/src/intel/tools/tests/gen9/wait.asm @@ -1 +1 @@ -wait(1) n0<0,1,0>UD { align1 WE_all 1N }; +wait(1) n0<0>UD { align1 WE_all 1N }; -- 2.30.2