From 6643143f6e763b2915e793d6b8b7750849cc5ed7 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sun, 3 Jun 2018 13:20:45 -0700 Subject: [PATCH] intel/eu: Assert that the instruction is send-like in brw_set_desc_ex(). Constructing a descriptor in-place as part of the immediate of an ALU instruction is no longer supported. Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_eu_emit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index 2346d1a966c..0847d9b404c 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -368,11 +368,12 @@ brw_set_desc_ex(struct brw_codegen *p, brw_inst *inst, unsigned desc, unsigned ex_desc) { const struct gen_device_info *devinfo = p->devinfo; + assert(brw_inst_opcode(devinfo, inst) == BRW_OPCODE_SEND || + brw_inst_opcode(devinfo, inst) == BRW_OPCODE_SENDC); brw_inst_set_src1_file_type(devinfo, inst, BRW_IMMEDIATE_VALUE, BRW_REGISTER_TYPE_D); brw_inst_set_send_desc(devinfo, inst, desc); - if (devinfo->gen >= 9 && (brw_inst_opcode(devinfo, inst) == BRW_OPCODE_SEND || - brw_inst_opcode(devinfo, inst) == BRW_OPCODE_SENDC)) + if (devinfo->gen >= 9) brw_inst_set_send_ex_desc(devinfo, inst, ex_desc); } -- 2.30.2