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

radeonsi/sqtt: setup spm bo

Browse Source 
The hardware will write SPM counters to this bo.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15646>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2022-03-29 14:36:26 +02:00
parent a884f36949
commit e5e8b56236
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_perfcounter.c
+26
View File
@@ -713,6 +713,26 @@ void si_init_perfcounters(struct si_screen *screen)
}
}
static bool
si_spm_init_bo(struct si_context *sctx)
{
struct radeon_winsys *ws = sctx->ws;
uint64_t size = 32 * 1024 * 1024; /* Default to 32MB. */
sctx->spm_trace.buffer_size = size;
sctx->spm_trace.sample_interval = 4096; /* Default to 4096 clk. */
sctx->spm_trace.bo = ws->buffer_create(
ws, size, 4096,
RADEON_DOMAIN_VRAM,
RADEON_FLAG_NO_INTERPROCESS_SHARING |
RADEON_FLAG_GTT_WC |
RADEON_FLAG_NO_SUBALLOC);
return sctx->spm_trace.bo != NULL;
}
static void
si_emit_spm_counters(struct si_context *sctx, struct radeon_cmdbuf *cs)
{
@@ -886,11 +906,17 @@ si_spm_init(struct si_context *sctx)
if (!ac_init_spm(info, pc, ARRAY_SIZE(spm_counters), spm_counters, &sctx->spm_trace))
return false;
if (!si_spm_init_bo(sctx))
return false;
return true;
}
void
si_spm_finish(struct si_context *sctx)
{
struct pb_buffer *bo = sctx->spm_trace.bo;
radeon_bo_reference(sctx->screen->ws, &bo, NULL);
ac_destroy_spm(&sctx->spm_trace);
}
src/gallium/drivers/radeonsi/si_sqtt.c
+10 -1
View File
@@ -389,6 +389,10 @@ si_thread_trace_start(struct si_context *sctx, int family, struct radeon_cmdbuf
sctx->thread_trace->bo,
RADEON_USAGE_READWRITE,
RADEON_DOMAIN_VRAM);
ws->cs_add_buffer(cs,
sctx->spm_trace.bo,
RADEON_USAGE_READWRITE,
RADEON_DOMAIN_VRAM);
si_cp_dma_wait_for_idle(sctx, cs);
@@ -432,6 +436,11 @@ si_thread_trace_stop(struct si_context *sctx, int family, struct radeon_cmdbuf *
RADEON_USAGE_READWRITE,
RADEON_DOMAIN_VRAM);
ws->cs_add_buffer(cs,
sctx->spm_trace.bo,
RADEON_USAGE_READWRITE,
RADEON_DOMAIN_VRAM);
si_cp_dma_wait_for_idle(sctx, cs);
/* Make sure to wait-for-idle before stopping SQTT. */
@@ -711,7 +720,7 @@ si_handle_thread_trace(struct si_context *sctx, struct radeon_cmdbuf *rcs)
/* Wait for SQTT to finish and read back the bo */
if (sctx->ws->fence_wait(sctx->ws, sctx->last_sqtt_fence, PIPE_TIMEOUT_INFINITE) &&
si_get_thread_trace(sctx, &thread_trace)) {
ac_dump_rgp_capture(&sctx->screen->info, &thread_trace, NULL);
ac_dump_rgp_capture(&sctx->screen->info, &thread_trace, &sctx->spm_trace);
} else {
fprintf(stderr, "Failed to read the trace\n");
}