From fb622054f7065d0a92547f20dba404e3e5aec38d Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Thu, 30 May 2019 18:09:02 -0700 Subject: [PATCH] intel/perf: move get_metric_id to perf Reviewed-by: Kenneth Graunke --- src/intel/perf/gen_perf.c | 34 +++++++++++++++++ src/intel/perf/gen_perf.h | 2 + .../drivers/dri/i965/brw_performance_query.c | 37 +------------------ 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c index d28da495761..76fe725e3b1 100644 --- a/src/intel/perf/gen_perf.c +++ b/src/intel/perf/gen_perf.c @@ -790,3 +790,37 @@ gen_perf_query_register_mdapi_statistic_query(const struct gen_device_info *devi query->data_size = sizeof(uint64_t) * query->n_counters; } +uint64_t +gen_perf_query_get_metric_id(struct gen_perf_config *perf, + const struct gen_perf_query_info *query) +{ + /* These queries are know not to ever change, their config ID has been + * loaded upon the first query creation. No need to look them up again. + */ + if (query->kind == GEN_PERF_QUERY_TYPE_OA) + return query->oa_metrics_set_id; + + assert(query->kind == GEN_PERF_QUERY_TYPE_RAW); + + /* Raw queries can be reprogrammed up by an external application/library. + * When a raw query is used for the first time it's id is set to a value != + * 0. When it stops being used the id returns to 0. No need to reload the + * ID when it's already loaded. + */ + if (query->oa_metrics_set_id != 0) { + DBG("Raw query '%s' guid=%s using cached ID: %"PRIu64"\n", + query->name, query->guid, query->oa_metrics_set_id); + return query->oa_metrics_set_id; + } + + struct gen_perf_query_info *raw_query = (struct gen_perf_query_info *)query; + if (!gen_perf_load_metric_id(perf, query->guid, + &raw_query->oa_metrics_set_id)) { + DBG("Unable to read query guid=%s ID, falling back to test config\n", query->guid); + raw_query->oa_metrics_set_id = 1ULL; + } else { + DBG("Raw query '%s'guid=%s loaded ID: %"PRIu64"\n", + query->name, query->guid, query->oa_metrics_set_id); + } + return query->oa_metrics_set_id; +} diff --git a/src/intel/perf/gen_perf.h b/src/intel/perf/gen_perf.h index cb4d0d2da6c..670640f7410 100644 --- a/src/intel/perf/gen_perf.h +++ b/src/intel/perf/gen_perf.h @@ -445,6 +445,8 @@ void gen_perf_query_register_mdapi_statistic_query(const struct gen_device_info struct gen_perf_config *perf); void gen_perf_query_register_mdapi_oa_query(const struct gen_device_info *devinfo, struct gen_perf_config *perf); +uint64_t gen_perf_query_get_metric_id(struct gen_perf_config *perf, + const struct gen_perf_query_info *query); #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 0ecdac48253..9ee0ea45bb7 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -104,41 +104,6 @@ static bool brw_is_perf_query_ready(struct gl_context *ctx, struct gl_perf_query_object *o); -static uint64_t -brw_perf_query_get_metric_id(struct brw_context *brw, - const struct gen_perf_query_info *query) -{ - /* These queries are know not to ever change, their config ID has been - * loaded upon the first query creation. No need to look them up again. - */ - if (query->kind == GEN_PERF_QUERY_TYPE_OA) - return query->oa_metrics_set_id; - - assert(query->kind == GEN_PERF_QUERY_TYPE_RAW); - - /* Raw queries can be reprogrammed up by an external application/library. - * When a raw query is used for the first time it's id is set to a value != - * 0. When it stops being used the id returns to 0. No need to reload the - * ID when it's already loaded. - */ - if (query->oa_metrics_set_id != 0) { - DBG("Raw query '%s' guid=%s using cached ID: %"PRIu64"\n", - query->name, query->guid, query->oa_metrics_set_id); - return query->oa_metrics_set_id; - } - - struct gen_perf_query_info *raw_query = (struct gen_perf_query_info *)query; - if (!gen_perf_load_metric_id(brw->perfquery.perf, query->guid, - &raw_query->oa_metrics_set_id)) { - DBG("Unable to read query guid=%s ID, falling back to test config\n", query->guid); - raw_query->oa_metrics_set_id = 1ULL; - } else { - DBG("Raw query '%s'guid=%s loaded ID: %"PRIu64"\n", - query->name, query->guid, query->oa_metrics_set_id); - } - return query->oa_metrics_set_id; -} - static void dump_perf_query_callback(GLuint id, void *query_void, void *brw_void) { @@ -908,7 +873,7 @@ brw_begin_perf_query(struct gl_context *ctx, * require a different counter set or format unless we get an opportunity * to close the stream and open a new one... */ - uint64_t metric_id = brw_perf_query_get_metric_id(brw, query); + uint64_t metric_id = gen_perf_query_get_metric_id(brw->perfquery.perf, query); if (brw->perfquery.oa_stream_fd != -1 && brw->perfquery.current_oa_metrics_set_id != metric_id) { -- 2.30.2