KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/aub_viewer: printout 48bits addresses 

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Lionel Landwerlin 2019-02-25 10:47:55 +00:00
parent 875942c059
commit f1da10e0c5
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/intel/tools/aubinator_viewer_decoder.cpp
View File

@ -66,7 +66,7 @@ aub_viewer_print_group(struct aub_viewer_decode_ctx *ctx,
if (last_dword != iter_dword) { if (last_dword != iter_dword) {
for (int i = last_dword + 1; i <= iter_dword; i++) { for (int i = last_dword + 1; i <= iter_dword; i++) {
ImGui::TextColored(ctx->cfg->dwords_color, ImGui::TextColored(ctx->cfg->dwords_color,
"0x%08" PRIx64 ": 0x%08x : Dword %d", "0x%012" PRIx64 ": 0x%012x : Dword %d",
address + 4 * i, iter.p[i], i); address + 4 * i, iter.p[i], i);
} }
last_dword = iter_dword; last_dword = iter_dword;
@ -217,7 +217,7 @@ dump_binding_table(struct aub_viewer_decode_ctx *ctx, uint32_t offset, int count
if (bind_bo.map == NULL) { if (bind_bo.map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"binding table unavailable addr=0x%08" PRIx64, "binding table unavailable addr=0x%012" PRIx64,
ctx->surface_base + offset); ctx->surface_base + offset);
return; return;
} }
@ -234,13 +234,13 @@ dump_binding_table(struct aub_viewer_decode_ctx *ctx, uint32_t offset, int count
if (pointers[i] % 32 != 0 || if (pointers[i] % 32 != 0 ||
addr < bo.addr || addr + size >= bo.addr + bo.size) { addr < bo.addr || addr + size >= bo.addr + bo.size) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"pointer %u: %08x <not valid>", i, pointers[i]); "pointer %u: %012x <not valid>", i, pointers[i]);
continue; continue;
} }
const uint8_t *state = (const uint8_t *) bo.map + (addr - bo.addr); const uint8_t *state = (const uint8_t *) bo.map + (addr - bo.addr);
if (ImGui::TreeNodeEx(&pointers[i], ImGuiTreeNodeFlags_Framed, if (ImGui::TreeNodeEx(&pointers[i], ImGuiTreeNodeFlags_Framed,
"pointer %u: %08x", i, pointers[i])) { "pointer %u: %012x", i, pointers[i])) {
aub_viewer_print_group(ctx, strct, addr, state); aub_viewer_print_group(ctx, strct, addr, state);
ImGui::TreePop(); ImGui::TreePop();
} }
@ -261,7 +261,7 @@ dump_samplers(struct aub_viewer_decode_ctx *ctx, uint32_t offset, int count)
if (state_map == NULL) { if (state_map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"samplers unavailable addr=0x%08" PRIx64, state_addr); "samplers unavailable addr=0x%012" PRIx64, state_addr);
return; return;
} }
@ -308,12 +308,12 @@ handle_media_interface_descriptor_load(struct aub_viewer_decode_ctx *ctx,
if (desc_map == NULL) { if (desc_map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"interface descriptors unavailable addr=0x%08" PRIx64, desc_addr); "interface descriptors unavailable addr=0x%012" PRIx64, desc_addr);
return; return;
} }
for (int i = 0; i < descriptor_count; i++) { for (int i = 0; i < descriptor_count; i++) {
ImGui::Text("descriptor %d: %08x", i, descriptor_offset); ImGui::Text("descriptor %d: %012x", i, descriptor_offset);
aub_viewer_print_group(ctx, desc, desc_addr, desc_map); aub_viewer_print_group(ctx, desc, desc_addr, desc_map);
@ -394,7 +394,7 @@ handle_3dstate_vertex_buffers(struct aub_viewer_decode_ctx *ctx,
if (vb.map == NULL) { if (vb.map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"buffer contents unavailable addr=0x%08" PRIx64, buffer_addr); "buffer contents unavailable addr=0x%012" PRIx64, buffer_addr);
continue; continue;
} }
@ -435,7 +435,7 @@ handle_3dstate_index_buffer(struct aub_viewer_decode_ctx *ctx,
if (ib.map == NULL) { if (ib.map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"buffer contents unavailable addr=0x%08" PRIx64, "buffer contents unavailable addr=0x%012" PRIx64,
buffer_addr); buffer_addr);
return; return;
} }
@ -581,7 +581,7 @@ decode_3dstate_constant(struct aub_viewer_decode_ctx *ctx,
struct gen_batch_decode_bo buffer = ctx_get_bo(ctx, read_addr[i]); struct gen_batch_decode_bo buffer = ctx_get_bo(ctx, read_addr[i]);
if (!buffer.map) { if (!buffer.map) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"constant buffer %d unavailable addr=0x%08" PRIx64, "constant buffer %d unavailable addr=0x%012" PRIx64,
i, read_addr[i]); i, read_addr[i]);
continue; continue;
} }
@ -655,7 +655,7 @@ decode_dynamic_state_pointers(struct aub_viewer_decode_ctx *ctx,
if (state_map == NULL) { if (state_map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"dynamic %s state unavailable addr=0x%08" PRIx64, "dynamic %s state unavailable addr=0x%012" PRIx64,
struct_type, state_addr); struct_type, state_addr);
return; return;
} }
@ -908,7 +908,7 @@ aub_viewer_render_batch(struct aub_viewer_decode_ctx *ctx,
if (inst == NULL) { if (inst == NULL) {
ImGui::TextColored(ctx->cfg->error_color, ImGui::TextColored(ctx->cfg->error_color,
"0x%08" PRIx64 ": unknown instruction %08x", "0x%012" PRIx64 ": unknown instruction %012x",
offset, p[0]); offset, p[0]);
continue; continue;
} }
@ -926,7 +926,7 @@ aub_viewer_render_batch(struct aub_viewer_decode_ctx *ctx,
if (ctx->decode_cfg->command_filter.PassFilter(inst->name) && if (ctx->decode_cfg->command_filter.PassFilter(inst->name) &&
ImGui::TreeNodeEx(p, ImGui::TreeNodeEx(p,
ImGuiTreeNodeFlags_Framed, ImGuiTreeNodeFlags_Framed,
"0x%08" PRIx64 ": %s", "0x%012" PRIx64 ": %s",
offset, inst->name)) { offset, inst->name)) {
aub_viewer_print_group(ctx, inst, offset, p); aub_viewer_print_group(ctx, inst, offset, p);
@ -961,7 +961,7 @@ aub_viewer_render_batch(struct aub_viewer_decode_ctx *ctx,
if (next_batch.map == NULL) { if (next_batch.map == NULL) {
ImGui::TextColored(ctx->cfg->missing_color, ImGui::TextColored(ctx->cfg->missing_color,
"Secondary batch at 0x%08" PRIx64 " unavailable", "Secondary batch at 0x%012" PRIx64 " unavailable",
next_batch.addr); next_batch.addr);
} else { } else {
aub_viewer_render_batch(ctx, next_batch.map, next_batch.size, aub_viewer_render_batch(ctx, next_batch.map, next_batch.size,