OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/disasm: fix missing oword index decoding

Browse Source 
Also switch to array of strings to show high/low dwords.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: daba2894ff ("intel/disasm: decode/describe more send messages")
Acked-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12183>
This commit is contained in:
Lionel Landwerlin
2021-08-03 15:48:03 +03:00
committed by Marge Bot
parent b4e5bf0637
commit 97be8e42e4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/intel/compiler/brw_disasm.c
View File

@@ -429,11 +429,12 @@ static const char *const dp_dc0_msg_type_gfx7[16] = {
[GFX7_DATAPORT_DC_UNTYPED_SURFACE_WRITE] = "DC untyped surface write", [GFX7_DATAPORT_DC_UNTYPED_SURFACE_WRITE] = "DC untyped surface write",
}; };
static const int dp_oword_block_rw[8] = { static const char *const dp_oword_block_rw[8] = {
[BRW_DATAPORT_OWORD_BLOCK_1_OWORDLOW] = 1, [BRW_DATAPORT_OWORD_BLOCK_1_OWORDLOW] = "1-low",
[BRW_DATAPORT_OWORD_BLOCK_2_OWORDS] = 2, [BRW_DATAPORT_OWORD_BLOCK_1_OWORDHIGH] = "1-high",
[BRW_DATAPORT_OWORD_BLOCK_4_OWORDS] = 4, [BRW_DATAPORT_OWORD_BLOCK_2_OWORDS] = "2",
[BRW_DATAPORT_OWORD_BLOCK_8_OWORDS] = 8, [BRW_DATAPORT_OWORD_BLOCK_4_OWORDS] = "4",
[BRW_DATAPORT_OWORD_BLOCK_8_OWORDS] = "8",
}; };
static const char *const dp_dc1_msg_type_hsw[32] = { static const char *const dp_dc1_msg_type_hsw[32] = {
@@ -2307,8 +2308,8 @@ brw_disassemble_inst(FILE *file, const struct intel_device_info *devinfo,
case GFX7_DATAPORT_DC_OWORD_BLOCK_READ: case GFX7_DATAPORT_DC_OWORD_BLOCK_READ:
case GFX7_DATAPORT_DC_OWORD_BLOCK_WRITE: { case GFX7_DATAPORT_DC_OWORD_BLOCK_WRITE: {
unsigned msg_ctrl = brw_dp_desc_msg_control(devinfo, imm_desc); unsigned msg_ctrl = brw_dp_desc_msg_control(devinfo, imm_desc);
assert(dp_oword_block_rw[msg_ctrl & 7] > 0); assert(dp_oword_block_rw[msg_ctrl & 7]);
format(file, "owords = %d, aligned = %d", format(file, "owords = %s, aligned = %d",
dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3); dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3);
break; break;
} }
@@ -2369,8 +2370,8 @@ brw_disassemble_inst(FILE *file, const struct intel_device_info *devinfo,
break; break;
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE: case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_WRITE:
case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ: case GFX9_DATAPORT_DC_PORT1_A64_OWORD_BLOCK_READ:
assert(dp_oword_block_rw[msg_ctrl & 7] > 0); assert(dp_oword_block_rw[msg_ctrl & 7]);
format(file, "owords = %d, aligned = %d", format(file, "owords = %s, aligned = %d",
dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3); dp_oword_block_rw[msg_ctrl & 7], (msg_ctrl >> 3) & 3);
break; break;
default: default: