Mesa (master): i965: move mdapi result data format to intel/perf
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 17 13:15:42 UTC 2019
Module: Mesa
Branch: master
Commit: b48d6d74717d5024f5b3a3e9d5b6f3a6bfa00617
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b48d6d74717d5024f5b3a3e9d5b6f3a6bfa00617
Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date: Fri Jun 8 17:53:08 2018 +0100
i965: move mdapi result data format to intel/perf
We want to reuse this in Anv.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Mark Janes <mark.a.janes at intel.com>
---
src/intel/Makefile.sources | 3 +-
src/intel/perf/gen_perf_mdapi.c | 116 +++++++++++++++++++++
src/intel/perf/gen_perf_mdapi.h | 8 ++
src/intel/perf/meson.build | 3 +-
src/mesa/drivers/dri/i965/brw_performance_query.c | 13 ++-
src/mesa/drivers/dri/i965/brw_performance_query.h | 4 -
.../drivers/dri/i965/brw_performance_query_mdapi.c | 89 ----------------
7 files changed, 138 insertions(+), 98 deletions(-)
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 2aaa7feee53..dc1425c8c1c 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -334,7 +334,8 @@ GEN_PERF_XML_FILES = \
GEN_PERF_FILES = \
perf/gen_perf.c \
perf/gen_perf.h \
- perf/gen_perf_mdapi.h
+ perf/gen_perf_mdapi.h \
+ perf/gen_perf_mdapi.c
GEN_PERF_GENERATED_FILES = \
perf/gen_perf_metrics.c \
diff --git a/src/intel/perf/gen_perf_mdapi.c b/src/intel/perf/gen_perf_mdapi.c
new file mode 100644
index 00000000000..38ca23088d2
--- /dev/null
+++ b/src/intel/perf/gen_perf_mdapi.c
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "gen_perf.h"
+#include "gen_perf_mdapi.h"
+
+#include "dev/gen_device_info.h"
+
+int
+gen_perf_query_result_write_mdapi(void *data, uint32_t data_size,
+ const struct gen_device_info *devinfo,
+ const struct gen_perf_query_result *result,
+ uint64_t freq_start, uint64_t freq_end)
+{
+ switch (devinfo->gen) {
+ case 7: {
+ struct gen7_mdapi_metrics *mdapi_data = (struct gen7_mdapi_metrics *) data;
+
+ if (data_size < sizeof(*mdapi_data))
+ return 0;
+
+ assert(devinfo->is_haswell);
+
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->ACounters); i++)
+ mdapi_data->ACounters[i] = result->accumulator[1 + i];
+
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->NOACounters); i++) {
+ mdapi_data->NOACounters[i] =
+ result->accumulator[1 + ARRAY_SIZE(mdapi_data->ACounters) + i];
+ }
+
+ mdapi_data->ReportsCount = result->reports_accumulated;
+ mdapi_data->TotalTime =
+ gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
+ mdapi_data->CoreFrequency = freq_end;
+ mdapi_data->CoreFrequencyChanged = freq_end != freq_start;
+ return sizeof(*mdapi_data);
+ }
+ case 8: {
+ struct gen8_mdapi_metrics *mdapi_data = (struct gen8_mdapi_metrics *) data;
+
+ if (data_size < sizeof(*mdapi_data))
+ return 0;
+
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->OaCntr); i++)
+ mdapi_data->OaCntr[i] = result->accumulator[2 + i];
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->NoaCntr); i++) {
+ mdapi_data->NoaCntr[i] =
+ result->accumulator[2 + ARRAY_SIZE(mdapi_data->OaCntr) + i];
+ }
+
+ mdapi_data->ReportId = result->hw_id;
+ mdapi_data->ReportsCount = result->reports_accumulated;
+ mdapi_data->TotalTime =
+ gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
+ mdapi_data->GPUTicks = result->accumulator[1];
+ mdapi_data->CoreFrequency = freq_end;
+ mdapi_data->CoreFrequencyChanged = freq_end != freq_start;
+ mdapi_data->SliceFrequency =
+ (result->slice_frequency[0] + result->slice_frequency[1]) / 2ULL;
+ mdapi_data->UnsliceFrequency =
+ (result->unslice_frequency[0] + result->unslice_frequency[1]) / 2ULL;
+ return sizeof(*mdapi_data);
+ }
+ case 9:
+ case 10:
+ case 11: {
+ struct gen9_mdapi_metrics *mdapi_data = (struct gen9_mdapi_metrics *) data;
+
+ if (data_size < sizeof(*mdapi_data))
+ return 0;
+
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->OaCntr); i++)
+ mdapi_data->OaCntr[i] = result->accumulator[2 + i];
+ for (int i = 0; i < ARRAY_SIZE(mdapi_data->NoaCntr); i++) {
+ mdapi_data->NoaCntr[i] =
+ result->accumulator[2 + ARRAY_SIZE(mdapi_data->OaCntr) + i];
+ }
+
+ mdapi_data->ReportId = result->hw_id;
+ mdapi_data->ReportsCount = result->reports_accumulated;
+ mdapi_data->TotalTime =
+ gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
+ mdapi_data->GPUTicks = result->accumulator[1];
+ mdapi_data->CoreFrequency = freq_end;
+ mdapi_data->CoreFrequencyChanged = freq_end != freq_start;
+ mdapi_data->SliceFrequency =
+ (result->slice_frequency[0] + result->slice_frequency[1]) / 2ULL;
+ mdapi_data->UnsliceFrequency =
+ (result->unslice_frequency[0] + result->unslice_frequency[1]) / 2ULL;
+ return sizeof(*mdapi_data);
+ }
+ default:
+ unreachable("unexpected gen");
+ }
+}
diff --git a/src/intel/perf/gen_perf_mdapi.h b/src/intel/perf/gen_perf_mdapi.h
index dcaa8c3ebeb..fcdee079013 100644
--- a/src/intel/perf/gen_perf_mdapi.h
+++ b/src/intel/perf/gen_perf_mdapi.h
@@ -26,6 +26,9 @@
#include <stdint.h>
+struct gen_device_info;
+struct gen_perf_query_result;
+
/*
* Data format expected by MDAPI.
*/
@@ -116,4 +119,9 @@ struct mdapi_pipeline_metrics {
uint64_t CSInvocations;
};
+int gen_perf_query_result_write_mdapi(void *data, uint32_t data_size,
+ const struct gen_device_info *devinfo,
+ const struct gen_perf_query_result *result,
+ uint64_t freq_start, uint64_t freq_end);
+
#endif /* GEN_PERF_MDAPI_H */
diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build
index 3620f6885a4..d6426d0958a 100644
--- a/src/intel/perf/meson.build
+++ b/src/intel/perf/meson.build
@@ -15,7 +15,8 @@ foreach hw : gen_hw_metrics
endforeach
gen_perf_sources = [
- 'gen_perf.c'
+ 'gen_perf.c',
+ 'gen_perf_mdapi.c',
]
gen_perf_sources += custom_target(
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index b3b34a82da7..831ad97a675 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -74,6 +74,7 @@
#include "intel_batchbuffer.h"
#include "perf/gen_perf.h"
+#include "perf/gen_perf_mdapi.h"
#define FILE_DEBUG_FLAG DEBUG_PERFMON
@@ -1488,10 +1489,16 @@ brw_get_perf_query_data(struct gl_context *ctx,
brw_bo_unmap(obj->oa.bo);
obj->oa.map = NULL;
}
- if (obj->query->kind == GEN_PERF_QUERY_TYPE_OA)
+ if (obj->query->kind == GEN_PERF_QUERY_TYPE_OA) {
written = get_oa_counter_data(brw, obj, data_size, (uint8_t *)data);
- else
- written = brw_perf_query_get_mdapi_oa_data(brw, obj, data_size, (uint8_t *)data);
+ } else {
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+
+ written = gen_perf_query_result_write_mdapi((uint8_t *)data, data_size,
+ devinfo, &obj->oa.result,
+ obj->oa.gt_frequency[0],
+ obj->oa.gt_frequency[1]);
+ }
break;
case GEN_PERF_QUERY_TYPE_PIPELINE:
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.h b/src/mesa/drivers/dri/i965/brw_performance_query.h
index 86632e06a61..b0bf60cc4ff 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.h
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.h
@@ -114,10 +114,6 @@ struct brw_perf_query_object
};
};
-int brw_perf_query_get_mdapi_oa_data(struct brw_context *brw,
- struct brw_perf_query_object *obj,
- size_t data_size,
- uint8_t *data);
void brw_perf_query_register_mdapi_oa_query(struct brw_context *brw);
void brw_perf_query_register_mdapi_statistic_query(struct brw_context *brw);
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c b/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c
index 919069f9e39..fbdbca1260c 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query_mdapi.c
@@ -27,95 +27,6 @@
#include "perf/gen_perf.h"
#include "perf/gen_perf_mdapi.h"
-int
-brw_perf_query_get_mdapi_oa_data(struct brw_context *brw,
- struct brw_perf_query_object *obj,
- size_t data_size,
- uint8_t *data)
-{
- const struct gen_device_info *devinfo = &brw->screen->devinfo;
- const struct gen_perf_query_result *result = &obj->oa.result;
-
- switch (devinfo->gen) {
- case 7: {
- struct gen7_mdapi_metrics *mdapi_data = (struct gen7_mdapi_metrics *) data;
-
- if (data_size < sizeof(*mdapi_data))
- return 0;
-
- assert(devinfo->is_haswell);
-
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->ACounters); i++)
- mdapi_data->ACounters[i] = result->accumulator[1 + i];
-
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->NOACounters); i++) {
- mdapi_data->NOACounters[i] =
- result->accumulator[1 + ARRAY_SIZE(mdapi_data->ACounters) + i];
- }
-
- mdapi_data->ReportsCount = result->reports_accumulated;
- mdapi_data->TotalTime = gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
- mdapi_data->CoreFrequency = obj->oa.gt_frequency[1];
- mdapi_data->CoreFrequencyChanged = obj->oa.gt_frequency[0] != obj->oa.gt_frequency[1];
- return sizeof(*mdapi_data);
- }
- case 8: {
- struct gen8_mdapi_metrics *mdapi_data = (struct gen8_mdapi_metrics *) data;
-
- if (data_size < sizeof(*mdapi_data))
- return 0;
-
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->OaCntr); i++)
- mdapi_data->OaCntr[i] = result->accumulator[2 + i];
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->NoaCntr); i++) {
- mdapi_data->NoaCntr[i] =
- result->accumulator[2 + ARRAY_SIZE(mdapi_data->OaCntr) + i];
- }
-
- mdapi_data->ReportId = result->hw_id;
- mdapi_data->ReportsCount = result->reports_accumulated;
- mdapi_data->TotalTime = gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
- mdapi_data->GPUTicks = result->accumulator[1];
- mdapi_data->CoreFrequency = obj->oa.gt_frequency[1];
- mdapi_data->CoreFrequencyChanged = obj->oa.gt_frequency[0] != obj->oa.gt_frequency[1];
- mdapi_data->SliceFrequency = (result->slice_frequency[0] + result->slice_frequency[1]) / 2ULL;
- mdapi_data->UnsliceFrequency = (result->unslice_frequency[0] + result->unslice_frequency[1]) / 2ULL;
-
- return sizeof(*mdapi_data);
- }
- case 9:
- case 10:
- case 11: {
- struct gen9_mdapi_metrics *mdapi_data = (struct gen9_mdapi_metrics *) data;
-
- if (data_size < sizeof(*mdapi_data))
- return 0;
-
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->OaCntr); i++)
- mdapi_data->OaCntr[i] = result->accumulator[2 + i];
- for (int i = 0; i < ARRAY_SIZE(mdapi_data->NoaCntr); i++) {
- mdapi_data->NoaCntr[i] =
- result->accumulator[2 + ARRAY_SIZE(mdapi_data->OaCntr) + i];
- }
-
- mdapi_data->ReportId = result->hw_id;
- mdapi_data->ReportsCount = result->reports_accumulated;
- mdapi_data->TotalTime = gen_device_info_timebase_scale(devinfo, result->accumulator[0]);
- mdapi_data->GPUTicks = result->accumulator[1];
- mdapi_data->CoreFrequency = obj->oa.gt_frequency[1];
- mdapi_data->CoreFrequencyChanged = obj->oa.gt_frequency[0] != obj->oa.gt_frequency[1];
- mdapi_data->SliceFrequency = (result->slice_frequency[0] + result->slice_frequency[1]) / 2ULL;
- mdapi_data->UnsliceFrequency = (result->unslice_frequency[0] + result->unslice_frequency[1]) / 2ULL;
-
- return sizeof(*mdapi_data);
- }
- default:
- unreachable("unexpected gen");
- }
-
- return 0;
-}
-
static void
fill_mdapi_perf_query_counter(struct gen_perf_query_info *query,
const char *name,
More information about the mesa-commit
mailing list