[igt-dev] [PATCH i-g-t v4 23/31] i915/perf: Add support for engine specific metrics
Umesh Nerlige Ramappa
umesh.nerlige.ramappa at intel.com
Wed Mar 22 00:05:15 UTC 2023
Metrics config is different for media vs render engines. Choose the metrics
configurations as per the engine used for the test.
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
---
tests/i915/perf.c | 236 ++++++++++++++++++++++++++--------------------
1 file changed, 136 insertions(+), 100 deletions(-)
diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index d6db31c0..e72704b5 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -265,7 +265,6 @@ static uint32_t num_perf_oa_groups;
static uint64_t gt_max_freq_mhz = 0;
static struct intel_perf *intel_perf = NULL;
-static struct intel_perf_metric_set *test_set = NULL;
static bool *undefined_a_counters;
static uint64_t oa_exp_1_millisec;
@@ -276,6 +275,10 @@ static void (*sanity_check_reports)(const uint32_t *oa_report0,
const uint32_t *oa_report1,
enum drm_i915_oa_format format);
+
+static struct intel_perf_metric_set *metric_set(const struct intel_execution_engine2 *e2);
+#define default_test_set metric_set(&default_e2)
+
static void
dump_report(const uint32_t *report, uint32_t size, const char *message) {
uint32_t i;
@@ -678,17 +681,7 @@ oar_unit_default_format(void)
if (IS_DG2(devid) || IS_METEORLAKE(devid))
return I915_OAR_FORMAT_A32u40_A4u32_B8_C8;
- return test_set->perf_oa_format;
-}
-
-static int
-oa_unit_default_format(const struct intel_execution_engine2 *e)
-{
- if (e->class == I915_ENGINE_CLASS_VIDEO ||
- e->class == I915_ENGINE_CLASS_VIDEO_ENHANCE)
- return I915_OAM_FORMAT_MPEC8u32_B8_C8;
-
- return test_set->perf_oa_format;
+ return default_test_set->perf_oa_format;
}
/*
@@ -1120,9 +1113,6 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,
static bool
init_sys_info(void)
{
- const char *test_set_name = NULL;
- struct intel_perf_metric_set *metric_set_iter;
-
igt_assert_neq(devid, 0);
intel_perf = intel_perf_for_fd(drm_fd);
@@ -1139,38 +1129,17 @@ init_sys_info(void)
* RenderBasic
*/
if (IS_HASWELL(devid)) {
- test_set_name = "RenderBasic";
read_report_ticks = hsw_read_report_ticks;
sanity_check_reports = hsw_sanity_check_render_basic_reports;
undefined_a_counters = hsw_undefined_a_counters;
} else {
- test_set_name = "TestOa";
read_report_ticks = gen8_read_report_ticks;
sanity_check_reports = gen8_sanity_check_test_oa_reports;
undefined_a_counters = gen8_undefined_a_counters;
}
- igt_list_for_each_entry(metric_set_iter, &intel_perf->metric_sets, link) {
- if (strcmp(metric_set_iter->symbol_name, test_set_name) == 0) {
- test_set = metric_set_iter;
- break;
- }
- }
-
- if (!test_set)
- return false;
-
- igt_debug("%s metric set UUID = %s\n",
- test_set->symbol_name,
- test_set->hw_config_guid);
-
intel_perf_load_perf_configs(intel_perf, drm_fd);
- if (test_set->perf_oa_metrics_set == 0) {
- igt_debug("Unable to load configurations\n");
- return false;
- }
-
oa_exp_1_millisec = max_oa_exponent_for_period_lte(1000000);
return true;
@@ -1242,8 +1211,8 @@ test_system_wide_paranoid(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
};
struct drm_i915_perf_open_param param = {
@@ -1268,8 +1237,8 @@ test_system_wide_paranoid(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
};
struct drm_i915_perf_open_param param = {
@@ -1300,8 +1269,8 @@ test_invalid_open_flags(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
};
struct drm_i915_perf_open_param param = {
@@ -1318,8 +1287,8 @@ test_invalid_class_instance(void)
{
uint64_t properties[] = {
DRM_I915_PERF_PROP_SAMPLE_OA, true,
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, 0,
DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, 0,
@@ -1362,7 +1331,7 @@ test_invalid_oa_metric_set_id(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_OA_METRICS_SET, UINT64_MAX,
};
@@ -1379,7 +1348,7 @@ test_invalid_oa_metric_set_id(void)
do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, ¶m, EINVAL);
/* Check that we aren't just seeing false positives... */
- properties[ARRAY_SIZE(properties) - 1] = test_set->perf_oa_metrics_set;
+ properties[ARRAY_SIZE(properties) - 1] = default_test_set->perf_oa_metrics_set;
stream_fd = __perf_open(drm_fd, ¶m, false);
__perf_close(stream_fd);
@@ -1396,7 +1365,7 @@ test_invalid_oa_format_id(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_OA_FORMAT, UINT64_MAX,
};
@@ -1413,7 +1382,7 @@ test_invalid_oa_format_id(void)
do_ioctl_err(drm_fd, DRM_IOCTL_I915_PERF_OPEN, ¶m, EINVAL);
/* Check that we aren't just seeing false positives... */
- properties[ARRAY_SIZE(properties) - 1] = test_set->perf_oa_format;
+ properties[ARRAY_SIZE(properties) - 1] = default_test_set->perf_oa_format;
stream_fd = __perf_open(drm_fd, ¶m, false);
__perf_close(stream_fd);
@@ -1429,9 +1398,9 @@ test_missing_sample_flags(void)
/* No _PROP_SAMPLE_xyz flags */
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
};
struct drm_i915_perf_open_param param = {
.flags = I915_PERF_FLAG_FD_CLOEXEC,
@@ -1564,6 +1533,7 @@ open_and_read_2_oa_reports(int format_id,
bool timer_only,
const struct intel_execution_engine2 *e)
{
+ struct intel_perf_metric_set *test_set = metric_set(e);
uint64_t properties[] = {
/* Include OA reports in samples */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
@@ -1948,7 +1918,8 @@ static bool expected_report_timing_delta(uint32_t delta, uint32_t expected_delta
static void
test_oa_exponents(const struct intel_execution_engine2 *e)
{
- uint64_t fmt = oa_unit_default_format(e);
+ struct intel_perf_metric_set *test_set = metric_set(e);
+ uint64_t fmt = test_set->perf_oa_format;
load_helper_init();
load_helper_run(HIGH);
@@ -2094,8 +2065,8 @@ test_invalid_oa_exponent(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, 31, /* maximum exponent expected
to be accepted */
};
@@ -2130,8 +2101,8 @@ test_low_oa_exponent_permissions(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, bad_exponent,
};
struct drm_i915_perf_open_param param = {
@@ -2193,8 +2164,8 @@ test_per_context_mode_unprivileged(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
};
struct drm_i915_perf_open_param param = {
@@ -2289,10 +2260,11 @@ test_blocking(uint64_t requested_oa_period,
int64_t start, end;
int n = 0;
+ struct intel_perf_metric_set *test_set = metric_set(e);
ADD_PROPS(props, idx, SAMPLE_OA, true);
ADD_PROPS(props, idx, OA_METRICS_SET, test_set->perf_oa_metrics_set);
- ADD_PROPS(props, idx, OA_FORMAT, oa_unit_default_format(e));
+ ADD_PROPS(props, idx, OA_FORMAT, test_set->perf_oa_format);
ADD_PROPS(props, idx, OA_EXPONENT, oa_exponent);
if (has_param_poll_period() && set_kernel_hrtimer)
@@ -2452,10 +2424,11 @@ test_polling(uint64_t requested_oa_period,
int min_iterations = (test_duration_ns / (oa_period + (kernel_hrtimer + kernel_hrtimer / 5)));
int64_t start, end;
int n = 0;
+ struct intel_perf_metric_set *test_set = metric_set(e);
ADD_PROPS(props, idx, SAMPLE_OA, true);
ADD_PROPS(props, idx, OA_METRICS_SET, test_set->perf_oa_metrics_set);
- ADD_PROPS(props, idx, OA_FORMAT, oa_unit_default_format(e));
+ ADD_PROPS(props, idx, OA_FORMAT, test_set->perf_oa_format);
ADD_PROPS(props, idx, OA_EXPONENT, oa_exponent);
if (has_param_poll_period() && set_kernel_hrtimer)
@@ -2627,8 +2600,8 @@ static void test_polling_small_buf(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
};
struct drm_i915_perf_open_param param = {
@@ -2640,7 +2613,7 @@ static void test_polling_small_buf(void)
};
uint32_t test_duration = 80 * 1000 * 1000;
int sample_size = (sizeof(struct drm_i915_perf_record_header) +
- get_oa_format(test_set->perf_oa_format).size);
+ get_oa_format(default_test_set->perf_oa_format).size);
int n_expected_reports = test_duration / oa_exponent_to_ns(oa_exponent);
int n_expect_read_bytes = n_expected_reports * sample_size;
struct timespec ts = {};
@@ -2725,11 +2698,12 @@ static void
gen12_test_oa_tlb_invalidate(const struct intel_execution_engine2 *e)
{
int oa_exponent = max_oa_exponent_for_period_lte(30000000);
+ struct intel_perf_metric_set *test_set = metric_set(e);
uint64_t properties[] = {
DRM_I915_PERF_PROP_SAMPLE_OA, true,
DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_format(e),
+ DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, e->class,
DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance,
@@ -2772,7 +2746,8 @@ test_buffer_fill(const struct intel_execution_engine2 *e)
/* ~5 micro second period */
int oa_exponent = max_oa_exponent_for_period_lte(5000);
uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
- uint64_t fmt = oa_unit_default_format(e);
+ struct intel_perf_metric_set *test_set = metric_set(e);
+ uint64_t fmt = test_set->perf_oa_format;
uint64_t properties[] = {
/* Include OA reports in samples */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
@@ -2929,8 +2904,8 @@ test_non_zero_reason(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
};
struct drm_i915_perf_open_param param = {
@@ -2986,7 +2961,7 @@ test_non_zero_reason(void)
if (last_report) {
sanity_check_reports(last_report, report,
- test_set->perf_oa_format);
+ default_test_set->perf_oa_format);
}
last_report = report;
break;
@@ -3008,7 +2983,8 @@ test_enable_disable(const struct intel_execution_engine2 *e)
/* ~5 micro second period */
int oa_exponent = max_oa_exponent_for_period_lte(5000);
uint64_t oa_period = oa_exponent_to_ns(oa_exponent);
- uint64_t fmt = oa_unit_default_format(e);
+ struct intel_perf_metric_set *test_set = metric_set(e);
+ uint64_t fmt = test_set->perf_oa_format;
uint64_t properties[] = {
/* Include OA reports in samples */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
@@ -3168,8 +3144,8 @@ test_short_reads(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
};
struct drm_i915_perf_open_param param = {
@@ -3259,8 +3235,8 @@ test_non_sampling_read_error(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
/* XXX: no sampling exponent */
};
@@ -3295,8 +3271,8 @@ test_disabled_read_error(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
};
struct drm_i915_perf_open_param param = {
@@ -3322,7 +3298,7 @@ test_disabled_read_error(void)
param.flags &= ~I915_PERF_FLAG_DISABLED;
stream_fd = __perf_open(drm_fd, ¶m, false);
- read_2_oa_reports(test_set->perf_oa_format,
+ read_2_oa_reports(default_test_set->perf_oa_format,
oa_exponent,
oa_report0,
oa_report1,
@@ -3336,7 +3312,7 @@ test_disabled_read_error(void)
do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
- read_2_oa_reports(test_set->perf_oa_format,
+ read_2_oa_reports(default_test_set->perf_oa_format,
oa_exponent,
oa_report0,
oa_report1,
@@ -3349,6 +3325,7 @@ static void
gen12_test_mi_rpc(const struct intel_execution_engine2 *e)
{
uint64_t fmt = oar_unit_default_format();
+ struct intel_perf_metric_set *test_set = metric_set(e);
uint64_t properties[] = {
/* On Gen12, MI RPC uses OAR. OAR is configured only for the
* render context that wants to measure the performance. Hence a
@@ -3457,8 +3434,8 @@ test_mi_rpc(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
/* Note: no OA exponent specified in this case */
};
@@ -3496,7 +3473,7 @@ test_mi_rpc(void)
report32 = buf->ptr;
dump_report(report32, 64, "mi-rpc");
igt_assert_eq(report32[0], 0xdeadbeef); /* report ID */
- igt_assert(oa_timestamp(report32, test_set->perf_oa_format)); /* timestamp */
+ igt_assert(oa_timestamp(report32, default_test_set->perf_oa_format)); /* timestamp */
igt_assert_neq(report32[63], 0x80808080); /* end of report */
igt_assert_eq(report32[64], 0x80808080); /* after 256 byte report */
@@ -3560,8 +3537,8 @@ hsw_test_single_ctx_counters(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
/* Note: no OA exponent specified in this case */
};
@@ -3706,7 +3683,7 @@ hsw_test_single_ctx_counters(void)
igt_assert_neq(report1_32[1], 0); /* timestamp */
print_reports(report0_32, report1_32,
- lookup_format(test_set->perf_oa_format));
+ lookup_format(default_test_set->perf_oa_format));
/* A40 == N samples written to all render targets */
n_samples_written = report1_32[43] - report0_32[43];
@@ -3789,8 +3766,8 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
/* Note: no OA exponent specified in this case */
@@ -3800,7 +3777,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
.num_properties = ARRAY_SIZE(properties) / 2,
.properties_ptr = to_user_pointer(properties),
};
- size_t format_size = get_oa_format(test_set->perf_oa_format).size;
+ size_t format_size = get_oa_format(default_test_set->perf_oa_format).size;
size_t sample_size = (sizeof(struct drm_i915_perf_record_header) +
format_size);
int max_reports = MAX_OA_BUF_SIZE / format_size;
@@ -3835,7 +3812,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
int delta_delta;
int ret;
struct accumulator accumulator = {
- .format = test_set->perf_oa_format
+ .format = default_test_set->perf_oa_format
};
bops = buf_ops_create(drm_fd);
@@ -4001,7 +3978,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
goto again;
}
- len = i915_read_reports_until_timestamp(test_set->perf_oa_format,
+ len = i915_read_reports_until_timestamp(default_test_set->perf_oa_format,
buf, buf_size,
report0_32[1],
report1_32[1]);
@@ -4016,7 +3993,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
uint32_t reason;
const char *skip_reason = NULL, *report_reason = NULL;
struct accumulator laccumulator = {
- .format = test_set->perf_oa_format
+ .format = default_test_set->perf_oa_format
};
@@ -4147,7 +4124,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
if (report == report1_32) {
igt_debug("Breaking on end of report\n");
print_reports(report0_32, report1_32,
- lookup_format(test_set->perf_oa_format));
+ lookup_format(default_test_set->perf_oa_format));
break;
}
}
@@ -4202,6 +4179,7 @@ again:
static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e)
{
+ struct intel_perf_metric_set *test_set = metric_set(e);
uint64_t fmt = oar_unit_default_format();
uint64_t properties[] = {
/* Have a random value here for the context id, but initialize
@@ -4547,8 +4525,8 @@ test_rc6_disable(void)
DRM_I915_PERF_PROP_SAMPLE_OA, true,
/* OA unit configuration */
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, default_test_set->perf_oa_metrics_set,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
};
struct drm_i915_perf_open_param param = {
@@ -4590,6 +4568,8 @@ test_rc6_disable(void)
static void
test_stress_open_close(const struct intel_execution_engine2 *e)
{
+ struct intel_perf_metric_set *test_set = metric_set(e);
+
load_helper_init();
load_helper_run(HIGH);
@@ -4603,7 +4583,7 @@ test_stress_open_close(const struct intel_execution_engine2 *e)
/* OA unit configuration */
DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_format(e),
+ DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exponent,
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, e->class,
DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance,
@@ -4691,6 +4671,7 @@ make_valid_reduced_sseu_config(struct drm_i915_gem_context_param_sseu default_ss
static void
test_global_sseu_config_invalid(const intel_ctx_t *ctx, const struct intel_execution_engine2 *e)
{
+ struct intel_perf_metric_set *test_set = metric_set(e);
struct drm_i915_gem_context_param_sseu default_sseu;
struct drm_i915_gem_context_param_sseu sseu_param;
struct drm_i915_gem_context_param ctx_gp = {
@@ -4707,7 +4688,7 @@ test_global_sseu_config_invalid(const intel_ctx_t *ctx, const struct intel_execu
/* OA unit configuration */
DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_format(e),
+ DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_GLOBAL_SSEU, to_user_pointer(&sseu_param),
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, e->class,
@@ -4781,6 +4762,7 @@ test_global_sseu_config_invalid(const intel_ctx_t *ctx, const struct intel_execu
static void
test_global_sseu_config(const intel_ctx_t *ctx, const struct intel_execution_engine2 *e)
{
+ struct intel_perf_metric_set *test_set = metric_set(e);
struct drm_i915_gem_context_param_sseu default_sseu;
struct drm_i915_gem_context_param_sseu sseu_param;
struct drm_i915_gem_context_param ctx_gp = {
@@ -4797,7 +4779,7 @@ test_global_sseu_config(const intel_ctx_t *ctx, const struct intel_execution_eng
/* OA unit configuration */
DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_format(e),
+ DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_GLOBAL_SSEU, to_user_pointer(&sseu_param),
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, e->class,
@@ -5003,7 +4985,7 @@ test_create_destroy_userspace_config(void)
/* OA unit configuration */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, default_test_set->perf_oa_format,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
DRM_I915_PERF_PROP_OA_METRICS_SET
};
@@ -5290,8 +5272,8 @@ test_i915_ref_count(void)
* init_sys_info()...
*/
igt_require(init_sys_info());
- properties[3] = test_set->perf_oa_metrics_set;
- properties[5] = test_set->perf_oa_format;
+ properties[3] = default_test_set->perf_oa_metrics_set;
+ properties[5] = default_test_set->perf_oa_format;
properties[7] = oa_exp_1_millisec;
ref_count0 = read_i915_module_ref();
@@ -5312,7 +5294,7 @@ test_i915_ref_count(void)
igt_assert(ref_count0 > baseline);
- read_2_oa_reports(test_set->perf_oa_format,
+ read_2_oa_reports(default_test_set->perf_oa_format,
oa_exp_1_millisec,
oa_report0,
oa_report1,
@@ -5372,6 +5354,9 @@ struct perf_engine_group {
/* perf engines in a group */
int num_engines;
struct i915_engine_class_instance *ci;
+
+ int gt;
+ struct intel_perf_metric_set *test_set;
};
static struct drm_i915_query_engine_info *query_engine_info(int i915)
@@ -5388,6 +5373,49 @@ static struct drm_i915_query_engine_info *query_engine_info(int i915)
return qinfo;
}
+static struct intel_perf_metric_set *metric_set(const struct intel_execution_engine2 *e2)
+{
+ const char *test_set_name = NULL;
+ struct intel_perf_metric_set *metric_set_iter;
+ struct intel_perf_metric_set *test_set = NULL;
+
+ if (IS_HASWELL(devid))
+ test_set_name = "RenderBasic";
+ else if (e2->class == I915_ENGINE_CLASS_RENDER)
+ test_set_name = "TestOa";
+ else if ((e2->class == I915_ENGINE_CLASS_VIDEO ||
+ e2->class == I915_ENGINE_CLASS_VIDEO_ENHANCE) &&
+ HAS_OAM(devid))
+ test_set_name = "MediaSet1";
+ else
+ igt_assert(!"reached");
+
+ igt_list_for_each_entry(metric_set_iter, &intel_perf->metric_sets, link) {
+ if (strcmp(metric_set_iter->symbol_name, test_set_name) == 0) {
+ test_set = metric_set_iter;
+ break;
+ }
+ }
+
+ igt_assert(test_set);
+
+ /*
+ * configuration was loaded in init_sys_info() ->
+ * intel_perf_load_perf_configs(), and test_set->perf_oa_metrics_set
+ * should point to metric id returned by the config add ioctl. 0 is
+ * invalid.
+ */
+ igt_assert_neq_u64(test_set->perf_oa_metrics_set, 0);
+
+ igt_debug("engine %d:%d - %s metric set UUID = %s\n",
+ e2->class,
+ e2->instance,
+ test_set->symbol_name,
+ test_set->hw_config_guid);
+
+ return test_set;
+}
+
static int compare_engine_oa_unit_id(const void *e1, const void *e2)
{
const struct drm_i915_engine_info *_e1 = e1;
@@ -5566,8 +5594,8 @@ test_group_exclusive_stream(const intel_ctx_t *ctx, bool exponent)
{
uint64_t properties[] = {
DRM_I915_PERF_PROP_SAMPLE_OA, true,
- DRM_I915_PERF_PROP_OA_METRICS_SET, test_set->perf_oa_metrics_set,
- DRM_I915_PERF_PROP_OA_FORMAT, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_METRICS_SET, 0,
+ DRM_I915_PERF_PROP_OA_FORMAT, 0,
DRM_I915_PERF_PROP_OA_ENGINE_CLASS, 0,
DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, 0,
DRM_I915_PERF_PROP_OA_EXPONENT, oa_exp_1_millisec,
@@ -5586,12 +5614,16 @@ test_group_exclusive_stream(const intel_ctx_t *ctx, bool exponent)
for (i = 0; i < num_perf_oa_groups; i++) {
struct perf_engine_group *grp = &perf_oa_groups[i];
struct i915_engine_class_instance *ci = random_engine(grp);
+ struct intel_execution_engine2 *e2 = __ci_to_e2(ctx, ci);
+ struct intel_perf_metric_set *test_set = metric_set(e2);
if (!exponent) {
properties[0] = DRM_I915_PERF_PROP_CTX_HANDLE;
properties[1] = ctx->id;
}
+ properties[3] = test_set->perf_oa_metrics_set;
+ properties[5] = test_set->perf_oa_format;
properties[7] = ci->engine_class;
properties[9] = ci->engine_instance;
grp->perf_fd = igt_ioctl(drm_fd,
@@ -5609,6 +5641,8 @@ test_group_exclusive_stream(const intel_ctx_t *ctx, bool exponent)
for (j = 0; j < grp->num_engines; j++) {
struct i915_engine_class_instance *ci = grp->ci + j;
+ struct intel_execution_engine2 *e2 = __ci_to_e2(ctx, ci);
+ struct intel_perf_metric_set *test_set = metric_set(e2);
/*
* case 1:
@@ -5616,6 +5650,8 @@ test_group_exclusive_stream(const intel_ctx_t *ctx, bool exponent)
*/
properties[0] = DRM_I915_PERF_PROP_SAMPLE_OA;
properties[1] = true;
+ properties[3] = test_set->perf_oa_metrics_set;
+ properties[5] = test_set->perf_oa_format;
properties[7] = ci->engine_class;
properties[9] = ci->engine_instance;
/* for SAMPLE OA use case, we must pass exponent */
--
2.36.1
More information about the igt-dev
mailing list