From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Lionel G Landwerlin <lionel.g.landwerlin@linux.intel.com>
Subject: [igt-dev] [PATCH 11/30] i915/perf: Use a helper for OA format
Date: Tue, 14 Feb 2023 12:59:48 -0800 [thread overview]
Message-ID: <20230214210007.2026033-12-umesh.nerlige.ramappa@intel.com> (raw)
In-Reply-To: <20230214210007.2026033-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>
---
tests/i915/perf.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/tests/i915/perf.c b/tests/i915/perf.c
index e9613dc9..a23438fc 100644
--- a/tests/i915/perf.c
+++ b/tests/i915/perf.c
@@ -670,6 +670,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.
@@ -1913,7 +1919,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);
@@ -1951,7 +1957,7 @@ test_oa_exponents(const struct intel_execution_engine2 *e)
int ret, n_timer_reports = 0;
uint32_t matches = 0;
struct {
- uint32_t report[64];
+ uint32_t report[format_size / 4];
} timer_reports[30];
igt_debug("testing OA exponent %d,"
@@ -2254,7 +2260,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)
@@ -2417,7 +2423,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)
@@ -2691,7 +2697,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,
@@ -2734,7 +2740,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,
@@ -2754,11 +2760,11 @@ test_buffer_fill(const struct intel_execution_engine2 *e)
.properties_ptr = to_user_pointer(properties),
};
struct drm_i915_perf_record_header *header;
- int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
+ size_t report_size = get_oa_format(fmt).size;
+ int buf_size = 65536 * (report_size + sizeof(struct drm_i915_perf_record_header));
uint8_t *buf = malloc(buf_size);
int len;
size_t oa_buf_size = MAX_OA_BUF_SIZE;
- size_t report_size = get_oa_format(fmt).size;
int n_full_oa_reports = oa_buf_size / report_size;
uint64_t fill_duration = n_full_oa_reports * oa_period;
@@ -2770,7 +2776,7 @@ test_buffer_fill(const struct intel_execution_engine2 *e)
bool overflow_seen;
uint32_t n_periodic_reports;
uint32_t first_timestamp = 0, last_timestamp = 0;
- uint32_t last_periodic_report[64];
+ uint32_t last_periodic_report[report_size / 4];
do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
@@ -2970,7 +2976,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,
@@ -2990,10 +2996,10 @@ test_enable_disable(const struct intel_execution_engine2 *e)
(ARRAY_SIZE(properties) / 2) - 2,
.properties_ptr = to_user_pointer(properties),
};
- int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header));
+ size_t report_size = get_oa_format(fmt).size;
+ int buf_size = 65536 * (report_size + sizeof(struct drm_i915_perf_record_header));
uint8_t *buf = malloc(buf_size);
size_t oa_buf_size = MAX_OA_BUF_SIZE;
- size_t report_size = get_oa_format(fmt).size;
int n_full_oa_reports = oa_buf_size / report_size;
uint64_t fill_duration = n_full_oa_reports * oa_period;
@@ -3007,7 +3013,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)
uint32_t n_periodic_reports;
struct drm_i915_perf_record_header *header;
uint64_t first_timestamp = 0, last_timestamp = 0;
- uint32_t last_periodic_report[64];
+ uint32_t last_periodic_report[report_size / 4];
/* Giving enough time for an overflow might help catch whether
* the OA unit has been enabled even if the driver might at
@@ -4565,7 +4571,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,
@@ -4668,7 +4674,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,
@@ -4757,7 +4763,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-02-14 21:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 20:59 [igt-dev] [PATCH 00/30] Enable OAM support in IGT and GPUvis Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 01/30] i915/perf: Add support for 64-bit OA formats Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 02/30] i915/perf: Define a default engine for OA Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 03/30] i915/perf: Use default engine for sseu tests Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 04/30] i915/perf: Ensure rcs0 is present for gen12-mi-rpc Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 05/30] i915/perf: Use ARRAY_SIZE for buffer-fill test Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 06/30] i915/perf: Add class:instance support to OA tests Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 07/30] i915/perf: Enable tests to run on specific engines Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 08/30] i915/perf: Treat ticks as 64 bit Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 09/30] i915/perf: Treat timestamp as 64 bit value Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 10/30] i915/perf: Add OAM format type Umesh Nerlige Ramappa
2023-02-14 20:59 ` Umesh Nerlige Ramappa [this message]
2023-02-14 20:59 ` [igt-dev] [PATCH 12/30] i915/perf: Add support for oa perf groups Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 13/30] i915/perf: Test concurrent access to OA in different groups Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 14/30] i915/perf: Add OAM support Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 15/30] lib/perf: Make chipsets aware of oa formats Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 16/30] i915/perf: Choose OAM format for media metrics Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 17/30] lib/perf" Set missing metric unit for some counters Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 18/30] lib/perf: Add MTL to supprted HW in oa guid registry Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 19/30] lib/perf: Add support for OAM format in codegen Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 20/30] lib/perf: Update MTL GT2 metrics for OAM Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 21/30] lib/perf: Update MTL GT3 " Umesh Nerlige Ramappa
2023-02-14 20:59 ` [igt-dev] [PATCH 22/30] i915/perf: Add support for engine specific metrics Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 23/30] i915/perf: Run non-zero-reason on media engines as well Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 24/30] i915/perf: Make sanity check failures descriptive Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 25/30] lib/perf: Enable multi-tile support for perf library Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 26/30] lib/perf: Update MTL OA timestamp and EU thread config Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 27/30] lib/perf: Add support for MPEC format Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 28/30] lib/perf: Adjust the GPU timestamp for new OA formats Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 29/30] tools/perf: Choose the right card Umesh Nerlige Ramappa
2023-02-14 21:00 ` [igt-dev] [PATCH 30/30] lib/perf: Apply shift to raw timestamp as well Umesh Nerlige Ramappa
2023-02-14 21:18 ` [igt-dev] ✗ GitLab.Pipeline: warning for Enable OAM support in IGT and GPUvis Patchwork
2023-02-14 21:47 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2023-02-15 0:48 ` [igt-dev] [PATCH 00/30] " Umesh Nerlige Ramappa
2023-02-15 7:22 ` [igt-dev] ✗ Fi.CI.IGT: failure for " 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=20230214210007.2026033-12-umesh.nerlige.ramappa@intel.com \
--to=umesh.nerlige.ramappa@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--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