Mesa (master): intel/perf: link queries back to the gen_perf_config object

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: b7032d67764304b949adc1867a0e17de576d2373
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7032d67764304b949adc1867a0e17de576d2373

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Sep  3 12:19:11 2020 +0300

intel/perf: link queries back to the gen_perf_config object

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8525>

---

 src/intel/perf/gen_perf.h         | 2 ++
 src/intel/perf/gen_perf.py        | 1 +
 src/intel/perf/gen_perf_private.h | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/intel/perf/gen_perf.h b/src/intel/perf/gen_perf.h
index 30a57dc483f..c91f9eeb55c 100644
--- a/src/intel/perf/gen_perf.h
+++ b/src/intel/perf/gen_perf.h
@@ -201,6 +201,8 @@ struct gen_perf_registers {
 };
 
 struct gen_perf_query_info {
+   struct gen_perf_config *perf;
+
    enum gen_perf_query_type {
       GEN_PERF_QUERY_TYPE_OA,
       GEN_PERF_QUERY_TYPE_RAW,
diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py
index 0d0aae90b5f..94fd6f619f4 100644
--- a/src/intel/perf/gen_perf.py
+++ b/src/intel/perf/gen_perf.py
@@ -681,6 +681,7 @@ def main():
 
             c("struct gen_perf_query_info *query = rzalloc(perf, struct gen_perf_query_info);\n")
             c("\n")
+            c("query->perf = perf;\n")
             c("query->kind = GEN_PERF_QUERY_TYPE_OA;\n")
             c("query->name = \"" + set.name + "\";\n")
             c("query->symbol_name = \"" + set.symbol_name + "\";\n")
diff --git a/src/intel/perf/gen_perf_private.h b/src/intel/perf/gen_perf_private.h
index e3e877dd89e..acca9a2b48a 100644
--- a/src/intel/perf/gen_perf_private.h
+++ b/src/intel/perf/gen_perf_private.h
@@ -76,6 +76,8 @@ gen_perf_append_query_info(struct gen_perf_config *perf, int max_counters)
    query = &perf->queries[perf->n_queries - 1];
    memset(query, 0, sizeof(*query));
 
+   query->perf = perf;
+
    if (max_counters > 0) {
       query->max_counters = max_counters;
       query->counters =