[Mesa-dev] [PATCH v3 04/10] gallium: replace pipe_driver_query_info::max_value by a union
Martin Peres
martin.peres at free.fr
Sun Apr 26 14:12:11 PDT 2015
On 02/04/2015 21:41, Samuel Pitoiset wrote:
> This allows queries to return different numeric types.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> Reviewed-by: Marek Olšák <marek.olsak at amd.com>
> Reviewed-by: Martin Peres <martin.peres at free.fr>
> ---
> src/gallium/auxiliary/hud/hud_driver_query.c | 3 ++-
> src/gallium/drivers/freedreno/freedreno_query.c | 12 ++++++------
> src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 9 +++++----
> src/gallium/drivers/radeon/r600_pipe_common.c | 16 ++++++++--------
> src/gallium/drivers/svga/svga_screen.c | 6 +++---
> src/gallium/include/pipe/p_defines.h | 9 ++++++++-
> 6 files changed, 32 insertions(+), 23 deletions(-)
>
> diff --git a/src/gallium/auxiliary/hud/hud_driver_query.c b/src/gallium/auxiliary/hud/hud_driver_query.c
> index 1c8c485..603aba7 100644
> --- a/src/gallium/auxiliary/hud/hud_driver_query.c
> +++ b/src/gallium/auxiliary/hud/hud_driver_query.c
> @@ -208,6 +208,7 @@ hud_driver_query_install(struct hud_pane *pane, struct pipe_context *pipe,
>
> uses_byte_units = query.type == PIPE_DRIVER_QUERY_TYPE_BYTES;
> hud_pipe_query_install(pane, pipe, query.name, query.query_type, 0,
> - query.max_value, uses_byte_units);
> + query.max_value.u64, uses_byte_units);
> +
> return TRUE;
> }
> diff --git a/src/gallium/drivers/freedreno/freedreno_query.c b/src/gallium/drivers/freedreno/freedreno_query.c
> index cb3b49a..6f01e03 100644
> --- a/src/gallium/drivers/freedreno/freedreno_query.c
> +++ b/src/gallium/drivers/freedreno/freedreno_query.c
> @@ -86,12 +86,12 @@ fd_get_driver_query_info(struct pipe_screen *pscreen,
> unsigned index, struct pipe_driver_query_info *info)
> {
> struct pipe_driver_query_info list[] = {
> - {"draw-calls", FD_QUERY_DRAW_CALLS, 0},
> - {"batches", FD_QUERY_BATCH_TOTAL, 0},
> - {"batches-sysmem", FD_QUERY_BATCH_SYSMEM, 0},
> - {"batches-gmem", FD_QUERY_BATCH_GMEM, 0},
> - {"restores", FD_QUERY_BATCH_RESTORE, 0},
> - {"prims-emitted", PIPE_QUERY_PRIMITIVES_EMITTED, 0},
> + {"draw-calls", FD_QUERY_DRAW_CALLS, {0}},
> + {"batches", FD_QUERY_BATCH_TOTAL, {0}},
> + {"batches-sysmem", FD_QUERY_BATCH_SYSMEM, {0}},
> + {"batches-gmem", FD_QUERY_BATCH_GMEM, {0}},
> + {"restores", FD_QUERY_BATCH_RESTORE, {0}},
> + {"prims-emitted", PIPE_QUERY_PRIMITIVES_EMITTED, {0}},
This works because:
"With C89-style initializers, structure members must be initialized in
the order declared, and only the first member of a union can be
initialized."
http://www-01.ibm.com/support/knowledgecenter/SSGH3R_8.0.0/com.ibm.xlcpp8a.doc/language/ref/strin.htm%23strin
> };
>
> if (!info)
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> index 5be150e..477ca80 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
> @@ -1418,7 +1418,7 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen,
> if (id < NVC0_QUERY_DRV_STAT_COUNT) {
> info->name = nvc0_drv_stat_names[id];
> info->query_type = NVC0_QUERY_DRV_STAT(id);
> - info->max_value = 0;
> + info->max_value.u64 = 0;
> if (strstr(info->name, "bytes"))
> info->type = PIPE_DRIVER_QUERY_TYPE_BYTES;
> return 1;
> @@ -1428,20 +1428,21 @@ nvc0_screen_get_driver_query_info(struct pipe_screen *pscreen,
> if (screen->base.class_3d >= NVE4_3D_CLASS) {
> info->name = nve4_pm_query_names[id - NVC0_QUERY_DRV_STAT_COUNT];
> info->query_type = NVE4_PM_QUERY(id - NVC0_QUERY_DRV_STAT_COUNT);
> - info->max_value = (id < NVE4_PM_QUERY_METRIC_MP_OCCUPANCY) ? 0 : 100;
> + info->max_value.u64 =
> + (id < NVE4_PM_QUERY_METRIC_MP_OCCUPANCY) ? 0 : 100;
> return 1;
> } else
> if (screen->compute) {
> info->name = nvc0_pm_query_names[id - NVC0_QUERY_DRV_STAT_COUNT];
> info->query_type = NVC0_PM_QUERY(id - NVC0_QUERY_DRV_STAT_COUNT);
> - info->max_value = 0;
> + info->max_value.u64 = 0;
> return 1;
> }
> }
> /* user asked for info about non-existing query */
> info->name = "this_is_not_the_query_you_are_looking_for";
> info->query_type = 0xdeadd01d;
> - info->max_value = 0;
> + info->max_value.u64 = 0;
> return 0;
> }
>
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 238a934..cd0d09f 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -655,14 +655,14 @@ static int r600_get_driver_query_info(struct pipe_screen *screen,
> {
> struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
> struct pipe_driver_query_info list[] = {
> - {"draw-calls", R600_QUERY_DRAW_CALLS, 0},
> - {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->info.vram_size, PIPE_DRIVER_QUERY_TYPE_BYTES},
> - {"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->info.gart_size, PIPE_DRIVER_QUERY_TYPE_BYTES},
> - {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, 0},
> - {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, 0},
> - {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, 0, PIPE_DRIVER_QUERY_TYPE_BYTES},
> - {"VRAM-usage", R600_QUERY_VRAM_USAGE, rscreen->info.vram_size, PIPE_DRIVER_QUERY_TYPE_BYTES},
> - {"GTT-usage", R600_QUERY_GTT_USAGE, rscreen->info.gart_size, PIPE_DRIVER_QUERY_TYPE_BYTES},
> + {"draw-calls", R600_QUERY_DRAW_CALLS, {0}},
> + {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
> + {"requested-GTT", R600_QUERY_REQUESTED_GTT, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
> + {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, {0}},
> + {"num-cs-flushes", R600_QUERY_NUM_CS_FLUSHES, {0}},
> + {"num-bytes-moved", R600_QUERY_NUM_BYTES_MOVED, {0}, PIPE_DRIVER_QUERY_TYPE_BYTES},
> + {"VRAM-usage", R600_QUERY_VRAM_USAGE, {rscreen->info.vram_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
> + {"GTT-usage", R600_QUERY_GTT_USAGE, {rscreen->info.gart_size}, PIPE_DRIVER_QUERY_TYPE_BYTES},
> };
>
> if (!info)
> diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c
> index 35e5a11..b75f038 100644
> --- a/src/gallium/drivers/svga/svga_screen.c
> +++ b/src/gallium/drivers/svga/svga_screen.c
> @@ -568,9 +568,9 @@ svga_get_driver_query_info(struct pipe_screen *screen,
> struct pipe_driver_query_info *info)
> {
> static const struct pipe_driver_query_info queries[] = {
> - {"draw-calls", SVGA_QUERY_DRAW_CALLS, 0},
> - {"fallbacks", SVGA_QUERY_FALLBACKS, 0},
> - {"memory-used", SVGA_QUERY_MEMORY_USED, 0, PIPE_DRIVER_QUERY_TYPE_BYTES}
> + {"draw-calls", SVGA_QUERY_DRAW_CALLS, {0}},
> + {"fallbacks", SVGA_QUERY_FALLBACKS, {0}},
> + {"memory-used", SVGA_QUERY_MEMORY_USED, {0}, PIPE_DRIVER_QUERY_TYPE_BYTES}
> };
>
> if (!info)
> diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
> index b1df836..8a16fde 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -775,11 +775,18 @@ enum pipe_driver_query_group_type
> PIPE_DRIVER_QUERY_GROUP_TYPE_GPU = 1,
> };
>
> +union pipe_numeric_type_union
> +{
> + uint64_t u64;
> + uint32_t u32;
> + float f;
> +};
> +
> struct pipe_driver_query_info
> {
> const char *name;
> unsigned query_type; /* PIPE_QUERY_DRIVER_SPECIFIC + i */
> - uint64_t max_value; /* max value that can be returned */
> + union pipe_numeric_type_union max_value; /* max value that can be returned */
> enum pipe_driver_query_type type;
> unsigned group_id;
> };
More information about the mesa-dev
mailing list