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.
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_inst_send_src0_reg_file(devinfo, inst),
+ BRW_GENERAL_REGISTER_FILE,
brw_inst_src0_da_reg_nr(devinfo, inst),
brw_inst_src0_da16_subreg_nr(devinfo, inst));
} else {
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)
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) {