diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2018-05-29 15:28:36 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-05 08:40:59 -0700 |
| commit | 4599cebfb31e57132ec1e81885591cfd4338c8a9 (patch) | |
| tree | 2b8cb5a3031c8d1495efe77347366d4a5ace5ac8 | |
| parent | 371e5bd93b39586c1f1a1207ff0a155a7155e496 (diff) | |
| download | mesa-4599cebfb31e57132ec1e81885591cfd4338c8a9.tar.gz | |
intel/eu: Set flag [sub]register number differently for 3src
Prior to gen8, the flag [sub]register number is in a different spot on
3src instructions than on other instructions. Starting with Broadwell,
they made it consistent. This commit fixes bugs that occur when a
conditional modifier gets propagated into a 3src instruction such as a
MAD.
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit db9675f5a4c68e39bb777eb7003f01854fd235dc)
| -rw-r--r-- | src/intel/compiler/brw_eu_emit.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index b2bce0e9ec8..0dfe26a2a02 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -701,9 +701,16 @@ brw_inst_set_state(const struct gen_device_info *devinfo, brw_inst_set_pred_control(devinfo, insn, state->predicate); brw_inst_set_pred_inv(devinfo, insn, state->pred_inv); - brw_inst_set_flag_subreg_nr(devinfo, insn, state->flag_subreg % 2); - if (devinfo->gen >= 7) - brw_inst_set_flag_reg_nr(devinfo, insn, state->flag_subreg / 2); + if (is_3src(devinfo, brw_inst_opcode(devinfo, insn)) && + state->access_mode == BRW_ALIGN_16) { + brw_inst_set_3src_a16_flag_subreg_nr(devinfo, insn, state->flag_subreg % 2); + if (devinfo->gen >= 7) + brw_inst_set_3src_a16_flag_reg_nr(devinfo, insn, state->flag_subreg / 2); + } else { + brw_inst_set_flag_subreg_nr(devinfo, insn, state->flag_subreg % 2); + if (devinfo->gen >= 7) + brw_inst_set_flag_reg_nr(devinfo, insn, state->flag_subreg / 2); + } if (devinfo->gen >= 6) brw_inst_set_acc_wr_control(devinfo, insn, state->acc_wr_control); |