#include "brw_eu.h"
#include "util/half_float.h"
-static bool
-has_jip(const struct gen_device_info *devinfo, enum opcode opcode)
+bool
+brw_has_jip(const struct gen_device_info *devinfo, enum opcode opcode)
{
if (devinfo->gen < 6)
return false;
opcode == BRW_OPCODE_HALT;
}
-static bool
-has_uip(const struct gen_device_info *devinfo, enum opcode opcode)
+bool
+brw_has_uip(const struct gen_device_info *devinfo, enum opcode opcode)
{
if (devinfo->gen < 6)
return false;
format(file, "mask%d", _reg_nr & 0x0f);
break;
case BRW_ARF_MASK_STACK:
+ format(file, "ms%d", _reg_nr & 0x0f);
+ break;
+ case BRW_ARF_MASK_STACK_DEPTH:
format(file, "msd%d", _reg_nr & 0x0f);
break;
case BRW_ARF_STATE:
unsigned subreg_nr;
enum brw_reg_type type;
+ if (devinfo->gen < 10 && is_align1)
+ return 0;
+
if (devinfo->gen == 6 && brw_inst_3src_a16_dst_reg_file(devinfo, inst))
reg_file = BRW_MESSAGE_REGISTER_FILE;
else if (devinfo->gen >= 12)
bool is_scalar_region;
bool is_align1 = brw_inst_3src_access_mode(devinfo, inst) == BRW_ALIGN_1;
+ if (devinfo->gen < 10 && is_align1)
+ return 0;
+
if (is_align1) {
- if (devinfo->gen >= 12) {
+ if (devinfo->gen >= 12 && !brw_inst_3src_a1_src0_is_imm(devinfo, inst)) {
_file = brw_inst_3src_a1_src0_reg_file(devinfo, inst);
- reg_nr = brw_inst_3src_src0_reg_nr(devinfo, inst);
- subreg_nr = brw_inst_3src_a1_src0_subreg_nr(devinfo, inst);
- type = brw_inst_3src_a1_src0_type(devinfo, inst);
} else if (brw_inst_3src_a1_src0_reg_file(devinfo, inst) ==
BRW_ALIGN1_3SRC_GENERAL_REGISTER_FILE) {
_file = BRW_GENERAL_REGISTER_FILE;
- reg_nr = brw_inst_3src_src0_reg_nr(devinfo, inst);
- subreg_nr = brw_inst_3src_a1_src0_subreg_nr(devinfo, inst);
- type = brw_inst_3src_a1_src0_type(devinfo, inst);
} else if (brw_inst_3src_a1_src0_type(devinfo, inst) ==
BRW_REGISTER_TYPE_NF) {
_file = BRW_ARCHITECTURE_REGISTER_FILE;
- reg_nr = brw_inst_3src_src0_reg_nr(devinfo, inst);
- subreg_nr = brw_inst_3src_a1_src0_subreg_nr(devinfo, inst);
- type = brw_inst_3src_a1_src0_type(devinfo, inst);
} else {
_file = BRW_IMMEDIATE_VALUE;
uint16_t imm_val = brw_inst_3src_a1_src0_imm(devinfo, inst);
} else if (type == BRW_REGISTER_TYPE_UW) {
format(file, "0x%04xUW", imm_val);
} else if (type == BRW_REGISTER_TYPE_HF) {
- format(file, "%-gF", _mesa_half_to_float(imm_val));
+ format(file, "0x%04xHF", imm_val);
}
return 0;
}
+ reg_nr = brw_inst_3src_src0_reg_nr(devinfo, inst);
+ subreg_nr = brw_inst_3src_a1_src0_subreg_nr(devinfo, inst);
+ type = brw_inst_3src_a1_src0_type(devinfo, inst);
_vert_stride = vstride_from_align1_3src_vstride(
devinfo, brw_inst_3src_a1_src0_vstride(devinfo, inst));
_horiz_stride = hstride_from_align1_3src_hstride(
bool is_scalar_region;
bool is_align1 = brw_inst_3src_access_mode(devinfo, inst) == BRW_ALIGN_1;
+ if (devinfo->gen < 10 && is_align1)
+ return 0;
+
if (is_align1) {
if (devinfo->gen >= 12) {
_file = brw_inst_3src_a1_src1_reg_file(devinfo, inst);
bool is_scalar_region;
bool is_align1 = brw_inst_3src_access_mode(devinfo, inst) == BRW_ALIGN_1;
+ if (devinfo->gen < 10 && is_align1)
+ return 0;
+
if (is_align1) {
- if (devinfo->gen >= 12) {
+ if (devinfo->gen >= 12 && !brw_inst_3src_a1_src2_is_imm(devinfo, inst)) {
_file = brw_inst_3src_a1_src2_reg_file(devinfo, inst);
- reg_nr = brw_inst_3src_src2_reg_nr(devinfo, inst);
- subreg_nr = brw_inst_3src_a1_src2_subreg_nr(devinfo, inst);
- type = brw_inst_3src_a1_src2_type(devinfo, inst);
} else if (brw_inst_3src_a1_src2_reg_file(devinfo, inst) ==
BRW_ALIGN1_3SRC_GENERAL_REGISTER_FILE) {
_file = BRW_GENERAL_REGISTER_FILE;
- reg_nr = brw_inst_3src_src2_reg_nr(devinfo, inst);
- subreg_nr = brw_inst_3src_a1_src2_subreg_nr(devinfo, inst);
- type = brw_inst_3src_a1_src2_type(devinfo, inst);
} else {
_file = BRW_IMMEDIATE_VALUE;
uint16_t imm_val = brw_inst_3src_a1_src2_imm(devinfo, inst);
} else if (type == BRW_REGISTER_TYPE_UW) {
format(file, "0x%04xUW", imm_val);
} else if (type == BRW_REGISTER_TYPE_HF) {
- format(file, "%-gF", _mesa_half_to_float(imm_val));
+ format(file, "0x%04xHF", imm_val);
}
return 0;
}
+ reg_nr = brw_inst_3src_src2_reg_nr(devinfo, inst);
+ subreg_nr = brw_inst_3src_a1_src2_subreg_nr(devinfo, inst);
+ type = brw_inst_3src_a1_src2_type(devinfo, inst);
/* FINISHME: No vertical stride on src2. Is using the hstride in place
* correct? Doesn't seem like it, since there's hstride=1 but
* no vstride=1.
src_sends_da(FILE *file,
const struct gen_device_info *devinfo,
enum brw_reg_type type,
+ enum brw_reg_file _reg_file,
unsigned _reg_nr,
unsigned _reg_subnr)
{
int err = 0;
- err |= reg(file, BRW_GENERAL_REGISTER_FILE, _reg_nr);
+ err |= reg(file, _reg_file, _reg_nr);
if (err == -1)
return 0;
if (_reg_subnr)
return 0;
}
+static int
+src_send_desc_ia(FILE *file,
+ const struct gen_device_info *devinfo,
+ unsigned _addr_subreg_nr)
+{
+ string(file, "a0");
+ if (_addr_subreg_nr)
+ format(file, ".%d", _addr_subreg_nr);
+ format(file, "<0>UD");
+
+ return 0;
+}
+
static int
src0(FILE *file, const struct gen_device_info *devinfo, const brw_inst *inst)
{
return src_sends_da(file,
devinfo,
BRW_REGISTER_TYPE_UD,
+ BRW_GENERAL_REGISTER_FILE,
brw_inst_src0_da_reg_nr(devinfo, inst),
brw_inst_src0_da16_subreg_nr(devinfo, inst));
} else {
return src_sends_da(file,
devinfo,
BRW_REGISTER_TYPE_UD,
+ brw_inst_send_src1_reg_file(devinfo, inst),
brw_inst_send_src1_reg_nr(devinfo, inst),
0 /* subreg_nr */);
} else if (brw_inst_src1_reg_file(devinfo, inst) == BRW_IMMEDIATE_VALUE) {
static int
swsb(FILE *file, const struct gen_device_info *devinfo, const brw_inst *inst)
{
- const struct tgl_swsb swsb = tgl_swsb_decode(brw_inst_swsb(devinfo, inst));
+ const struct tgl_swsb swsb = tgl_swsb_decode(brw_inst_opcode(devinfo, inst),
+ brw_inst_swsb(devinfo, inst));
if (swsb.regdist)
format(file, " @%d", swsb.regdist);
if (swsb.mode)
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);
+ return brw_disassemble_inst(stderr, devinfo, &inst, false, 0, NULL);
}
#endif
+static void
+write_label(FILE *file, const struct gen_device_info *devinfo,
+ const struct brw_label *root_label,
+ int offset, int jump)
+{
+ if (root_label != NULL) {
+ int to_bytes_scale = sizeof(brw_inst) / brw_jump_scale(devinfo);
+ const struct brw_label *label =
+ brw_find_label(root_label, offset + jump * to_bytes_scale);
+ if (label != NULL) {
+ format(file, " LABEL%d", label->number);
+ }
+ }
+}
+
int
brw_disassemble_inst(FILE *file, const struct gen_device_info *devinfo,
- const brw_inst *inst, bool is_compacted)
+ const brw_inst *inst, bool is_compacted,
+ int offset, const struct brw_label *root_label)
{
int err = 0;
int space = 0;
if (opcode == BRW_OPCODE_SEND && devinfo->gen < 6)
format(file, " %"PRIu64, brw_inst_base_mrf(devinfo, inst));
- if (has_uip(devinfo, opcode)) {
+ if (brw_has_uip(devinfo, opcode)) {
/* Instructions that have UIP also have JIP. */
pad(file, 16);
- format(file, "JIP: %d", brw_inst_jip(devinfo, inst));
- pad(file, 32);
- format(file, "UIP: %d", brw_inst_uip(devinfo, inst));
- } else if (has_jip(devinfo, opcode)) {
- pad(file, 16);
+ string(file, "JIP: ");
+ write_label(file, devinfo, root_label, offset, brw_inst_jip(devinfo, inst));
+
+ pad(file, 38);
+ string(file, "UIP: ");
+ write_label(file, devinfo, root_label, offset, brw_inst_uip(devinfo, inst));
+ } else if (brw_has_jip(devinfo, opcode)) {
+ int jip;
if (devinfo->gen >= 7) {
- format(file, "JIP: %d", brw_inst_jip(devinfo, inst));
+ jip = brw_inst_jip(devinfo, inst);
} else {
- format(file, "JIP: %d", brw_inst_gen6_jump_count(devinfo, inst));
+ jip = brw_inst_gen6_jump_count(devinfo, inst);
}
+
+ pad(file, 16);
+ string(file, "JIP: ");
+ write_label(file, devinfo, root_label, offset, jip);
} else if (devinfo->gen < 6 && (opcode == BRW_OPCODE_BREAK ||
opcode == BRW_OPCODE_CONTINUE ||
opcode == BRW_OPCODE_ELSE)) {
pad(file, 64);
if (brw_inst_send_sel_reg32_desc(devinfo, inst)) {
/* show the indirect descriptor source */
- err |= src_sends_ia(file, devinfo, BRW_REGISTER_TYPE_UD, 0, 0);
+ err |= src_send_desc_ia(file, devinfo, 0);
} else {
has_imm_desc = true;
imm_desc = brw_inst_send_desc(devinfo, inst);
pad(file, 80);
if (brw_inst_send_sel_reg32_ex_desc(devinfo, inst)) {
/* show the indirect descriptor source */
- err |= src_sends_ia(file, devinfo, BRW_REGISTER_TYPE_UD, 0,
- brw_inst_send_ex_desc_ia_subreg_nr(devinfo, inst));
+ err |= src_send_desc_ia(file, devinfo,
+ brw_inst_send_ex_desc_ia_subreg_nr(devinfo, inst));
} else {
has_imm_ex_desc = true;
imm_ex_desc = brw_inst_sends_ex_desc(devinfo, inst);
format(file, ")");
break;
}
- /* FALLTHROUGH */
}
+ /* FALLTHROUGH */
case GEN7_SFID_PIXEL_INTERPOLATOR:
if (devinfo->gen >= 7) {
projects / mesa.git / blobdiff