From: Iago Toral Quiroga <itoral@igalia.com>
Date: Fri, 22 Jul 2016 11:36:25 +0000 (+0200)
Subject: i965/disasm: also print nibctrl in IVB for execsize=8
X-Git-Tag: upstream/17.1.0~168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbac8b1f9465fd13dd61aa0010049d1b61654a2b;p=platform%2Fupstream%2Fmesa.git

i965/disasm: also print nibctrl in IVB for execsize=8

4-wide DF operations where NibCtrl applies require and execsize of 8
in IvyBridge/BayTrail.

v2:
- Refactor NibCtrl printing (Matt)

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/src/intel/compiler/brw_disasm.c b/src/intel/compiler/brw_disasm.c
index 536a003..8b44736 100644
--- a/src/intel/compiler/brw_disasm.c
+++ b/src/intel/compiler/brw_disasm.c
@@ -1182,10 +1182,10 @@ qtr_ctrl(FILE *file, const struct gen_device_info *devinfo, brw_inst *inst)
 {
    int qtr_ctl = brw_inst_qtr_control(devinfo, inst);
    int exec_size = 1 << brw_inst_exec_size(devinfo, inst);
+   const unsigned nib_ctl = devinfo->gen < 7 ? 0 :
+                            brw_inst_nib_control(devinfo, inst);
 
-   if (exec_size < 8) {
-      const unsigned nib_ctl = devinfo->gen < 7 ? 0 :
-                               brw_inst_nib_control(devinfo, inst);
+   if (exec_size < 8 || nib_ctl) {
       format(file, " %dN", qtr_ctl * 2 + nib_ctl + 1);
    } else if (exec_size == 8) {
       switch (qtr_ctl) {