assembler: Factor out the destination register validation
The goal is to use brw_set_dest(), so let's start by validating the
register we have before generating the opcode.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
diff --git a/assembler/gram.y b/assembler/gram.y
index 28b722e..9c5f864 100644
--- a/assembler/gram.y
+++ b/assembler/gram.y
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <assert.h>
#include "gen4asm.h"
#include "brw_defines.h"
@@ -159,6 +160,21 @@
return resolved;
}
+static bool validate_dst_reg(struct brw_instruction *insn, struct brw_reg *reg)
+{
+
+ if (reg->address_mode == BRW_ADDRESS_DIRECT &&
+ insn->header.access_mode == BRW_ALIGN_1 &&
+ reg->dw1.bits.writemask != 0 &&
+ reg->dw1.bits.writemask != BRW_WRITEMASK_XYZW)
+ {
+ fprintf(stderr, "error: write mask set in align1 instruction\n");
+ return false;
+ }
+
+ return true;
+}
+
%}
%start ROOT
@@ -2803,6 +2819,9 @@
int set_instruction_dest(struct brw_instruction *instr,
struct brw_reg *dest)
{
+ if (!validate_dst_reg(instr, dest))
+ return 1;
+
if (dest->address_mode == BRW_ADDRESS_DIRECT &&
instr->header.access_mode == BRW_ALIGN_1) {
instr->bits1.da1.dest_reg_file = dest->file;
@@ -2811,12 +2830,6 @@
instr->bits1.da1.dest_reg_nr = dest->nr;
instr->bits1.da1.dest_horiz_stride = dest->hstride;
instr->bits1.da1.dest_address_mode = dest->address_mode;
- if (dest->dw1.bits.writemask != 0 &&
- dest->dw1.bits.writemask != BRW_WRITEMASK_XYZW) {
- fprintf(stderr, "error: write mask set in align1 "
- "instruction\n");
- return 1;
- }
} else if (dest->address_mode == BRW_ADDRESS_DIRECT) {
instr->bits1.da16.dest_reg_file = dest->file;
instr->bits1.da16.dest_reg_type = dest->type;
@@ -2832,12 +2845,6 @@
instr->bits1.ia1.dest_horiz_stride = dest->hstride;
instr->bits1.ia1.dest_indirect_offset = dest->dw1.bits.indirect_offset;
instr->bits1.ia1.dest_address_mode = dest->address_mode;
- if (dest->dw1.bits.writemask != 0 &&
- dest->dw1.bits.writemask != BRW_WRITEMASK_XYZW) {
- fprintf(stderr, "error: write mask set in align1 "
- "instruction\n");
- return 1;
- }
} else {
instr->bits1.ia16.dest_reg_file = dest->file;
instr->bits1.ia16.dest_reg_type = dest->type;