X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_disasm.c;h=09eb2392836eba8d09674eba3613af3832c1219d;hb=839793680f99b8387bee9489733d5071c10f3ace;hp=b651120ee7d6bc7ef9c83e7e00684e34bfdaa4e5;hpb=9a91f92596908f2934350bc115bd889f2926128a;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index b651120ee7d..09eb2392836 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -21,10 +21,7 @@ */ #include -#include #include -#include -#include #include #include "brw_context.h" @@ -34,6 +31,7 @@ const struct opcode_desc opcode_descs[128] = { [BRW_OPCODE_MOV] = { .name = "mov", .nsrc = 1, .ndst = 1 }, + [BRW_OPCODE_MOVI] = { .name = "movi", .nsrc = 2, .ndst = 1 }, [BRW_OPCODE_FRC] = { .name = "frc", .nsrc = 1, .ndst = 1 }, [BRW_OPCODE_RNDU] = { .name = "rndu", .nsrc = 1, .ndst = 1 }, [BRW_OPCODE_RNDD] = { .name = "rndd", .nsrc = 1, .ndst = 1 }, @@ -74,6 +72,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 }, @@ -82,53 +81,80 @@ const struct opcode_desc opcode_descs[128] = { [BRW_OPCODE_SEND] = { .name = "send", .nsrc = 1, .ndst = 1 }, [BRW_OPCODE_SENDC] = { .name = "sendc", .nsrc = 1, .ndst = 1 }, + [BRW_OPCODE_SENDS] = { .name = "sends", .nsrc = 2, .ndst = 1 }, + [BRW_OPCODE_SENDSC] = { .name = "sendsc", .nsrc = 2, .ndst = 1 }, + [BRW_OPCODE_ILLEGAL] = { .name = "illegal", .nsrc = 0, .ndst = 0 }, [BRW_OPCODE_NOP] = { .name = "nop", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_NENOP] = { .name = "nenop", .nsrc = 0, .ndst = 0 }, [BRW_OPCODE_JMPI] = { .name = "jmpi", .nsrc = 0, .ndst = 0 }, - [BRW_OPCODE_IF] = { .name = "if", .nsrc = 2, .ndst = 0 }, - [BRW_OPCODE_IFF] = { .name = "iff", .nsrc = 2, .ndst = 1 }, - [BRW_OPCODE_WHILE] = { .name = "while", .nsrc = 2, .ndst = 0 }, - [BRW_OPCODE_ELSE] = { .name = "else", .nsrc = 2, .ndst = 0 }, - [BRW_OPCODE_BREAK] = { .name = "break", .nsrc = 2, .ndst = 0 }, - [BRW_OPCODE_CONTINUE] = { .name = "cont", .nsrc = 1, .ndst = 0 }, - [BRW_OPCODE_HALT] = { .name = "halt", .nsrc = 1, .ndst = 0 }, - [BRW_OPCODE_MSAVE] = { .name = "msave", .nsrc = 1, .ndst = 1 }, - [BRW_OPCODE_PUSH] = { .name = "push", .nsrc = 1, .ndst = 1 }, - [BRW_OPCODE_MRESTORE] = { .name = "mrest", .nsrc = 1, .ndst = 1 }, - [BRW_OPCODE_POP] = { .name = "pop", .nsrc = 2, .ndst = 0 }, + [BRW_OPCODE_IF] = { .name = "if", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_IFF] = { .name = "iff", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_WHILE] = { .name = "while", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_ELSE] = { .name = "else", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_BREAK] = { .name = "break", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_CONTINUE] = { .name = "cont", .nsrc = 0, .ndst = 0 }, + [BRW_OPCODE_HALT] = { .name = "halt", .nsrc = 0, .ndst = 0 }, + // [BRW_OPCODE_MSAVE] = { .name = "msave", .nsrc = 1, .ndst = 1 }, + // [BRW_OPCODE_PUSH] = { .name = "push", .nsrc = 1, .ndst = 1 }, + // [BRW_OPCODE_MREST] = { .name = "mrest", .nsrc = 1, .ndst = 1 }, + // [BRW_OPCODE_POP] = { .name = "pop", .nsrc = 2, .ndst = 0 }, [BRW_OPCODE_WAIT] = { .name = "wait", .nsrc = 1, .ndst = 0 }, [BRW_OPCODE_DO] = { .name = "do", .nsrc = 0, .ndst = 0 }, - [BRW_OPCODE_ENDIF] = { .name = "endif", .nsrc = 2, .ndst = 0 }, + [BRW_OPCODE_ENDIF] = { .name = "endif", .nsrc = 0, .ndst = 0 }, }; static bool -has_jip(struct brw_context *brw, enum opcode opcode) +has_jip(const struct brw_device_info *devinfo, enum opcode opcode) { - if (brw->gen < 6) + if (devinfo->gen < 6) return false; return opcode == BRW_OPCODE_IF || opcode == BRW_OPCODE_ELSE || opcode == BRW_OPCODE_ENDIF || - opcode == BRW_OPCODE_WHILE; + 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) +has_uip(const struct brw_device_info *devinfo, enum opcode opcode) { - if (brw->gen < 6) + if (devinfo->gen < 6) return false; - return (brw->gen >= 7 && opcode == BRW_OPCODE_IF) || - (brw->gen >= 8 && opcode == BRW_OPCODE_ELSE) || + return (devinfo->gen >= 7 && opcode == BRW_OPCODE_IF) || + (devinfo->gen >= 8 && opcode == BRW_OPCODE_ELSE) || opcode == BRW_OPCODE_BREAK || opcode == BRW_OPCODE_CONTINUE || opcode == BRW_OPCODE_HALT; } +static bool +has_branch_ctrl(const struct brw_device_info *devinfo, enum opcode opcode) +{ + if (devinfo->gen < 8) + return false; + + return opcode == BRW_OPCODE_IF || + opcode == BRW_OPCODE_ELSE; + /* opcode == BRW_OPCODE_GOTO; */ +} + +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", @@ -148,6 +174,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", @@ -201,8 +229,13 @@ static const char *const accwr[2] = { [1] = "AccWrEnable" }; +static const char *const branch_ctrl[2] = { + [0] = "", + [1] = "BranchCtrl" +}; + static const char *const wectrl[2] = { - [0] = "WE_normal", + [0] = "", [1] = "WE_all" }; @@ -220,7 +253,7 @@ static const char *const pred_inv[2] = { [1] = "-" }; -static const char *const pred_ctrl_align16[16] = { +const char *const pred_ctrl_align16[16] = { [1] = "", [2] = ".x", [3] = ".y", @@ -241,9 +274,9 @@ static const char *const pred_ctrl_align1[16] = { [BRW_PREDICATE_ALIGN1_ANY8H] = ".any8h", [BRW_PREDICATE_ALIGN1_ALL8H] = ".all8h", [BRW_PREDICATE_ALIGN1_ANY16H] = ".any16h", - [BRW_PREDICATE_ALIGN1_ANY16H] = ".all16h", + [BRW_PREDICATE_ALIGN1_ALL16H] = ".all16h", [BRW_PREDICATE_ALIGN1_ANY32H] = ".any32h", - [BRW_PREDICATE_ALIGN1_ANY32H] = ".all32h", + [BRW_PREDICATE_ALIGN1_ALL32H] = ".all32h", }; static const char *const thread_ctrl[4] = { @@ -341,7 +374,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", @@ -353,7 +387,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", @@ -369,6 +403,43 @@ static const char *const target_function_gen6[16] = { [HSW_SFID_CRE] = "cre", }; +static const char *const gen7_gateway_subfuncid[8] = { + [BRW_MESSAGE_GATEWAY_SFID_OPEN_GATEWAY] = "open", + [BRW_MESSAGE_GATEWAY_SFID_CLOSE_GATEWAY] = "close", + [BRW_MESSAGE_GATEWAY_SFID_FORWARD_MSG] = "forward msg", + [BRW_MESSAGE_GATEWAY_SFID_GET_TIMESTAMP] = "get timestamp", + [BRW_MESSAGE_GATEWAY_SFID_BARRIER_MSG] = "barrier msg", + [BRW_MESSAGE_GATEWAY_SFID_UPDATE_GATEWAY_STATE] = "update state", + [BRW_MESSAGE_GATEWAY_SFID_MMIO_READ_WRITE] = "mmio read/write", +}; + +static const char *const gen4_dp_read_port_msg_type[4] = { + [0b00] = "OWord Block Read", + [0b01] = "OWord Dual Block Read", + [0b10] = "Media Block Read", + [0b11] = "DWord Scattered Read", +}; + +static const char *const g45_dp_read_port_msg_type[8] = { + [0b000] = "OWord Block Read", + [0b010] = "OWord Dual Block Read", + [0b100] = "Media Block Read", + [0b110] = "DWord Scattered Read", + [0b001] = "Render Target UNORM Read", + [0b011] = "AVC Loop Filter Read", +}; + +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", @@ -386,7 +457,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] = { @@ -396,6 +477,7 @@ static const char *const dp_dc0_msg_type_gen7[16] = { [GEN7_DATAPORT_DC_OWORD_DUAL_BLOCK_READ] = "DC OWORD dual block read", [GEN7_DATAPORT_DC_DWORD_SCATTERED_READ] = "DC DWORD scattered read", [GEN7_DATAPORT_DC_BYTE_SCATTERED_READ] = "DC byte scattered read", + [GEN7_DATAPORT_DC_UNTYPED_SURFACE_READ] = "DC untyped surface read", [GEN7_DATAPORT_DC_UNTYPED_ATOMIC_OP] = "DC untyped atomic", [GEN7_DATAPORT_DC_MEMORY_FENCE] = "DC mfence", [GEN7_DATAPORT_DC_OWORD_BLOCK_WRITE] = "DC OWORD block write", @@ -440,6 +522,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", @@ -454,6 +543,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] = { @@ -476,11 +567,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[] = { + [BRW_URB_OPCODE_WRITE_HWORD] = "write HWord", + [BRW_URB_OPCODE_WRITE_OWORD] = "write OWord", + [BRW_URB_OPCODE_READ_HWORD] = "read HWord", + [BRW_URB_OPCODE_READ_OWORD] = "read OWord", + [GEN7_URB_OPCODE_ATOMIC_MOV] = "atomic mov", /* Gen7+ */ + [GEN7_URB_OPCODE_ATOMIC_INC] = "atomic inc", /* Gen7+ */ + [GEN8_URB_OPCODE_ATOMIC_ADD] = "atomic add", /* Gen8+ */ + [GEN8_URB_OPCODE_SIMD8_WRITE] = "SIMD8 write", /* Gen8+ */ + [GEN8_URB_OPCODE_SIMD8_READ] = "SIMD8 read", /* Gen8+ */ + /* [9-15] - reserved */ +}; + static const char *const urb_swizzle[4] = { [BRW_URB_SWIZZLE_NONE] = "", [BRW_URB_SWIZZLE_INTERLEAVE] = "interleave", @@ -502,6 +606,36 @@ static const char *const urb_complete[2] = { [1] = "complete" }; +static const char *const gen5_sampler_msg_type[] = { + [GEN5_SAMPLER_MESSAGE_SAMPLE] = "sample", + [GEN5_SAMPLER_MESSAGE_SAMPLE_BIAS] = "sample_b", + [GEN5_SAMPLER_MESSAGE_SAMPLE_LOD] = "sample_l", + [GEN5_SAMPLER_MESSAGE_SAMPLE_COMPARE] = "sample_c", + [GEN5_SAMPLER_MESSAGE_SAMPLE_DERIVS] = "sample_d", + [GEN5_SAMPLER_MESSAGE_SAMPLE_BIAS_COMPARE] = "sample_b_c", + [GEN5_SAMPLER_MESSAGE_SAMPLE_LOD_COMPARE] = "sample_l_c", + [GEN5_SAMPLER_MESSAGE_SAMPLE_LD] = "ld", + [GEN7_SAMPLER_MESSAGE_SAMPLE_GATHER4] = "gather4", + [GEN5_SAMPLER_MESSAGE_LOD] = "lod", + [GEN5_SAMPLER_MESSAGE_SAMPLE_RESINFO] = "resinfo", + [GEN6_SAMPLER_MESSAGE_SAMPLE_SAMPLEINFO] = "sampleinfo", + [GEN7_SAMPLER_MESSAGE_SAMPLE_GATHER4_C] = "gather4_c", + [GEN7_SAMPLER_MESSAGE_SAMPLE_GATHER4_PO] = "gather4_po", + [GEN7_SAMPLER_MESSAGE_SAMPLE_GATHER4_PO_C] = "gather4_po_c", + [HSW_SAMPLER_MESSAGE_SAMPLE_DERIV_COMPARE] = "sample_d_c", + [GEN9_SAMPLER_MESSAGE_SAMPLE_LD2DMS_W] = "ld2dms_w", + [GEN7_SAMPLER_MESSAGE_SAMPLE_LD_MCS] = "ld_mcs", + [GEN7_SAMPLER_MESSAGE_SAMPLE_LD2DMS] = "ld2dms", + [GEN7_SAMPLER_MESSAGE_SAMPLE_LD2DSS] = "ld2dss", +}; + +static const char *const gen5_sampler_simd_mode[4] = { + [BRW_SAMPLER_SIMD_MODE_SIMD4X2] = "SIMD4x2", + [BRW_SAMPLER_SIMD_MODE_SIMD8] = "SIMD8", + [BRW_SAMPLER_SIMD_MODE_SIMD16] = "SIMD16", + [BRW_SAMPLER_SIMD_MODE_SIMD32_64] = "SIMD32/64", +}; + static const char *const sampler_target_format[4] = { [0] = "F", [2] = "UD", @@ -519,6 +653,9 @@ string(FILE *file, const char *string) return 0; } +static int +format(FILE *f, const char *format, ...) PRINTFLIKE(2, 3); + static int format(FILE *f, const char *format, ...) { @@ -585,13 +722,13 @@ reg(FILE *file, unsigned _reg_file, unsigned _reg_nr) /* Clear the Compr4 instruction compression bit. */ if (_reg_file == BRW_MESSAGE_REGISTER_FILE) - _reg_nr &= ~(1 << 7); + _reg_nr &= ~BRW_MRF_COMPR4; if (_reg_file == BRW_ARCHITECTURE_REGISTER_FILE) { switch (_reg_nr & 0xf0) { case BRW_ARF_NULL: string(file, "null"); - return -1; + break; case BRW_ARF_ADDRESS: format(file, "a%d", _reg_nr & 0x0f); break; @@ -620,6 +757,12 @@ reg(FILE *file, unsigned _reg_file, unsigned _reg_nr) string(file, "ip"); return -1; break; + case BRW_ARF_TDR: + format(file, "tdr0"); + return -1; + case BRW_ARF_TIMESTAMP: + format(file, "tm%d", _reg_nr & 0x0f); + break; default: format(file, "ARF%d", _reg_nr); break; @@ -632,53 +775,53 @@ reg(FILE *file, unsigned _reg_file, unsigned _reg_nr) } static int -dest(FILE *file, struct brw_context *brw, brw_inst *inst) +dest(FILE *file, const struct brw_device_info *devinfo, brw_inst *inst) { int err = 0; - if (brw_inst_access_mode(brw, inst) == BRW_ALIGN_1) { - if (brw_inst_dst_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) { - err |= reg(file, brw_inst_dst_reg_file(brw, inst), - brw_inst_dst_da_reg_nr(brw, inst)); + if (brw_inst_access_mode(devinfo, inst) == BRW_ALIGN_1) { + if (brw_inst_dst_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { + err |= reg(file, brw_inst_dst_reg_file(devinfo, inst), + brw_inst_dst_da_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (brw_inst_dst_da1_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_dst_da1_subreg_nr(brw, inst) / - reg_type_size[brw_inst_dst_reg_type(brw, inst)]); + if (brw_inst_dst_da1_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_dst_da1_subreg_nr(devinfo, inst) / + reg_type_size[brw_inst_dst_reg_type(devinfo, inst)]); string(file, "<"); err |= control(file, "horiz stride", horiz_stride, - brw_inst_dst_hstride(brw, inst), NULL); + brw_inst_dst_hstride(devinfo, inst), NULL); string(file, ">"); err |= control(file, "dest reg encoding", reg_encoding, - brw_inst_dst_reg_type(brw, inst), NULL); + brw_inst_dst_reg_type(devinfo, inst), NULL); } else { string(file, "g[a0"); - if (brw_inst_dst_ia_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_dst_ia_subreg_nr(brw, inst) / - reg_type_size[brw_inst_dst_reg_type(brw, inst)]); - if (brw_inst_dst_ia1_addr_imm(brw, inst)) - format(file, " %d", brw_inst_dst_ia1_addr_imm(brw, inst)); + if (brw_inst_dst_ia_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_dst_ia_subreg_nr(devinfo, inst) / + reg_type_size[brw_inst_dst_reg_type(devinfo, inst)]); + if (brw_inst_dst_ia1_addr_imm(devinfo, inst)) + format(file, " %d", brw_inst_dst_ia1_addr_imm(devinfo, inst)); string(file, "]<"); err |= control(file, "horiz stride", horiz_stride, - brw_inst_dst_hstride(brw, inst), NULL); + brw_inst_dst_hstride(devinfo, inst), NULL); string(file, ">"); err |= control(file, "dest reg encoding", reg_encoding, - brw_inst_dst_reg_type(brw, inst), NULL); + brw_inst_dst_reg_type(devinfo, inst), NULL); } } else { - if (brw_inst_dst_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) { - err |= reg(file, brw_inst_dst_reg_file(brw, inst), - brw_inst_dst_da_reg_nr(brw, inst)); + if (brw_inst_dst_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { + err |= reg(file, brw_inst_dst_reg_file(devinfo, inst), + brw_inst_dst_da_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (brw_inst_dst_da16_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_dst_da16_subreg_nr(brw, inst) / - reg_type_size[brw_inst_dst_reg_type(brw, inst)]); + if (brw_inst_dst_da16_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_dst_da16_subreg_nr(devinfo, inst) / + reg_type_size[brw_inst_dst_reg_type(devinfo, inst)]); string(file, "<1>"); err |= control(file, "writemask", writemask, - brw_inst_da16_writemask(brw, inst), NULL); + brw_inst_da16_writemask(devinfo, inst), NULL); err |= control(file, "dest reg encoding", reg_encoding, - brw_inst_dst_reg_type(brw, inst), NULL); + brw_inst_dst_reg_type(devinfo, inst), NULL); } else { err = 1; string(file, "Indirect align16 address mode not supported"); @@ -689,26 +832,26 @@ dest(FILE *file, struct brw_context *brw, brw_inst *inst) } static int -dest_3src(FILE *file, struct brw_context *brw, brw_inst *inst) +dest_3src(FILE *file, const struct brw_device_info *devinfo, brw_inst *inst) { int err = 0; uint32_t reg_file; - if (brw->gen == 6 && brw_inst_3src_dst_reg_file(brw, inst)) + if (devinfo->gen == 6 && brw_inst_3src_dst_reg_file(devinfo, inst)) reg_file = BRW_MESSAGE_REGISTER_FILE; else reg_file = BRW_GENERAL_REGISTER_FILE; - err |= reg(file, reg_file, brw_inst_3src_dst_reg_nr(brw, inst)); + err |= reg(file, reg_file, brw_inst_3src_dst_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (brw_inst_3src_dst_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_3src_dst_subreg_nr(brw, inst)); + if (brw_inst_3src_dst_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_3src_dst_subreg_nr(devinfo, inst)); string(file, "<1>"); err |= control(file, "writemask", writemask, - brw_inst_3src_dst_writemask(brw, inst), NULL); + brw_inst_3src_dst_writemask(devinfo, inst), NULL); err |= control(file, "dest reg encoding", three_source_reg_encoding, - brw_inst_3src_dst_type(brw, inst), NULL); + brw_inst_3src_dst_type(devinfo, inst), NULL); return 0; } @@ -730,13 +873,21 @@ src_align1_region(FILE *file, } static int -src_da1(FILE *file, unsigned type, unsigned _reg_file, +src_da1(FILE *file, + const struct brw_device_info *devinfo, + 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 (devinfo->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); @@ -751,17 +902,23 @@ src_da1(FILE *file, unsigned type, unsigned _reg_file, static int src_ia1(FILE *file, + const struct brw_device_info *devinfo, + unsigned opcode, unsigned type, unsigned _reg_file, int _addr_imm, unsigned _addr_subreg_nr, unsigned _negate, unsigned __abs, - unsigned _addr_mode, unsigned _horiz_stride, unsigned _width, unsigned _vert_stride) { int err = 0; - err |= control(file, "negate", m_negate, _negate, NULL); + + if (devinfo->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"); @@ -775,8 +932,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_device_info *devinfo, + unsigned opcode, unsigned _reg_type, unsigned _reg_file, unsigned _vert_stride, @@ -787,7 +968,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 (devinfo->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); @@ -800,250 +986,184 @@ 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; } static int -src0_3src(FILE *file, struct brw_context *brw, brw_inst *inst) +src0_3src(FILE *file, const struct brw_device_info *devinfo, 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); + unsigned src0_subreg_nr = brw_inst_3src_src0_subreg_nr(devinfo, inst); err |= control(file, "negate", m_negate, - brw_inst_3src_src0_negate(brw, inst), NULL); - err |= control(file, "abs", _abs, brw_inst_3src_src0_abs(brw, inst), NULL); + brw_inst_3src_src0_negate(devinfo, inst), NULL); + err |= control(file, "abs", _abs, brw_inst_3src_src0_abs(devinfo, inst), NULL); err |= reg(file, BRW_GENERAL_REGISTER_FILE, - brw_inst_3src_src0_reg_nr(brw, inst)); + brw_inst_3src_src0_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (src0_subreg_nr) + if (src0_subreg_nr || brw_inst_3src_src0_rep_ctrl(devinfo, inst)) format(file, ".%d", src0_subreg_nr); - if (brw_inst_3src_src0_rep_ctrl(brw, inst)) + if (brw_inst_3src_src0_rep_ctrl(devinfo, inst)) string(file, "<0,1,0>"); - else + else { 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(devinfo, inst)); } + err |= control(file, "src da16 reg type", three_source_reg_encoding, + brw_inst_3src_src_type(devinfo, inst), NULL); return err; } static int -src1_3src(FILE *file, struct brw_context *brw, brw_inst *inst) +src1_3src(FILE *file, const struct brw_device_info *devinfo, 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); + unsigned src1_subreg_nr = brw_inst_3src_src1_subreg_nr(devinfo, inst); err |= control(file, "negate", m_negate, - brw_inst_3src_src1_negate(brw, inst), NULL); - err |= control(file, "abs", _abs, brw_inst_3src_src1_abs(brw, inst), NULL); + brw_inst_3src_src1_negate(devinfo, inst), NULL); + err |= control(file, "abs", _abs, brw_inst_3src_src1_abs(devinfo, inst), NULL); err |= reg(file, BRW_GENERAL_REGISTER_FILE, - brw_inst_3src_src1_reg_nr(brw, inst)); + brw_inst_3src_src1_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (src1_subreg_nr) + if (src1_subreg_nr || brw_inst_3src_src1_rep_ctrl(devinfo, inst)) format(file, ".%d", src1_subreg_nr); - if (brw_inst_3src_src1_rep_ctrl(brw, inst)) + if (brw_inst_3src_src1_rep_ctrl(devinfo, inst)) string(file, "<0,1,0>"); - else + else { 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(devinfo, inst)); } + err |= control(file, "src da16 reg type", three_source_reg_encoding, + brw_inst_3src_src_type(devinfo, inst), NULL); return err; } static int -src2_3src(FILE *file, struct brw_context *brw, brw_inst *inst) +src2_3src(FILE *file, const struct brw_device_info *devinfo, 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); + unsigned src2_subreg_nr = brw_inst_3src_src2_subreg_nr(devinfo, inst); err |= control(file, "negate", m_negate, - brw_inst_3src_src2_negate(brw, inst), NULL); - err |= control(file, "abs", _abs, brw_inst_3src_src2_abs(brw, inst), NULL); + brw_inst_3src_src2_negate(devinfo, inst), NULL); + err |= control(file, "abs", _abs, brw_inst_3src_src2_abs(devinfo, inst), NULL); err |= reg(file, BRW_GENERAL_REGISTER_FILE, - brw_inst_3src_src2_reg_nr(brw, inst)); + brw_inst_3src_src2_reg_nr(devinfo, inst)); if (err == -1) return 0; - if (src2_subreg_nr) + if (src2_subreg_nr || brw_inst_3src_src2_rep_ctrl(devinfo, inst)) format(file, ".%d", src2_subreg_nr); - if (brw_inst_3src_src2_rep_ctrl(brw, inst)) + if (brw_inst_3src_src2_rep_ctrl(devinfo, inst)) string(file, "<0,1,0>"); - else + else { 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(devinfo, inst)); } + err |= control(file, "src da16 reg type", three_source_reg_encoding, + brw_inst_3src_src_type(devinfo, inst), NULL); return err; } static int -imm(FILE *file, struct brw_context *brw, unsigned type, brw_inst *inst) +imm(FILE *file, const struct brw_device_info *devinfo, unsigned type, brw_inst *inst) { switch (type) { case BRW_HW_REG_TYPE_UD: - format(file, "0x%08xUD", brw_inst_imm_ud(brw, inst)); + format(file, "0x%08xUD", brw_inst_imm_ud(devinfo, inst)); break; case BRW_HW_REG_TYPE_D: - format(file, "%dD", brw_inst_imm_d(brw, inst)); + format(file, "%dD", brw_inst_imm_d(devinfo, inst)); break; case BRW_HW_REG_TYPE_UW: - format(file, "0x%04xUW", (uint16_t) brw_inst_imm_ud(brw, inst)); + format(file, "0x%04xUW", (uint16_t) brw_inst_imm_ud(devinfo, inst)); break; case BRW_HW_REG_TYPE_W: - format(file, "%dW", (int16_t) brw_inst_imm_d(brw, inst)); + format(file, "%dW", (int16_t) brw_inst_imm_d(devinfo, inst)); break; case BRW_HW_REG_IMM_TYPE_UV: - format(file, "0x%08xUV", brw_inst_imm_ud(brw, inst)); + format(file, "0x%08xUV", brw_inst_imm_ud(devinfo, inst)); break; case BRW_HW_REG_IMM_TYPE_VF: - format(file, "Vector Float"); + format(file, "[%-gF, %-gF, %-gF, %-gF]VF", + brw_vf_to_float(brw_inst_imm_ud(devinfo, inst)), + brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 8), + brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 16), + brw_vf_to_float(brw_inst_imm_ud(devinfo, inst) >> 24)); break; case BRW_HW_REG_IMM_TYPE_V: - format(file, "0x%08xV", brw_inst_imm_ud(brw, inst)); + format(file, "0x%08xV", brw_inst_imm_ud(devinfo, inst)); break; case BRW_HW_REG_TYPE_F: - format(file, "%-gF", brw_inst_imm_f(brw, inst)); + format(file, "%-gF", brw_inst_imm_f(devinfo, 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; } static int -src0(FILE *file, struct brw_context *brw, brw_inst *inst) +src0(FILE *file, const struct brw_device_info *devinfo, brw_inst *inst) { - if (brw_inst_src0_reg_file(brw, inst) == BRW_IMMEDIATE_VALUE) { - return imm(file, brw, brw_inst_src0_reg_type(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) { + if (brw_inst_src0_reg_file(devinfo, inst) == BRW_IMMEDIATE_VALUE) { + return imm(file, devinfo, brw_inst_src0_reg_type(devinfo, inst), inst); + } else if (brw_inst_access_mode(devinfo, inst) == BRW_ALIGN_1) { + if (brw_inst_src0_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { return src_da1(file, - brw_inst_src0_reg_type(brw, inst), - brw_inst_src0_reg_file(brw, inst), - brw_inst_src0_vstride(brw, inst), - brw_inst_src0_width(brw, inst), - brw_inst_src0_hstride(brw, inst), - brw_inst_src0_da_reg_nr(brw, inst), - brw_inst_src0_da1_subreg_nr(brw, inst), - brw_inst_src0_abs(brw, inst), - brw_inst_src0_negate(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src0_reg_type(devinfo, inst), + brw_inst_src0_reg_file(devinfo, inst), + brw_inst_src0_vstride(devinfo, inst), + brw_inst_src0_width(devinfo, inst), + brw_inst_src0_hstride(devinfo, inst), + brw_inst_src0_da_reg_nr(devinfo, inst), + brw_inst_src0_da1_subreg_nr(devinfo, inst), + brw_inst_src0_abs(devinfo, inst), + brw_inst_src0_negate(devinfo, inst)); } else { return src_ia1(file, - brw_inst_src0_reg_type(brw, inst), - brw_inst_src0_reg_file(brw, inst), - brw_inst_src0_ia1_addr_imm(brw, inst), - brw_inst_src0_ia_subreg_nr(brw, inst), - brw_inst_src0_negate(brw, inst), - brw_inst_src0_abs(brw, inst), - brw_inst_src0_address_mode(brw, inst), - brw_inst_src0_hstride(brw, inst), - brw_inst_src0_width(brw, inst), - brw_inst_src0_vstride(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src0_reg_type(devinfo, inst), + brw_inst_src0_reg_file(devinfo, inst), + brw_inst_src0_ia1_addr_imm(devinfo, inst), + brw_inst_src0_ia_subreg_nr(devinfo, inst), + brw_inst_src0_negate(devinfo, inst), + brw_inst_src0_abs(devinfo, inst), + brw_inst_src0_hstride(devinfo, inst), + brw_inst_src0_width(devinfo, inst), + brw_inst_src0_vstride(devinfo, inst)); } } else { - if (brw_inst_src0_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) { + if (brw_inst_src0_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { return src_da16(file, - brw_inst_src0_reg_type(brw, inst), - brw_inst_src0_reg_file(brw, inst), - brw_inst_src0_vstride(brw, inst), - brw_inst_src0_da_reg_nr(brw, inst), - brw_inst_src0_da16_subreg_nr(brw, inst), - brw_inst_src0_abs(brw, inst), - brw_inst_src0_negate(brw, inst), - brw_inst_src0_da16_swiz_x(brw, inst), - brw_inst_src0_da16_swiz_y(brw, inst), - brw_inst_src0_da16_swiz_z(brw, inst), - brw_inst_src0_da16_swiz_w(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src0_reg_type(devinfo, inst), + brw_inst_src0_reg_file(devinfo, inst), + brw_inst_src0_vstride(devinfo, inst), + brw_inst_src0_da_reg_nr(devinfo, inst), + brw_inst_src0_da16_subreg_nr(devinfo, inst), + brw_inst_src0_abs(devinfo, inst), + brw_inst_src0_negate(devinfo, inst), + brw_inst_src0_da16_swiz_x(devinfo, inst), + brw_inst_src0_da16_swiz_y(devinfo, inst), + brw_inst_src0_da16_swiz_z(devinfo, inst), + brw_inst_src0_da16_swiz_w(devinfo, inst)); } else { string(file, "Indirect align16 address mode not supported"); return 1; @@ -1052,49 +1172,54 @@ src0(FILE *file, struct brw_context *brw, brw_inst *inst) } static int -src1(FILE *file, struct brw_context *brw, brw_inst *inst) +src1(FILE *file, const struct brw_device_info *devinfo, brw_inst *inst) { - if (brw_inst_src1_reg_file(brw, inst) == BRW_IMMEDIATE_VALUE) { - return imm(file, brw, brw_inst_src1_reg_type(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) { + if (brw_inst_src1_reg_file(devinfo, inst) == BRW_IMMEDIATE_VALUE) { + return imm(file, devinfo, brw_inst_src1_reg_type(devinfo, inst), inst); + } else if (brw_inst_access_mode(devinfo, inst) == BRW_ALIGN_1) { + if (brw_inst_src1_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { return src_da1(file, - brw_inst_src1_reg_type(brw, inst), - brw_inst_src1_reg_file(brw, inst), - brw_inst_src1_vstride(brw, inst), - brw_inst_src1_width(brw, inst), - brw_inst_src1_hstride(brw, inst), - brw_inst_src1_da_reg_nr(brw, inst), - brw_inst_src1_da1_subreg_nr(brw, inst), - brw_inst_src1_abs(brw, inst), - brw_inst_src1_negate(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src1_reg_type(devinfo, inst), + brw_inst_src1_reg_file(devinfo, inst), + brw_inst_src1_vstride(devinfo, inst), + brw_inst_src1_width(devinfo, inst), + brw_inst_src1_hstride(devinfo, inst), + brw_inst_src1_da_reg_nr(devinfo, inst), + brw_inst_src1_da1_subreg_nr(devinfo, inst), + brw_inst_src1_abs(devinfo, inst), + brw_inst_src1_negate(devinfo, inst)); } else { return src_ia1(file, - brw_inst_src1_reg_type(brw, inst), - brw_inst_src1_reg_file(brw, inst), - brw_inst_src1_ia1_addr_imm(brw, inst), - brw_inst_src1_ia_subreg_nr(brw, inst), - brw_inst_src1_negate(brw, inst), - brw_inst_src1_abs(brw, inst), - brw_inst_src1_address_mode(brw, inst), - brw_inst_src1_hstride(brw, inst), - brw_inst_src1_width(brw, inst), - brw_inst_src1_vstride(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src1_reg_type(devinfo, inst), + brw_inst_src1_reg_file(devinfo, inst), + brw_inst_src1_ia1_addr_imm(devinfo, inst), + brw_inst_src1_ia_subreg_nr(devinfo, inst), + brw_inst_src1_negate(devinfo, inst), + brw_inst_src1_abs(devinfo, inst), + brw_inst_src1_hstride(devinfo, inst), + brw_inst_src1_width(devinfo, inst), + brw_inst_src1_vstride(devinfo, inst)); } } else { - if (brw_inst_src1_address_mode(brw, inst) == BRW_ADDRESS_DIRECT) { + if (brw_inst_src1_address_mode(devinfo, inst) == BRW_ADDRESS_DIRECT) { return src_da16(file, - brw_inst_src1_reg_type(brw, inst), - brw_inst_src1_reg_file(brw, inst), - brw_inst_src1_vstride(brw, inst), - brw_inst_src1_da_reg_nr(brw, inst), - brw_inst_src1_da16_subreg_nr(brw, inst), - brw_inst_src1_abs(brw, inst), - brw_inst_src1_negate(brw, inst), - brw_inst_src1_da16_swiz_x(brw, inst), - brw_inst_src1_da16_swiz_y(brw, inst), - brw_inst_src1_da16_swiz_z(brw, inst), - brw_inst_src1_da16_swiz_w(brw, inst)); + devinfo, + brw_inst_opcode(devinfo, inst), + brw_inst_src1_reg_type(devinfo, inst), + brw_inst_src1_reg_file(devinfo, inst), + brw_inst_src1_vstride(devinfo, inst), + brw_inst_src1_da_reg_nr(devinfo, inst), + brw_inst_src1_da16_subreg_nr(devinfo, inst), + brw_inst_src1_abs(devinfo, inst), + brw_inst_src1_negate(devinfo, inst), + brw_inst_src1_da16_swiz_x(devinfo, inst), + brw_inst_src1_da16_swiz_y(devinfo, inst), + brw_inst_src1_da16_swiz_z(devinfo, inst), + brw_inst_src1_da16_swiz_w(devinfo, inst)); } else { string(file, "Indirect align16 address mode not supported"); return 1; @@ -1103,10 +1228,10 @@ src1(FILE *file, struct brw_context *brw, brw_inst *inst) } static int -qtr_ctrl(FILE *file, struct brw_context *brw, brw_inst *inst) +qtr_ctrl(FILE *file, const struct brw_device_info *devinfo, brw_inst *inst) { - int qtr_ctl = brw_inst_qtr_control(brw, inst); - int exec_size = 1 << brw_inst_exec_size(brw, inst); + int qtr_ctl = brw_inst_qtr_control(devinfo, inst); + int exec_size = 1 << brw_inst_exec_size(devinfo, inst); if (exec_size == 8) { switch (qtr_ctl) { @@ -1132,350 +1257,416 @@ qtr_ctrl(FILE *file, struct brw_context *brw, brw_inst *inst) return 0; } +#ifdef DEBUG +static __attribute__((__unused__)) int +brw_disassemble_imm(const struct brw_device_info *devinfo, + uint32_t dw3, uint32_t dw2, uint32_t dw1, uint32_t dw0) +{ + brw_inst inst; + inst.data[0] = (((uint64_t) dw1) << 32) | ((uint64_t) dw0); + inst.data[1] = (((uint64_t) dw3) << 32) | ((uint64_t) dw2); + return brw_disassemble_inst(stderr, devinfo, &inst, false); +} +#endif + int -brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst, - bool is_compacted) +brw_disassemble_inst(FILE *file, const struct brw_device_info *devinfo, + brw_inst *inst, bool is_compacted) { int err = 0; int space = 0; - const enum opcode opcode = brw_inst_opcode(brw, inst); + const enum opcode opcode = brw_inst_opcode(devinfo, inst); - if (brw_inst_pred_control(brw, inst)) { + if (brw_inst_pred_control(devinfo, inst)) { string(file, "("); err |= control(file, "predicate inverse", pred_inv, - brw_inst_pred_inv(brw, inst), NULL); - format(file, "f%d", brw->gen >= 7 ? brw_inst_flag_reg_nr(brw, inst) : 0); - if (brw_inst_flag_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_flag_subreg_nr(brw, inst)); - if (brw_inst_access_mode(brw, inst) == BRW_ALIGN_1) { + brw_inst_pred_inv(devinfo, inst), NULL); + format(file, "f%ld", devinfo->gen >= 7 ? brw_inst_flag_reg_nr(devinfo, inst) : 0); + if (brw_inst_flag_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_flag_subreg_nr(devinfo, inst)); + if (brw_inst_access_mode(devinfo, inst) == BRW_ALIGN_1) { err |= control(file, "predicate control align1", pred_ctrl_align1, - brw_inst_pred_control(brw, inst), NULL); + brw_inst_pred_control(devinfo, inst), NULL); } else { err |= control(file, "predicate control align16", pred_ctrl_align16, - brw_inst_pred_control(brw, inst), NULL); + brw_inst_pred_control(devinfo, inst), NULL); } string(file, ") "); } err |= print_opcode(file, opcode); - err |= control(file, "saturate", saturate, brw_inst_saturate(brw, inst), + err |= control(file, "saturate", saturate, brw_inst_saturate(devinfo, inst), NULL); err |= control(file, "debug control", debug_ctrl, - brw_inst_debug_control(brw, inst), NULL); + brw_inst_debug_control(devinfo, inst), NULL); if (opcode == BRW_OPCODE_MATH) { string(file, " "); err |= control(file, "function", math_function, - brw_inst_math_function(brw, inst), NULL); + brw_inst_math_function(devinfo, inst), NULL); } else if (opcode != BRW_OPCODE_SEND && opcode != BRW_OPCODE_SENDC) { err |= control(file, "conditional modifier", conditional_modifier, - brw_inst_cond_modifier(brw, inst), NULL); + brw_inst_cond_modifier(devinfo, inst), NULL); /* If we're using the conditional modifier, print which flags reg is * used for it. Note that on gen6+, the embedded-condition SEL and * control flow doesn't update flags. */ - if (brw_inst_cond_modifier(brw, inst) && - (brw->gen < 6 || (opcode != BRW_OPCODE_SEL && + if (brw_inst_cond_modifier(devinfo, inst) && + (devinfo->gen < 6 || (opcode != BRW_OPCODE_SEL && opcode != BRW_OPCODE_IF && opcode != BRW_OPCODE_WHILE))) { - format(file, ".f%d", - brw->gen >= 7 ? brw_inst_flag_reg_nr(brw, inst) : 0); - if (brw_inst_flag_subreg_nr(brw, inst)) - format(file, ".%d", brw_inst_flag_subreg_nr(brw, inst)); + format(file, ".f%ld", + devinfo->gen >= 7 ? brw_inst_flag_reg_nr(devinfo, inst) : 0); + if (brw_inst_flag_subreg_nr(devinfo, inst)) + format(file, ".%ld", brw_inst_flag_subreg_nr(devinfo, inst)); } } - if (opcode != BRW_OPCODE_NOP) { + if (opcode != BRW_OPCODE_NOP && opcode != BRW_OPCODE_NENOP) { string(file, "("); err |= control(file, "execution size", exec_size, - brw_inst_exec_size(brw, inst), NULL); + brw_inst_exec_size(devinfo, inst), NULL); string(file, ")"); } - if (opcode == BRW_OPCODE_SEND && brw->gen < 6) - format(file, " %d", brw_inst_base_mrf(brw, inst)); + if (opcode == BRW_OPCODE_SEND && devinfo->gen < 6) + format(file, " %ld", brw_inst_base_mrf(devinfo, inst)); - if (has_uip(brw, opcode)) { + if (has_uip(devinfo, opcode)) { /* Instructions that have UIP also have JIP. */ pad(file, 16); - format(file, "JIP: %d", brw_inst_jip(brw, inst)); + format(file, "JIP: %d", brw_inst_jip(devinfo, inst)); pad(file, 32); - format(file, "UIP: %d", brw_inst_uip(brw, inst)); - } else if (has_jip(brw, opcode)) { + format(file, "UIP: %d", brw_inst_uip(devinfo, inst)); + } else if (has_jip(devinfo, opcode)) { pad(file, 16); - if (brw->gen >= 7) { - format(file, "JIP: %d", brw_inst_jip(brw, inst)); + if (devinfo->gen >= 7) { + format(file, "JIP: %d", brw_inst_jip(devinfo, inst)); } else { - format(file, "JIP: %d", brw_inst_gen6_jump_count(brw, inst)); + format(file, "JIP: %d", brw_inst_gen6_jump_count(devinfo, inst)); } - } else if (brw->gen < 6 && (opcode == BRW_OPCODE_BREAK || + } else if (devinfo->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)); + format(file, "Jump: %d", brw_inst_gen4_jump_count(devinfo, inst)); pad(file, 32); - format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst)); - } else if (brw->gen < 6 && (opcode == BRW_OPCODE_IF || + format(file, "Pop: %ld", brw_inst_gen4_pop_count(devinfo, inst)); + } else if (devinfo->gen < 6 && (opcode == BRW_OPCODE_IF || opcode == BRW_OPCODE_IFF || opcode == BRW_OPCODE_HALT)) { pad(file, 16); - format(file, "Jump: %d", brw_inst_gen4_pop_count(brw, inst)); - } else if (brw->gen < 6 && opcode == BRW_OPCODE_ENDIF) { + format(file, "Jump: %d", brw_inst_gen4_jump_count(devinfo, inst)); + } else if (devinfo->gen < 6 && opcode == BRW_OPCODE_ENDIF) { pad(file, 16); - format(file, "Pop: %d", brw_inst_gen4_pop_count(brw, inst)); + format(file, "Pop: %ld", brw_inst_gen4_pop_count(devinfo, inst)); } else if (opcode == BRW_OPCODE_JMPI) { - format(file, " %d", brw_inst_imm_d(brw, inst)); + pad(file, 16); + err |= src1(file, devinfo, inst); } else if (opcode_descs[opcode].nsrc == 3) { pad(file, 16); - err |= dest_3src(file, brw, inst); + err |= dest_3src(file, devinfo, inst); pad(file, 32); - err |= src0_3src(file, brw, inst); + err |= src0_3src(file, devinfo, inst); pad(file, 48); - err |= src1_3src(file, brw, inst); + err |= src1_3src(file, devinfo, inst); pad(file, 64); - err |= src2_3src(file, brw, inst); + err |= src2_3src(file, devinfo, inst); } else { if (opcode_descs[opcode].ndst > 0) { pad(file, 16); - err |= dest(file, brw, inst); + err |= dest(file, devinfo, inst); } if (opcode_descs[opcode].nsrc > 0) { pad(file, 32); - err |= src0(file, brw, inst); + err |= src0(file, devinfo, inst); } if (opcode_descs[opcode].nsrc > 1) { pad(file, 48); - err |= src1(file, brw, inst); + err |= src1(file, devinfo, 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(devinfo, inst); + + if (brw_inst_src1_reg_file(devinfo, inst) != BRW_IMMEDIATE_VALUE) { + /* show the indirect descriptor source */ + pad(file, 48); + err |= src1(file, devinfo, 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", devinfo->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); + + if (brw_inst_src1_reg_file(devinfo, 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(devinfo, inst), &space); + err |= control(file, "math saturate", math_saturate, + brw_inst_math_msg_saturate(devinfo, inst), &space); + err |= control(file, "math signed", math_signed, + brw_inst_math_msg_signed_int(devinfo, inst), &space); + err |= control(file, "math scalar", math_scalar, + brw_inst_math_msg_data_type(devinfo, inst), &space); + err |= control(file, "math precision", math_precision, + brw_inst_math_msg_precision(devinfo, inst), &space); + break; + case BRW_SFID_SAMPLER: + if (devinfo->gen >= 5) { + err |= control(file, "sampler message", gen5_sampler_msg_type, + brw_inst_sampler_msg_type(devinfo, inst), &space); + err |= control(file, "sampler simd mode", gen5_sampler_simd_mode, + brw_inst_sampler_simd_mode(devinfo, inst), &space); + format(file, " Surface = %ld Sampler = %ld", + brw_inst_binding_table_index(devinfo, inst), + brw_inst_sampler(devinfo, inst)); + } else { + format(file, " (%ld, %ld, %ld, ", + brw_inst_binding_table_index(devinfo, inst), + brw_inst_sampler(devinfo, inst), + brw_inst_sampler_msg_type(devinfo, inst)); + if (!devinfo->is_g4x) { + err |= control(file, "sampler target format", + sampler_target_format, + brw_inst_sampler_return_format(devinfo, inst), NULL); + } + string(file, ")"); } - 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; + break; + case GEN6_SFID_DATAPORT_SAMPLER_CACHE: + /* aka BRW_SFID_DATAPORT_READ on Gen4-5 */ + if (devinfo->gen >= 6) { + format(file, " (%ld, %ld, %ld, %ld)", + brw_inst_binding_table_index(devinfo, inst), + brw_inst_dp_msg_control(devinfo, inst), + brw_inst_dp_msg_type(devinfo, inst), + devinfo->gen >= 7 ? 0 : brw_inst_dp_write_commit(devinfo, inst)); + } else { + bool is_965 = devinfo->gen == 4 && !devinfo->is_g4x; + err |= control(file, "DP read message type", + is_965 ? gen4_dp_read_port_msg_type : + g45_dp_read_port_msg_type, + brw_inst_dp_read_msg_type(devinfo, inst), + &space); + + format(file, " MsgCtrl = 0x%lx", + brw_inst_dp_read_msg_control(devinfo, inst)); + + format(file, " Surface = %ld", brw_inst_binding_table_index(devinfo, inst)); + } + break; - case BRW_SFID_DATAPORT_WRITE: - if (brw->gen >= 7) { - 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(devinfo, 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)", - 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, " ("); + devinfo->gen >= 6 ? dp_rc_msg_type_gen6 + : dp_write_port_msg_type, + msg_type, &space); + + bool is_rt_write = msg_type == + (devinfo->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(devinfo, inst), &space); + if (devinfo->gen >= 6 && brw_inst_rt_slot_group(devinfo, inst)) + string(file, " Hi"); + if (brw_inst_rt_last(devinfo, inst)) + string(file, " LastRT"); + if (devinfo->gen < 7 && brw_inst_dp_write_commit(devinfo, inst)) + string(file, " WriteCommit"); + } else { + format(file, " MsgCtrl = 0x%lx", + brw_inst_dp_write_msg_control(devinfo, 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)); + format(file, " Surface = %ld", brw_inst_binding_table_index(devinfo, inst)); + break; } - break; - case BRW_SFID_URB: - format(file, " %d", brw_inst_urb_global_offset(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); - } - 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, " ("); + case BRW_SFID_URB: + format(file, " %ld", brw_inst_urb_global_offset(devinfo, inst)); - err |= control(file, "DP DC0 message type", - dp_dc0_msg_type_gen7, - brw_inst_dp_msg_type(brw, inst), &space); + space = 1; + if (devinfo->gen >= 7) { + err |= control(file, "urb opcode", gen7_urb_opcode, + brw_inst_urb_opcode(devinfo, inst), &space); + } else if (devinfo->gen >= 5) { + err |= control(file, "urb opcode", gen5_urb_opcode, + brw_inst_urb_opcode(devinfo, inst), &space); + } + err |= control(file, "urb swizzle", urb_swizzle, + brw_inst_urb_swizzle_control(devinfo, inst), &space); + if (devinfo->gen < 7) { + err |= control(file, "urb allocate", urb_allocate, + brw_inst_urb_allocate(devinfo, inst), &space); + err |= control(file, "urb used", urb_used, + brw_inst_urb_used(devinfo, inst), &space); + } + if (devinfo->gen < 8) { + err |= control(file, "urb complete", urb_complete, + brw_inst_urb_complete(devinfo, inst), &space); + } + break; + case BRW_SFID_THREAD_SPAWNER: + break; - format(file, ", %d, ", brw_inst_binding_table_index(brw, inst)); + case BRW_SFID_MESSAGE_GATEWAY: + format(file, " (%s)", + gen7_gateway_subfuncid[brw_inst_gateway_subfuncid(devinfo, inst)]); + break; - 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); + case GEN7_SFID_DATAPORT_DATA_CACHE: + if (devinfo->gen >= 7) { + format(file, " ("); + + err |= control(file, "DP DC0 message type", + dp_dc0_msg_type_gen7, + brw_inst_dp_msg_type(devinfo, inst), &space); + + format(file, ", %ld, ", brw_inst_binding_table_index(devinfo, inst)); + + switch (brw_inst_dp_msg_type(devinfo, inst)) { + case GEN7_DATAPORT_DC_UNTYPED_ATOMIC_OP: + control(file, "atomic op", aop, + brw_inst_imm_ud(devinfo, inst) >> 8 & 0xf, &space); + break; + default: + format(file, "%ld", brw_inst_dp_msg_control(devinfo, inst)); + } + format(file, ")"); break; - default: - format(file, "%d", brw_inst_dp_msg_control(brw, inst)); } - format(file, ")"); - break; + /* FALLTHROUGH */ + + case HSW_SFID_DATAPORT_DATA_CACHE_1: { + if (devinfo->gen >= 7) { + format(file, " ("); + + unsigned msg_ctrl = brw_inst_dp_msg_control(devinfo, inst); + + err |= control(file, "DP DC1 message type", + dp_dc1_msg_type_hsw, + brw_inst_dp_msg_type(devinfo, inst), &space); + + format(file, ", Surface = %ld, ", + brw_inst_binding_table_index(devinfo, inst)); + + switch (brw_inst_dp_msg_type(devinfo, 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 (devinfo->gen >= 7) { + format(file, " (%s, %s, 0x%02lx)", + brw_inst_pi_nopersp(devinfo, inst) ? "linear" : "persp", + pixel_interpolator_msg_types[brw_inst_pi_message_type(devinfo, inst)], + brw_inst_pi_message_data(devinfo, 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 %ld", brw_inst_mlen(devinfo, inst)); + format(file, " rlen %ld", brw_inst_rlen(devinfo, 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) { + if (opcode != BRW_OPCODE_NOP && opcode != BRW_OPCODE_NENOP) { string(file, "{"); space = 1; err |= control(file, "access mode", access_mode, - brw_inst_access_mode(brw, inst), &space); - if (brw->gen >= 6) { + brw_inst_access_mode(devinfo, inst), &space); + if (devinfo->gen >= 6) { err |= control(file, "write enable control", wectrl, - brw_inst_mask_control(brw, inst), &space); + brw_inst_mask_control(devinfo, inst), &space); } else { err |= control(file, "mask control", mask_ctrl, - brw_inst_mask_control(brw, inst), &space); + brw_inst_mask_control(devinfo, inst), &space); } err |= control(file, "dependency control", dep_ctrl, - ((brw_inst_no_dd_check(brw, inst) << 1) | - brw_inst_no_dd_clear(brw, inst)), &space); + ((brw_inst_no_dd_check(devinfo, inst) << 1) | + brw_inst_no_dd_clear(devinfo, inst)), &space); - if (brw->gen >= 6) - err |= qtr_ctrl(file, brw, inst); + if (devinfo->gen >= 6) + err |= qtr_ctrl(file, devinfo, inst); else { - if (brw_inst_qtr_control(brw, inst) == BRW_COMPRESSION_COMPRESSED && + if (brw_inst_qtr_control(devinfo, inst) == BRW_COMPRESSION_COMPRESSED && opcode_descs[opcode].ndst > 0 && - brw_inst_dst_reg_file(brw, inst) == BRW_MESSAGE_REGISTER_FILE && - brw_inst_dst_da_reg_nr(brw, inst) & (1 << 7)) { + brw_inst_dst_reg_file(devinfo, inst) == BRW_MESSAGE_REGISTER_FILE && + brw_inst_dst_da_reg_nr(devinfo, inst) & BRW_MRF_COMPR4) { format(file, " compr4"); } else { err |= control(file, "compression control", compr_ctrl, - brw_inst_qtr_control(brw, inst), &space); + brw_inst_qtr_control(devinfo, inst), &space); } } err |= control(file, "compaction", cmpt_ctrl, is_compacted, &space); err |= control(file, "thread control", thread_ctrl, - brw_inst_thread_control(brw, inst), &space); - if (brw->gen >= 6) + brw_inst_thread_control(devinfo, inst), &space); + if (has_branch_ctrl(devinfo, opcode)) { + err |= control(file, "branch ctrl", branch_ctrl, + brw_inst_branch_control(devinfo, inst), &space); + } else if (devinfo->gen >= 6) { err |= control(file, "acc write control", accwr, - brw_inst_acc_wr_control(brw, inst), &space); + brw_inst_acc_wr_control(devinfo, inst), &space); + } if (opcode == BRW_OPCODE_SEND || opcode == BRW_OPCODE_SENDC) err |= control(file, "end of thread", end_of_thread, - brw_inst_eot(brw, inst), &space); + brw_inst_eot(devinfo, inst), &space); if (space) string(file, " "); string(file, "}");