fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Rename SPM functions.

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16879>
This commit is contained in:
Bas Nieuwenhuizen 2022-05-08 18:20:27 +02:00 • committed by Marge Bot
parent f7d8e64f51
commit 80a3c218eb
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amd/vulkan/radv_perfcounter.c
View file

@ -36,7 +36,7 @@ radv_perfcounter_emit_shaders(struct radeon_cmdbuf *cs, unsigned shaders)
}
void
radv_perfcounter_emit_reset(struct radeon_cmdbuf *cs)
radv_perfcounter_emit_spm_reset(struct radeon_cmdbuf *cs)
{
radeon_set_uconfig_reg(cs, R_036020_CP_PERFMON_CNTL,
S_036020_PERFMON_STATE(V_036020_CP_PERFMON_STATE_DISABLE_AND_RESET) |
@ -44,7 +44,7 @@ radv_perfcounter_emit_reset(struct radeon_cmdbuf *cs)
}
void
radv_perfcounter_emit_start(struct radv_device *device, struct radeon_cmdbuf *cs, int family)
radv_perfcounter_emit_spm_start(struct radv_device *device, struct radeon_cmdbuf *cs, int family)
{
/* Start SPM counters. */
radeon_set_uconfig_reg(cs, R_036020_CP_PERFMON_CNTL,
@ -60,7 +60,7 @@ radv_perfcounter_emit_start(struct radv_device *device, struct radeon_cmdbuf *cs
}
void
radv_perfcounter_emit_stop(struct radv_device *device, struct radeon_cmdbuf *cs, int family)
radv_perfcounter_emit_spm_stop(struct radv_device *device, struct radeon_cmdbuf *cs, int family)
{
/* Stop windowed performance counters. */
if (family == RADV_QUEUE_GENERAL) {

8
src/amd/vulkan/radv_private.h
View file

@ -3105,9 +3105,11 @@ radv_accel_struct_get_va(const struct radv_acceleration_structure *accel)
/* radv_perfcounter.c */
void radv_perfcounter_emit_shaders(struct radeon_cmdbuf *cs, unsigned shaders);
void radv_perfcounter_emit_reset(struct radeon_cmdbuf *cs);
void radv_perfcounter_emit_start(struct radv_device *device, struct radeon_cmdbuf *cs, int family);
void radv_perfcounter_emit_stop(struct radv_device *device, struct radeon_cmdbuf *cs, int family);
void radv_perfcounter_emit_spm_reset(struct radeon_cmdbuf *cs);
void radv_perfcounter_emit_spm_start(struct radv_device *device, struct radeon_cmdbuf *cs,
int family);
void radv_perfcounter_emit_spm_stop(struct radv_device *device, struct radeon_cmdbuf *cs,
int family);
/* radv_spm.c */
bool radv_spm_init(struct radv_device *device);

8
src/amd/vulkan/radv_sqtt.c
View file

@ -568,7 +568,7 @@ radv_begin_thread_trace(struct radv_queue *queue)
/* Enable SQG events that collects thread trace data. */
radv_emit_spi_config_cntl(device, cs, true);
radv_perfcounter_emit_reset(cs);
radv_perfcounter_emit_spm_reset(cs);
if (device->spm_trace.bo) {
/* Enable all shader stages by default. */
@ -581,7 +581,7 @@ radv_begin_thread_trace(struct radv_queue *queue)
radv_emit_thread_trace_start(device, cs, family);
if (device->spm_trace.bo)
radv_perfcounter_emit_start(device, cs, family);
radv_perfcounter_emit_spm_start(device, cs, family);
result = ws->cs_finalize(cs);
if (result != VK_SUCCESS) {
@ -632,12 +632,12 @@ radv_end_thread_trace(struct radv_queue *queue)
radv_emit_wait_for_idle(device, cs, family);
if (device->spm_trace.bo)
radv_perfcounter_emit_stop(device, cs, family);
radv_perfcounter_emit_spm_stop(device, cs, family);
/* Stop SQTT. */
radv_emit_thread_trace_stop(device, cs, family);
radv_perfcounter_emit_reset(cs);
radv_perfcounter_emit_spm_reset(cs);
/* Restore previous state by disabling SQG events. */
radv_emit_spi_config_cntl(device, cs, false);