i965/disasm: Show jump count for if/iff/halt.
[mesa.git] / src / mesa / drivers / dri / i965 / brw_disasm.c
index 569dd68a885b8e71b5930cfffb966b8e094ee12b..5a56591f0ad07c11eb0c19bece704a9cec6f5af8 100644 (file)
@@ -74,6 +74,7 @@ const struct opcode_desc opcode_descs[128] = {
    [BRW_OPCODE_ASR]      = { .name = "asr",     .nsrc = 2, .ndst = 1 },
    [BRW_OPCODE_CMP]      = { .name = "cmp",     .nsrc = 2, .ndst = 1 },
    [BRW_OPCODE_CMPN]     = { .name = "cmpn",    .nsrc = 2, .ndst = 1 },
+   [BRW_OPCODE_CSEL]     = { .name = "csel",    .nsrc = 3, .ndst = 1 },
    [BRW_OPCODE_BFE]      = { .name = "bfe",     .nsrc = 3, .ndst = 1 },
    [BRW_OPCODE_BFI1]     = { .name = "bfi1",    .nsrc = 2, .ndst = 1 },
    [BRW_OPCODE_BFI2]     = { .name = "bfi2",    .nsrc = 3, .ndst = 1 },
@@ -100,10 +101,47 @@ const struct opcode_desc opcode_descs[128] = {
    [BRW_OPCODE_ENDIF]    = { .name = "endif",   .nsrc = 2, .ndst = 0 },
 };
 
+static bool
+has_jip(struct brw_context *brw, enum opcode opcode)
+{
+   if (brw->gen < 6)
+      return false;
+
+   return opcode == BRW_OPCODE_IF ||
+          opcode == BRW_OPCODE_ELSE ||
+          opcode == BRW_OPCODE_ENDIF ||
+          opcode == BRW_OPCODE_WHILE ||
+          opcode == BRW_OPCODE_BREAK ||
+          opcode == BRW_OPCODE_CONTINUE ||
+          opcode == BRW_OPCODE_HALT;
+}
+
+static bool
+has_uip(struct brw_context *brw, enum opcode opcode)
+{
+   if (brw->gen < 6)
+      return false;
+
+   return (brw->gen >= 7 && opcode == BRW_OPCODE_IF) ||
+          (brw->gen >= 8 && opcode == BRW_OPCODE_ELSE) ||
+          opcode == BRW_OPCODE_BREAK ||
+          opcode == BRW_OPCODE_CONTINUE ||
+          opcode == BRW_OPCODE_HALT;
+}
+
+static bool
+is_logic_instruction(unsigned opcode)
+{
+   return opcode == BRW_OPCODE_AND ||
+          opcode == BRW_OPCODE_NOT ||
+          opcode == BRW_OPCODE_OR ||
+          opcode == BRW_OPCODE_XOR;
+}
+
 const char *const conditional_modifier[16] = {
    [BRW_CONDITIONAL_NONE] = "",
-   [BRW_CONDITIONAL_Z]    = ".e",
-   [BRW_CONDITIONAL_NZ]   = ".ne",
+   [BRW_CONDITIONAL_Z]    = ".z",
+   [BRW_CONDITIONAL_NZ]   = ".nz",
    [BRW_CONDITIONAL_G]    = ".g",
    [BRW_CONDITIONAL_GE]   = ".ge",
    [BRW_CONDITIONAL_L]    = ".l",
@@ -123,6 +161,8 @@ static const char *const _abs[2] = {
    [1] = "(abs)",
 };
 
+static const char *const m_bitnot[2] = { "", "~" };
+
 static const char *const vert_stride[16] = {
    [0] = "0",
    [1] = "1",
@@ -177,7 +217,7 @@ static const char *const accwr[2] = {
 };
 
 static const char *const wectrl[2] = {
-   [0] = "WE_normal",
+   [0] = "",
    [1] = "WE_all"
 };
 
@@ -206,22 +246,25 @@ static const char *const pred_ctrl_align16[16] = {
 };
 
 static const char *const pred_ctrl_align1[16] = {
-   [1] = "",
-   [2] = ".anyv",
-   [3] = ".allv",
-   [4] = ".any2h",
-   [5] = ".all2h",
-   [6] = ".any4h",
-   [7] = ".all4h",
-   [8] = ".any8h",
-   [9] = ".all8h",
-   [10] = ".any16h",
-   [11] = ".all16h",
+   [BRW_PREDICATE_NORMAL]        = "",
+   [BRW_PREDICATE_ALIGN1_ANYV]   = ".anyv",
+   [BRW_PREDICATE_ALIGN1_ALLV]   = ".allv",
+   [BRW_PREDICATE_ALIGN1_ANY2H]  = ".any2h",
+   [BRW_PREDICATE_ALIGN1_ALL2H]  = ".all2h",
+   [BRW_PREDICATE_ALIGN1_ANY4H]  = ".any4h",
+   [BRW_PREDICATE_ALIGN1_ALL4H]  = ".all4h",
+   [BRW_PREDICATE_ALIGN1_ANY8H]  = ".any8h",
+   [BRW_PREDICATE_ALIGN1_ALL8H]  = ".all8h",
+   [BRW_PREDICATE_ALIGN1_ANY16H] = ".any16h",
+   [BRW_PREDICATE_ALIGN1_ALL16H] = ".all16h",
+   [BRW_PREDICATE_ALIGN1_ANY32H] = ".any32h",
+   [BRW_PREDICATE_ALIGN1_ANY32H] = ".all32h",
 };
 
 static const char *const thread_ctrl[4] = {
-   [0] = "",
-   [2] = "switch"
+   [BRW_THREAD_NORMAL] = "",
+   [BRW_THREAD_ATOMIC] = "atomic",
+   [BRW_THREAD_SWITCH] = "switch",
 };
 
 static const char *const compr_ctrl[4] = {
@@ -313,7 +356,8 @@ static const char *const end_of_thread[2] = {
    [1] = "EOT"
 };
 
-static const char *const target_function[16] = {
+/* SFIDs on Gen4-5 */
+static const char *const gen4_sfid[16] = {
    [BRW_SFID_NULL]            = "null",
    [BRW_SFID_MATH]            = "math",
    [BRW_SFID_SAMPLER]         = "sampler",
@@ -325,7 +369,7 @@ static const char *const target_function[16] = {
    [BRW_SFID_VME]             = "vme",
 };
 
-static const char *const target_function_gen6[16] = {
+static const char *const gen6_sfid[16] = {
    [BRW_SFID_NULL]                     = "null",
    [BRW_SFID_MATH]                     = "math",
    [BRW_SFID_SAMPLER]                  = "sampler",
@@ -341,6 +385,17 @@ static const char *const target_function_gen6[16] = {
    [HSW_SFID_CRE]                      = "cre",
 };
 
+static const char *const dp_write_port_msg_type[8] = {
+   [0b000] = "OWord block write",
+   [0b001] = "OWord dual block write",
+   [0b010] = "media block write",
+   [0b011] = "DWord scattered write",
+   [0b100] = "RT write",
+   [0b101] = "streamed VB write",
+   [0b110] = "RT UNORM write", /* G45+ */
+   [0b111] = "flush render cache",
+};
+
 static const char *const dp_rc_msg_type_gen6[16] = {
    [BRW_DATAPORT_READ_MESSAGE_OWORD_BLOCK_READ] = "OWORD block read",
    [GEN6_DATAPORT_READ_MESSAGE_RENDER_UNORM_READ] = "RT UNORM read",
@@ -358,7 +413,17 @@ static const char *const dp_rc_msg_type_gen6[16] = {
       "DWORD scattered write",
    [GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_WRITE] = "RT write",
    [GEN6_DATAPORT_WRITE_MESSAGE_STREAMED_VB_WRITE] = "streamed VB write",
-   [GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_UNORM_WRITE] = "RT UNORMc write",
+   [GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_UNORM_WRITE] = "RT UNORM write",
+};
+
+static const char *const m_rt_write_subtype[] = {
+   [0b000] = "SIMD16",
+   [0b001] = "SIMD16/RepData",
+   [0b010] = "SIMD8/DualSrcLow",
+   [0b011] = "SIMD8/DualSrcHigh",
+   [0b100] = "SIMD8",
+   [0b101] = "SIMD8/ImageWrite",   /* Gen6+ */
+   [0b111] = "SIMD16/RepData-111", /* no idea how this is different than 1 */
 };
 
 static const char *const dp_dc0_msg_type_gen7[16] = {
@@ -412,6 +477,13 @@ static const char *const aop[16] = {
    [BRW_AOP_PREDEC] = "predec",
 };
 
+static const char * const pixel_interpolator_msg_types[4] = {
+    [GEN7_PIXEL_INTERPOLATOR_LOC_SHARED_OFFSET] = "per_message_offset",
+    [GEN7_PIXEL_INTERPOLATOR_LOC_SAMPLE] = "sample_position",
+    [GEN7_PIXEL_INTERPOLATOR_LOC_CENTROID] = "centroid",
+    [GEN7_PIXEL_INTERPOLATOR_LOC_PER_SLOT_OFFSET] = "per_slot_offset",
+};
+
 static const char *const math_function[16] = {
    [BRW_MATH_FUNCTION_INV]    = "inv",
    [BRW_MATH_FUNCTION_LOG]    = "log",
@@ -426,6 +498,8 @@ static const char *const math_function[16] = {
    [BRW_MATH_FUNCTION_INT_DIV_QUOTIENT_AND_REMAINDER] = "intdivmod",
    [BRW_MATH_FUNCTION_INT_DIV_QUOTIENT]  = "intdiv",
    [BRW_MATH_FUNCTION_INT_DIV_REMAINDER] = "intmod",
+   [GEN8_MATH_FUNCTION_INVM]  = "invm",
+   [GEN8_MATH_FUNCTION_RSQRTM] = "rsqrtm",
 };
 
 static const char *const math_saturate[2] = {
@@ -448,11 +522,24 @@ static const char *const math_precision[2] = {
    [1] = "partial_precision"
 };
 
-static const char *const urb_opcode[2] = {
+static const char *const gen5_urb_opcode[] = {
    [0] = "urb_write",
    [1] = "ff_sync",
 };
 
+static const char *const gen7_urb_opcode[] = {
+   [0] = "write HWord",
+   [1] = "write OWord",
+   [2] = "read HWord",
+   [3] = "read OWord",
+   [4] = "atomic mov",  /* Gen7+ */
+   [5] = "atomic inc",  /* Gen7+ */
+   [6] = "atomic add",  /* Gen8+ */
+   [7] = "SIMD8 write", /* Gen8+ */
+   [8] = "SIMD8 read",  /* Gen8+ */
+   /* [9-15] - reserved */
+};
+
 static const char *const urb_swizzle[4] = {
    [BRW_URB_SWIZZLE_NONE]       = "",
    [BRW_URB_SWIZZLE_INTERLEAVE] = "interleave",
@@ -702,13 +789,21 @@ src_align1_region(FILE *file,
 }
 
 static int
-src_da1(FILE *file, unsigned type, unsigned _reg_file,
+src_da1(FILE *file,
+        const struct brw_context *brw,
+        unsigned opcode,
+        unsigned type, unsigned _reg_file,
         unsigned _vert_stride, unsigned _width, unsigned _horiz_stride,
         unsigned reg_num, unsigned sub_reg_num, unsigned __abs,
         unsigned _negate)
 {
    int err = 0;
-   err |= control(file, "negate", m_negate, _negate, NULL);
+
+   if (brw->gen >= 8 && is_logic_instruction(opcode))
+      err |= control(file, "bitnot", m_bitnot, _negate, NULL);
+   else
+      err |= control(file, "negate", m_negate, _negate, NULL);
+
    err |= control(file, "abs", _abs, __abs, NULL);
 
    err |= reg(file, _reg_file, reg_num);
@@ -723,6 +818,8 @@ src_da1(FILE *file, unsigned type, unsigned _reg_file,
 
 static int
 src_ia1(FILE *file,
+        const struct brw_context *brw,
+        unsigned opcode,
         unsigned type,
         unsigned _reg_file,
         int _addr_imm,
@@ -733,7 +830,12 @@ src_ia1(FILE *file,
         unsigned _horiz_stride, unsigned _width, unsigned _vert_stride)
 {
    int err = 0;
-   err |= control(file, "negate", m_negate, _negate, NULL);
+
+   if (brw->gen >= 8 && is_logic_instruction(opcode))
+      err |= control(file, "bitnot", m_bitnot, _negate, NULL);
+   else
+      err |= control(file, "negate", m_negate, _negate, NULL);
+
    err |= control(file, "abs", _abs, __abs, NULL);
 
    string(file, "g[a0");
@@ -747,8 +849,32 @@ src_ia1(FILE *file,
    return err;
 }
 
+static int
+src_swizzle(FILE *file, unsigned swiz)
+{
+   unsigned x = BRW_GET_SWZ(swiz, BRW_CHANNEL_X);
+   unsigned y = BRW_GET_SWZ(swiz, BRW_CHANNEL_Y);
+   unsigned z = BRW_GET_SWZ(swiz, BRW_CHANNEL_Z);
+   unsigned w = BRW_GET_SWZ(swiz, BRW_CHANNEL_W);
+   int err = 0;
+
+   if (x == y && x == z && x == w) {
+      string(file, ".");
+      err |= control(file, "channel select", chan_sel, x, NULL);
+   } else if (swiz != BRW_SWIZZLE_XYZW) {
+      string(file, ".");
+      err |= control(file, "channel select", chan_sel, x, NULL);
+      err |= control(file, "channel select", chan_sel, y, NULL);
+      err |= control(file, "channel select", chan_sel, z, NULL);
+      err |= control(file, "channel select", chan_sel, w, NULL);
+   }
+   return err;
+}
+
 static int
 src_da16(FILE *file,
+         const struct brw_context *brw,
+         unsigned opcode,
          unsigned _reg_type,
          unsigned _reg_file,
          unsigned _vert_stride,
@@ -759,7 +885,12 @@ src_da16(FILE *file,
          unsigned swz_x, unsigned swz_y, unsigned swz_z, unsigned swz_w)
 {
    int err = 0;
-   err |= control(file, "negate", m_negate, _negate, NULL);
+
+   if (brw->gen >= 8 && is_logic_instruction(opcode))
+      err |= control(file, "bitnot", m_bitnot, _negate, NULL);
+   else
+      err |= control(file, "negate", m_negate, _negate, NULL);
+
    err |= control(file, "abs", _abs, __abs, NULL);
 
    err |= reg(file, _reg_file, _reg_nr);
@@ -772,26 +903,7 @@ src_da16(FILE *file,
    string(file, "<");
    err |= control(file, "vert stride", vert_stride, _vert_stride, NULL);
    string(file, ",4,1>");
-   /*
-    * Three kinds of swizzle display:
-    *  identity - nothing printed
-    *  1->all   - print the single channel
-    *  1->1     - print the mapping
-    */
-   if (swz_x == BRW_CHANNEL_X &&
-       swz_y == BRW_CHANNEL_Y &&
-       swz_z == BRW_CHANNEL_Z && swz_w == BRW_CHANNEL_W) {
-      ;
-   } else if (swz_x == swz_y && swz_x == swz_z && swz_x == swz_w) {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-   } else {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-      err |= control(file, "channel select", chan_sel, swz_y, NULL);
-      err |= control(file, "channel select", chan_sel, swz_z, NULL);
-      err |= control(file, "channel select", chan_sel, swz_w, NULL);
-   }
+   err |= src_swizzle(file, BRW_SWIZZLE4(swz_x, swz_y, swz_z, swz_w));
    err |= control(file, "src da16 reg type", reg_encoding, _reg_type, NULL);
    return err;
 }
@@ -800,11 +912,6 @@ static int
 src0_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
 {
    int err = 0;
-   unsigned swz = brw_inst_3src_src0_swizzle(brw, inst);
-   unsigned swz_x = BRW_GET_SWZ(swz, BRW_CHANNEL_X);
-   unsigned swz_y = BRW_GET_SWZ(swz, BRW_CHANNEL_Y);
-   unsigned swz_z = BRW_GET_SWZ(swz, BRW_CHANNEL_Z);
-   unsigned swz_w = BRW_GET_SWZ(swz, BRW_CHANNEL_W);
    unsigned src0_subreg_nr = brw_inst_3src_src0_subreg_nr(brw, inst);
 
    err |= control(file, "negate", m_negate,
@@ -823,24 +930,7 @@ src0_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
       string(file, "<4,4,1>");
    err |= control(file, "src da16 reg type", three_source_reg_encoding,
                   brw_inst_3src_src_type(brw, inst), NULL);
-   /*
-    * Three kinds of swizzle display:
-    *  identity - nothing printed
-    *  1->all   - print the single channel
-    *  1->1     - print the mapping
-    */
-   if (swz == BRW_SWIZZLE_XYZW) {
-      ;
-   } else if (swz_x == swz_y && swz_x == swz_z && swz_x == swz_w) {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-   } else {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-      err |= control(file, "channel select", chan_sel, swz_y, NULL);
-      err |= control(file, "channel select", chan_sel, swz_z, NULL);
-      err |= control(file, "channel select", chan_sel, swz_w, NULL);
-   }
+   err |= src_swizzle(file, brw_inst_3src_src0_swizzle(brw, inst));
    return err;
 }
 
@@ -848,11 +938,6 @@ static int
 src1_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
 {
    int err = 0;
-   unsigned swz = brw_inst_3src_src1_swizzle(brw, inst);
-   unsigned swz_x = BRW_GET_SWZ(swz, BRW_CHANNEL_X);
-   unsigned swz_y = BRW_GET_SWZ(swz, BRW_CHANNEL_Y);
-   unsigned swz_z = BRW_GET_SWZ(swz, BRW_CHANNEL_Z);
-   unsigned swz_w = BRW_GET_SWZ(swz, BRW_CHANNEL_W);
    unsigned src1_subreg_nr = brw_inst_3src_src1_subreg_nr(brw, inst);
 
    err |= control(file, "negate", m_negate,
@@ -871,24 +956,7 @@ src1_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
       string(file, "<4,4,1>");
    err |= control(file, "src da16 reg type", three_source_reg_encoding,
                   brw_inst_3src_src_type(brw, inst), NULL);
-   /*
-    * Three kinds of swizzle display:
-    *  identity - nothing printed
-    *  1->all   - print the single channel
-    *  1->1     - print the mapping
-    */
-   if (swz == BRW_SWIZZLE_XYZW) {
-      ;
-   } else if (swz_x == swz_y && swz_x == swz_z && swz_x == swz_w) {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-   } else {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-      err |= control(file, "channel select", chan_sel, swz_y, NULL);
-      err |= control(file, "channel select", chan_sel, swz_z, NULL);
-      err |= control(file, "channel select", chan_sel, swz_w, NULL);
-   }
+   err |= src_swizzle(file, brw_inst_3src_src1_swizzle(brw, inst));
    return err;
 }
 
@@ -897,11 +965,6 @@ static int
 src2_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
 {
    int err = 0;
-   unsigned swz = brw_inst_3src_src2_swizzle(brw, inst);
-   unsigned swz_x = BRW_GET_SWZ(swz, BRW_CHANNEL_X);
-   unsigned swz_y = BRW_GET_SWZ(swz, BRW_CHANNEL_Y);
-   unsigned swz_z = BRW_GET_SWZ(swz, BRW_CHANNEL_Z);
-   unsigned swz_w = BRW_GET_SWZ(swz, BRW_CHANNEL_W);
    unsigned src2_subreg_nr = brw_inst_3src_src2_subreg_nr(brw, inst);
 
    err |= control(file, "negate", m_negate,
@@ -920,24 +983,7 @@ src2_3src(FILE *file, struct brw_context *brw, brw_inst *inst)
       string(file, "<4,4,1>");
    err |= control(file, "src da16 reg type", three_source_reg_encoding,
                   brw_inst_3src_src_type(brw, inst), NULL);
-   /*
-    * Three kinds of swizzle display:
-    *  identity - nothing printed
-    *  1->all   - print the single channel
-    *  1->1     - print the mapping
-    */
-   if (swz == BRW_SWIZZLE_XYZW) {
-      ;
-   } else if (swz_x == swz_y && swz_x == swz_z && swz_x == swz_w) {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-   } else {
-      string(file, ".");
-      err |= control(file, "channel select", chan_sel, swz_x, NULL);
-      err |= control(file, "channel select", chan_sel, swz_y, NULL);
-      err |= control(file, "channel select", chan_sel, swz_z, NULL);
-      err |= control(file, "channel select", chan_sel, swz_w, NULL);
-   }
+   err |= src_swizzle(file, brw_inst_3src_src2_swizzle(brw, inst));
    return err;
 }
 
@@ -968,6 +1014,13 @@ imm(FILE *file, struct brw_context *brw, unsigned type, brw_inst *inst)
       break;
    case BRW_HW_REG_TYPE_F:
       format(file, "%-gF", brw_inst_imm_f(brw, inst));
+      break;
+   case GEN8_HW_REG_IMM_TYPE_DF:
+      string(file, "Double IMM");
+      break;
+   case GEN8_HW_REG_IMM_TYPE_HF:
+      string(file, "Half Float IMM");
+      break;
    }
    return 0;
 }
@@ -980,6 +1033,8 @@ src0(FILE *file, struct brw_context *brw, brw_inst *inst)
    } else if (brw_inst_access_mode(brw, inst) == BRW_ALIGN_1) {
       if (brw_inst_src0_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) {
          return src_da1(file,
+                        brw,
+                        brw_inst_opcode(brw, inst),
                         brw_inst_src0_reg_type(brw, inst),
                         brw_inst_src0_reg_file(brw, inst),
                         brw_inst_src0_vstride(brw, inst),
@@ -991,6 +1046,8 @@ src0(FILE *file, struct brw_context *brw, brw_inst *inst)
                         brw_inst_src0_negate(brw, inst));
       } else {
          return src_ia1(file,
+                        brw,
+                        brw_inst_opcode(brw, inst),
                         brw_inst_src0_reg_type(brw, inst),
                         brw_inst_src0_reg_file(brw, inst),
                         brw_inst_src0_ia1_addr_imm(brw, inst),
@@ -1005,6 +1062,8 @@ src0(FILE *file, struct brw_context *brw, brw_inst *inst)
    } else {
       if (brw_inst_src0_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) {
          return src_da16(file,
+                         brw,
+                         brw_inst_opcode(brw, inst),
                          brw_inst_src0_reg_type(brw, inst),
                          brw_inst_src0_reg_file(brw, inst),
                          brw_inst_src0_vstride(brw, inst),
@@ -1031,6 +1090,8 @@ src1(FILE *file, struct brw_context *brw, brw_inst *inst)
    } else if (brw_inst_access_mode(brw, inst) == BRW_ALIGN_1) {
       if (brw_inst_src1_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) {
          return src_da1(file,
+                        brw,
+                        brw_inst_opcode(brw, inst),
                         brw_inst_src1_reg_type(brw, inst),
                         brw_inst_src1_reg_file(brw, inst),
                         brw_inst_src1_vstride(brw, inst),
@@ -1042,6 +1103,8 @@ src1(FILE *file, struct brw_context *brw, brw_inst *inst)
                         brw_inst_src1_negate(brw, inst));
       } else {
          return src_ia1(file,
+                        brw,
+                        brw_inst_opcode(brw, inst),
                         brw_inst_src1_reg_type(brw, inst),
                         brw_inst_src1_reg_file(brw, inst),
                         brw_inst_src1_ia1_addr_imm(brw, inst),
@@ -1056,6 +1119,8 @@ src1(FILE *file, struct brw_context *brw, brw_inst *inst)
    } else {
       if (brw_inst_src1_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) {
          return src_da16(file,
+                         brw,
+                         brw_inst_opcode(brw, inst),
                          brw_inst_src1_reg_type(brw, inst),
                          brw_inst_src1_reg_file(brw, inst),
                          brw_inst_src1_vstride(brw, inst),
@@ -1170,7 +1235,38 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst,
    if (opcode == BRW_OPCODE_SEND && brw->gen < 6)
       format(file, " %d", brw_inst_base_mrf(brw, inst));
 
-   if (opcode_descs[opcode].nsrc == 3) {
+   if (has_uip(brw, opcode)) {
+      /* Instructions that have UIP also have JIP. */
+      pad(file, 16);
+      format(file, "JIP: %d", brw_inst_jip(brw, inst));
+      pad(file, 32);
+      format(file, "UIP: %d", brw_inst_uip(brw, inst));
+   } else if (has_jip(brw, opcode)) {
+      pad(file, 16);
+      if (brw->gen >= 7) {
+         format(file, "JIP: %d", brw_inst_jip(brw, inst));
+      } else {
+         format(file, "JIP: %d", brw_inst_gen6_jump_count(brw, inst));
+      }
+   } else if (brw->gen < 6 && (opcode == BRW_OPCODE_BREAK ||
+                               opcode == BRW_OPCODE_CONTINUE ||
+                               opcode == BRW_OPCODE_ELSE)) {
+      pad(file, 16);
+      format(file, "Jump: %d", brw_inst_gen4_jump_count(brw, inst));
+      pad(file, 32);
+      format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst));
+   } else if (brw->gen < 6 && (opcode == BRW_OPCODE_IF ||
+                               opcode == BRW_OPCODE_IFF ||
+                               opcode == BRW_OPCODE_HALT)) {
+      pad(file, 16);
+      format(file, "Jump: %d", brw_inst_gen4_jump_count(brw, inst));
+   } else if (brw->gen < 6 && opcode == BRW_OPCODE_ENDIF) {
+      pad(file, 16);
+      format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst));
+   } else if (opcode == BRW_OPCODE_JMPI) {
+      pad(file, 16);
+      err |= src1(file, brw, inst);
+   } else if (opcode_descs[opcode].nsrc == 3) {
       pad(file, 16);
       err |= dest_3src(file, brw, inst);
 
@@ -1186,29 +1282,13 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst,
       if (opcode_descs[opcode].ndst > 0) {
          pad(file, 16);
          err |= dest(file, brw, inst);
-      } else if (brw->gen == 7 && (opcode == BRW_OPCODE_ELSE ||
-                                   opcode == BRW_OPCODE_ENDIF ||
-                                   opcode == BRW_OPCODE_WHILE)) {
-         format(file, " %d", brw_inst_jip(brw, inst));
-      } else if (brw->gen == 6 && (opcode == BRW_OPCODE_IF ||
-                                   opcode == BRW_OPCODE_ELSE ||
-                                   opcode == BRW_OPCODE_ENDIF ||
-                                   opcode == BRW_OPCODE_WHILE)) {
-         format(file, " %d", brw_inst_gen6_jump_count(brw, inst));
-      } else if ((brw->gen >= 6 && (opcode == BRW_OPCODE_BREAK ||
-                                    opcode == BRW_OPCODE_CONTINUE ||
-                                    opcode == BRW_OPCODE_HALT)) ||
-                 (brw->gen == 7 && opcode == BRW_OPCODE_IF)) {
-         format(file, " %d %d", brw_inst_uip(brw, inst),
-                brw_inst_jip(brw, inst));
-      } else if (opcode == BRW_OPCODE_JMPI) {
-         format(file, " %d", brw_inst_imm_d(brw, inst));
       }
 
       if (opcode_descs[opcode].nsrc > 0) {
          pad(file, 32);
          err |= src0(file, brw, inst);
       }
+
       if (opcode_descs[opcode].nsrc > 1) {
          pad(file, 48);
          err |= src1(file, brw, inst);
@@ -1216,183 +1296,217 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst,
    }
 
    if (opcode == BRW_OPCODE_SEND || opcode == BRW_OPCODE_SENDC) {
-      enum brw_message_target target = brw_inst_sfid(brw, inst);
+      enum brw_message_target sfid = brw_inst_sfid(brw, inst);
+
+      if (brw_inst_src1_reg_file(brw, inst) != BRW_IMMEDIATE_VALUE) {
+         /* show the indirect descriptor source */
+         pad(file, 48);
+         err |= src1(file, brw, inst);
+      }
 
       newline(file);
       pad(file, 16);
       space = 0;
 
       fprintf(file, "            ");
-      if (brw->gen >= 6) {
-         err |= control(file, "target function", target_function_gen6,
-                        target, &space);
-      } else {
-         err |= control(file, "target function", target_function,
-                        target, &space);
-      }
+      err |= control(file, "SFID", brw->gen >= 6 ? gen6_sfid : gen4_sfid,
+                     sfid, &space);
 
-      switch (target) {
-      case BRW_SFID_MATH:
-         err |= control(file, "math function", math_function,
-                        brw_inst_math_msg_function(brw, inst), &space);
-         err |= control(file, "math saturate", math_saturate,
-                        brw_inst_math_msg_saturate(brw, inst), &space);
-         err |= control(file, "math signed", math_signed,
-                        brw_inst_math_msg_signed_int(brw, inst), &space);
-         err |= control(file, "math scalar", math_scalar,
-                        brw_inst_math_msg_data_type(brw, inst), &space);
-         err |= control(file, "math precision", math_precision,
-                        brw_inst_math_msg_precision(brw, inst), &space);
-         break;
-      case BRW_SFID_SAMPLER:
-         if (brw->gen >= 5) {
-            format(file, " (%d, %d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_sampler(brw, inst),
-                   brw_inst_sampler_msg_type(brw, inst),
-                   brw_inst_sampler_simd_mode(brw, inst));
-         } else {
-            format(file, " (%d, %d, %d, ",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_sampler(brw, inst),
-                   brw_inst_sampler_msg_type(brw, inst));
-            if (!brw->is_g4x) {
-               err |= control(file, "sampler target format",
-                              sampler_target_format,
-                              brw_inst_sampler_return_format(brw, inst), NULL);
-            }
-            string(file, ")");
-         }
-         break;
-      case BRW_SFID_DATAPORT_READ:
-         if (brw->gen >= 6) {
-            format(file, " (%d, %d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_dp_msg_control(brw, inst),
-                   brw_inst_dp_msg_type(brw, inst),
-                   brw->gen >= 7 ? 0 : brw_inst_dp_write_commit(brw, inst));
-         } else {
-            format(file, " (%d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_dp_read_msg_control(brw, inst),
-                   brw_inst_dp_read_msg_type(brw, inst));
-         }
-         break;
 
-      case BRW_SFID_DATAPORT_WRITE:
-         if (brw->gen >= 7) {
-            format(file, " (");
-
-            err |= control(file, "DP rc message type",
-                           dp_rc_msg_type_gen6,
-                           brw_inst_dp_msg_type(brw, inst), &space);
+      if (brw_inst_src1_reg_file(brw, inst) != BRW_IMMEDIATE_VALUE) {
+         format(file, " indirect");
+      } else {
+         switch (sfid) {
+         case BRW_SFID_MATH:
+            err |= control(file, "math function", math_function,
+                           brw_inst_math_msg_function(brw, inst), &space);
+            err |= control(file, "math saturate", math_saturate,
+                           brw_inst_math_msg_saturate(brw, inst), &space);
+            err |= control(file, "math signed", math_signed,
+                           brw_inst_math_msg_signed_int(brw, inst), &space);
+            err |= control(file, "math scalar", math_scalar,
+                           brw_inst_math_msg_data_type(brw, inst), &space);
+            err |= control(file, "math precision", math_precision,
+                           brw_inst_math_msg_precision(brw, inst), &space);
+            break;
+         case BRW_SFID_SAMPLER:
+            if (brw->gen >= 5) {
+               format(file, " (%d, %d, %d, %d)",
+                      brw_inst_binding_table_index(brw, inst),
+                      brw_inst_sampler(brw, inst),
+                      brw_inst_sampler_msg_type(brw, inst),
+                      brw_inst_sampler_simd_mode(brw, inst));
+            } else {
+               format(file, " (%d, %d, %d, ",
+                      brw_inst_binding_table_index(brw, inst),
+                      brw_inst_sampler(brw, inst),
+                      brw_inst_sampler_msg_type(brw, inst));
+               if (!brw->is_g4x) {
+                  err |= control(file, "sampler target format",
+                                 sampler_target_format,
+                                 brw_inst_sampler_return_format(brw, inst), NULL);
+               }
+               string(file, ")");
+            }
+            break;
+         case GEN6_SFID_DATAPORT_SAMPLER_CACHE:
+            /* aka BRW_SFID_DATAPORT_READ on Gen4-5 */
+            if (brw->gen >= 6) {
+               format(file, " (%d, %d, %d, %d)",
+                      brw_inst_binding_table_index(brw, inst),
+                      brw_inst_dp_msg_control(brw, inst),
+                      brw_inst_dp_msg_type(brw, inst),
+                      brw->gen >= 7 ? 0 : brw_inst_dp_write_commit(brw, inst));
+            } else {
+               format(file, " (%d, %d, %d)",
+                      brw_inst_binding_table_index(brw, inst),
+                      brw_inst_dp_read_msg_control(brw, inst),
+                      brw_inst_dp_read_msg_type(brw, inst));
+            }
+            break;
 
-            format(file, ", %d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_dp_msg_control(brw, inst),
-                   brw_inst_dp_msg_type(brw, inst));
-         } else if (brw->gen == 6) {
-            format(file, " (");
+         case GEN6_SFID_DATAPORT_RENDER_CACHE: {
+            /* aka BRW_SFID_DATAPORT_WRITE on Gen4-5 */
+            unsigned msg_type = brw_inst_dp_write_msg_type(brw, inst);
 
             err |= control(file, "DP rc message type",
-                           dp_rc_msg_type_gen6,
-                           brw_inst_dp_msg_type(brw, inst), &space);
-
-            format(file, ", %d, %d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   brw_inst_dp_msg_control(brw, inst),
-                   brw_inst_dp_msg_type(brw, inst),
-                   brw_inst_dp_write_commit(brw, inst));
-         } else {
-            format(file, " (%d, %d, %d, %d)",
-                   brw_inst_binding_table_index(brw, inst),
-                   (brw_inst_rt_last(brw, inst) << 3) |
-                   brw_inst_dp_write_msg_control(brw, inst),
-                   brw_inst_dp_write_msg_type(brw, inst),
-                   brw_inst_dp_write_commit(brw, inst));
-         }
-         break;
-
-      case BRW_SFID_URB:
-         format(file, " %d", brw_inst_urb_global_offset(brw, inst));
+                           brw->gen >= 6 ? dp_rc_msg_type_gen6
+                                         : dp_write_port_msg_type,
+                           msg_type, &space);
+
+            bool is_rt_write = msg_type ==
+               (brw->gen >= 6 ? GEN6_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_WRITE
+                              : BRW_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_WRITE);
+
+            if (is_rt_write) {
+               err |= control(file, "RT message type", m_rt_write_subtype,
+                              brw_inst_rt_message_type(brw, inst), &space);
+               if (brw->gen >= 6 && brw_inst_rt_slot_group(brw, inst))
+                  string(file, " Hi");
+               if (brw_inst_rt_last(brw, inst))
+                  string(file, " LastRT");
+               if (brw->gen < 7 && brw_inst_dp_write_commit(brw, inst))
+                  string(file, " WriteCommit");
+            } else {
+               format(file, " MsgCtrl = 0x%x",
+                      brw_inst_dp_write_msg_control(brw, inst));
+            }
 
-         space = 1;
-         if (brw->gen >= 5) {
-            err |= control(file, "urb opcode", urb_opcode,
-                           brw_inst_urb_opcode(brw, inst), &space);
-         }
-         err |= control(file, "urb swizzle", urb_swizzle,
-                        brw_inst_urb_swizzle_control(brw, inst), &space);
-         if (brw->gen < 7) {
-            err |= control(file, "urb allocate", urb_allocate,
-                           brw_inst_urb_allocate(brw, inst), &space);
-            err |= control(file, "urb used", urb_used,
-                           brw_inst_urb_used(brw, inst), &space);
+            format(file, " Surface = %d", brw_inst_binding_table_index(brw, inst));
+            break;
          }
-         err |= control(file, "urb complete", urb_complete,
-                        brw_inst_urb_complete(brw, inst), &space);
-         break;
-      case BRW_SFID_THREAD_SPAWNER:
-         break;
-      case GEN7_SFID_DATAPORT_DATA_CACHE:
-         if (brw->gen >= 7) {
-            format(file, " (");
-
-            err |= control(file, "DP DC0 message type",
-                           dp_dc0_msg_type_gen7,
-                           brw_inst_dp_msg_type(brw, inst), &space);
 
-            format(file, ", %d, ", brw_inst_binding_table_index(brw, inst));
+         case BRW_SFID_URB:
+            format(file, " %d", brw_inst_urb_global_offset(brw, inst));
 
-            switch (brw_inst_dp_msg_type(brw, inst)) {
-            case GEN7_DATAPORT_DC_UNTYPED_ATOMIC_OP:
-               control(file, "atomic op", aop,
-                       brw_inst_imm_ud(brw, inst) >> 8 & 0xf, &space);
-               break;
-            default:
-               format(file, "%d", brw_inst_dp_msg_control(brw, inst));
+            space = 1;
+            if (brw->gen >= 7) {
+               err |= control(file, "urb opcode", gen7_urb_opcode,
+                              brw_inst_urb_opcode(brw, inst), &space);
+            } else if (brw->gen >= 5) {
+               err |= control(file, "urb opcode", gen5_urb_opcode,
+                              brw_inst_urb_opcode(brw, inst), &space);
+            }
+            err |= control(file, "urb swizzle", urb_swizzle,
+                           brw_inst_urb_swizzle_control(brw, inst), &space);
+            if (brw->gen < 7) {
+               err |= control(file, "urb allocate", urb_allocate,
+                              brw_inst_urb_allocate(brw, inst), &space);
+               err |= control(file, "urb used", urb_used,
+                              brw_inst_urb_used(brw, inst), &space);
             }
-            format(file, ")");
+            if (brw->gen < 8) {
+               err |= control(file, "urb complete", urb_complete,
+                              brw_inst_urb_complete(brw, inst), &space);
+            }
+            break;
+         case BRW_SFID_THREAD_SPAWNER:
             break;
+         case GEN7_SFID_DATAPORT_DATA_CACHE:
+            if (brw->gen >= 7) {
+               format(file, " (");
+
+               err |= control(file, "DP DC0 message type",
+                              dp_dc0_msg_type_gen7,
+                              brw_inst_dp_msg_type(brw, inst), &space);
+
+               format(file, ", %d, ", brw_inst_binding_table_index(brw, inst));
+
+               switch (brw_inst_dp_msg_type(brw, inst)) {
+               case GEN7_DATAPORT_DC_UNTYPED_ATOMIC_OP:
+                  control(file, "atomic op", aop,
+                          brw_inst_imm_ud(brw, inst) >> 8 & 0xf, &space);
+                  break;
+               default:
+                  format(file, "%d", brw_inst_dp_msg_control(brw, inst));
+               }
+               format(file, ")");
+               break;
+            }
+            /* FALLTHROUGH */
+
+         case HSW_SFID_DATAPORT_DATA_CACHE_1: {
+            if (brw->gen >= 7) {
+               format(file, " (");
+
+               unsigned msg_ctrl = brw_inst_dp_msg_control(brw, inst);
+
+               err |= control(file, "DP DC1 message type",
+                              dp_dc1_msg_type_hsw,
+                              brw_inst_dp_msg_type(brw, inst), &space);
+
+               format(file, ", Surface = %d, ",
+                      brw_inst_binding_table_index(brw, inst));
+
+               switch (brw_inst_dp_msg_type(brw, inst)) {
+               case HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP:
+               case HSW_DATAPORT_DC_PORT1_TYPED_ATOMIC_OP:
+               case HSW_DATAPORT_DC_PORT1_ATOMIC_COUNTER_OP:
+                  format(file, "SIMD%d,", (msg_ctrl & (1 << 4)) ? 8 : 16);
+                  /* fallthrough */
+               case HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP_SIMD4X2:
+               case HSW_DATAPORT_DC_PORT1_TYPED_ATOMIC_OP_SIMD4X2:
+               case HSW_DATAPORT_DC_PORT1_ATOMIC_COUNTER_OP_SIMD4X2:
+                  control(file, "atomic op", aop, msg_ctrl & 0xf, &space);
+                  break;
+               case HSW_DATAPORT_DC_PORT1_UNTYPED_SURFACE_READ:
+               case HSW_DATAPORT_DC_PORT1_UNTYPED_SURFACE_WRITE:
+               case HSW_DATAPORT_DC_PORT1_TYPED_SURFACE_READ:
+               case HSW_DATAPORT_DC_PORT1_TYPED_SURFACE_WRITE: {
+                  static const char *simd_modes[] = { "4x2", "16", "8" };
+                  format(file, "SIMD%s, Mask = 0x%x",
+                         simd_modes[msg_ctrl >> 4], msg_ctrl & 0xf);
+                  break;
+               }
+               default:
+                  format(file, "0x%x", msg_ctrl);
+               }
+               format(file, ")");
+               break;
+            }
+            /* FALLTHROUGH */
          }
-         /* FALLTHROUGH */
-
-      case HSW_SFID_DATAPORT_DATA_CACHE_1:
-         if (brw->gen >= 7) {
-            format(file, " (");
-
-            err |= control(file, "DP DC1 message type",
-                           dp_dc1_msg_type_hsw,
-                           brw_inst_dp_msg_type(brw, inst), &space);
-
-            format(file, ", %d, ", brw_inst_binding_table_index(brw, inst));
-
-            switch (brw_inst_dp_msg_type(brw, inst)) {
-            case HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP:
-            case HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP_SIMD4X2:
-            case HSW_DATAPORT_DC_PORT1_TYPED_ATOMIC_OP:
-            case HSW_DATAPORT_DC_PORT1_TYPED_ATOMIC_OP_SIMD4X2:
-            case HSW_DATAPORT_DC_PORT1_ATOMIC_COUNTER_OP:
-            case HSW_DATAPORT_DC_PORT1_ATOMIC_COUNTER_OP_SIMD4X2:
-               control(file, "atomic op", aop,
-                       brw_inst_imm_ud(brw, inst) >> 8 & 0xf, &space);
+
+         case GEN7_SFID_PIXEL_INTERPOLATOR:
+            if (brw->gen >= 7) {
+               format(file, " (%s, %s, 0x%02x)",
+                      brw_inst_pi_nopersp(brw, inst) ? "linear" : "persp",
+                      pixel_interpolator_msg_types[brw_inst_pi_message_type(brw, inst)],
+                      brw_inst_pi_message_data(brw, inst));
                break;
-            default:
-               format(file, "%d", brw_inst_dp_msg_control(brw, inst));
             }
-            format(file, ")");
+            /* FALLTHROUGH */
+
+         default:
+            format(file, "unsupported shared function ID %d", sfid);
             break;
          }
-         /* FALLTHROUGH */
 
-      default:
-         format(file, "unsupported target %d", target);
-         break;
+         if (space)
+            string(file, " ");
+         format(file, "mlen %d", brw_inst_mlen(brw, inst));
+         format(file, " rlen %d", brw_inst_rlen(brw, inst));
       }
-      if (space)
-         string(file, " ");
-      format(file, "mlen %d", brw_inst_mlen(brw, inst));
-      format(file, " rlen %d", brw_inst_rlen(brw, inst));
    }
    pad(file, 64);
    if (opcode != BRW_OPCODE_NOP) {