mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-04 09:10:12 +01:00
radeonsi: start using u_log_context for debugging
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
ad33f2ddd8
commit
bc93339799
3 changed files with 228 additions and 112 deletions
|
|
@ -833,7 +833,7 @@ bool r600_init_flushed_depth_texture(struct pipe_context *ctx,
|
|||
struct pipe_resource *texture,
|
||||
struct r600_texture **staging);
|
||||
void r600_print_texture_info(struct r600_common_screen *rscreen,
|
||||
struct r600_texture *rtex, FILE *f);
|
||||
struct r600_texture *rtex, struct u_log_context *log);
|
||||
struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
|
||||
const struct pipe_resource *templ);
|
||||
bool vi_dcc_formats_compatible(enum pipe_format format1,
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "r600_cs.h"
|
||||
#include "r600_query.h"
|
||||
#include "util/u_format.h"
|
||||
#include "util/u_log.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "util/u_pack_color.h"
|
||||
#include "util/u_surface.h"
|
||||
|
|
@ -1039,12 +1040,12 @@ static void r600_texture_allocate_htile(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
void r600_print_texture_info(struct r600_common_screen *rscreen,
|
||||
struct r600_texture *rtex, FILE *f)
|
||||
struct r600_texture *rtex, struct u_log_context *log)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* Common parameters. */
|
||||
fprintf(f, " Info: npix_x=%u, npix_y=%u, npix_z=%u, blk_w=%u, "
|
||||
u_log_printf(log, " Info: npix_x=%u, npix_y=%u, npix_z=%u, blk_w=%u, "
|
||||
"blk_h=%u, array_size=%u, last_level=%u, "
|
||||
"bpe=%u, nsamples=%u, flags=0x%x, %s\n",
|
||||
rtex->resource.b.b.width0, rtex->resource.b.b.height0,
|
||||
|
|
@ -1055,7 +1056,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
rtex->surface.flags, util_format_short_name(rtex->resource.b.b.format));
|
||||
|
||||
if (rscreen->chip_class >= GFX9) {
|
||||
fprintf(f, " Surf: size=%"PRIu64", slice_size=%"PRIu64", "
|
||||
u_log_printf(log, " Surf: size=%"PRIu64", slice_size=%"PRIu64", "
|
||||
"alignment=%u, swmode=%u, epitch=%u, pitch=%u\n",
|
||||
rtex->surface.surf_size,
|
||||
rtex->surface.u.gfx9.surf_slice_size,
|
||||
|
|
@ -1065,7 +1066,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
rtex->surface.u.gfx9.surf_pitch);
|
||||
|
||||
if (rtex->fmask.size) {
|
||||
fprintf(f, " FMASK: offset=%"PRIu64", size=%"PRIu64", "
|
||||
u_log_printf(log, " FMASK: offset=%"PRIu64", size=%"PRIu64", "
|
||||
"alignment=%u, swmode=%u, epitch=%u\n",
|
||||
rtex->fmask.offset,
|
||||
rtex->surface.u.gfx9.fmask_size,
|
||||
|
|
@ -1075,7 +1076,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
if (rtex->cmask.size) {
|
||||
fprintf(f, " CMask: offset=%"PRIu64", size=%"PRIu64", "
|
||||
u_log_printf(log, " CMask: offset=%"PRIu64", size=%"PRIu64", "
|
||||
"alignment=%u, rb_aligned=%u, pipe_aligned=%u\n",
|
||||
rtex->cmask.offset,
|
||||
rtex->surface.u.gfx9.cmask_size,
|
||||
|
|
@ -1085,7 +1086,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
if (rtex->htile_offset) {
|
||||
fprintf(f, " HTile: offset=%"PRIu64", size=%"PRIu64", alignment=%u, "
|
||||
u_log_printf(log, " HTile: offset=%"PRIu64", size=%"PRIu64", alignment=%u, "
|
||||
"rb_aligned=%u, pipe_aligned=%u\n",
|
||||
rtex->htile_offset,
|
||||
rtex->surface.htile_size,
|
||||
|
|
@ -1095,7 +1096,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
if (rtex->dcc_offset) {
|
||||
fprintf(f, " DCC: offset=%"PRIu64", size=%"PRIu64", "
|
||||
u_log_printf(log, " DCC: offset=%"PRIu64", size=%"PRIu64", "
|
||||
"alignment=%u, pitch_max=%u, num_dcc_levels=%u\n",
|
||||
rtex->dcc_offset, rtex->surface.dcc_size,
|
||||
rtex->surface.dcc_alignment,
|
||||
|
|
@ -1104,7 +1105,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
if (rtex->surface.u.gfx9.stencil_offset) {
|
||||
fprintf(f, " Stencil: offset=%"PRIu64", swmode=%u, epitch=%u\n",
|
||||
u_log_printf(log, " Stencil: offset=%"PRIu64", swmode=%u, epitch=%u\n",
|
||||
rtex->surface.u.gfx9.stencil_offset,
|
||||
rtex->surface.u.gfx9.stencil.swizzle_mode,
|
||||
rtex->surface.u.gfx9.stencil.epitch);
|
||||
|
|
@ -1112,7 +1113,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
return;
|
||||
}
|
||||
|
||||
fprintf(f, " Layout: size=%"PRIu64", alignment=%u, bankw=%u, "
|
||||
u_log_printf(log, " Layout: size=%"PRIu64", alignment=%u, bankw=%u, "
|
||||
"bankh=%u, nbanks=%u, mtilea=%u, tilesplit=%u, pipeconfig=%u, scanout=%u\n",
|
||||
rtex->surface.surf_size, rtex->surface.surf_alignment, rtex->surface.u.legacy.bankw,
|
||||
rtex->surface.u.legacy.bankh, rtex->surface.u.legacy.num_banks, rtex->surface.u.legacy.mtilea,
|
||||
|
|
@ -1120,31 +1121,31 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
(rtex->surface.flags & RADEON_SURF_SCANOUT) != 0);
|
||||
|
||||
if (rtex->fmask.size)
|
||||
fprintf(f, " FMask: offset=%"PRIu64", size=%"PRIu64", alignment=%u, pitch_in_pixels=%u, "
|
||||
u_log_printf(log, " FMask: offset=%"PRIu64", size=%"PRIu64", alignment=%u, pitch_in_pixels=%u, "
|
||||
"bankh=%u, slice_tile_max=%u, tile_mode_index=%u\n",
|
||||
rtex->fmask.offset, rtex->fmask.size, rtex->fmask.alignment,
|
||||
rtex->fmask.pitch_in_pixels, rtex->fmask.bank_height,
|
||||
rtex->fmask.slice_tile_max, rtex->fmask.tile_mode_index);
|
||||
|
||||
if (rtex->cmask.size)
|
||||
fprintf(f, " CMask: offset=%"PRIu64", size=%"PRIu64", alignment=%u, "
|
||||
u_log_printf(log, " CMask: offset=%"PRIu64", size=%"PRIu64", alignment=%u, "
|
||||
"slice_tile_max=%u\n",
|
||||
rtex->cmask.offset, rtex->cmask.size, rtex->cmask.alignment,
|
||||
rtex->cmask.slice_tile_max);
|
||||
|
||||
if (rtex->htile_offset)
|
||||
fprintf(f, " HTile: offset=%"PRIu64", size=%"PRIu64", "
|
||||
u_log_printf(log, " HTile: offset=%"PRIu64", size=%"PRIu64", "
|
||||
"alignment=%u, TC_compatible = %u\n",
|
||||
rtex->htile_offset, rtex->surface.htile_size,
|
||||
rtex->surface.htile_alignment,
|
||||
rtex->tc_compatible_htile);
|
||||
|
||||
if (rtex->dcc_offset) {
|
||||
fprintf(f, " DCC: offset=%"PRIu64", size=%"PRIu64", alignment=%u\n",
|
||||
u_log_printf(log, " DCC: offset=%"PRIu64", size=%"PRIu64", alignment=%u\n",
|
||||
rtex->dcc_offset, rtex->surface.dcc_size,
|
||||
rtex->surface.dcc_alignment);
|
||||
for (i = 0; i <= rtex->resource.b.b.last_level; i++)
|
||||
fprintf(f, " DCCLevel[%i]: enabled=%u, offset=%"PRIu64", "
|
||||
u_log_printf(log, " DCCLevel[%i]: enabled=%u, offset=%"PRIu64", "
|
||||
"fast_clear_size=%"PRIu64"\n",
|
||||
i, i < rtex->surface.num_dcc_levels,
|
||||
rtex->surface.u.legacy.level[i].dcc_offset,
|
||||
|
|
@ -1152,7 +1153,7 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
}
|
||||
|
||||
for (i = 0; i <= rtex->resource.b.b.last_level; i++)
|
||||
fprintf(f, " Level[%i]: offset=%"PRIu64", slice_size=%"PRIu64", "
|
||||
u_log_printf(log, " Level[%i]: offset=%"PRIu64", slice_size=%"PRIu64", "
|
||||
"npix_x=%u, npix_y=%u, npix_z=%u, nblk_x=%u, nblk_y=%u, "
|
||||
"mode=%u, tiling_index = %u\n",
|
||||
i, rtex->surface.u.legacy.level[i].offset,
|
||||
|
|
@ -1166,10 +1167,10 @@ void r600_print_texture_info(struct r600_common_screen *rscreen,
|
|||
rtex->surface.u.legacy.tiling_index[i]);
|
||||
|
||||
if (rtex->surface.flags & RADEON_SURF_SBUFFER) {
|
||||
fprintf(f, " StencilLayout: tilesplit=%u\n",
|
||||
u_log_printf(log, " StencilLayout: tilesplit=%u\n",
|
||||
rtex->surface.u.legacy.stencil_tile_split);
|
||||
for (i = 0; i <= rtex->resource.b.b.last_level; i++) {
|
||||
fprintf(f, " StencilLevel[%i]: offset=%"PRIu64", "
|
||||
u_log_printf(log, " StencilLevel[%i]: offset=%"PRIu64", "
|
||||
"slice_size=%"PRIu64", npix_x=%u, "
|
||||
"npix_y=%u, npix_z=%u, nblk_x=%u, nblk_y=%u, "
|
||||
"mode=%u, tiling_index = %u\n",
|
||||
|
|
@ -1360,8 +1361,12 @@ r600_texture_create_object(struct pipe_screen *screen,
|
|||
|
||||
if (rscreen->debug_flags & DBG_TEX) {
|
||||
puts("Texture:");
|
||||
r600_print_texture_info(rscreen, rtex, stdout);
|
||||
struct u_log_context log;
|
||||
u_log_context_init(&log);
|
||||
r600_print_texture_info(rscreen, rtex, &log);
|
||||
u_log_new_page_print(&log, stdout);
|
||||
fflush(stdout);
|
||||
u_log_context_destroy(&log);
|
||||
}
|
||||
|
||||
return rtex;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include "gfx9d.h"
|
||||
#include "sid_tables.h"
|
||||
#include "ddebug/dd_util.h"
|
||||
#include "util/u_log.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "ac_debug.h"
|
||||
|
||||
|
|
@ -45,24 +46,72 @@ static void si_dump_shader(struct si_screen *sscreen,
|
|||
si_shader_dump(sscreen, shader, NULL, processor, f, false);
|
||||
}
|
||||
|
||||
static void si_dump_gfx_shader(struct si_screen *sscreen,
|
||||
const struct si_shader_ctx_state *state, FILE *f)
|
||||
struct si_log_chunk_shader {
|
||||
/* The shader destroy code assumes a current context for unlinking of
|
||||
* PM4 packets etc.
|
||||
*
|
||||
* While we should be able to destroy shaders without a context, doing
|
||||
* so would happen only very rarely and be therefore likely to fail
|
||||
* just when you're trying to debug something. Let's just remember the
|
||||
* current context in the chunk.
|
||||
*/
|
||||
struct si_context *ctx;
|
||||
struct si_shader *shader;
|
||||
|
||||
/* For keep-alive reference counts */
|
||||
struct si_shader_selector *sel;
|
||||
struct si_compute *program;
|
||||
};
|
||||
|
||||
static void
|
||||
si_log_chunk_shader_destroy(void *data)
|
||||
{
|
||||
const struct si_shader *current = state->current;
|
||||
struct si_log_chunk_shader *chunk = data;
|
||||
si_shader_selector_reference(chunk->ctx, &chunk->sel, NULL);
|
||||
si_compute_reference(&chunk->program, NULL);
|
||||
FREE(chunk);
|
||||
}
|
||||
|
||||
static void
|
||||
si_log_chunk_shader_print(void *data, FILE *f)
|
||||
{
|
||||
struct si_log_chunk_shader *chunk = data;
|
||||
struct si_screen *sscreen = chunk->ctx->screen;
|
||||
si_dump_shader(sscreen, chunk->shader->selector->info.processor,
|
||||
chunk->shader, f);
|
||||
}
|
||||
|
||||
static struct u_log_chunk_type si_log_chunk_type_shader = {
|
||||
.destroy = si_log_chunk_shader_destroy,
|
||||
.print = si_log_chunk_shader_print,
|
||||
};
|
||||
|
||||
static void si_dump_gfx_shader(struct si_context *ctx,
|
||||
const struct si_shader_ctx_state *state,
|
||||
struct u_log_context *log)
|
||||
{
|
||||
struct si_shader *current = state->current;
|
||||
|
||||
if (!state->cso || !current)
|
||||
return;
|
||||
|
||||
si_dump_shader(sscreen, state->cso->info.processor, current, f);
|
||||
struct si_log_chunk_shader *chunk = CALLOC_STRUCT(si_log_chunk_shader);
|
||||
chunk->ctx = ctx;
|
||||
chunk->shader = current;
|
||||
si_shader_selector_reference(ctx, &chunk->sel, current->selector);
|
||||
u_log_chunk(log, &si_log_chunk_type_shader, chunk);
|
||||
}
|
||||
|
||||
static void si_dump_compute_shader(struct si_screen *sscreen,
|
||||
const struct si_cs_shader_state *state, FILE *f)
|
||||
static void si_dump_compute_shader(const struct si_cs_shader_state *state,
|
||||
struct u_log_context *log)
|
||||
{
|
||||
if (!state->program || state->program != state->emitted_program)
|
||||
return;
|
||||
|
||||
si_dump_shader(sscreen, PIPE_SHADER_COMPUTE, &state->program->shader, f);
|
||||
struct si_log_chunk_shader *chunk = CALLOC_STRUCT(si_log_chunk_shader);
|
||||
chunk->shader = &state->program->shader;
|
||||
si_compute_reference(&chunk->program, state->program);
|
||||
u_log_chunk(log, &si_log_chunk_type_shader, chunk);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -365,7 +414,7 @@ static void si_dump_bo_list(struct si_context *sctx,
|
|||
" Other buffers can still be allocated there.\n\n");
|
||||
}
|
||||
|
||||
static void si_dump_framebuffer(struct si_context *sctx, FILE *f)
|
||||
static void si_dump_framebuffer(struct si_context *sctx, struct u_log_context *log)
|
||||
{
|
||||
struct pipe_framebuffer_state *state = &sctx->framebuffer.state;
|
||||
struct r600_texture *rtex;
|
||||
|
|
@ -376,89 +425,143 @@ static void si_dump_framebuffer(struct si_context *sctx, FILE *f)
|
|||
continue;
|
||||
|
||||
rtex = (struct r600_texture*)state->cbufs[i]->texture;
|
||||
fprintf(f, COLOR_YELLOW "Color buffer %i:" COLOR_RESET "\n", i);
|
||||
r600_print_texture_info(sctx->b.screen, rtex, f);
|
||||
fprintf(f, "\n");
|
||||
u_log_printf(log, COLOR_YELLOW "Color buffer %i:" COLOR_RESET "\n", i);
|
||||
r600_print_texture_info(sctx->b.screen, rtex, log);
|
||||
u_log_printf(log, "\n");
|
||||
}
|
||||
|
||||
if (state->zsbuf) {
|
||||
rtex = (struct r600_texture*)state->zsbuf->texture;
|
||||
fprintf(f, COLOR_YELLOW "Depth-stencil buffer:" COLOR_RESET "\n");
|
||||
r600_print_texture_info(sctx->b.screen, rtex, f);
|
||||
fprintf(f, "\n");
|
||||
u_log_printf(log, COLOR_YELLOW "Depth-stencil buffer:" COLOR_RESET "\n");
|
||||
r600_print_texture_info(sctx->b.screen, rtex, log);
|
||||
u_log_printf(log, "\n");
|
||||
}
|
||||
}
|
||||
|
||||
typedef unsigned (*slot_remap_func)(unsigned);
|
||||
|
||||
struct si_log_chunk_desc_list {
|
||||
/** Pointer to memory map of buffer where the list is uploader */
|
||||
uint32_t *gpu_list;
|
||||
/** Reference of buffer where the list is uploaded, so that gpu_list
|
||||
* is kept live. */
|
||||
struct r600_resource *buf;
|
||||
|
||||
const char *shader_name;
|
||||
const char *elem_name;
|
||||
slot_remap_func slot_remap;
|
||||
unsigned element_dw_size;
|
||||
unsigned num_elements;
|
||||
|
||||
uint32_t list[0];
|
||||
};
|
||||
|
||||
static void
|
||||
si_log_chunk_desc_list_destroy(void *data)
|
||||
{
|
||||
struct si_log_chunk_desc_list *chunk = data;
|
||||
r600_resource_reference(&chunk->buf, NULL);
|
||||
FREE(chunk);
|
||||
}
|
||||
|
||||
static void
|
||||
si_log_chunk_desc_list_print(void *data, FILE *f)
|
||||
{
|
||||
struct si_log_chunk_desc_list *chunk = data;
|
||||
|
||||
for (unsigned i = 0; i < chunk->num_elements; i++) {
|
||||
unsigned cpu_dw_offset = i * chunk->element_dw_size;
|
||||
unsigned gpu_dw_offset = chunk->slot_remap(i) * chunk->element_dw_size;
|
||||
const char *list_note = chunk->gpu_list ? "GPU list" : "CPU list";
|
||||
uint32_t *cpu_list = chunk->list + cpu_dw_offset;
|
||||
uint32_t *gpu_list = chunk->gpu_list ? chunk->gpu_list + gpu_dw_offset : cpu_list;
|
||||
|
||||
fprintf(f, COLOR_GREEN "%s%s slot %u (%s):" COLOR_RESET "\n",
|
||||
chunk->shader_name, chunk->elem_name, i, list_note);
|
||||
|
||||
switch (chunk->element_dw_size) {
|
||||
case 4:
|
||||
for (unsigned j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
break;
|
||||
case 8:
|
||||
for (unsigned j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Buffer:" COLOR_RESET "\n");
|
||||
for (unsigned j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[4+j], 0xffffffff);
|
||||
break;
|
||||
case 16:
|
||||
for (unsigned j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Buffer:" COLOR_RESET "\n");
|
||||
for (unsigned j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[4+j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " FMASK:" COLOR_RESET "\n");
|
||||
for (unsigned j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[8+j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Sampler state:" COLOR_RESET "\n");
|
||||
for (unsigned j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F30_SQ_IMG_SAMP_WORD0 + j*4,
|
||||
gpu_list[12+j], 0xffffffff);
|
||||
break;
|
||||
}
|
||||
|
||||
if (memcmp(gpu_list, cpu_list, chunk->element_dw_size * 4) != 0) {
|
||||
fprintf(f, COLOR_RED "!!!!! This slot was corrupted in GPU memory !!!!!"
|
||||
COLOR_RESET "\n");
|
||||
}
|
||||
|
||||
fprintf(f, "\n");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static const struct u_log_chunk_type si_log_chunk_type_descriptor_list = {
|
||||
.destroy = si_log_chunk_desc_list_destroy,
|
||||
.print = si_log_chunk_desc_list_print,
|
||||
};
|
||||
|
||||
static void si_dump_descriptor_list(struct si_descriptors *desc,
|
||||
const char *shader_name,
|
||||
const char *elem_name,
|
||||
unsigned element_dw_size,
|
||||
unsigned num_elements,
|
||||
slot_remap_func slot_remap,
|
||||
FILE *f)
|
||||
struct u_log_context *log)
|
||||
{
|
||||
unsigned i, j;
|
||||
|
||||
if (!desc->list)
|
||||
return;
|
||||
|
||||
for (i = 0; i < num_elements; i++) {
|
||||
unsigned dw_offset = slot_remap(i) * element_dw_size;
|
||||
uint32_t *gpu_ptr = desc->gpu_list ? desc->gpu_list : desc->list;
|
||||
const char *list_note = desc->gpu_list ? "GPU list" : "CPU list";
|
||||
uint32_t *cpu_list = desc->list + dw_offset;
|
||||
uint32_t *gpu_list = gpu_ptr + dw_offset;
|
||||
struct si_log_chunk_desc_list *chunk =
|
||||
CALLOC_VARIANT_LENGTH_STRUCT(si_log_chunk_desc_list,
|
||||
4 * element_dw_size * num_elements);
|
||||
chunk->shader_name = shader_name;
|
||||
chunk->elem_name = elem_name;
|
||||
chunk->element_dw_size = element_dw_size;
|
||||
chunk->num_elements = num_elements;
|
||||
chunk->slot_remap = slot_remap;
|
||||
|
||||
fprintf(f, COLOR_GREEN "%s%s slot %u (%s):" COLOR_RESET "\n",
|
||||
shader_name, elem_name, i, list_note);
|
||||
r600_resource_reference(&chunk->buf, desc->buffer);
|
||||
chunk->gpu_list = desc->gpu_list;
|
||||
|
||||
switch (element_dw_size) {
|
||||
case 4:
|
||||
for (j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
break;
|
||||
case 8:
|
||||
for (j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Buffer:" COLOR_RESET "\n");
|
||||
for (j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[4+j], 0xffffffff);
|
||||
break;
|
||||
case 16:
|
||||
for (j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Buffer:" COLOR_RESET "\n");
|
||||
for (j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
|
||||
gpu_list[4+j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " FMASK:" COLOR_RESET "\n");
|
||||
for (j = 0; j < 8; j++)
|
||||
ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
|
||||
gpu_list[8+j], 0xffffffff);
|
||||
|
||||
fprintf(f, COLOR_CYAN " Sampler state:" COLOR_RESET "\n");
|
||||
for (j = 0; j < 4; j++)
|
||||
ac_dump_reg(f, R_008F30_SQ_IMG_SAMP_WORD0 + j*4,
|
||||
gpu_list[12+j], 0xffffffff);
|
||||
break;
|
||||
}
|
||||
|
||||
if (memcmp(gpu_list, cpu_list, desc->element_dw_size * 4) != 0) {
|
||||
fprintf(f, COLOR_RED "!!!!! This slot was corrupted in GPU memory !!!!!"
|
||||
COLOR_RESET "\n");
|
||||
}
|
||||
|
||||
fprintf(f, "\n");
|
||||
for (unsigned i = 0; i < num_elements; ++i) {
|
||||
memcpy(&chunk->list[i * element_dw_size],
|
||||
&desc->list[slot_remap(i) * element_dw_size],
|
||||
4 * element_dw_size);
|
||||
}
|
||||
|
||||
u_log_chunk(log, &si_log_chunk_type_descriptor_list, chunk);
|
||||
}
|
||||
|
||||
static unsigned si_identity(unsigned slot)
|
||||
|
|
@ -468,7 +571,8 @@ static unsigned si_identity(unsigned slot)
|
|||
|
||||
static void si_dump_descriptors(struct si_context *sctx,
|
||||
enum pipe_shader_type processor,
|
||||
const struct tgsi_shader_info *info, FILE *f)
|
||||
const struct tgsi_shader_info *info,
|
||||
struct u_log_context *log)
|
||||
{
|
||||
struct si_descriptors *descs =
|
||||
&sctx->descriptors[SI_DESCS_FIRST_SHADER +
|
||||
|
|
@ -499,44 +603,45 @@ static void si_dump_descriptors(struct si_context *sctx,
|
|||
|
||||
si_dump_descriptor_list(&sctx->vertex_buffers, name,
|
||||
" - Vertex buffer", 4, info->num_inputs,
|
||||
si_identity, f);
|
||||
si_identity, log);
|
||||
}
|
||||
|
||||
si_dump_descriptor_list(&descs[SI_SHADER_DESCS_CONST_AND_SHADER_BUFFERS],
|
||||
name, " - Constant buffer", 4,
|
||||
util_last_bit(enabled_constbuf),
|
||||
si_get_constbuf_slot, f);
|
||||
si_get_constbuf_slot, log);
|
||||
si_dump_descriptor_list(&descs[SI_SHADER_DESCS_CONST_AND_SHADER_BUFFERS],
|
||||
name, " - Shader buffer", 4,
|
||||
util_last_bit(enabled_shaderbuf),
|
||||
si_get_shaderbuf_slot, f);
|
||||
si_get_shaderbuf_slot, log);
|
||||
si_dump_descriptor_list(&descs[SI_SHADER_DESCS_SAMPLERS_AND_IMAGES],
|
||||
name, " - Sampler", 16,
|
||||
util_last_bit(enabled_samplers),
|
||||
si_get_sampler_slot, f);
|
||||
si_get_sampler_slot, log);
|
||||
si_dump_descriptor_list(&descs[SI_SHADER_DESCS_SAMPLERS_AND_IMAGES],
|
||||
name, " - Image", 8,
|
||||
util_last_bit(enabled_images),
|
||||
si_get_image_slot, f);
|
||||
si_get_image_slot, log);
|
||||
}
|
||||
|
||||
static void si_dump_gfx_descriptors(struct si_context *sctx,
|
||||
const struct si_shader_ctx_state *state,
|
||||
FILE *f)
|
||||
struct u_log_context *log)
|
||||
{
|
||||
if (!state->cso || !state->current)
|
||||
return;
|
||||
|
||||
si_dump_descriptors(sctx, state->cso->type, &state->cso->info, f);
|
||||
si_dump_descriptors(sctx, state->cso->type, &state->cso->info, log);
|
||||
}
|
||||
|
||||
static void si_dump_compute_descriptors(struct si_context *sctx, FILE *f)
|
||||
static void si_dump_compute_descriptors(struct si_context *sctx,
|
||||
struct u_log_context *log)
|
||||
{
|
||||
if (!sctx->cs_shader_state.program ||
|
||||
sctx->cs_shader_state.program != sctx->cs_shader_state.emitted_program)
|
||||
return;
|
||||
|
||||
si_dump_descriptors(sctx, PIPE_SHADER_COMPUTE, NULL, f);
|
||||
si_dump_descriptors(sctx, PIPE_SHADER_COMPUTE, NULL, log);
|
||||
}
|
||||
|
||||
struct si_shader_inst {
|
||||
|
|
@ -825,28 +930,34 @@ static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
|
|||
}
|
||||
}
|
||||
|
||||
struct u_log_context log;
|
||||
u_log_context_init(&log);
|
||||
|
||||
if (flags & PIPE_DUMP_CURRENT_STATES)
|
||||
si_dump_framebuffer(sctx, f);
|
||||
si_dump_framebuffer(sctx, &log);
|
||||
|
||||
if (flags & PIPE_DUMP_CURRENT_SHADERS) {
|
||||
si_dump_gfx_shader(sctx->screen, &sctx->vs_shader, f);
|
||||
si_dump_gfx_shader(sctx->screen, &sctx->tcs_shader, f);
|
||||
si_dump_gfx_shader(sctx->screen, &sctx->tes_shader, f);
|
||||
si_dump_gfx_shader(sctx->screen, &sctx->gs_shader, f);
|
||||
si_dump_gfx_shader(sctx->screen, &sctx->ps_shader, f);
|
||||
si_dump_compute_shader(sctx->screen, &sctx->cs_shader_state, f);
|
||||
si_dump_gfx_shader(sctx, &sctx->vs_shader, &log);
|
||||
si_dump_gfx_shader(sctx, &sctx->tcs_shader, &log);
|
||||
si_dump_gfx_shader(sctx, &sctx->tes_shader, &log);
|
||||
si_dump_gfx_shader(sctx, &sctx->gs_shader, &log);
|
||||
si_dump_gfx_shader(sctx, &sctx->ps_shader, &log);
|
||||
si_dump_compute_shader(&sctx->cs_shader_state, &log);
|
||||
|
||||
si_dump_descriptor_list(&sctx->descriptors[SI_DESCS_RW_BUFFERS],
|
||||
"", "RW buffers", 4, SI_NUM_RW_BUFFERS,
|
||||
si_identity, f);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->vs_shader, f);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->tcs_shader, f);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->tes_shader, f);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->gs_shader, f);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->ps_shader, f);
|
||||
si_dump_compute_descriptors(sctx, f);
|
||||
si_identity, &log);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->vs_shader, &log);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->tcs_shader, &log);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->tes_shader, &log);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->gs_shader, &log);
|
||||
si_dump_gfx_descriptors(sctx, &sctx->ps_shader, &log);
|
||||
si_dump_compute_descriptors(sctx, &log);
|
||||
}
|
||||
|
||||
u_log_new_page_print(&log, f);
|
||||
u_log_context_destroy(&log);
|
||||
|
||||
if (flags & PIPE_DUMP_LAST_COMMAND_BUFFER) {
|
||||
si_dump_bo_list(sctx, &sctx->last_gfx, f);
|
||||
si_dump_last_ib(sctx, f);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue