diff options
| -rw-r--r-- | src/intel/perf/gen_perf.c | 30 | ||||
| -rw-r--r-- | src/intel/perf/gen_perf.h | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query.c | 33 |
3 files changed, 43 insertions, 25 deletions
diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c index 2d1a58bae9e..0bac1fd2888 100644 --- a/src/intel/perf/gen_perf.c +++ b/src/intel/perf/gen_perf.c @@ -2266,3 +2266,33 @@ gen_perf_get_query_data(struct gen_perf_context *perf_ctx, if (bytes_written) *bytes_written = written; } + +void +gen_perf_dump_query_count(struct gen_perf_context *perf_ctx) +{ + DBG("Queries: (Open queries = %d, OA users = %d)\n", + perf_ctx->n_active_oa_queries, perf_ctx->n_oa_users); +} + +void +gen_perf_dump_query(struct gen_perf_context *ctx, + struct gen_perf_query_object *obj, + void *current_batch) +{ + switch (obj->queryinfo->kind) { + case GEN_PERF_QUERY_TYPE_OA: + case GEN_PERF_QUERY_TYPE_RAW: + DBG("BO: %-4s OA data: %-10s %-15s\n", + obj->oa.bo ? "yes," : "no,", + gen_perf_is_query_ready(ctx, obj, current_batch) ? "ready," : "not ready,", + obj->oa.results_accumulated ? "accumulated" : "not accumulated"); + break; + case GEN_PERF_QUERY_TYPE_PIPELINE: + DBG("BO: %-4s\n", + obj->pipeline_stats.bo ? "yes" : "no"); + break; + default: + unreachable("Unknown query type"); + break; + } +} diff --git a/src/intel/perf/gen_perf.h b/src/intel/perf/gen_perf.h index 1b0836f9ff1..d4178900714 100644 --- a/src/intel/perf/gen_perf.h +++ b/src/intel/perf/gen_perf.h @@ -445,4 +445,9 @@ void gen_perf_get_query_data(struct gen_perf_context *perf_ctx, unsigned *data, unsigned *bytes_written); +void gen_perf_dump_query_count(struct gen_perf_context *perf_ctx); +void gen_perf_dump_query(struct gen_perf_context *perf_ctx, + struct gen_perf_query_object *obj, + void *current_batch); + #endif /* GEN_PERF_H */ diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index c1cba62cb3a..80a2ba6f4b4 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -111,41 +111,24 @@ brw_is_perf_query_ready(struct gl_context *ctx, static void dump_perf_query_callback(GLuint id, void *query_void, void *brw_void) { - struct gl_context *ctx = brw_void; + struct brw_context *ctx = brw_void; + struct gen_perf_context *perf_ctx = &ctx->perf_ctx; struct gl_perf_query_object *o = query_void; struct brw_perf_query_object * brw_query = brw_perf_query(o); struct gen_perf_query_object *obj = brw_query->query; - switch (obj->queryinfo->kind) { - case GEN_PERF_QUERY_TYPE_OA: - case GEN_PERF_QUERY_TYPE_RAW: - DBG("%4d: %-6s %-8s BO: %-4s OA data: %-10s %-15s\n", - id, - o->Used ? "Dirty," : "New,", - o->Active ? "Active," : (o->Ready ? "Ready," : "Pending,"), - obj->oa.bo ? "yes," : "no,", - brw_is_perf_query_ready(ctx, o) ? "ready," : "not ready,", - obj->oa.results_accumulated ? "accumulated" : "not accumulated"); - break; - case GEN_PERF_QUERY_TYPE_PIPELINE: - DBG("%4d: %-6s %-8s BO: %-4s\n", - id, - o->Used ? "Dirty," : "New,", - o->Active ? "Active," : (o->Ready ? "Ready," : "Pending,"), - obj->pipeline_stats.bo ? "yes" : "no"); - break; - default: - unreachable("Unknown query type"); - break; - } + DBG("%4d: %-6s %-8s ", + id, + o->Used ? "Dirty," : "New,", + o->Active ? "Active," : (o->Ready ? "Ready," : "Pending,")); + gen_perf_dump_query(perf_ctx, obj, &ctx->batch); } static void dump_perf_queries(struct brw_context *brw) { struct gl_context *ctx = &brw->ctx; - DBG("Queries: (Open queries = %d, OA users = %d)\n", - brw->perf_ctx.n_active_oa_queries, brw->perf_ctx.n_oa_users); + gen_perf_dump_query_count(&brw->perf_ctx); _mesa_HashWalk(ctx->PerfQuery.Objects, dump_perf_query_callback, brw); } |