Commit d644698b authored by Kenneth Graunke's avatar Kenneth Graunke

gallium: Add the ability to query a single pipeline statistics counter

Gallium historically has treated pipeline statistics queries as a single
query, PIPE_QUERY_PIPELINE_STATISTICS, which returns a block of 11
values.  This was originally patterned after the D3D1x API.  Much later,
Brian introduced an OpenGL extension that exposed these counters - but
it exposes 11 separate queries, each of which returns a single value.

Today, st/mesa simply queries all 11 values, and returns a single value.
While pipeline statistics counters aren't typically performance
critical, this is still not a great fit.  A D3D1x->GL translator might
request all 11 counters by creating 11 separate GL queries...which
Gallium would map to reads of all 11 values each time, resulting in a
total 121 counter reads.  That's not ideal.

This patch adds a new cap, PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE,
and corresponding query type PIPE_QUERY_PIPELINE_STATISTICS_SINGLE.
When calling create_query(), q->index should be set to one of the
PIPE_STAT_QUERY_* enums to select a counter.  Unlike the block query,
this returns the value in pipe_query_result::u64 (as it's a single
value) instead of the pipe_query_data_pipeline_statistics group.

We update st/mesa to expose ARB_pipeline_statistics_query if either
capability is set, preferring the new SINGLE variant when available.

Thanks to Roland, Ilia, and Marek for helping me sort this out.
Reviewed-by: default avatarMarek Olšák <marek.olsak@amd.com>
Reviewed-by: Tapani Pälli's avatarTapani Pälli <tapani.palli@intel.com>
parent f967273f
......@@ -145,6 +145,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen,
return 1;
case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
case PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE:
case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK:
return 0;
......
......@@ -491,6 +491,11 @@ Number of tessellation evaluation shader threads launched.
If a shader type is not supported by the device/driver,
the corresponding values should be set to 0.
``PIPE_QUERY_PIPELINE_STATISTICS_SINGLE`` returns a single counter from
the ``PIPE_QUERY_PIPELINE_STATISTICS`` group. The specific counter must
be selected when calling ``create_query`` by passing one of the
``PIPE_STAT_QUERY`` enums as the query's ``index``.
Gallium does not guarantee the availability of any query types; one must
always check the capabilities of the :ref:`Screen` first.
......
......@@ -563,6 +563,7 @@ enum pipe_query_type {
PIPE_QUERY_SO_OVERFLOW_ANY_PREDICATE,
PIPE_QUERY_GPU_FINISHED,
PIPE_QUERY_PIPELINE_STATISTICS,
PIPE_QUERY_PIPELINE_STATISTICS_SINGLE,
PIPE_QUERY_TYPES,
/* start of driver queries, see pipe_screen::get_driver_query_info */
PIPE_QUERY_DRIVER_SPECIFIC = 256,
......@@ -851,6 +852,7 @@ enum pipe_cap
PIPE_CAP_MAX_VERTEX_ELEMENT_SRC_OFFSET,
PIPE_CAP_SURFACE_SAMPLE_COUNT,
PIPE_CAP_TGSI_ATOMFADD,
PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE,
};
/**
......
......@@ -88,6 +88,44 @@ st_DeleteQuery(struct gl_context *ctx, struct gl_query_object *q)
free(stq);
}
static int
target_to_index(const struct st_context *st, const struct gl_query_object *q)
{
if (q->Target == GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN ||
q->Target == GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB)
return q->Stream;
if (st->has_single_pipe_stat) {
switch (q->Target) {
case GL_VERTICES_SUBMITTED_ARB:
return PIPE_STAT_QUERY_IA_VERTICES;
case GL_PRIMITIVES_SUBMITTED_ARB:
return PIPE_STAT_QUERY_IA_PRIMITIVES;
case GL_VERTEX_SHADER_INVOCATIONS_ARB:
return PIPE_STAT_QUERY_VS_INVOCATIONS;
case GL_GEOMETRY_SHADER_INVOCATIONS:
return PIPE_STAT_QUERY_GS_INVOCATIONS;
case GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB:
return PIPE_STAT_QUERY_GS_PRIMITIVES;
case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
return PIPE_STAT_QUERY_C_INVOCATIONS;
case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
return PIPE_STAT_QUERY_C_PRIMITIVES;
case GL_FRAGMENT_SHADER_INVOCATIONS_ARB:
return PIPE_STAT_QUERY_PS_INVOCATIONS;
case GL_TESS_CONTROL_SHADER_PATCHES_ARB:
return PIPE_STAT_QUERY_HS_INVOCATIONS;
case GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB:
return PIPE_STAT_QUERY_DS_INVOCATIONS;
case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
return PIPE_STAT_QUERY_CS_INVOCATIONS;
default:
break;
}
}
return 0;
}
static void
st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
......@@ -140,7 +178,8 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
case GL_COMPUTE_SHADER_INVOCATIONS_ARB:
case GL_CLIPPING_INPUT_PRIMITIVES_ARB:
case GL_CLIPPING_OUTPUT_PRIMITIVES_ARB:
type = PIPE_QUERY_PIPELINE_STATISTICS;
type = st->has_single_pipe_stat ? PIPE_QUERY_PIPELINE_STATISTICS_SINGLE
: PIPE_QUERY_PIPELINE_STATISTICS;
break;
default:
assert(0 && "unexpected query target in st_BeginQuery()");
......@@ -164,7 +203,7 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
ret = pipe->end_query(pipe, stq->pq_begin);
} else {
if (!stq->pq) {
stq->pq = pipe->create_query(pipe, type, q->Stream);
stq->pq = pipe->create_query(pipe, type, target_to_index(st, q));
stq->type = type;
}
if (stq->pq)
......
......@@ -462,6 +462,8 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
screen->get_param(screen, PIPE_CAP_TGSI_PACK_HALF_FLOAT);
st->has_multi_draw_indirect =
screen->get_param(screen, PIPE_CAP_MULTI_DRAW_INDIRECT);
st->has_single_pipe_stat =
screen->get_param(screen, PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE);
st->has_hw_atomics =
screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT,
......
......@@ -127,6 +127,7 @@ struct st_context
boolean has_shareable_shaders;
boolean has_half_float_packing;
boolean has_multi_draw_indirect;
boolean has_single_pipe_stat;
boolean can_bind_const_buffer_as_vertex;
/**
......
......@@ -704,6 +704,7 @@ void st_init_extensions(struct pipe_screen *screen,
{ o(ARB_occlusion_query), PIPE_CAP_OCCLUSION_QUERY },
{ o(ARB_occlusion_query2), PIPE_CAP_OCCLUSION_QUERY },
{ o(ARB_pipeline_statistics_query), PIPE_CAP_QUERY_PIPELINE_STATISTICS },
{ o(ARB_pipeline_statistics_query), PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE },
{ o(ARB_point_sprite), PIPE_CAP_POINT_SPRITE },
{ o(ARB_polygon_offset_clamp), PIPE_CAP_POLYGON_OFFSET_CLAMP },
{ o(ARB_post_depth_coverage), PIPE_CAP_POST_DEPTH_COVERAGE },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment