diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_disasm.c | 3 | ||||
| -rw-r--r-- | src/intel/compiler/brw_eu_defines.h | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json index e71396bab9a..e83836d2a10 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -517,7 +517,7 @@ "description": "intel/gen12: Take into account opcode when decoding SWSB", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "6154cdf924f4d0d3a6fb0cef38bc62eb4494c69c" }, diff --git a/src/intel/compiler/brw_disasm.c b/src/intel/compiler/brw_disasm.c index 57aa9e51091..ff46cb9549a 100644 --- a/src/intel/compiler/brw_disasm.c +++ b/src/intel/compiler/brw_disasm.c @@ -1632,7 +1632,8 @@ qtr_ctrl(FILE *file, const struct gen_device_info *devinfo, const brw_inst *inst 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) diff --git a/src/intel/compiler/brw_eu_defines.h b/src/intel/compiler/brw_eu_defines.h index 779bab04235..1e7ebe88772 100644 --- a/src/intel/compiler/brw_eu_defines.h +++ b/src/intel/compiler/brw_eu_defines.h @@ -1154,11 +1154,14 @@ tgl_swsb_encode(struct tgl_swsb swsb) * tgl_swsb. */ static inline struct tgl_swsb -tgl_swsb_decode(uint8_t x) +tgl_swsb_decode(enum opcode opcode, uint8_t x) { if (x & 0x80) { const struct tgl_swsb swsb = { (x & 0x70u) >> 4, x & 0xfu, - TGL_SBID_DST | TGL_SBID_SET }; + (opcode == BRW_OPCODE_SEND || + opcode == BRW_OPCODE_SENDC || + opcode == BRW_OPCODE_MATH) ? + TGL_SBID_SET : TGL_SBID_DST }; return swsb; } else if ((x & 0x70) == 0x20) { return tgl_swsb_sbid(TGL_SBID_DST, x & 0xfu); |