fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 02:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

freedreno/perfcntrs: add accessor to get per-gen tables

Browse source 
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Rob Clark 2019-11-19 11:43:40 -08:00 • committed by Rob Clark
parent b21f03ae7e
commit e35c4e6ad2
8 changed files with 66 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/freedreno/Makefile.sources
View file

@ -57,4 +57,5 @@ perfcntrs_SOURCES := \
perfcntrs/fd2_perfcntr.c \
perfcntrs/fd5_perfcntr.c \
perfcntrs/fd6_perfcntr.c \
perfcntrs/freedreno_perfcntr.c \
perfcntrs/freedreno_perfcntr.h

57
src/freedreno/perfcntrs/freedreno_perfcntr.c Normal file
View file

@ -0,0 +1,57 @@
/*
* Copyright (C) 2019 Rob Clark <robclark@freedesktop.org>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* Authors:
* Rob Clark <robclark@freedesktop.org>
*/
#include <stddef.h>
#include "freedreno_perfcntr.h"
extern const struct fd_perfcntr_group a2xx_perfcntr_groups[];
extern const unsigned a2xx_num_perfcntr_groups;
extern const struct fd_perfcntr_group a5xx_perfcntr_groups[];
extern const unsigned a5xx_num_perfcntr_groups;
extern const struct fd_perfcntr_group a6xx_perfcntr_groups[];
extern const unsigned a6xx_num_perfcntr_groups;
const struct fd_perfcntr_group *
fd_perfcntrs(unsigned gpu_id, unsigned *count)
{
switch (gpu_id) {
case 200 ... 299:
*count = a2xx_num_perfcntr_groups;
return a2xx_perfcntr_groups;
case 500 ... 599:
*count = a5xx_num_perfcntr_groups;
return a5xx_perfcntr_groups;
case 600 ... 699:
*count = a6xx_num_perfcntr_groups;
return a6xx_perfcntr_groups;
default:
*count = 0;
return NULL;
}
}

2
src/freedreno/perfcntrs/freedreno_perfcntr.h
View file

@ -91,6 +91,8 @@ struct fd_perfcntr_group {
const struct fd_perfcntr_countable *countables;
};
const struct fd_perfcntr_group *fd_perfcntrs(unsigned gpu_id, unsigned *count);
#define COUNTER(_sel, _lo, _hi) { \
.select_reg = REG(_sel), \
.counter_reg_lo = REG(_lo), \

1
src/freedreno/perfcntrs/meson.build
View file

@ -22,6 +22,7 @@ libfreedreno_perfcntrs_files = files(
'fd2_perfcntr.c',
'fd5_perfcntr.c',
'fd6_perfcntr.c',
'freedreno_perfcntr.c',
'freedreno_perfcntr.h',
)

8
src/gallium/drivers/freedreno/a2xx/fd2_screen.c
View file

@ -99,9 +99,6 @@ fd2_screen_is_format_supported(struct pipe_screen *pscreen,
return retval == usage;
}
extern const struct fd_perfcntr_group a2xx_perfcntr_groups[];
extern const unsigned a2xx_num_perfcntr_groups;
void
fd2_screen_init(struct pipe_screen *pscreen)
{
@ -115,10 +112,5 @@ fd2_screen_init(struct pipe_screen *pscreen)
if (fd_mesa_debug & FD_DBG_TTILE)
screen->tile_mode = fd2_tile_mode;
if (fd_mesa_debug & FD_DBG_PERFC) {
screen->perfcntr_groups = a2xx_perfcntr_groups;
screen->num_perfcntr_groups = a2xx_num_perfcntr_groups;
}
fd2_emit_init_screen(pscreen);
}

8
src/gallium/drivers/freedreno/a5xx/fd5_screen.c
View file

@ -121,9 +121,6 @@ fd5_screen_is_format_supported(struct pipe_screen *pscreen,
return retval == usage;
}
extern const struct fd_perfcntr_group a5xx_perfcntr_groups[];
extern const unsigned a5xx_num_perfcntr_groups;
void
fd5_screen_init(struct pipe_screen *pscreen)
{
@ -137,10 +134,5 @@ fd5_screen_init(struct pipe_screen *pscreen)
if (fd_mesa_debug & FD_DBG_TTILE)
screen->tile_mode = fd5_tile_mode;
if (fd_mesa_debug & FD_DBG_PERFC) {
screen->perfcntr_groups = a5xx_perfcntr_groups;
screen->num_perfcntr_groups = a5xx_num_perfcntr_groups;
}
fd5_emit_init_screen(pscreen);
}

8
src/gallium/drivers/freedreno/a6xx/fd6_screen.c
View file

@ -127,9 +127,6 @@ fd6_screen_is_format_supported(struct pipe_screen *pscreen,
return retval == usage;
}
extern const struct fd_perfcntr_group a6xx_perfcntr_groups[];
extern const unsigned a6xx_num_perfcntr_groups;
void
fd6_screen_init(struct pipe_screen *pscreen)
{
@ -151,10 +148,5 @@ fd6_screen_init(struct pipe_screen *pscreen)
screen->supported_modifiers = supported_modifiers;
screen->num_supported_modifiers = ARRAY_SIZE(supported_modifiers);
if (fd_mesa_debug & FD_DBG_PERFC) {
screen->perfcntr_groups = a6xx_perfcntr_groups;
screen->num_perfcntr_groups = a6xx_num_perfcntr_groups;
}
fd6_emit_init_screen(pscreen);
}

5
src/gallium/drivers/freedreno/freedreno_screen.c
View file

@ -941,6 +941,11 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
screen->num_vsc_pipes = 8;
}
if (fd_mesa_debug & FD_DBG_PERFC) {
screen->perfcntr_groups = fd_perfcntrs(screen->gpu_id,
&screen->num_perfcntr_groups);
}
/* NOTE: don't enable if we have too old of a kernel to support
* growable cmdstream buffers, since memory requirement for cmdstream
* buffers would be too much otherwise.