From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
To: igt-dev@lists.freedesktop.org,
Ashutosh Dixit <ashutosh.dixit@intel.com>,
kamil.konieczny@linux.intel.com
Cc: Lionel G Landwerlin <lionel.g.landwerlin@linux.intel.com>
Subject: [igt-dev] [PATCH i-g-t v3 12/31] i915/perf: Use a helper for OA format
Date: Thu, 16 Mar 2023 16:33:04 -0700 [thread overview]
Message-ID: <20230316233323.2638668-13-umesh.nerlige.ramappa@intel.com> (raw)
In-Reply-To: <20230316233323.2638668-1-umesh.nerlige.ramappa@intel.com>
Refactor and use a helper for OA format
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
tests/i915/perf.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index 2f2e403a..6f10d57e 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -657,6 +657,12 @@ oar_unit_default_format(void)
return test_set->perf_oa_format;
}
+static int
+oa_unit_default_format(void)
+{
+ return test_set->perf_oa_format;
+}
+
/*
* Temporary wrapper to distinguish mappings on !llc platforms,
* where it seems cache over GEM_MMAP_OFFSET is not flushed before execution.
@@ -1900,7 +1906,7 @@ 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 = test_set->perf_oa_format;
+ uint64_t fmt = oa_unit_default_format();
load_helper_init();
load_helper_run(HIGH);
@@ -2243,7 +2249,7 @@ test_blocking(uint64_t requested_oa_period,
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, test_set->perf_oa_format);
+ ADD_PROPS(props, idx, OA_FORMAT, oa_unit_default_format());
ADD_PROPS(props, idx, OA_EXPONENT, oa_exponent);
if (has_param_poll_period() && set_kernel_hrtimer)
@@ -2406,7 +2412,7 @@ test_polling(uint64_t requested_oa_period,
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, test_set->perf_oa_format);
+ ADD_PROPS(props, idx, OA_FORMAT, oa_unit_default_format());
ADD_PROPS(props, idx, OA_EXPONENT, oa_exponent);
if (has_param_poll_period() && set_kernel_hrtimer)
@@ -2680,7 +2686,7 @@ gen12_test_oa_tlb_invalidate(const struct intel_execution_engine2 *e)
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_FORMAT, oa_unit_default_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,
@@ -2723,7 +2729,7 @@ 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 = test_set->perf_oa_format;
+ uint64_t fmt = oa_unit_default_format();
uint64_t properties[] = {
/* Include OA reports in samples */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
@@ -2959,7 +2965,7 @@ 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 = test_set->perf_oa_format;
+ uint64_t fmt = oa_unit_default_format();
uint64_t properties[] = {
/* Include OA reports in samples */
DRM_I915_PERF_PROP_SAMPLE_OA, true,
@@ -4554,7 +4560,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, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_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,
@@ -4657,7 +4663,7 @@ test_global_sseu_config_invalid(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, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_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,
@@ -4746,7 +4752,7 @@ test_global_sseu_config(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, test_set->perf_oa_format,
+ DRM_I915_PERF_PROP_OA_FORMAT, oa_unit_default_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,
--
2.36.1
next prev parent reply other threads:[~2023-03-16 23:33 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 23:32 [igt-dev] [PATCH i-g-t v3 00/31] Enable OAM support in IGT and GPUvis Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 01/31] i915/perf: Add support for 64-bit OA formats Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 02/31] i915/perf: Define a default engine for OA Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 03/31] i915/perf: Use default engine for sseu tests Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 04/31] i915/perf: Ensure rcs0 is present for gen12-mi-rpc Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 05/31] i915/perf: Use ARRAY_SIZE for buffer-fill test Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 06/31] i915/perf: Add class:instance support to OA tests Umesh Nerlige Ramappa
2023-03-16 23:32 ` [igt-dev] [PATCH i-g-t v3 07/31] i915/perf: Enable tests to run on specific engines Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 08/31] i915/perf: Treat ticks as 64 bit Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 09/31] i915/perf: Treat timestamp as 64 bit value Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 10/31] i915/perf: Add OAM format type Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 11/31] i915/perf: Move OA format array from stack to heap Umesh Nerlige Ramappa
2023-03-16 23:33 ` Umesh Nerlige Ramappa [this message]
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 13/31] i915/perf: Add support for oa perf groups Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 14/31] i915/perf: Test concurrent access to OA in different groups Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 15/31] i915/perf: Add OAM support Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 16/31] lib/i915/perf: Prepare to read different OA formats Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 17/31] lib/i915/perf: Choose OAM format for media metrics Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 18/31] lib/i915/perf: Set missing metric unit for some counters Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 19/31] lib/i915/perf: Add MTL to supported HW in OA guid registry Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 20/31] lib/i915/perf: Add support for OAM format in codegen Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 21/31] lib/i915/perf: Update MTL GT2 metrics Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 22/31] lib/i915/perf: Update MTL GT3 metrics Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 23/31] i915/perf: Add support for engine specific metrics Umesh Nerlige Ramappa
2023-03-21 22:44 ` Dixit, Ashutosh
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 24/31] i915/perf: Run non-zero-reason on media engines as well Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 25/31] i915/perf: Make sanity check failures descriptive Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 26/31] lib/i915/perf: Enable multi-tile support for perf library Umesh Nerlige Ramappa
2023-03-22 4:59 ` Dixit, Ashutosh
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 27/31] lib/i915/perf: Update MTL OA timestamp and EU thread config Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 28/31] lib/i915/perf: Add support for MPEC format Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 29/31] lib/i915/perf: Adjust the GPU timestamp for new OA formats Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 30/31] tools/perf: Choose the right card Umesh Nerlige Ramappa
2023-03-16 23:33 ` [igt-dev] [PATCH i-g-t v3 31/31] lib/i915/perf: Apply shift to raw timestamp as well Umesh Nerlige Ramappa
2023-03-17 0:33 ` [igt-dev] ✓ Fi.CI.BAT: success for Enable OAM support in IGT and GPUvis (rev3) Patchwork
2023-03-17 4:03 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230316233323.2638668-13-umesh.nerlige.ramappa@intel.com \
--to=umesh.nerlige.ramappa@intel.com \
--cc=ashutosh.dixit@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=kamil.konieczny@linux.intel.com \
--cc=lionel.g.landwerlin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox