Enable OAM support in IGT and GPUvis
v5 cover Enable OAM support in IGT and GPUvis
Add support for OAM in IGT and enable support for GPUvis to capture OA reports on the media GT using OAM unit. Patch groups:
OAM test support
----------------
i915/perf: Add support for 64-bit OA formats
...
i915/perf: Add OAM support
OAM metrics support
-------------------
lib/perf: Make chipsets aware of oa formats
...
i915/perf: Make sanity check failures descriptive
GPUvis support
--------------
lib/perf: Enable multi-tile support for perf library
...
lib/perf: Apply shift to raw timestamp as well
v2:
- Variable array sizes failed to build on fedora-clang, allocate on heap.
- Add i-g-t to patch series.
v3:
- Incorporate review comments (Ashutosh, Kamil)
- Fix CI failures
v4: Fix CI failures
v5:
- Mention which patch supports GPUvis (Kamil)
- Drop "tools/perf: Choose the right card" since renderD works fine
Note:
At the time v3 was posted, patches 23, 26 - 31 still need to be reviewed from pervious series. The review can continue in this series.
Umesh Nerlige Ramappa (30):
i915/perf: Add support for 64-bit OA formats i915/perf: Define a default engine for OA i915/perf: Use default engine for sseu tests i915/perf: Ensure rcs0 is present for gen12-mi-rpc i915/perf: Use ARRAY_SIZE for buffer-fill test i915/perf: Add class:instance support to OA tests i915/perf: Enable tests to run on specific engines i915/perf: Treat ticks as 64 bit
i915/perf: Treat timestamp as 64 bit value i915/perf: Add OAM format type
i915/perf: Move OA format array from stack to heap i915/perf: Use a helper for OA format
i915/perf: Add support for oa perf groups i915/perf: Test concurrent access to OA in different groups i915/perf: Add OAM support
lib/i915/perf: Prepare to read different OA formats lib/i915/perf: Choose OAM format for media metrics lib/i915/perf: Set missing metric unit for some counters lib/i915/perf: Add MTL to supported HW in OA guid registry lib/i915/perf: Add support for OAM format in codegen lib/i915/perf: Update MTL GT2 metrics lib/i915/perf: Update MTL GT3 metrics
i915/perf: Add support for engine specific metrics i915/perf: Run non-zero-reason on media engines as well i915/perf: Make sanity check failures descriptive lib/i915/perf: Enable multi-tile support for perf library lib/i915/perf: Update MTL OA timestamp and EU thread config lib/i915/perf: Add support for select MPEC formats lib/i915/perf: Adjust the GPU timestamp for new OA formats lib/i915/perf: Apply shift to raw timestamp as well
include/drm-uapi/i915_drm.h | 4 + lib/i915/i915_drm_local.h | 3 + lib/i915/perf-configs/codegen.py | 4 + lib/i915/perf-configs/guids.xml | 36 +- lib/i915/perf-configs/mdapi-xml-convert.py | 220 ++- lib/i915/perf-configs/oa-mtlgt2.xml | 1014 ++++++++++-- lib/i915/perf-configs/oa-mtlgt3.xml | 1328 +++++++++++++--- lib/i915/perf-configs/oa_guid_registry.py | 3 +- .../perf-configs/perf-metricset-codegen.py | 36 +- lib/i915/perf.c | 66 +- lib/i915/perf.h | 2 +- lib/i915/perf_data_reader.c | 20 +- lib/intel_chipset.h | 3 + lib/intel_device_info.c | 1 + tests/core_hotunplug.c | 2 +- tests/i915/gem_barrier_race.c | 2 +- tests/i915/perf.c | 1380 +++++++++++++---- tools/i915-perf/i915_perf_configs.c | 2 +- tools/i915-perf/i915_perf_recorder.c | 74 +- 19 files changed, 3484 insertions(+), 716 deletions(-)
Signature · 1 line
2.36.1
PATCH v5 1/30 i915/perf: Add support for 64-bit OA formats
Newer gen12 platforms introduced 64 bit OA formats that are used by MTL. Add support to parse reports for 64 bit counters.
--- tests/i915/perf.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)
tests/i915/perf.c +57 -1
@@ -94,6 +94,8 @@ struct oa_format {int a40_high_off;/* bytes */ int a40_low_off;int n_a40; +int a64_off; +int n_a64;int a_off;int n_a;int first_a;
@@ -707,6 +709,15 @@ gen8_read_40bit_a_counter(const uint32_t *report,return a40_low[a_id] | high; } +static uint64_t +xehpsdv_read_64bit_a_counter (const uint32_t *report,enum drm_i915_oa_format fmt,int a_id) +{ +struct oa_format format =get_oa_format (fmt); +uint64_t *a64 = (uint64_t *)(((uint8_t *)report) + format.a64_off); + +return a64[a_id]; +} +static uint64_t gen8_40bit_a_delta (uint64_t value0,uint64_t value1) {
@@ -741,6 +752,19 @@ accumulate_uint40(int a_index, *delta +=gen8_40bit_a_delta (value0, value1); } +static void +accumulate_uint64 (int a_index, +const uint32_t *report0, +const uint32_t *report1, +enum drm_i915_oa_format format, +uint64_t *delta) +{ +uint64_t value0 =xehpsdv_read_64bit_a_counter (report0, format, a_index), + value1 =xehpsdv_read_64bit_a_counter (report1, format, a_index); + + *delta += (value1 - value0); +} + static void accumulate_reports(struct accumulator *accumulator, uint32_t *start,
@@ -766,6 +790,11 @@ accumulate_reports(struct accumulator *accumulator, deltas + idx++); } +for (int i =0 ; i < format.n_a64; i++) { +accumulate_uint64 (i, start, end, accumulator->format, + deltas + idx++); + } +for (int i =0 ; i < format.n_a; i++) {accumulate_uint32 (format.a_off +4 * i, start, end, deltas + idx++);
@@ -796,6 +825,9 @@ accumulator_print(struct accumulator *accumulator, const char *title)for (int i =0 ; i < format.n_a40; i++)igt_debug ("\tA%u = %" PRIu64"\n" , i, deltas[idx++]); + +for (int i =0 ; i < format.n_a64; i++) +igt_debug ("\tA64_%u = %" PRIu64"\n" , i, deltas[idx++]); }else {igt_debug ("\ttime delta = %" PRIu64"\n" , deltas[idx++]); }
@@ -852,7 +884,19 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,if (undefined_a_counters[j])continue ; -igt_debug ("A%d: delta = %" PRIu64"\n" , j, delta); +igt_debug ("A40_%d: delta = %" PRIu64"\n" , j, delta); +igt_assert (delta <= max_delta); + } + +for (int j =0 ; j < format.n_a64; j++) { +uint64_t delta =0 ; + +accumulate_uint64 (j, oa_report0, oa_report1, fmt, &delta); + +if (undefined_a_counters[j]) +continue ; + +igt_debug ("A64_%d: delta = %" PRIu64"\n" , format.first_a + j, delta);igt_assert (delta <= max_delta); }
@@ -1417,6 +1461,18 @@ print_reports(uint32_t *oa_report0, uint32_t *oa_report1, int fmt) j, value0, value1, delta); } +for (int j =0 ; j < format.n_a64; j++) { +uint64_t value0 =xehpsdv_read_64bit_a_counter (oa_report0, fmt, j); +uint64_t value1 =xehpsdv_read_64bit_a_counter (oa_report1, fmt, j); +uint64_t delta = value1 - value0; + +if (undefined_a_counters[j]) +continue ; + +igt_debug ("A_64%d: 1st = %" PRIu64", 2nd = %" PRIu64", delta = %" PRIu64"\n" , + format.first_a + j, value0, value1, delta); + } +for (int j =0 ; j < format.n_a; j++) {uint32_t *a0 = (uint32_t *)(((uint8_t *)oa_report0) + format.a_off);
Signature · 1 line
2.36.1
PATCH v5 2/30 i915/perf: Define a default engine for OA
In reply to Umesh Nerlige RamappaUse a helper to set the default engine for use with OA.
--- tests/i915/perf.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tests/i915/perf.c +15 -0
@@ -215,6 +215,7 @@ static int sysfs = -1;static int pm_fd =-1 ;static int stream_fd =-1 ;static uint32_t devid; +static struct intel_execution_engine2 default_e2;static uint64_t gt_max_freq_mhz =0 ;static struct intel_perf *intel_perf =NULL ;
@@ -5084,8 +5085,19 @@ static bool has_class_instance(int i915, uint16_t class, uint16_t instance)return false; } +static void set_default_engine (const intel_ctx_t *ctx) +{ +const struct intel_execution_engine2 *e; + +for_each_ctx_engine (drm_fd, ctx, e) +if (e->class ==I915_ENGINE_CLASS_RENDER && e->instance ==0 ) + default_e2 = *e; +} + igt_main { +const intel_ctx_t *ctx; + igt_fixture {struct stat sb;
@@ -5123,6 +5135,8 @@ igt_mainigt_require (init_sys_info ()); + ctx =intel_ctx_create_all_physical (drm_fd); +set_default_engine (ctx);write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" ,1 );write_u64_file ("/proc/sys/dev/i915/oa_max_sample_rate" ,100000 );
@@ -5310,6 +5324,7 @@ igt_mainif (intel_perf)intel_perf_free (intel_perf); +intel_ctx_destroy (drm_fd, ctx);close (drm_fd); } }
Signature · 1 line
2.36.1
PATCH v5 3/30 i915/perf: Use default engine for sseu tests
In reply to Umesh Nerlige RamappaExplicitly pass the default engine for the sseu tests.
v2: Pass context id in sseu tests to fix CI failure
--- tests/i915/perf.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tests/i915/perf.c +12 -4
@@ -4440,11 +4440,12 @@ make_valid_reduced_sseu_config(struct drm_i915_gem_context_param_sseu default_ss }static void -test_global_sseu_config_invalid (void ) +test_global_sseu_config_invalid (const intel_ctx_t *ctx) {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 = { + .ctx_id = ctx->id, .param =I915_CONTEXT_PARAM_SSEU , .size =sizeof (default_sseu), .value =to_user_pointer (&default_sseu),
@@ -4469,6 +4470,9 @@ test_global_sseu_config_invalid(void) };memset (&default_sseu,0 ,sizeof (default_sseu)); + default_sseu.flags =I915_CONTEXT_SSEU_FLAG_ENGINE_INDEX ; + default_sseu.engine.engine_class = default_e2.class; + default_sseu.engine.engine_instance = default_e2.flags;igt_require (__gem_context_get_param (drm_fd, &ctx_gp) ==0 );igt_debug ("Default context sseu:\n" );
@@ -4515,11 +4519,12 @@ test_global_sseu_config_invalid(void) }static void -test_global_sseu_config (void ) +test_global_sseu_config (const intel_ctx_t *ctx) {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 = { + .ctx_id = ctx->id, .param =I915_CONTEXT_PARAM_SSEU , .size =sizeof (default_sseu), .value =to_user_pointer (&default_sseu),
@@ -4544,6 +4549,9 @@ test_global_sseu_config(void) };memset (&default_sseu,0 ,sizeof (default_sseu)); + default_sseu.flags =I915_CONTEXT_SSEU_FLAG_ENGINE_INDEX ; + default_sseu.engine.engine_class = default_e2.class; + default_sseu.engine.engine_instance = default_e2.flags;igt_require (__gem_context_get_param (drm_fd, &ctx_gp) ==0 );igt_debug ("Default context sseu:\n" );
@@ -5297,11 +5305,11 @@ igt_mainigt_describe ("Verify invalid SSEU opening parameters" ); igt_subtest("global-sseu-config-invalid") -test_global_sseu_config_invalid (); +test_global_sseu_config_invalid (ctx);igt_describe ("Verify specifying SSEU opening parameters" ); igt_subtest("global-sseu-config") -test_global_sseu_config (); +test_global_sseu_config (ctx); }igt_subtest ("invalid-create-userspace-config" )
Signature · 1 line
2.36.1
PATCH v5 4/30 i915/perf: Ensure rcs0 is present for gen12-mi-rpc
In reply to Umesh Nerlige RamappaMake sure rcs0 is present for gen12-mi-rpc.
--- tests/i915/perf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tests/i915/perf.c +5 -1
@@ -5276,8 +5276,12 @@ igt_main igt_fixture igt_require(intel_gen(devid) >= 12);igt_describe ("Test MI REPORT PERF COUNT for Gen 12" ); - igt_subtest("gen12-mi-rpc") + igt_subtest("gen12-mi-rpc") { +igt_require_f (has_class_instance (drm_fd, +I915_ENGINE_CLASS_RENDER , +0 ),"no render engine\n" );gen12_test_mi_rpc (); + }igt_describe ("Test OA TLB invalidate" );igt_subtest ("gen12-oa-tlb-invalidate" )
Signature · 1 line
2.36.1
PATCH v5 5/30 i915/perf: Use ARRAY_SIZE for buffer-fill test
In reply to Umesh Nerlige RamappaA prior patch changed the way size of properties is calculated. It missed one test. Replace the sizeof with ARRAY_SIZE for buffer-fill test.
--- tests/i915/perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/i915/perf.c +1 -1
@@ -2560,7 +2560,7 @@ test_buffer_fill(void) };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =sizeof (properties) /16 , + .num_properties =ARRAY_SIZE (properties) /2 , .properties_ptr =to_user_pointer (properties), };struct drm_i915_perf_record_header *header;
Signature · 1 line
2.36.1
PATCH v5 6/30 i915/perf: Add class:instance support to OA tests
In reply to Umesh Nerlige RamappaAdd test to verify class:instance interface to perf OA.
v2: Temporarily move uapi to lib/i915/i915_drm_local.h
--- lib/i915/i915_drm_local.h | 3 +++ tests/i915/perf.c | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+)
lib/i915/i915_drm_local.h +3 -0
@@ -23,6 +23,9 @@ extern "C" {#define DRM_I915_QUERY_GEOMETRY_SUBSLICES 6 +#define DRM_I915_PERF_PROP_OA_ENGINE_CLASS 9 +#define DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE 10 +#if defined(__cplusplus) }#endif
tests/i915/perf.c +49 -0
61 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 7/30 i915/perf: Enable tests to run on specific engines
In reply to Umesh Nerlige RamappaNew perf interface enabled passing engine class instance to the perf interface. Enable some tests to utlize this interface to run the test on supported engines.
--- tests/i915/perf.c | 388 +++++++++++++++++++++++++++++++--------------- 1 file changed, 264 insertions(+), 124 deletions(-)
tests/i915/perf.c +264 -124
@@ -74,6 +74,13 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");#define MAX_OA_BUF_SIZE (16 * 1024 * 1024) +#define ADD_PROPS (_head, _tail, _key, _value) \ + do { \ + igt_assert((_tail - _head) < (DRM_I915_PERF_PROP_MAX * 2)); \ + *_tail++ = DRM_I915_PERF_PROP_##_key; \ + *_tail++ = _value; \ + } while (0) +struct accumulator {#define MAX_RAW_OA_COUNTERS 62enum drm_i915_oa_format format;
@@ -314,6 +321,50 @@ __perf_open(int fd, struct drm_i915_perf_open_param *param, bool prevent_pm)return ret; } +static int i915_perf_revision (int fd) +{ +drm_i915_getparam_t gp; +int value =1 , ret; + + gp.param =I915_PARAM_PERF_REVISION ; + gp.value = &value; + ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret ==-1 ) { +/* If the param is missing, consider version 1. */ +igt_assert_eq (errno,EINVAL ); +return 1 ; + } + +return value; +} + +/* +* perf_supports_engine is used in the for loop that iterates over engines and +* determines if perf test can be run on a particular engine. For perf revisions +* below 10, we only need to run the test once, so we return true only for rcs0. +* Note that the test itself ignores the class instance parameters if they are +* not supported by the perf interface. This enables us to use a single for-loop +* construct to run the same test on all platforms and all perf revisions. +*/ +static bool +perf_supports_engine (const struct intel_execution_engine2 *e) +{ +return e->class ==I915_ENGINE_CLASS_RENDER && + e->instance ==0 ; +} + +static bool +has_param_class_instance (void ) +{ +return i915_perf_revision (drm_fd) >=6 ; +} + +static bool +has_param_poll_period (void ) +{ +return i915_perf_revision (drm_fd) >=5 ; +} +static int lookup_format (int i915_perf_fmt_id) {
@@ -1423,7 +1474,8 @@ open_and_read_2_oa_reports(int format_id, int exponent, uint32_t *oa_report0, uint32_t *oa_report1, - bool timer_only) + bool timer_only, + const struct intel_execution_engine2 *e) { uint64_t properties[] = { /* Include OA reports in samples */
@@ -1433,11 +1485,15 @@ open_and_read_2_oa_reports(int format_id,DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set,DRM_I915_PERF_PROP_OA_FORMAT , format_id,DRM_I915_PERF_PROP_OA_EXPONENT , exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };
@@ -1620,7 +1676,7 @@ print_report(uint32_t *report, int fmt)#endif static void -test_oa_formats (void ) +test_oa_formats (const struct intel_execution_engine2 *e) {for (int i =0 ; i <I915_OA_FORMAT_MAX ; i++) {struct oa_format format =get_oa_format (i);
@@ -1639,7 +1695,8 @@ test_oa_formats(void) oa_exp_1_millisec, oa_report0, oa_report1, - false); /* timer reports only */ + false,/* timer reports only */ + e);print_reports (oa_report0, oa_report1, i);sanity_check_reports (oa_report0, oa_report1, i);
@@ -1786,7 +1843,7 @@ static bool expected_report_timing_delta(uint32_t delta, uint32_t expected_delta }static void -test_oa_exponents (void ) +test_oa_exponents (const struct intel_execution_engine2 *e) {load_helper_init ();load_helper_run (HIGH );
@@ -1804,10 +1861,14 @@ test_oa_exponents(void)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_EXPONENT , exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };uint64_t expected_timestamp_delta =2ULL << exponent;
@@ -2086,30 +2147,16 @@ get_time(void)* kernelspace. */ static void -test_blocking (uint64_t requested_oa_period,bool set_kernel_hrtimer,uint64_t kernel_hrtimer) +test_blocking (uint64_t requested_oa_period, +bool set_kernel_hrtimer, +uint64_t kernel_hrtimer, +const struct intel_execution_engine2 *e) {int oa_exponent =max_oa_exponent_for_period_lte (requested_oa_period);uint64_t oa_period =oa_exponent_to_ns (oa_exponent); -uint64_t properties[] = { -/* Include OA reports in samples */ -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_EXPONENT , oa_exponent, - -/* Kernel configuration (optional) */ -DRM_I915_PERF_PROP_POLL_OA_PERIOD , kernel_hrtimer, - }; -struct drm_i915_perf_open_param param = { - .flags =I915_PERF_FLAG_FD_CLOEXEC | -I915_PERF_FLAG_DISABLED , - .num_properties = set_kernel_hrtimer ? -ARRAY_SIZE (properties) /2 : - (ARRAY_SIZE (properties) /2 ) -1 , - .properties_ptr =to_user_pointer (properties), - }; +uint64_t props[DRM_I915_PERF_PROP_MAX *2 ]; +uint64_t *idx = props; +struct drm_i915_perf_open_param param;uint8_t buf[1024 *1024 ];struct tms start_times;struct tms end_times;
@@ -2134,6 +2181,24 @@ test_blocking(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t keint64_t start, end;int n =0 ; +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_EXPONENT , oa_exponent); + +if (has_param_poll_period () && set_kernel_hrtimer) +ADD_PROPS (props, idx,POLL_OA_PERIOD , kernel_hrtimer); + +if (has_param_class_instance ()) { +ADD_PROPS (props, idx,OA_ENGINE_CLASS , e->class); +ADD_PROPS (props, idx,OA_ENGINE_INSTANCE , e->instance); + } + + param.flags =I915_PERF_FLAG_FD_CLOEXEC | +I915_PERF_FLAG_DISABLED ; + param.num_properties = (idx - props) /2 ; + param.properties_ptr =to_user_pointer (props); + stream_fd =__perf_open (drm_fd, ¶m, true/* prevent_pm */ );times (&start_times);
@@ -2245,31 +2310,16 @@ test_blocking(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t ke }static void -test_polling (uint64_t requested_oa_period,bool set_kernel_hrtimer,uint64_t kernel_hrtimer) +test_polling (uint64_t requested_oa_period, +bool set_kernel_hrtimer, +uint64_t kernel_hrtimer, +const struct intel_execution_engine2 *e) {int oa_exponent =max_oa_exponent_for_period_lte (requested_oa_period);uint64_t oa_period =oa_exponent_to_ns (oa_exponent); -uint64_t properties[] = { -/* Include OA reports in samples */ -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_EXPONENT , oa_exponent, - -/* Kernel configuration (optional) */ -DRM_I915_PERF_PROP_POLL_OA_PERIOD , kernel_hrtimer, - }; -struct drm_i915_perf_open_param param = { - .flags =I915_PERF_FLAG_FD_CLOEXEC | -I915_PERF_FLAG_DISABLED | -I915_PERF_FLAG_FD_NONBLOCK , - .num_properties = set_kernel_hrtimer ? -ARRAY_SIZE (properties) /2 : - (ARRAY_SIZE (properties) /2 ) -1 , - .properties_ptr =to_user_pointer (properties), - }; +uint64_t props[DRM_I915_PERF_PROP_MAX *2 ]; +uint64_t *idx = props; +struct drm_i915_perf_open_param param;uint8_t buf[1024 *1024 ];struct tms start_times;struct tms end_times;
@@ -2294,6 +2344,25 @@ test_polling(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t kerint64_t start, end;int n =0 ; +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_EXPONENT , oa_exponent); + +if (has_param_poll_period () && set_kernel_hrtimer) +ADD_PROPS (props, idx,POLL_OA_PERIOD , kernel_hrtimer); + +if (has_param_class_instance ()) { +ADD_PROPS (props, idx,OA_ENGINE_CLASS , e->class); +ADD_PROPS (props, idx,OA_ENGINE_INSTANCE , e->instance); + } + + param.flags =I915_PERF_FLAG_FD_CLOEXEC | +I915_PERF_FLAG_DISABLED | +I915_PERF_FLAG_FD_NONBLOCK ; + param.num_properties = (idx - props) /2 ; + param.properties_ptr =to_user_pointer (props); + stream_fd =__perf_open (drm_fd, ¶m, true/* prevent_pm */ );times (&start_times);
@@ -2544,7 +2613,7 @@ num_valid_reports_captured(struct drm_i915_perf_open_param *param, }static void -gen12_test_oa_tlb_invalidate (void ) +gen12_test_oa_tlb_invalidate (const struct intel_execution_engine2 *e) {int oa_exponent =max_oa_exponent_for_period_lte (30000000 );uint64_t properties[] = {
@@ -2553,11 +2622,15 @@ gen12_test_oa_tlb_invalidate(void)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_EXPONENT , oa_exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC |I915_PERF_FLAG_DISABLED , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };int num_reports1, num_reports2, num_expected_reports;
@@ -2585,7 +2658,7 @@ gen12_test_oa_tlb_invalidate(void)static void -test_buffer_fill (void ) +test_buffer_fill (const struct intel_execution_engine2 *e) {/* ~5 micro second period */ int oa_exponent =max_oa_exponent_for_period_lte (5000 );
@@ -2598,10 +2671,14 @@ test_buffer_fill(void)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_EXPONENT , oa_exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };struct drm_i915_perf_record_header *header;
@@ -2816,7 +2893,7 @@ test_non_zero_reason(void) }static void -test_enable_disable (void ) +test_enable_disable (const struct intel_execution_engine2 *e) {/* ~5 micro second period */ int oa_exponent =max_oa_exponent_for_period_lte (5000 );
@@ -2829,11 +2906,15 @@ test_enable_disable(void)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_EXPONENT , oa_exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC |I915_PERF_FLAG_DISABLED ,/* Verify we start disabled */ - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };int buf_size =65536 * (256 +sizeof (struct drm_i915_perf_record_header ));
@@ -3154,7 +3235,7 @@ test_disabled_read_error(void) }static void -gen12_test_mi_rpc (void ) +gen12_test_mi_rpc (const struct intel_execution_engine2 *e) {uint64_t fmt =oar_unit_default_format ();uint64_t properties[] = {
@@ -3178,10 +3259,14 @@ gen12_test_mi_rpc(void)*/ DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set,DRM_I915_PERF_PROP_OA_FORMAT , fmt, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };struct buf_ops *bops;
@@ -4004,7 +4089,7 @@ again: }while (WEXITSTATUS (child_ret) ==EAGAIN ); } -static void gen12_single_ctx_helper (void ) +static void gen12_single_ctx_helper (const struct intel_execution_engine2 *e) {uint64_t fmt =oar_unit_default_format ();uint64_t properties[] = {
@@ -4023,10 +4108,14 @@ static void gen12_single_ctx_helper(void)*/ DRM_I915_PERF_PROP_OA_METRICS_SET , test_set->perf_oa_metrics_set,DRM_I915_PERF_PROP_OA_FORMAT , fmt, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };struct buf_ops *bops;
@@ -4310,7 +4399,7 @@ static void gen12_single_ctx_helper(void) }static void -gen12_test_single_ctx_render_target_writes_a_counter (void ) +gen12_test_single_ctx_render_target_writes_a_counter (const struct intel_execution_engine2 *e) {int child_ret;struct igt_helper_process child = {};
@@ -4324,7 +4413,7 @@ gen12_test_single_ctx_render_target_writes_a_counter(void) drm_fd =gem_reopen_driver (drm_fd);igt_drop_root (); -gen12_single_ctx_helper (); +gen12_single_ctx_helper (e);close (drm_fd); }
@@ -4388,7 +4477,7 @@ test_rc6_disable(void) }static void -test_stress_open_close (void ) +test_stress_open_close (const struct intel_execution_engine2 *e) {load_helper_init ();load_helper_run (HIGH );
@@ -4405,11 +4494,15 @@ test_stress_open_close(void)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_EXPONENT , oa_exponent, +DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC |I915_PERF_FLAG_DISABLED ,/* XXX: open disabled */ - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };
@@ -4460,7 +4553,8 @@ static void print_sseu_config(struct drm_i915_gem_context_param_sseu *sseu) }static struct drm_i915_gem_context_param_sseu -make_valid_reduced_sseu_config (struct drm_i915_gem_context_param_sseu default_sseu) +make_valid_reduced_sseu_config (struct drm_i915_gem_context_param_sseu default_sseu, +uint16_t class,uint16_t instance) {struct drm_i915_gem_context_param_sseu sseu = default_sseu;
@@ -4477,11 +4571,14 @@ make_valid_reduced_sseu_config(struct drm_i915_gem_context_param_sseu default_ss sseu.subslice_mask =mask_minus_one (sseu.subslice_mask); } + sseu.engine.engine_class = class; + sseu.engine.engine_instance = instance; +return sseu; }static void -test_global_sseu_config_invalid (const intel_ctx_t *ctx) +test_global_sseu_config_invalid (const intel_ctx_t *ctx,const struct intel_execution_engine2 *e) {struct drm_i915_gem_context_param_sseu default_sseu;struct drm_i915_gem_context_param_sseu sseu_param;
@@ -4502,18 +4599,27 @@ test_global_sseu_config_invalid(const intel_ctx_t *ctx)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, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC |I915_PERF_FLAG_DISABLED ,/* XXX: open disabled */ - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };memset (&default_sseu,0 ,sizeof (default_sseu)); default_sseu.flags =I915_CONTEXT_SSEU_FLAG_ENGINE_INDEX ; - default_sseu.engine.engine_class = default_e2.class; - default_sseu.engine.engine_instance = default_e2.flags; +if (has_param_class_instance ()) { + default_sseu.engine.engine_class = e->class; + default_sseu.engine.engine_instance = e->flags; + }else { + default_sseu.engine.engine_class = default_e2.class; + default_sseu.engine.engine_instance = default_e2.flags; + }igt_require (__gem_context_get_param (drm_fd, &ctx_gp) ==0 );igt_debug ("Default context sseu:\n" );
@@ -4552,7 +4658,9 @@ test_global_sseu_config_invalid(const intel_ctx_t *ctx) igt_fork(child, 1) {igt_drop_root (); - sseu_param =make_valid_reduced_sseu_config (default_sseu); + sseu_param =make_valid_reduced_sseu_config (default_sseu, + e->class, + e->instance);do_ioctl_err (drm_fd,DRM_IOCTL_I915_PERF_OPEN , ¶m,EACCES ); }igt_waitchildren ();
@@ -4560,7 +4668,7 @@ test_global_sseu_config_invalid(const intel_ctx_t *ctx) }static void -test_global_sseu_config (const intel_ctx_t *ctx) +test_global_sseu_config (const intel_ctx_t *ctx,const struct intel_execution_engine2 *e) {struct drm_i915_gem_context_param_sseu default_sseu;struct drm_i915_gem_context_param_sseu sseu_param;
@@ -4581,18 +4689,27 @@ test_global_sseu_config(const intel_ctx_t *ctx)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, + DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC |I915_PERF_FLAG_DISABLED ,/* XXX: open disabled */ - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };memset (&default_sseu,0 ,sizeof (default_sseu)); default_sseu.flags =I915_CONTEXT_SSEU_FLAG_ENGINE_INDEX ; - default_sseu.engine.engine_class = default_e2.class; - default_sseu.engine.engine_instance = default_e2.flags; +if (has_param_class_instance ()) { + default_sseu.engine.engine_class = e->class; + default_sseu.engine.engine_instance = e->flags; + }else { + default_sseu.engine.engine_class = default_e2.class; + default_sseu.engine.engine_instance = default_e2.flags; + }igt_require (__gem_context_get_param (drm_fd, &ctx_gp) ==0 );igt_debug ("Default context sseu:\n" );
@@ -4602,7 +4719,9 @@ test_global_sseu_config(const intel_ctx_t *ctx)write_u64_file ("/proc/sys/dev/i915/perf_stream_paranoid" ,0 ); - sseu_param =make_valid_reduced_sseu_config (default_sseu); + sseu_param =make_valid_reduced_sseu_config (default_sseu, + e->class, + e->instance);igt_debug ("Selected context sseu:\n" );print_sseu_config (&sseu_param);
@@ -5104,22 +5223,15 @@ test_sysctl_defaults(void)igt_assert_eq (max_freq,100000 ); } -static int i915_perf_revision (int fd) -{ -drm_i915_getparam_t gp; -int value =1 , ret; +#define __for_each_perf_enabled_engine (fd__, e__) \ + for_each_physical_engine(fd__, e__) \ + if (perf_supports_engine(e__)) \ + igt_dynamic_f("%s", e__->name) - gp.param =I915_PARAM_PERF_REVISION ; - gp.value = &value; - ret =igt_ioctl (drm_fd,DRM_IOCTL_I915_GETPARAM , &gp); -if (ret ==-1 ) { -/* If the param is missing, consider version 1. */ -igt_assert_eq (errno,EINVAL ); -return 1 ; - } - -return value; -} +#define __for_each_render_engine (fd__, e__) \ + for_each_physical_engine(fd__, e__) \ + if (e__->class == I915_ENGINE_CLASS_RENDER) \ + igt_dynamic_f("%s", e__->name)static bool has_class_instance (int i915,uint16_t class,uint16_t instance) {
@@ -5146,6 +5258,7 @@ static void set_default_engine(const intel_ctx_t *ctx) igt_main {const intel_ctx_t *ctx; +const struct intel_execution_engine2 *e; igt_fixture {struct stat sb;
@@ -5210,23 +5323,26 @@ igt_main igt_subtest("missing-sample-flags")test_missing_sample_flags (); - igt_subtest("oa-formats") -test_oa_formats (); + igt_subtest_with_dynamic("oa-formats") +__for_each_perf_enabled_engine (drm_fd, e) +test_oa_formats (e); igt_subtest("invalid-oa-exponent")test_invalid_oa_exponent (); igt_subtest("low-oa-exponent-permissions")test_low_oa_exponent_permissions (); - igt_subtest("oa-exponents") -test_oa_exponents (); + igt_subtest_with_dynamic("oa-exponents") +__for_each_perf_enabled_engine (drm_fd, e) +test_oa_exponents (e); igt_subtest("per-context-mode-unprivileged") {igt_require (IS_HASWELL (devid));test_per_context_mode_unprivileged (); } - igt_subtest("buffer-fill") -test_buffer_fill (); + igt_subtest_with_dynamic("buffer-fill") +__for_each_perf_enabled_engine (drm_fd, e) +test_buffer_fill (e);igt_describe ("Test that reason field in OA reports is never 0 on Gen8+" ); igt_subtest("non-zero-reason") {
@@ -5240,45 +5356,64 @@ igt_main igt_subtest("non-sampling-read-error")test_non_sampling_read_error (); - igt_subtest("enable-disable") -test_enable_disable (); + igt_subtest_with_dynamic("enable-disable") +__for_each_perf_enabled_engine (drm_fd, e) +test_enable_disable (e);igt_describe ("Test blocking read with default hrtimer frequency" ); - igt_subtest("blocking") { -test_blocking (40 *1000 *1000 /* 40ms oa period */ , - false/* set_kernel_hrtimer */ , -5 *1000 *1000 /* default 5ms/200Hz hrtimer */ ); + igt_subtest_with_dynamic("blocking") { +__for_each_perf_enabled_engine (drm_fd, e) +test_blocking (40 *1000 *1000 /* 40ms oa period */ , + false/* set_kernel_hrtimer */ , +5 *1000 *1000 /* default 5ms/200Hz hrtimer */ , + e); }igt_describe ("Test blocking read with different hrtimer frequencies" ); igt_subtest("blocking-parameterized") { +const struct intel_execution_engine2 _e = { + .class = default_e2.class, + .instance = default_e2.instance, + }; +igt_require (i915_perf_revision (drm_fd) >=5 );test_blocking (10 *1000 *1000 /* 10ms oa period */ , true/* set_kernel_hrtimer */ , -40 *1000 *1000 /* default 40ms hrtimer */ ); +40 *1000 *1000 /* default 40ms hrtimer */ , + &_e);test_blocking (500 *1000 /* 500us oa period */ , true/* set_kernel_hrtimer */ , -2 *1000 *1000 /* default 2ms hrtimer */ ); +2 *1000 *1000 /* default 2ms hrtimer */ , + &_e); }igt_describe ("Test polled read with default hrtimer frequency" ); - igt_subtest("polling") { -test_polling (40 *1000 *1000 /* 40ms oa period */ , - false/* set_kernel_hrtimer */ , -5 *1000 *1000 /* default 5ms/200Hz hrtimer */ ); + igt_subtest_with_dynamic("polling") { +__for_each_perf_enabled_engine (drm_fd, e) +test_polling (40 *1000 *1000 /* 40ms oa period */ , + false/* set_kernel_hrtimer */ , +5 *1000 *1000 /* default 5ms/200Hz hrtimer */ , + e); }igt_describe ("Test polled read with different hrtimer frequencies" ); igt_subtest("polling-parameterized") { +const struct intel_execution_engine2 _e = { + .class = default_e2.class, + .instance = default_e2.instance, + }; +igt_require (i915_perf_revision (drm_fd) >=5 );test_polling (10 *1000 *1000 /* 10ms oa period */ , true/* set_kernel_hrtimer */ , -40 *1000 *1000 /* default 40ms hrtimer */ ); +40 *1000 *1000 /* default 40ms hrtimer */ , + &_e);test_polling (500 *1000 /* 500us oa period */ , true/* set_kernel_hrtimer */ , -2 *1000 *1000 /* default 2ms hrtimer */ ); +2 *1000 *1000 /* default 2ms hrtimer */ , + &_e); }igt_describe ("Test polled read with buffer size smaller than available data" );
@@ -5317,21 +5452,23 @@ igt_main igt_fixture igt_require(intel_gen(devid) >= 12);igt_describe ("Test MI REPORT PERF COUNT for Gen 12" ); - igt_subtest("gen12-mi-rpc") { -igt_require_f (has_class_instance (drm_fd, -I915_ENGINE_CLASS_RENDER , -0 ),"no render engine\n" ); -gen12_test_mi_rpc (); + igt_subtest_with_dynamic("gen12-mi-rpc") { +igt_require (has_class_instance (drm_fd,I915_ENGINE_CLASS_RENDER ,0 )); +__for_each_render_engine (drm_fd, e) +gen12_test_mi_rpc (e); }igt_describe ("Test OA TLB invalidate" ); - igt_subtest("gen12-oa-tlb-invalidate") -gen12_test_oa_tlb_invalidate (); + igt_subtest_with_dynamic("gen12-oa-tlb-invalidate") +__for_each_perf_enabled_engine (drm_fd, e) +gen12_test_oa_tlb_invalidate (e);igt_describe ("Measure performance for a specific context using OAR in Gen 12" ); - igt_subtest("gen12-unprivileged-single-ctx-counters") { + igt_subtest_with_dynamic("gen12-unprivileged-single-ctx-counters") { +igt_require (has_class_instance (drm_fd,I915_ENGINE_CLASS_RENDER ,0 ));igt_require_f (render_copy,"no render-copy function\n" ); -gen12_test_single_ctx_render_target_writes_a_counter (); +__for_each_render_engine (drm_fd, e) +gen12_test_single_ctx_render_target_writes_a_counter (e); } }
@@ -5347,8 +5484,9 @@ igt_maintest_rc6_disable ();igt_describe ("Stress tests opening & closing the i915-perf stream in a busy loop" ); - igt_subtest("stress-open-close") -test_stress_open_close (); + igt_subtest_with_dynamic("stress-open-close") +__for_each_perf_enabled_engine (drm_fd, e) +test_stress_open_close (e); igt_subtest_group { igt_fixture {
@@ -5357,12 +5495,14 @@ igt_main }igt_describe ("Verify invalid SSEU opening parameters" ); - igt_subtest("global-sseu-config-invalid") -test_global_sseu_config_invalid (ctx); + igt_subtest_with_dynamic("global-sseu-config-invalid") +__for_each_perf_enabled_engine (drm_fd, e) +test_global_sseu_config_invalid (ctx, e);igt_describe ("Verify specifying SSEU opening parameters" ); - igt_subtest("global-sseu-config") -test_global_sseu_config (ctx); + igt_subtest_with_dynamic("global-sseu-config") +__for_each_perf_enabled_engine (drm_fd, e) +test_global_sseu_config (ctx, e); }igt_subtest ("invalid-create-userspace-config" )
Signature · 1 line
2.36.1
PATCH v5 8/30 i915/perf: Treat ticks as 64 bit
In reply to Umesh Nerlige RamappaTo support 64 bit OA report headers, treat all ticks as 64 bits.
--- tests/i915/perf.c | 79 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 25 deletions(-)
tests/i915/perf.c +54 -25
@@ -112,6 +112,7 @@ struct oa_format {int c_off;int n_c;int oa_type; +bool report_hdr_64bit; };static struct oa_format hsw_oa_formats[I915_OA_FORMAT_MAX ] = {
@@ -231,7 +232,7 @@ static bool *undefined_a_counters;static uint64_t oa_exp_1_millisec;static igt_render_copyfunc_t render_copy =NULL ; -static uint32_t (*read_report_ticks)(const uint32_t *report, +static uint64_t (*read_report_ticks)(const uint32_t *report,enum drm_i915_oa_format format); static void (*sanity_check_reports)(const uint32_t *oa_report0, const uint32_t *oa_report1,
@@ -425,7 +426,7 @@ sysfs_read(enum i915_attr_id id)* C2 corresponds to a clock counter for the Haswell render basic metric set * but it's not included in all of the formats. */ -static uint32_t +static uint64_t hsw_read_report_ticks (const uint32_t *report,enum drm_i915_oa_format format) {uint32_t *c = (uint32_t *)(((uint8_t *)report) +get_oa_format (format).c_off);
@@ -435,10 +436,41 @@ hsw_read_report_ticks(const uint32_t *report, enum drm_i915_oa_format format)return c[2 ]; } -static uint32_t +static uint64_t gen8_read_report_ticks (const uint32_t *report,enum drm_i915_oa_format format) { -return report[3 ]; + +struct oa_format fmt =get_oa_format (format); + +return fmt.report_hdr_64bit ? *(uint64_t *)&report[6 ] : report[3 ]; +} + +/* +* t0 is a value sampled before t1. width is number of bits used to represent +* t0/t1. Normally t1 is greater than t0. In cases where t1 < t0 use this +* helper. Since the size of t1/t0 is already 64 bits, no special handling is +* needed for width = 64. +*/ +static uint64_t +elapsed_delta (uint64_t t1,uint64_t t0,uint32_t width) +{ +uint32_t max_bits =sizeof (t1) *8 ; + +igt_assert (width <= max_bits); + +if (t1 < t0 && width != max_bits) +return ((1ULL << width) - t0) + t1; + +return t1 - t0; +} + +static uint64_t +oa_tick_delta (const uint32_t *report1, +const uint32_t *report0, +enum drm_i915_oa_format format) +{ +return elapsed_delta (read_report_ticks (report1, format), +read_report_ticks (report0, format),32 ); } static void
@@ -668,8 +700,8 @@ hsw_sanity_check_render_basic_reports(const uint32_t *oa_report0, enum drm_i915_oa_format fmt) {uint32_t time_delta =timebase_scale (oa_report1[1 ] - oa_report0[1 ]); -uint32_t clock_delta; -uint32_t max_delta; +uint64_t clock_delta; +uint64_t max_delta;struct oa_format format =get_oa_format (fmt);igt_assert_neq (time_delta,0 );
@@ -684,21 +716,19 @@ hsw_sanity_check_render_basic_reports(const uint32_t *oa_report0, clock_delta = (gt_max_freq_mhz * (uint64_t )time_delta) /1000 ; }else { -uint32_t ticks0 =read_report_ticks (oa_report0, fmt); -uint32_t ticks1 =read_report_ticks (oa_report1, fmt);uint64_t freq; - clock_delta = ticks1 - ticks0; + clock_delta =oa_tick_delta (oa_report1, oa_report0, fmt); -igt_assert_neq (clock_delta,0 ); +igt_assert_neq_u64 (clock_delta,0 ); - freq = ((uint64_t )clock_delta *1000 ) / time_delta; + freq = (clock_delta *1000 ) / time_delta;igt_debug ("freq = %" PRIu64"\n" , freq);igt_assert (freq <= gt_max_freq_mhz); } -igt_debug ("clock delta = %" PRIu32"\n" , clock_delta); +igt_debug ("clock delta = %" PRIu64"\n" , clock_delta);/* The maximum rate for any HSW counter = * clock_delta * N EUs
@@ -831,7 +861,8 @@ accumulate_reports(struct accumulator *accumulator,accumulate_uint32 (4 , start, end, deltas + idx++);/* clock cycles */ -accumulate_uint32 (12 , start, end, deltas + idx++); + deltas[idx] +=oa_tick_delta (end, start, accumulator->format); + idx++; }else {/* timestamp */ accumulate_uint32 (4 , start, end, deltas + idx++);
@@ -904,10 +935,8 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0, {struct oa_format format =get_oa_format (fmt);uint32_t time_delta =timebase_scale (oa_report1[1 ] - oa_report0[1 ]); -uint32_t ticks0 =read_report_ticks (oa_report0, fmt); -uint32_t ticks1 =read_report_ticks (oa_report1, fmt); -uint32_t clock_delta = ticks1 - ticks0; -uint32_t max_delta; +uint64_t clock_delta =oa_tick_delta (oa_report1, oa_report0, fmt); +uint64_t max_delta;uint64_t freq;uint32_t *rpt0_b = (uint32_t *)(((uint8_t *)oa_report0) + format.b_off);
@@ -920,10 +949,10 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,gen8_read_report_reason (oa_report0), gen8_read_report_reason(oa_report1)); - freq = time_delta ? ((uint64_t )clock_delta *1000 ) / time_delta :0 ; + freq = time_delta ? (clock_delta *1000 ) / time_delta :0 ;igt_debug ("freq = %" PRIu64"\n" , freq); -igt_debug ("clock delta = %" PRIu32"\n" , clock_delta); +igt_debug ("clock delta = %" PRIu64"\n" , clock_delta); max_delta = clock_delta * intel_perf->devinfo.n_eus;
@@ -1024,7 +1053,7 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0, format.c_off);uint32_t delta = c1[j] - c0[j]; -igt_debug ("C%d: delta = %" PRIu32", max_delta=%" PRIu32"\n" , +igt_debug ("C%d: delta = %" PRIu32", max_delta=%" PRIu64"\n" , j, delta, max_delta);igt_assert (delta <= max_delta); }
@@ -1516,10 +1545,10 @@ print_reports(uint32_t *oa_report0, uint32_t *oa_report1, int fmt)if (IS_HASWELL (devid) && format.n_c ==0 ) {igt_debug ("CLOCK = N/A\n" ); }else { -uint32_t clock0 =read_report_ticks (oa_report0, fmt); -uint32_t clock1 =read_report_ticks (oa_report1, fmt); +uint64_t clock0 =read_report_ticks (oa_report0, fmt); +uint64_t clock1 =read_report_ticks (oa_report1, fmt); -igt_debug ("CLOCK: 1st = %" PRIu32", 2nd = %" PRIu32", delta = %" PRIu32"\n" , +igt_debug ("CLOCK: 1st = %" PRIu64", 2nd = %" PRIu64", delta = %" PRIu64"\n" , clock0, clock1, clock1 - clock0); }
@@ -1621,9 +1650,9 @@ print_report(uint32_t *report, int fmt)if (IS_HASWELL (devid) && format.n_c ==0 ) {igt_debug ("CLOCK = N/A\n" ); }else { -uint32_t clock =read_report_ticks (report, fmt); +uint64_t clock =read_report_ticks (report, fmt); -igt_debug ("CLOCK: %" PRIu32"\n" , clock); +igt_debug ("CLOCK: %" PRIu64"\n" , clock); }if (intel_gen (devid) >=8 ) {
Signature · 1 line
2.36.1
PATCH v5 9/30 i915/perf: Treat timestamp as 64 bit value
In reply to Umesh Nerlige RamappaNew OA formats in MTL have 64 bit OA report header. Update the timestamp in the tests to be default 64 bit.
--- tests/i915/perf.c | 156 +++++++++++++++++++++++++++------------------- 1 file changed, 93 insertions(+), 63 deletions(-)
tests/i915/perf.c +93 -63
@@ -539,9 +539,28 @@ cs_timebase_scale(uint32_t u32_delta) }static uint64_t -timebase_scale (uint32_t u32_delta) +oa_timestamp (const uint32_t *report,enum drm_i915_oa_format format) { -return ((uint64_t )u32_delta *NSEC_PER_SEC ) / intel_perf->devinfo.timestamp_frequency; +struct oa_format fmt =get_oa_format (format); + +return fmt.report_hdr_64bit ? *(uint64_t *)&report[2 ] : report[1 ]; +} + +static uint64_t +oa_timestamp_delta (const uint32_t *report1, +const uint32_t *report0, +enum drm_i915_oa_format format) +{ +uint32_t width =intel_graphics_ver (devid) >=IP_VER (12 ,55 ) ?56 :32 ; + +return elapsed_delta (oa_timestamp (report1, format), +oa_timestamp (report0, format), width); +} + +static uint64_t +timebase_scale (uint64_t delta) +{ +return (delta *NSEC_PER_SEC ) / intel_perf->devinfo.timestamp_frequency; }/* Returns: the largest OA exponent that will still result in a sampling period
@@ -550,7 +569,7 @@ timebase_scale(uint32_t u32_delta)static int max_oa_exponent_for_period_lte (uint64_t period) { -/* NB: timebase_scale() takes a uint32_t and an exponent of 30 +/* NB: timebase_scale() takes a uint64_t and an exponent of 30 * would already represent a period of ~3 minutes so there's * really no need to consider higher exponents. */
@@ -699,12 +718,14 @@ hsw_sanity_check_render_basic_reports(const uint32_t *oa_report0,const uint32_t *oa_report1, enum drm_i915_oa_format fmt) { - uint32_t time_delta = timebase_scale(oa_report1[1] - oa_report0[1]); + uint64_t time_delta = timebase_scale(oa_timestamp_delta(oa_report1, + oa_report0, + fmt));uint64_t clock_delta;uint64_t max_delta;struct oa_format format =get_oa_format (fmt); -igt_assert_neq (time_delta,0 ); +igt_assert_neq_u64 (time_delta,0 );/* As a special case we have to consider that on Haswell we * can't explicitly derive a clock delta for all OA report
@@ -713,8 +734,7 @@ hsw_sanity_check_render_basic_reports(const uint32_t *oa_report0,if (format.n_c ==0 ) {/* Assume running at max freq for sake of * below sanity check on counters... */ - clock_delta = (gt_max_freq_mhz * - (uint64_t )time_delta) /1000 ; + clock_delta = (gt_max_freq_mhz * time_delta) /1000 ; }else {uint64_t freq;
@@ -858,7 +878,8 @@ accumulate_reports(struct accumulator *accumulator,if (intel_gen (devid) >=8 ) {/* timestamp */ -accumulate_uint32 (4 , start, end, deltas + idx++); + deltas[idx] +=oa_timestamp_delta (end, start, accumulator->format); + idx++;/* clock cycles */ deltas[idx] +=oa_tick_delta (end, start, accumulator->format);
@@ -934,7 +955,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0, enum drm_i915_oa_format fmt) {struct oa_format format =get_oa_format (fmt); -uint32_t time_delta =timebase_scale (oa_report1[1 ] - oa_report0[1 ]); +uint64_t time_delta =timebase_scale (oa_timestamp_delta (oa_report1, + oa_report0, + fmt));uint64_t clock_delta =oa_tick_delta (oa_report1, oa_report0, fmt);uint64_t max_delta;uint64_t freq;
@@ -1122,11 +1145,11 @@ static int i915_read_reports_until_timestamp(enum drm_i915_oa_format oa_format, uint8_t *buf, uint32_t max_size, - uint32_t start_timestamp, - uint32_t end_timestamp) + uint64_t start_timestamp, + uint64_t end_timestamp) { size_t format_size = get_oa_format(oa_format).size; -uint32_t last_seen_timestamp = start_timestamp; +uint64_t last_seen_timestamp = start_timestamp;int total_len =0 ;while (last_seen_timestamp < end_timestamp) {
@@ -1135,7 +1158,7 @@ i915_read_reports_until_timestamp(enum drm_i915_oa_format oa_format,/* Running out of space. */ if ((max_size - total_len) < format_size) {igt_warn ("run out of space before reaching " -"end timestamp (%u/%u)\n" , +"end timestamp (%" PRIu64"/%" PRIu64")\n" , last_seen_timestamp, end_timestamp);return -1 ; }
@@ -1164,7 +1187,7 @@ i915_read_reports_until_timestamp(enum drm_i915_oa_format oa_format,uint32_t *report = (uint32_t *) (header +1 );if (header->type ==DRM_I915_PERF_RECORD_SAMPLE ) - last_seen_timestamp = report[1 ]; + last_seen_timestamp =oa_timestamp (report, oa_format); offset += header->size; }
@@ -1470,11 +1493,11 @@ read_2_oa_reports(int format_id, report = (const void *)(header +1 );dump_report (report, format_size /4 ,"oa-formats" ); -igt_debug ("read report: reason = %x, timestamp = %x, exponent mask=%x\n" , - report[0 ], report[1 ], exponent_mask); +igt_debug ("read report: reason = %x, timestamp = %" PRIx64", exponent mask=%x\n" , + report[0 ],oa_timestamp (report, format_id), exponent_mask);/* Don't expect zero for timestamps */ -igt_assert_neq (report[1 ],0 ); +igt_assert_neq_u64 (oa_timestamp (report, format_id),0 );if (timer_only) {if (!oa_report_is_periodic (exponent, report)) {
@@ -1538,9 +1561,11 @@ static void print_reports(uint32_t *oa_report0, uint32_t *oa_report1, int fmt) {struct oa_format format =get_oa_format (fmt); +uint64_t ts0 =oa_timestamp (oa_report0, fmt); +uint64_t ts1 =oa_timestamp (oa_report1, fmt); -igt_debug ("TIMESTAMP: 1st = %" PRIu32", 2nd = %" PRIu32", delta = %" PRIu32"\n" , - oa_report0[1 ], oa_report1[1 ], oa_report1[1 ] - oa_report0[1 ]); +igt_debug ("TIMESTAMP: 1st = %" PRIu64", 2nd = %" PRIu64", delta = %" PRIu64"\n" , + ts0, ts1, ts1 - ts0);if (IS_HASWELL (devid) && format.n_c ==0 ) {igt_debug ("CLOCK = N/A\n" );
@@ -1645,7 +1670,7 @@ print_report(uint32_t *report, int fmt) {struct oa_format format =get_oa_format (fmt); -igt_debug ("TIMESTAMP: %" PRIu32"\n" , report[1 ]); +igt_debug ("TIMESTAMP: %" PRIu64"\n" ,oa_timestamp (report, fmt));if (IS_HASWELL (devid) && format.n_c ==0 ) {igt_debug ("CLOCK = N/A\n" );
@@ -1874,6 +1899,8 @@ static bool expected_report_timing_delta(uint32_t delta, uint32_t expected_deltastatic void test_oa_exponents (const struct intel_execution_engine2 *e) { +uint64_t fmt = test_set->perf_oa_format; +load_helper_init ();load_helper_run (HIGH );
@@ -1888,7 +1915,7 @@ test_oa_exponents(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 , fmt,DRM_I915_PERF_PROP_OA_EXPONENT , exponent,DRM_I915_PERF_PROP_OA_ENGINE_CLASS , e->class, DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE, e->instance,
@@ -1901,7 +1928,7 @@ test_oa_exponents(const struct intel_execution_engine2 *e) .properties_ptr = to_user_pointer(properties), };uint64_t expected_timestamp_delta =2ULL << exponent; -size_t format_size =get_oa_format (test_set->perf_oa_format).size; +size_t format_size =get_oa_format (fmt).size;size_t sample_size = (sizeof (struct drm_i915_perf_record_header ) + format_size);int max_reports =MAX_OA_BUF_SIZE / format_size;
@@ -1965,15 +1992,16 @@ test_oa_exponents(const struct intel_execution_engine2 *e)__perf_close (stream_fd); -igt_debug ("report%04i ts=%08x hw_id=0x%08x\n" ,0 , - timer_reports[0 ].report[1 ], +igt_debug ("report%04i ts=%" PRIx64" hw_id=0x%08x\n" ,0 , +oa_timestamp (timer_reports[0 ].report, fmt),oa_report_get_ctx_id (timer_reports[0 ].report));for (int i =1 ; i < n_timer_reports; i++) { -uint32_t delta = - timer_reports[i].report[1 ] - timer_reports[i -1 ].report[1 ]; +uint64_t delta =oa_timestamp_delta (timer_reports[i].report, + timer_reports[i -1 ].report, + fmt); -igt_debug ("report%04i ts=%08x hw_id=0x%08x delta=%u %s\n" , i, - timer_reports[i].report[1 ], +igt_debug ("report%04i ts=%" PRIx64" hw_id=0x%08x delta=%" PRIu64" %s\n" , i, +oa_timestamp (timer_reports[i].report, fmt),oa_report_get_ctx_id (timer_reports[i].report), delta,expected_report_timing_delta (delta, expected_timestamp_delta) ?"" :"******" );
@@ -2692,13 +2720,14 @@ 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 properties[] = {/* Include OA reports in samples */ 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_FORMAT , fmt,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,
@@ -2715,7 +2744,7 @@ test_buffer_fill(const struct intel_execution_engine2 *e)uint8_t *buf =malloc (buf_size);int len;size_t oa_buf_size =MAX_OA_BUF_SIZE ; -size_t report_size =get_oa_format (test_set->perf_oa_format).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;
@@ -2790,17 +2819,17 @@ test_buffer_fill(const struct intel_execution_engine2 *e)igt_debug ("report loss, trying again\n" );break ;case DRM_I915_PERF_RECORD_SAMPLE : -igt_debug (" > report ts=%u" -" ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x nb_periodic=%u\n" , - report[1 ], - n_periodic_reports >0 ? report[1 ] - last_periodic_report[1 ] :0 , +igt_debug (" > report ts=%" PRIu64"" +" ts_delta_last_periodic=%" PRIu64" is_timer=%i ctx_id=%8x nb_periodic=%u\n" , +oa_timestamp (report, fmt), + n_periodic_reports >0 ?oa_timestamp_delta (report, last_periodic_report, fmt) :0 ,oa_report_is_periodic (oa_exponent, report),oa_report_get_ctx_id (report), n_periodic_reports);if (first_timestamp ==0 ) - first_timestamp = report[1 ]; - last_timestamp = report[1 ]; + first_timestamp =oa_timestamp (report, fmt); + last_timestamp =oa_timestamp (report, fmt);if (((last_timestamp - first_timestamp) * oa_period) < (fill_duration /2 ))break ;
@@ -2927,13 +2956,14 @@ 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 properties[] = {/* Include OA reports in samples */ 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_FORMAT , fmt,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,
@@ -2949,7 +2979,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)int buf_size =65536 * (256 +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 (test_set->perf_oa_format).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;
@@ -2962,7 +2992,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)int len;uint32_t n_periodic_reports;struct drm_i915_perf_record_header *header; -uint32_t first_timestamp =0 , last_timestamp =0 ; +uint64_t first_timestamp =0 , last_timestamp =0 ;uint32_t last_periodic_report[64 ];/* Giving enough time for an overflow might help catch whether
@@ -3009,15 +3039,15 @@ test_enable_disable(const struct intel_execution_engine2 *e)break ;case DRM_I915_PERF_RECORD_SAMPLE :if (first_timestamp ==0 ) - first_timestamp = report[1 ]; - last_timestamp = report[1 ]; + first_timestamp =oa_timestamp (report, fmt); + last_timestamp =oa_timestamp (report, fmt); -igt_debug (" > report ts=%8x" -" ts_delta_last_periodic=%s%8u" +igt_debug (" > report ts=%" PRIx64"" +" ts_delta_last_periodic=%s%" PRIu64"" " is_timer=%i ctx_id=0x%8x\n" , - report[1 ], +oa_timestamp (report, fmt),oa_report_is_periodic (oa_exponent, report) ?" " :"*" , - n_periodic_reports >0 ? (report[1 ] - last_periodic_report[1 ]) :0 , + n_periodic_reports >0 ?oa_timestamp_delta (report, last_periodic_report, fmt) :0 ,oa_report_is_periodic (oa_exponent, report),oa_report_get_ctx_id (report));
@@ -3047,7 +3077,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)do_ioctl (stream_fd,I915_PERF_IOCTL_DISABLE ,0 ); -igt_debug ("first ts = %u, last ts = %u\n" , first_timestamp, last_timestamp); +igt_debug ("first ts = %lu, last ts = %lu\n" , first_timestamp, last_timestamp); igt_debug("%f < %zu < %f\n", report_size * n_full_oa_reports * 0.45,
@@ -3353,7 +3383,7 @@ gen12_test_mi_rpc(const struct intel_execution_engine2 *e)* size amount of data was written. */ igt_assert_eq (report32[0 ],REPORT_ID ); -igt_assert_neq (report32[1 ],0 ); +igt_assert (oa_timestamp (report32, test_set->perf_oa_format));igt_assert_neq (report32[format.b_off >>2 ],0x80808080 );igt_assert_eq (report32[format_size_32],0x80808080 );
@@ -3414,7 +3444,7 @@ test_mi_rpc(void) report32 = buf->ptr;dump_report (report32,64 ,"mi-rpc" );igt_assert_eq (report32[0 ],0xdeadbeef );/* report ID */ -igt_assert_neq (report32[1 ],0 );/* timestamp */ +igt_assert (oa_timestamp (report32, 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 */
@@ -4153,9 +4183,9 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e)uint32_t context0_id, context1_id;uint32_t *report0_32, *report1_32, *report2_32, *report3_32;uint64_t timestamp0_64, timestamp1_64; -uint32_t delta_ts64, delta_oa32; +uint64_t delta_ts64, delta_oa32;uint64_t delta_ts64_ns, delta_oa32_ns; -uint32_t delta_delta; +uint64_t delta_delta;int width =800 ;int height =600 ;#define INVALID_CTX_ID 0xffffffff
@@ -4310,14 +4340,14 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e)*/ report0_32 = dst_buf->ptr;igt_assert_eq (report0_32[0 ],0xdeadbeef ); -igt_assert_neq (report0_32[1 ],0 ); +igt_assert (oa_timestamp (report0_32, fmt)); ctx0_id = report0_32[2 ];igt_debug ("MI_RPC(start) CTX ID: %u\n" , ctx0_id);dump_report (report0_32,64 ,"report0_32" ); report1_32 = report0_32 +64 ;igt_assert_eq (report1_32[0 ],0xbeefbeef ); -igt_assert_neq (report1_32[1 ],0 ); +igt_assert (oa_timestamp (report1_32, fmt)); ctx1_id = report1_32[2 ];igt_debug ("CTX ID1: %u\n" , ctx1_id);dump_report (report1_32,64 ,"report1_32" );
@@ -4325,7 +4355,7 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e)/* Verify that counters in context1 are all zeroes */ report2_32 = report0_32 +128 ;igt_assert_eq (report2_32[0 ],0x00c0ffee ); -igt_assert_neq (report2_32[1 ],0 ); +igt_assert (oa_timestamp (report2_32, fmt));dump_report (report2_32,64 ,"report2_32" ); igt_assert_eq(0, memcmp(&report2_32[4], (uint8_t *) dst_buf->ptr + 2048,
@@ -4333,7 +4363,7 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e) report3_32 = report0_32 +192 ;igt_assert_eq (report3_32[0 ],0x01c0ffee ); -igt_assert_neq (report3_32[1 ],0 ); +igt_assert (oa_timestamp (report3_32, fmt));dump_report (report3_32,64 ,"report3_32" ); igt_assert_eq(0, memcmp(&report3_32[4], (uint8_t *) dst_buf->ptr + 2048,
@@ -4347,8 +4377,8 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e) accumulator.deltas[2 +21 ], accumulator.deltas[2 + 26]); -igt_debug ("oa_timestamp32 0 = %u\n" , report0_32[1 ]); -igt_debug ("oa_timestamp32 1 = %u\n" , report1_32[1 ]); +igt_debug ("oa_timestamp32 0 = %" PRIu64"\n" ,oa_timestamp (report0_32, fmt)); +igt_debug ("oa_timestamp32 1 = %" PRIu64"\n" ,oa_timestamp (report1_32, fmt));igt_debug ("ctx_id 0 = %u\n" , report0_32[2 ]);igt_debug ("ctx_id 1 = %u\n" , report1_32[2 ]);
@@ -4363,23 +4393,23 @@ static void gen12_single_ctx_helper(const struct intel_execution_engine2 *e)igt_debug ("ts_timestamp64 1 = %" PRIu64"\n" , timestamp1_64); delta_ts64 = timestamp1_64 - timestamp0_64; - delta_oa32 = report1_32[1 ] - report0_32[1 ]; + delta_oa32 =oa_timestamp_delta (report1_32, report0_32, fmt);/* Sanity check that we can pass the delta to timebase_scale */ -igt_assert (delta_ts64 <UINT32_MAX ); delta_oa32_ns =timebase_scale (delta_oa32); delta_ts64_ns =cs_timebase_scale (delta_ts64); -igt_debug ("oa32 delta = %u, = %uns\n" , - delta_oa32, (unsigned )delta_oa32_ns); -igt_debug ("ts64 delta = %u, = %uns\n" , - delta_ts64, (unsigned )delta_ts64_ns); +igt_debug ("oa32 delta = %" PRIu64", = %" PRIu64"ns\n" , + delta_oa32, delta_oa32_ns); +igt_debug ("ts64 delta = %" PRIu64", = %" PRIu64"ns\n" , + delta_ts64, delta_ts64_ns); delta_delta = delta_ts64_ns > delta_oa32_ns ? (delta_ts64_ns - delta_oa32_ns) : (delta_oa32_ns - delta_ts64_ns);if (delta_delta >500 ) { -igt_debug ("delta_delta exceeds margin, skipping..\n" ); +igt_debug ("delta_delta = %" PRIu64". exceeds margin, skipping..\n" , + delta_delta);exit (EAGAIN ); }
Signature · 1 line
2.36.1
PATCH v5 10/30 i915/perf: Add OAM format type
In reply to Umesh Nerlige RamappaSimilar to OAG (Global) and OAR (Render), OAM (Observability Architecture for Media) adds some new OA formats that require different metrics configurations for B and C counters. Don't do a sanity check for B and C counters for OAM formats until such metrics are available.
v2: Improve commit message (Kamil)
--- tests/i915/perf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/i915/perf.c +2 -1
@@ -91,6 +91,7 @@ struct accumulator {enum {OAG ,OAR , +OAM ,MAX_OA_TYPE , };
@@ -1022,7 +1023,7 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,/* The TestOa metric set defines all B counters to be a * multiple of the gpu clock */ -if (format.n_b) { +if (format.n_b && (format.oa_type ==OAG || format.oa_type ==OAR )) {if (clock_delta >0 ) { b = rpt1_b[0 ] - rpt0_b[0 ];igt_debug ("B0: delta = %" PRIu32"\n" , b);
Signature · 1 line
2.36.1
PATCH v5 11/30 i915/perf: Move OA format array from stack to heap
In reply to Umesh Nerlige RamappaThe OA format size will change based on the specific format used in some of the tests. In preparation for that, allocated the space required for the format on heap.
v2: Allocate the correct bytes for OA format (CI failure)
--- tests/i915/perf.c | 48 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-)
tests/i915/perf.c +25 -23
@@ -1937,9 +1937,9 @@ test_oa_exponents(const struct intel_execution_engine2 *e)uint8_t *buf =calloc (1 , buf_size);int ret, n_timer_reports =0 ;uint32_t matches =0 ; -struct { -uint32_t report[64 ]; - } timer_reports[30 ]; +#define NUM_TIMER_REPORTS 30 +uint32_t *reports =malloc (NUM_TIMER_REPORTS * format_size); +uint32_t *timer_reports = reports; igt_debug("testing OA exponent %d," " expected ts delta = %"PRIu64" (%"PRIu64"ns/%.2fus/%.2fms)\n",
@@ -1950,7 +1950,7 @@ test_oa_exponents(const struct intel_execution_engine2 *e) stream_fd =__perf_open (drm_fd, ¶m, true/* prevent_pm */ ); -while (n_timer_reports <ARRAY_SIZE (timer_reports)) { +while (n_timer_reports <NUM_TIMER_REPORTS ) {struct drm_i915_perf_record_header *header; while ((ret = read(stream_fd, buf, buf_size)) < 0 &&
@@ -1963,7 +1963,7 @@ test_oa_exponents(const struct intel_execution_engine2 *e)igt_assert (ret >0 );for (int offset =0 ; - offset < ret && n_timer_reports <ARRAY_SIZE (timer_reports); + offset < ret && n_timer_reports <NUM_TIMER_REPORTS ; offset += header->size) {uint32_t *report;
@@ -1985,25 +1985,25 @@ test_oa_exponents(const struct intel_execution_engine2 *e)if (!oa_report_is_periodic (exponent, report))continue ; -memcpy (timer_reports[n_timer_reports].report, report, -sizeof (timer_reports[n_timer_reports].report)); +memcpy (timer_reports, report, format_size); n_timer_reports++; + timer_reports += (format_size /4 ); } }__perf_close (stream_fd);igt_debug ("report%04i ts=%" PRIx64" hw_id=0x%08x\n" ,0 , -oa_timestamp (timer_reports[0 ].report, fmt), -oa_report_get_ctx_id (timer_reports[0 ].report)); +oa_timestamp (&reports[0 ], fmt), +oa_report_get_ctx_id (&reports[0 ]));for (int i =1 ; i < n_timer_reports; i++) { -uint64_t delta =oa_timestamp_delta (timer_reports[i].report, - timer_reports[i -1 ].report, +uint64_t delta =oa_timestamp_delta (&reports[i], + &reports[i -1 ], fmt);igt_debug ("report%04i ts=%" PRIx64" hw_id=0x%08x delta=%" PRIu64" %s\n" , i, -oa_timestamp (timer_reports[i].report, fmt), -oa_report_get_ctx_id (timer_reports[i].report), +oa_timestamp (&reports[i], fmt), +oa_report_get_ctx_id (&reports[i]), delta,expected_report_timing_delta (delta, expected_timestamp_delta) ?"" :"******" );
@@ -2020,6 +2020,8 @@ test_oa_exponents(const struct intel_execution_engine2 *e)* etc... */ igt_assert_lte (n_timer_reports /2 , matches); + +free (reports); }load_helper_stop ();
@@ -2741,13 +2743,14 @@ 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; +uint32_t *last_periodic_report =malloc (report_size);igt_assert (fill_duration <1000000000 );
@@ -2757,7 +2760,6 @@ 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 ];do_ioctl (stream_fd,I915_PERF_IOCTL_ENABLE ,0 );
@@ -2836,8 +2838,7 @@ test_buffer_fill(const struct intel_execution_engine2 *e)break ;if (oa_report_is_periodic (oa_exponent, report)) { -memcpy (last_periodic_report, report, -sizeof (last_periodic_report)); +memcpy (last_periodic_report, report, report_size); n_periodic_reports++; }break ;
@@ -2863,6 +2864,7 @@ test_buffer_fill(const struct intel_execution_engine2 *e) report_size * n_full_oa_reports * 0.55); } +free (last_periodic_report);free (buf);__perf_close (stream_fd);
@@ -2977,12 +2979,13 @@ 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; +uint32_t *last_periodic_report =malloc (report_size);load_helper_init ();load_helper_run (HIGH );
@@ -2994,7 +2997,6 @@ 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 ];/* Giving enough time for an overflow might help catch whether * the OA unit has been enabled even if the driver might at
@@ -3056,8 +3058,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)break ;if (oa_report_is_periodic (oa_exponent, report)) { -memcpy (last_periodic_report, report, -sizeof (last_periodic_report)); +memcpy (last_periodic_report, report, report_size);/* We want to measure only the * periodic reports, ctx-switch
@@ -3100,6 +3101,7 @@ test_enable_disable(const struct intel_execution_engine2 *e)igt_assert_eq (errno,EIO ); } +free (last_periodic_report);free (buf);__perf_close (stream_fd);
Signature · 1 line
2.36.1
PATCH v5 12/30 i915/perf: Use a helper for OA format
In reply to Umesh Nerlige RamappaRefactor and use a helper for OA format
--- tests/i915/perf.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
tests/i915/perf.c +15 -9
@@ -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_deltastatic 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,
@@ -4658,7 +4664,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 , 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,
@@ -4748,7 +4754,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 , 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,
Signature · 1 line
2.36.1
PATCH v5 13/30 i915/perf: Add support for oa perf groups
In reply to Umesh Nerlige RamappaWith multiple OA buffers, we need a way to group engines per OA buffer. Add support for oa perf groups for tests
v2: When populating oa unit id in engine info, check for perf revision
--- tests/i915/perf.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+)
tests/i915/perf.c +173 -0
@@ -39,6 +39,7 @@#include <math.h> #include "i915/gem.h" +#include "i915/gem_engine_topology.h" #include "i915/perf.h" #include "igt.h" #include "igt_perf.h"
@@ -225,6 +226,8 @@ static int pm_fd = -1;static int stream_fd =-1 ;static uint32_t devid;static struct intel_execution_engine2 default_e2; +static struct perf_engine_group *perf_oa_groups; +static uint32_t num_perf_oa_groups;static uint64_t gt_max_freq_mhz =0 ;static struct intel_perf *intel_perf =NULL ;
@@ -5301,6 +5304,171 @@ test_sysctl_defaults(void)if (e__->class ==I915_ENGINE_CLASS_RENDER ) \ igt_dynamic_f("%s", e__->name) +struct perf_engine_group { +/* exclusive perf fd per engine group */ +int perf_fd; + +/* gem context id passed to perf */ +uint32_t ctx_id; +uint32_t oa_unit_id; + +/* perf engines in a group */ +int num_engines; +struct i915_engine_class_instance *ci; +}; + +static struct drm_i915_query_engine_info *query_engine_info (int i915) +{ +struct drm_i915_query_engine_info *qinfo; + +#define QUERY_SIZE (0x4000) + qinfo =malloc (QUERY_SIZE ); +igt_assert (qinfo); +memset (qinfo,0 ,QUERY_SIZE ); +igt_assert (!__gem_query_engines (i915, qinfo,QUERY_SIZE )); +#undef QUERY_SIZE + +return qinfo; +} + +static int compare_engine_oa_unit_id (const void *e1,const void *e2) +{ +const struct drm_i915_engine_info *_e1 = e1; +const struct drm_i915_engine_info *_e2 = e2; + +return (int )_e1->rsvd0 - (int )_e2->rsvd0; +} + +static struct perf_engine_group *default_engine_group (uint32_t *num_groups) +{ +struct perf_engine_group *groups =malloc (sizeof (*groups)); + +igt_debug ("using default engine group\n" ); + + groups->perf_fd =-1 , + groups->ctx_id =0xffffffff , + groups->oa_unit_id =0 , + groups->num_engines =1 , + + groups->ci =malloc (sizeof (*groups->ci)); + groups->ci->engine_class = default_e2.class; + groups->ci->engine_instance = default_e2.instance; + + *num_groups =1 ; + +return groups; +} + +/* Until oa_unit_id is exposed from uapi, work around it */ +static void populate_mtl_oa_unit_ids (struct drm_i915_query_engine_info *qinfo) +{ +struct i915_engine_class_instance ci; +int i; + +for (i =0 ; i < qinfo->num_engines; i++) { + ci = qinfo->engines[i].engine; + +switch (ci.engine_class) { +case I915_ENGINE_CLASS_RENDER : + qinfo->engines[i].rsvd0 =0 ; +break ; + +case I915_ENGINE_CLASS_VIDEO : +case I915_ENGINE_CLASS_VIDEO_ENHANCE : +if (i915_perf_revision (drm_fd) >=7 ) + qinfo->engines[i].rsvd0 =1 ; +else + qinfo->engines[i].rsvd0 =UINT32_MAX ; + +break ; + +default : + qinfo->engines[i].rsvd0 =UINT32_MAX ; +break ; + } + +igt_debug ("class:instance = %d:%d, id = %d\n" , + ci.engine_class, ci.engine_instance, + qinfo->engines[i].rsvd0); + } +} + +static struct perf_engine_group *get_engine_groups (int i915,uint32_t *num_groups) +{ +struct drm_i915_query_engine_info *qinfo; +struct perf_engine_group *groups =NULL ; +uint32_t id =UINT32_MAX , num_grps =0 , i =0 , j; + + qinfo =query_engine_info (i915); +if (!qinfo) +return default_engine_group (num_groups); +igt_assert (qinfo->num_engines); + +/* Currently only meteorlake is supported with engine groups */ +if (IS_METEORLAKE (devid)) { +populate_mtl_oa_unit_ids (qinfo); + }else { +free (qinfo); +return default_engine_group (num_groups); + } + +/* sort so that engines with same oa id are together */ +qsort (qinfo->engines, qinfo->num_engines,sizeof (qinfo->engines[0 ]), + compare_engine_oa_unit_id); + +/* create groups */ +for (i =0 ; i < qinfo->num_engines; i++) { +struct i915_engine_class_instance ci = qinfo->engines[i].engine; + +igt_debug ("class:instance = %d:%d, id = %d\n" , + ci.engine_class, ci.engine_instance, + qinfo->engines[i].rsvd0); + +if (qinfo->engines[i].rsvd0 ==UINT32_MAX ) +continue ; + +if (qinfo->engines[i].rsvd0 != id) { + id = qinfo->engines[i].rsvd0; + groups =realloc (groups, ++num_grps *sizeof (*groups)); + j = num_grps -1 ; + groups[j].perf_fd =-1 ; + groups[j].ctx_id =0xffffffff ; + groups[j].oa_unit_id = id; + groups[j].num_engines =0 ; +/* alloc max engines, trim later */ + groups[j].ci =malloc (qinfo->num_engines *sizeof (ci)); + } + groups[j].ci[groups[j].num_engines++] = ci; + } + +igt_assert (num_grps); + +/* trim engines */ +for (i =0 ; i < num_grps; i++) { +struct i915_engine_class_instance *ci = groups[i].ci; + + ci =realloc (ci, groups[i].num_engines *sizeof (*ci)); + groups[i].ci = ci; + } + + *num_groups = num_grps; + +free (qinfo); + +return groups; +} + +static void put_engine_groups (struct perf_engine_group *groups, +unsigned int num_groups) +{ +int i; + +for (i =0 ; i < num_groups; i++) +free (groups[i].ci); + +free (groups); +} +static bool has_class_instance (int i915,uint16_t class,uint16_t instance) {int fd;
@@ -5371,6 +5539,8 @@ igt_mainwrite_u64_file ("/proc/sys/dev/i915/oa_max_sample_rate" ,100000 ); gt_max_freq_mhz =sysfs_read (RPS_RP0_FREQ_MHZ ); + perf_oa_groups =get_engine_groups (drm_fd, &num_perf_oa_groups); +igt_assert (perf_oa_groups && num_perf_oa_groups);if (has_class_instance (drm_fd,I915_ENGINE_CLASS_RENDER ,0 )) render_copy =igt_get_render_copyfunc (devid);
@@ -5593,6 +5763,9 @@ igt_mainif (intel_perf)intel_perf_free (intel_perf); +if (perf_oa_groups) +put_engine_groups (perf_oa_groups, num_perf_oa_groups); +intel_ctx_destroy (drm_fd, ctx);close (drm_fd); }
Signature · 1 line
2.36.1
PATCH v5 14/30 i915/perf: Test concurrent access to OA in different groups
In reply to Umesh Nerlige RamappaWith multiple OA buffers, verify that the perf interface allows concurrent access to the OA buffers in different groups.
v2: (Ashutosh)
- Rename concurrency functions to use group instead of gt
- Fix comment
v3: (CI issues)
- Run group-exclusive-stream tests for >= gen12
- Fix exponent for group-exclusive-stream tests
--- tests/i915/perf.c | 142 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 138 insertions(+), 4 deletions(-)
tests/i915/perf.c +138 -4
@@ -2235,6 +2235,7 @@ test_blocking(uint64_t requested_oa_period,int max_iterations = (test_duration_ns / oa_period) +2 ;int n_extra_iterations =0 ; +int perf_fd;/* It's a bit tricky to put a lower limit here, but we expect a * relatively low latency for seeing reports, while we don't currently
@@ -2268,7 +2269,7 @@ test_blocking(uint64_t requested_oa_period, param.num_properties = (idx - props) /2 ; param.properties_ptr =to_user_pointer (props); - stream_fd =__perf_open (drm_fd, ¶m, true/* prevent_pm */ ); + perf_fd =__perf_open (drm_fd, ¶m, true/* prevent_pm */ );times (&start_times);
@@ -2300,14 +2301,14 @@ test_blocking(uint64_t requested_oa_period,* the error delta. */ start =get_time (); -do_ioctl (stream_fd,I915_PERF_IOCTL_ENABLE ,0 ); +do_ioctl (perf_fd,I915_PERF_IOCTL_ENABLE ,0 );for (/* nop */ ; ((end =get_time ()) - start) < test_duration_ns;/* nop */ ) {struct drm_i915_perf_record_header *header;bool timer_report_read = false;bool non_timer_report_read = false;int ret; -while ((ret =read (stream_fd, buf,sizeof (buf))) <0 && +while ((ret =read (perf_fd, buf,sizeof (buf))) <0 && errno ==EINTR ) ;
@@ -2375,7 +2376,7 @@ test_blocking(uint64_t requested_oa_period,if (!set_kernel_hrtimer)igt_assert (kernel_ns <= (test_duration_ns /100ull )); -__perf_close (stream_fd); +__perf_close (perf_fd); } static void
@@ -5469,6 +5470,14 @@ static void put_engine_groups(struct perf_engine_group *groups,free (groups); } +static struct i915_engine_class_instance * +random_engine (struct perf_engine_group *group) +{ +srandom (time (NULL )); + +return &group->ci[random () % group->num_engines]; +} +static bool has_class_instance (int i915,uint16_t class,uint16_t instance) {int fd;
@@ -5491,6 +5500,111 @@ static void set_default_engine(const intel_ctx_t *ctx) default_e2 = *e; } +/* +* Test if OA buffer streams can be independently opened on each group. Once a user +* opens a stream, that group is exclusive to the user, other users get -EBUSY on +* trying to open a stream. +*/ +static void +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_ENGINE_CLASS ,0 , +DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE ,0 , +DRM_I915_PERF_PROP_OA_EXPONENT , oa_exp_1_millisec, + }; +struct drm_i915_perf_open_param param = { + .flags =I915_PERF_FLAG_FD_CLOEXEC , +/* for gem_context use case, we do no pass exponent */ + .num_properties = exponent ? +ARRAY_SIZE (properties) /2 : +ARRAY_SIZE (properties) /2 -1 , + .properties_ptr =to_user_pointer (properties), + }; +uint32_t i, j; + +/* for each group, open one random perf stream with sample OA */ +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); + +if (!exponent) { + properties[0 ] =DRM_I915_PERF_PROP_CTX_HANDLE ; + properties[1 ] = ctx->id; + } + + properties[7 ] = ci->engine_class; + properties[9 ] = ci->engine_instance; + grp->perf_fd =igt_ioctl (drm_fd, +DRM_IOCTL_I915_PERF_OPEN , + ¶m); +igt_assert (grp->perf_fd >=0 ); +igt_debug ("opened OA buffer with c:i %d:%d\n" , + ci->engine_class, ci->engine_instance); + } + +/* for each group make sure no other streams can be opened */ +for (i =0 ; i < num_perf_oa_groups; i++) { +struct perf_engine_group *grp = &perf_oa_groups[i]; +int err; + +for (j =0 ; j < grp->num_engines; j++) { +struct i915_engine_class_instance *ci = grp->ci + j; + +/* +* case 1: +* concurrent access to OAG should fail +*/ + properties[0 ] =DRM_I915_PERF_PROP_SAMPLE_OA ; + properties[1 ] = true; + properties[7 ] = ci->engine_class; + properties[9 ] = ci->engine_instance; +/* for SAMPLE OA use case, we must pass exponent */ + param.num_properties =ARRAY_SIZE (properties) /2 ; +do_ioctl_err (drm_fd,DRM_IOCTL_I915_PERF_OPEN , ¶m, +EBUSY ); +igt_debug ("try OA buffer with c:i %d:%d\n" , + ci->engine_class, ci->engine_instance); + +/* +* case 2: +* concurrent access to non-OAG unit should fail +*/ + properties[0 ] =DRM_I915_PERF_PROP_CTX_HANDLE ; + properties[1 ] =gem_context_create (drm_fd); +/* for gem_context use case, we do no pass exponent */ + param.num_properties =ARRAY_SIZE (properties) /2 -1 ; + errno =0 ; + err =igt_ioctl (drm_fd,DRM_IOCTL_I915_PERF_OPEN , ¶m); +igt_assert (err <0 ); +igt_assert (errno ==EBUSY || errno ==ENODEV ); +igt_debug ("try OA ci unit with c:i %d:%d\n" , + ci->engine_class, ci->engine_instance); +gem_context_destroy (drm_fd, properties[1 ]); + } + +if (grp->perf_fd >=0 ) +close (grp->perf_fd); + } +} + +static void +test_group_concurrent_oa_buffer_read (void ) +{ + igt_fork(child, num_perf_oa_groups) { +struct intel_execution_engine2 e; + + e.class = perf_oa_groups[child].ci->engine_class; + e.instance = perf_oa_groups[child].ci->engine_instance; + +test_blocking (40 *1000 *1000 , false,5 *1000 *1000 , &e); + } +igt_waitchildren (); +} + igt_main {const intel_ctx_t *ctx;
@@ -5716,6 +5830,26 @@ igt_mainigt_describe ("Verify invalid class instance" ); igt_subtest("gen12-invalid-class-instance")test_invalid_class_instance (); + +/* +* OAR and OAG use cases can be separately opened only on gen12 +* and later, so group-exclusive-stream tests require >= 12. +*/ +igt_describe ("Verify exclusivity of perf streams with sample oa option" ); + igt_subtest("gen12-group-exclusive-stream-sample-oa") { +igt_require (intel_gen (devid) >=12 ); +test_group_exclusive_stream (ctx, true); + } + +igt_describe ("Verify exclusivity of perf streams with ctx handle" ); + igt_subtest("gen12-group-exclusive-stream-ctx-handle") { +igt_require (intel_gen (devid) >=12 ); +test_group_exclusive_stream (ctx, false); + } + +igt_describe ("Verify concurrent reads from OA buffers in different groups" ); + igt_subtest("gen12-group-concurrent-oa-buffer-read") +test_group_concurrent_oa_buffer_read (); }igt_subtest ("rc6-disable" )
Signature · 1 line
2.36.1
PATCH v5 15/30 i915/perf: Add OAM support
In reply to Umesh Nerlige RamappaAdd OAM formats and support for media engines in perf tests
--- include/drm-uapi/i915_drm.h | 4 ++ lib/intel_chipset.h | 3 + lib/intel_device_info.c | 1 + tests/i915/perf.c | 138 +++++++++++++++++++++++++----------- 4 files changed, 105 insertions(+), 41 deletions(-)
include/drm-uapi/i915_drm.h +4 -0
@@ -2545,6 +2545,10 @@ enum drm_i915_oa_format { I915_OAR_FORMAT_A32u40_A4u32_B8_C8, I915_OA_FORMAT_A24u40_A14u32_B8_C8, +/* MTL OAM */ + I915_OAM_FORMAT_MPEC8u64_B8_C8, + I915_OAM_FORMAT_MPEC8u32_B8_C8, + I915_OA_FORMAT_MAX /* non-ABI */ };
lib/intel_chipset.h +3 -0
@@ -45,6 +45,7 @@ struct intel_device_info {unsigned gt;/* 0 if unknown */ bool has_4tile : 1; bool has_flatccs : 1; + bool has_oam : 1; bool is_mobile : 1; bool is_whitney : 1; bool is_almador : 1;
@@ -231,4 +232,6 @@ void intel_check_pch(void);#define HAS_FLATCCS (devid) (intel_get_device_info(devid)->has_flatccs) +#define HAS_OAM (devid) (intel_get_device_info(devid)->has_oam) +#endif /* _INTEL_CHIPSET_H */
lib/intel_device_info.c +1 -0
@@ -472,6 +472,7 @@ static const struct intel_device_info intel_meteorlake_info = { .graphics_rel = 70, .display_ver = 14, .has_4tile = true, + .has_oam = true, .is_meteorlake = true, .codename = "meteorlake", .cmds_info = &gen12_mtl_cmds_info,
tests/i915/perf.c +97 -41
292 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 16/30 lib/i915/perf: Prepare to read different OA formats
In reply to Umesh Nerlige RamappaMake chipsets aware of oa formats to allow addition of different formats per chipset.
v2: Improve commit message (Kamil)
--- lib/i915/perf-configs/mdapi-xml-convert.py | 98 +++++++++++++--------- 1 file changed, 58 insertions(+), 40 deletions(-)
lib/i915/perf-configs/mdapi-xml-convert.py +58 -40
@@ -133,24 +133,39 @@ xehpsdv_chipset_params = { } } +# There is no ReportType field in most Metrics XML files, Use 256B_GENERIC_NOA16 +# to denote the generic 256 byte format that is used by most chipsets +hsw_chipset_oa_formats = { + '256B_GENERIC_NOA16': hsw_chipset_params, +} + +gen8_11_chipset_oa_formats = { + '256B_GENERIC_NOA16': gen8_11_chipset_params, +} + +xehpsdv_chipset_oa_formats = { + '256B_GENERIC_NOA16': xehpsdv_chipset_params, +} + + chipsets = { - 'HSW': hsw_chipset_params, - 'BDW': gen8_11_chipset_params, - 'CHV': gen8_11_chipset_params, - 'SKL': gen8_11_chipset_params, - 'BXT': gen8_11_chipset_params, - 'KBL': gen8_11_chipset_params, - 'GLK': gen8_11_chipset_params, - 'CFL': gen8_11_chipset_params, - 'CNL': gen8_11_chipset_params, - 'ICL': gen8_11_chipset_params, - 'EHL': gen8_11_chipset_params, - 'TGL': gen8_11_chipset_params, - 'RKL': gen8_11_chipset_params, - 'DG1': gen8_11_chipset_params, - 'ADL': gen8_11_chipset_params, - 'ACM': xehpsdv_chipset_params, - 'MTL': xehpsdv_chipset_params, + 'HSW': hsw_chipset_oa_formats, + 'BDW': gen8_11_chipset_oa_formats, + 'CHV': gen8_11_chipset_oa_formats, + 'SKL': gen8_11_chipset_oa_formats, + 'BXT': gen8_11_chipset_oa_formats, + 'KBL': gen8_11_chipset_oa_formats, + 'GLK': gen8_11_chipset_oa_formats, + 'CFL': gen8_11_chipset_oa_formats, + 'CNL': gen8_11_chipset_oa_formats, + 'ICL': gen8_11_chipset_oa_formats, + 'EHL': gen8_11_chipset_oa_formats, + 'TGL': gen8_11_chipset_oa_formats, + 'RKL': gen8_11_chipset_oa_formats, + 'DG1': gen8_11_chipset_oa_formats, + 'ADL': gen8_11_chipset_oa_formats, + 'ACM': xehpsdv_chipset_oa_formats, + 'MTL': xehpsdv_chipset_oa_formats, } xehp_plus = ( 'ACM', 'MTL' )
@@ -180,14 +195,14 @@ def underscore(name): def print_err(*args): sys.stderr.write(' '.join(map(str,args)) + '\n') -def read_value(chipset, offset): - if offset in chipsets[chipset]['register_offsets']: - return chipsets[chipset]['register_offsets'][offset] +def read_value(chipset, offset, oa_format): + if offset in chipsets[chipset][oa_format]['register_offsets']: + return chipsets[chipset][oa_format]['register_offsets'][offset] print_err("Unknown offset register at offset {0}".format(offset)) assert 0 -def read_token_to_rpn_read(chipset, token, raw_offsets): +def read_token_to_rpn_read(chipset, token, raw_offsets, oa_format): width, offset_str = token.split('@') # For Broadwell the raw read notation was extended for 40 bit
@@ -200,10 +215,10 @@ def read_token_to_rpn_read(chipset, token, raw_offsets): if raw_offsets: # Location in the HW reports - a_offset = chipsets[chipset]['a_offset'] - b_offset = chipsets[chipset]['b_offset'] - c_offset = chipsets[chipset]['c_offset'] - report_size = chipsets[chipset]['oa_report_size'] + a_offset = chipsets[chipset][oa_format]['a_offset'] + b_offset = chipsets[chipset][oa_format]['b_offset'] + c_offset = chipsets[chipset][oa_format]['c_offset'] + report_size = chipsets[chipset][oa_format]['oa_report_size'] if offset < a_offset: if offset == 4:
@@ -228,7 +243,7 @@ def read_token_to_rpn_read(chipset, token, raw_offsets): elif offset < report_size: return "C " + str(int((offset - c_offset) / 4)) + " READ" else: - return "{0} READ".format(read_value(chipset, offset)) + return "{0} READ".format(read_value(chipset, offset, oa_format)) else: # Location in the accumulated deltas idx = int(offset / 8)
@@ -245,7 +260,7 @@ def read_token_to_rpn_read(chipset, token, raw_offsets): elif idx < 62: return "C " + str(idx - 54) + " READ" else: - return "{0} READ".format(read_value(chipset, offset)) + return "{0} READ".format(read_value(chipset, offset, oa_format)) elif chipset in xehp_plus: # For XEHPSDV the array of accumulated counters is # assumed to start with a GPU_TIME then GPU_CLOCK,
@@ -262,7 +277,7 @@ def read_token_to_rpn_read(chipset, token, raw_offsets): elif idx < 56: return "C " + str(idx - 48) + " READ" else: - return "{0} READ".format(read_value(chipset, offset)) + return "{0} READ".format(read_value(chipset, offset, oa_format)) else: # For Gen8+ the array of accumulated counters is # assumed to start with a GPU_TIME then GPU_CLOCK,
@@ -279,11 +294,11 @@ def read_token_to_rpn_read(chipset, token, raw_offsets): elif idx < 54: return "C " + str(idx - 46) + " READ" else: - return "{0} READ".format(read_value(chipset, offset)) + return "{0} READ".format(read_value(chipset, offset, oa_format)) assert 0 -def replace_read_tokens_with_rpn_read_ops(chipset, equation, raw_offsets): +def replace_read_tokens_with_rpn_read_ops(chipset, oa_format, equation, raw_offsets): # MDAPI MetricSet equations use tokens like 'dw@0xff' for reading raw # values from snapshots, but this doesn't seem convenient for a few # reasons:
@@ -307,7 +322,7 @@ def replace_read_tokens_with_rpn_read_ops(chipset, equation, raw_offsets): for token in tokens: if '@' in token: - read_exp = read_token_to_rpn_read(chipset, token, raw_offsets) + read_exp = read_token_to_rpn_read(chipset, token, raw_offsets, oa_format) equation = equation + " " + read_exp else: equation = equation + " " + token
@@ -425,14 +440,14 @@ def fixup_equation(equation): # double check that there's never any variations between repeated # configs # -def filter_single_config_registers_of_type(mdapi_metric_set, type): +def filter_single_config_registers_of_type(mdapi_metric_set, type, oa_format): regs = [] for mdapi_reg_config in mdapi_metric_set.findall("RegConfigStart"): tmp_regs = [] for mdapi_reg in mdapi_reg_config.findall("Register"): reg = (int(mdapi_reg.get('offset'),16), int(mdapi_reg.get('value'),16)) - if reg[0] in chipsets[chipset]['config_reg_blacklist']: + if reg[0] in chipsets[chipset][oa_format]['config_reg_blacklist']: continue if mdapi_reg.get('type') == type:
@@ -472,7 +487,7 @@ def get_mux_id_group(id_groups, id): -def process_mux_configs(mdapi_set): +def process_mux_configs(mdapi_set, oa_format): allow_missing_id = True mux_config_id_groups = []
@@ -483,7 +498,7 @@ def process_mux_configs(mdapi_set): for mdapi_reg in mdapi_reg_config.findall("Register"): address = int(mdapi_reg.get('offset'), 16) - if address in chipsets[chipset]['config_reg_blacklist']: + if address in chipsets[chipset][oa_format]['config_reg_blacklist']: continue reg_type = mdapi_reg.get('type')
@@ -613,6 +628,7 @@ for arg in args.xml: if "OGL" not in apis and "OCL" not in apis and "MEDIA" not in apis: continue + oa_format = '256B_GENERIC_NOA16' set_symbol_name = oa_registry.Registry.sanitize_symbol_name(mdapi_set.get('SymbolName')) if set_symbol_name in sets:
@@ -668,7 +684,7 @@ for arg in args.xml: # to deal with. (At least we got the handling of the Broadwell # ComputeExtended example wrong and it took several email exchanges and # a conference call to confirm how to interpret this case) - mux_configs = process_mux_configs(mdapi_set) + mux_configs = process_mux_configs(mdapi_set, oa_format) # Unlike for MUX registers, we only expect one set of FLEX/OA # registers per metric set (even though they are sometimes duplicated
@@ -680,8 +696,8 @@ for arg in args.xml: # need some adapting to support multiple OA/FLEX configs with different # availability expressions) # - flex_regs = filter_single_config_registers_of_type(mdapi_set, "FLEX") - oa_regs = filter_single_config_registers_of_type(mdapi_set, "OA") + flex_regs = filter_single_config_registers_of_type(mdapi_set, "FLEX", oa_format) + oa_regs = filter_single_config_registers_of_type(mdapi_set, "OA", oa_format) # Note: we ignore Perfmon registers
@@ -877,6 +893,7 @@ for arg in args.xml: raw_read_eq = None else: raw_read_eq = replace_read_tokens_with_rpn_read_ops(chipset, + oa_format, raw_read_eq, True) #raw offsets
@@ -886,6 +903,7 @@ for arg in args.xml: delta_read_eq = None else: delta_read_eq = replace_read_tokens_with_rpn_read_ops(chipset, + oa_format, delta_read_eq, False) #delta offsets
@@ -1070,8 +1088,8 @@ for set in metrics.findall(".//set"): for reg in config.findall("register"): addr = int(reg.get('address'), 16) - if 'registers' in chipsets[chipset] and addr in chipsets[chipset]['registers']: - reg_info = chipsets[chipset]['registers'][addr] + if 'registers' in chipsets[chipset][oa_format] and addr in chipsets[chipset][oa_format]['registers']: + reg_info = chipsets[chipset][oa_format]['registers'][addr] comment = ' <!--' + reg_info['name'] + ' -->' else: comment = ''
Signature · 1 line
2.36.1
PATCH v5 17/30 lib/i915/perf: Choose OAM format for media metrics
In reply to Umesh Nerlige RamappaIf the metric set has OAM format defined, update the generated metrics accordingly.
--- lib/i915/perf-configs/codegen.py | 4 +++ lib/i915/perf-configs/mdapi-xml-convert.py | 1 + .../perf-configs/perf-metricset-codegen.py | 36 ++++++++++++------- 3 files changed, 29 insertions(+), 12 deletions(-)
lib/i915/perf-configs/codegen.py +4 -0
@@ -117,6 +117,10 @@ class Set: def underscore_name(self): return self.xml.get('underscore_name') + @property + def oa_format(self): + return self.xml.get('oa_format') + def findall(self, path): return self.xml.findall(path)
lib/i915/perf-configs/mdapi-xml-convert.py +1 -0
@@ -659,6 +659,7 @@ for arg in args.xml: set.set('symbol_name', set_symbol_name) set.set('underscore_name', underscore(mdapi_set.get('SymbolName'))) set.set('mdapi_supported_apis', strip_dx_apis(mdapi_set.get('SupportedAPI'))) + set.set('oa_format', oa_format) # Look at the hardware register config before looking at the counters.
lib/i915/perf-configs/perf-metricset-codegen.py +24 -12
@@ -128,18 +128,30 @@ def generate_metric_sets(args, gen): """)) elif gen.chipset.startswith("acm") or gen.chipset.startswith("mtl"): - c(textwrap.dedent("""\ - metric_set->perf_oa_format = I915_OA_FORMAT_A24u40_A14u32_B8_C8; - - metric_set->perf_raw_size = 256; - metric_set->gpu_time_offset = 0; - metric_set->gpu_clock_offset = 1; - metric_set->a_offset = 2; - metric_set->b_offset = metric_set->a_offset + 38; - metric_set->c_offset = metric_set->b_offset + 8; - metric_set->perfcnt_offset = metric_set->c_offset + 8; - - """)) + if set.oa_format == "128B_MPEC8_NOA16": + c(textwrap.dedent("""\ + metric_set->perf_oa_format = I915_OAM_FORMAT_MPEC8u32_B8_C8; + + metric_set->perf_raw_size = 128; + metric_set->gpu_time_offset = 0; + metric_set->gpu_clock_offset = 1; + metric_set->a_offset = 2; + metric_set->b_offset = metric_set->a_offset + 8; + metric_set->c_offset = metric_set->b_offset + 8; + metric_set->perfcnt_offset = metric_set->c_offset + 8; + """)) + else: + c(textwrap.dedent("""\ + metric_set->perf_oa_format = I915_OA_FORMAT_A24u40_A14u32_B8_C8; + + metric_set->perf_raw_size = 256; + metric_set->gpu_time_offset = 0; + metric_set->gpu_clock_offset = 1; + metric_set->a_offset = 2; + metric_set->b_offset = metric_set->a_offset + 38; + metric_set->c_offset = metric_set->b_offset + 8; + metric_set->perfcnt_offset = metric_set->c_offset + 8; + """)) else: c(textwrap.dedent("""\ metric_set->perf_oa_format = I915_OA_FORMAT_A32u40_A4u32_B8_C8;
Signature · 1 line
2.36.1
PATCH v5 18/30 lib/i915/perf: Set missing metric unit for some counters
In reply to Umesh Nerlige RamappaSome counters do not have units specified, so use 'number' as the unit.
v2: Drop " from commit description (Kamil)
--- lib/i915/perf-configs/mdapi-xml-convert.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
lib/i915/perf-configs/mdapi-xml-convert.py +6 -1
@@ -819,9 +819,14 @@ for arg in args.xml: # XXX Not sure why EU metrics tend to just be bundled under 'gpu' counter.set('mdapi_hw_unit_type', mdapi_counter.get('HWUnitType').lower()) + # Some counters do not have MetricUnits, treat them as number. + if mdapi_counter.get('MetricUnits') == None: + units = "number" + else: + units = mdapi_counter.get('MetricUnits').lower() + # There are counters representing cycle counts that have a semantic # type of 'duration' which doesn't seem to make sense... - units = mdapi_counter.get('MetricUnits').lower() if units == "cycles": semantic_type = "event" else:
Signature · 1 line
2.36.1
PATCH v5 19/30 lib/i915/perf: Add MTL to supported HW in OA guid registry
In reply to Umesh Nerlige RamappaAdd MTL to supprted HW in oa guid registry
v2: Improve commit message (Kamil)
--- lib/i915/perf-configs/oa_guid_registry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/i915/perf-configs/oa_guid_registry.py +2 -1
@@ -100,7 +100,8 @@ class Registry: 'RKL', 'DG1', 'ACM', - 'PVC' ) + 'PVC', + 'MTL', ) if name in known_chipsets: return name
Signature · 1 line
2.36.1
PATCH v5 20/30 lib/i915/perf: Add support for OAM format in codegen
In reply to Umesh Nerlige RamappaInclude OAM SAMedia (Standalone Media) format for MTL.
v2: Improve commit message (Kamil)
--- lib/i915/perf-configs/mdapi-xml-convert.py | 118 +++++++++++++++++++-- 1 file changed, 112 insertions(+), 6 deletions(-)
lib/i915/perf-configs/mdapi-xml-convert.py +112 -6
@@ -135,6 +135,36 @@ xehpsdv_chipset_params = { # There is no ReportType field in most Metrics XML files, Use 256B_GENERIC_NOA16 # to denote the generic 256 byte format that is used by most chipsets +# Just treat the MPEC counter names as A counters here. If a format has both A +# and MPEC counters, then we need to change this. +mtl_chipset_oam_samedia_ll_params = { + 'a_offset': 32, + 'b_offset': 96, + 'c_offset': 128, + 'oa_report_size': 192, + 'config_reg_blacklist': { + 0x2364, # OACTXID + }, + 'register_offsets': { + 0x1b0: 'PERFCNT 0', + 0x1b8: 'PERFCNT 1', + } +} + +mtl_chipset_oam_samedia_params = { + 'a_offset': 32, + 'b_offset': 64, + 'c_offset': 96, + 'oa_report_size': 128, + 'config_reg_blacklist': { + 0x2364, # OACTXID + }, + 'register_offsets': { + 0x1b0: 'PERFCNT 0', + 0x1b8: 'PERFCNT 1', + } +} + hsw_chipset_oa_formats = { '256B_GENERIC_NOA16': hsw_chipset_params, }
@@ -147,6 +177,11 @@ xehpsdv_chipset_oa_formats = { '256B_GENERIC_NOA16': xehpsdv_chipset_params, } +mtl_chipset_oa_formats = { + '256B_GENERIC_NOA16': xehpsdv_chipset_params, + '192B_MPEC8LL_NOA16': mtl_chipset_oam_samedia_ll_params, + '128B_MPEC8_NOA16': mtl_chipset_oam_samedia_params, +} chipsets = { 'HSW': hsw_chipset_oa_formats,
@@ -165,7 +200,7 @@ chipsets = { 'DG1': gen8_11_chipset_oa_formats, 'ADL': gen8_11_chipset_oa_formats, 'ACM': xehpsdv_chipset_oa_formats, - 'MTL': xehpsdv_chipset_oa_formats, + 'MTL': mtl_chipset_oa_formats, } xehp_plus = ( 'ACM', 'MTL' )
@@ -202,7 +237,62 @@ def read_value(chipset, offset, oa_format): assert 0 -def read_token_to_rpn_read(chipset, token, raw_offsets, oa_format): +def read_token_to_rpn_read_oam(chipset, token, raw_offsets, oa_format): + width, offset_str = token.split('@') + offset = int(offset_str, 16) + + if width == 'qw': + den = 8 + else: + den = 4 + + if raw_offsets: + # Location in the HW reports + a_offset = chipsets[chipset][oa_format]['a_offset'] + b_offset = chipsets[chipset][oa_format]['b_offset'] + c_offset = chipsets[chipset][oa_format]['c_offset'] + report_size = chipsets[chipset][oa_format]['oa_report_size'] + + if offset < a_offset: + if offset == 8: + return "GPU_TIME 0 READ" + elif offset == 24: + return "GPU_CLOCK 0 READ" + else: + assert 0 + elif offset < b_offset: + a_cnt_offset = int((offset - a_offset) / den) + return "A " + str(a_cnt_offset) + " READ" + elif offset < c_offset: + return "B " + str(int((offset - b_offset) / den)) + " READ" + elif offset < report_size: + return "C " + str(int((offset - c_offset) / den)) + " READ" + else: + return "{0} READ".format(read_value(chipset, offset, oa_format)) + else: + # Location in the accumulated deltas + idx = int(offset / 8) + if chipset in xehp_plus: + # For XEHPSDV the array of accumulated counters is + # assumed to start with a GPU_TIME then GPU_CLOCK, + # then 38 A counters, then 8 B counters and finally + # 8 C counters. + if idx == 0: + return "GPU_TIME 0 READ" + elif idx == 1: + return "GPU_CLOCK 0 READ" + elif idx < 40: + return "A " + str(idx - 2) + " READ" + elif idx < 48: + return "B " + str(idx - 40) + " READ" + elif idx < 56: + return "C " + str(idx - 48) + " READ" + else: + return "{0} READ".format(read_value(chipset, offset, oa_format)) + + assert 0 + +def read_token_to_rpn_read_oag(chipset, token, raw_offsets, oa_format): width, offset_str = token.split('@') # For Broadwell the raw read notation was extended for 40 bit
@@ -298,6 +388,16 @@ def read_token_to_rpn_read(chipset, token, raw_offsets, oa_format): assert 0 + +def read_token_to_rpn_read(chipset, token, raw_offsets, oa_format): + if oa_format == '256B_GENERIC_NOA16': + return read_token_to_rpn_read_oag(chipset, token, raw_offsets, oa_format) + + if oa_format in ['192B_MPEC8LL_NOA16', '128B_MPEC8_NOA16']: + return read_token_to_rpn_read_oam(chipset, token, raw_offsets, oa_format) + + assert 0 + def replace_read_tokens_with_rpn_read_ops(chipset, oa_format, equation, raw_offsets): # MDAPI MetricSet equations use tokens like 'dw@0xff' for reading raw # values from snapshots, but this doesn't seem convenient for a few
@@ -625,10 +725,13 @@ for arg in args.xml: for mdapi_set in mdapi.findall(".//MetricSet"): apis = mdapi_set.get('SupportedAPI') - if "OGL" not in apis and "OCL" not in apis and "MEDIA" not in apis: + if "OGL" not in apis and "OCL" not in apis and "MEDIA" not in apis and "IO" not in apis: continue oa_format = '256B_GENERIC_NOA16' + if mdapi_set.get('ReportType') in chipsets[chipset]: + oa_format = mdapi_set.get('ReportType') + set_symbol_name = oa_registry.Registry.sanitize_symbol_name(mdapi_set.get('SymbolName')) if set_symbol_name in sets:
@@ -647,7 +750,7 @@ for arg in args.xml: if set_symbol_name in set_blacklist: continue - if mdapi_set.get('SnapshotReportSize') != '256': + if mdapi_set.get('SnapshotReportSize') != str(chipsets[chipset][oa_format]['oa_report_size']): print_err("WARNING: skipping metric set '{0}', report size {1} invalid".format(set_symbol_name, mdapi_set.get('SnapshotReportSize'))) continue
@@ -880,8 +983,11 @@ for arg in args.xml: # XXX: As a special case, we override the raw and delta report # equations for the GpuTime counters, which seem inconsistent if mdapi_counter.get('SymbolName') == "GpuTime": - mdapi_counter.set('SnapshotReportReadEquation', "dw@0x04 1000000000 UMUL $GpuTimestampFrequency UDIV") mdapi_counter.set('DeltaReportReadEquation', "qw@0x0 1000000000 UMUL $GpuTimestampFrequency UDIV") + if chipset == 'MTL' and oa_format != '256B_GENERIC_NOA16': + mdapi_counter.set('SnapshotReportReadEquation', "qw@0x08 1000000000 UMUL $GpuTimestampFrequency UDIV") + else: + mdapi_counter.set('SnapshotReportReadEquation', "dw@0x04 1000000000 UMUL $GpuTimestampFrequency UDIV") availability = fixup_equation(mdapi_counter.get('AvailabilityEquation')) if availability == "":
@@ -919,7 +1025,7 @@ for arg in args.xml: "(" + mdapi_counter.get('ShortName') + ")" + "\"") # Media metric counters currently have no delta equation even # though they have normalization equations that reference $Self - if "MEDIA" in apis: + if "MEDIA" in apis or "IO" in apis: print_err("WARNING: -> Treating inconsistent media metric's 'raw' equation as a 'delta report' equation, but results should be double checked!") delta_read_eq = raw_read_eq else:
Signature · 1 line
2.36.1
PATCH v5 21/30 lib/i915/perf: Update MTL GT2 metrics
In reply to Umesh Nerlige RamappaAdd OAM metrics configurations and update MTL GT2 metrics.
v2: Fix commit description
--- lib/i915/perf-configs/guids.xml | 13 +- lib/i915/perf-configs/oa-mtlgt2.xml | 1014 ++++++++++++++++++++++++--- 2 files changed, 919 insertions(+), 108 deletions(-)
lib/i915/perf-configs/guids.xml +8 -5
@@ -2357,7 +2357,7 @@ <guid config_hash="321ffd18a528dd67798e8a8476f632fe" mdapi_config_hash="7984537ffe8ca547d3583a56edf26bbd" id="fc82db3d-d6a7-413a-8349-b31f02251d2f" chipset="mtlgt2" name="Ext1" /> <guid config_hash="28f18aeeb865c4bf1d8d82d77f571085" mdapi_config_hash="bba07ef452c6a67f0a8ff04fa9b4d93d" id="3479a81d-9017-4930-af0c-14f7fabadb38" chipset="mtlgt2" name="Ext4" /> <guid config_hash="0955d0036c6b2b4afe94cb4d8115c577" mdapi_config_hash="38688d5ff152f82f150d9c569caf2351" id="e4701256-cd06-48f7-a005-d4d1f9e895c1" chipset="mtlgt2" name="Ext5" /> - <guid config_hash="d93bc60082d0b69a8f0d430732d63f94" mdapi_config_hash="dc7a66d4de8f704f44b50c10b9dff1de" id="3e47d0e8-5414-4496-8746-37e36fefc777" chipset="mtlgt2" name="Ext7" /> + <guid config_hash="dcdb3b48b18515e0a0f7d2179c89bda6" mdapi_config_hash="a4f1512b26ca4c3ed1d8d818cfedcd65" id="3e47d0e8-5414-4496-8746-37e36fefc777" chipset="mtlgt2" name="Ext7" /> <guid config_hash="3de00cb5cc6f1598d624b9d4c2d072cf" mdapi_config_hash="0237dfeb5d300cab42cc36a64552ebe7" id="5aa36c1f-c6da-45ab-ab21-397d9a4b6a06" chipset="mtlgt2" name="Ext8" /> <guid config_hash="f66aff20b452fc6746f6f345aa996b63" mdapi_config_hash="14b2a444cc752fd4946c11906f5a7486" id="1df59d79-16d8-471c-b3da-f0f62862f89e" chipset="mtlgt2" name="Ext10" /> <guid config_hash="f27eef4bd1b25e14f598ff04fe69a511" mdapi_config_hash="1f4b2bf31f456235f289cf7eba5039c2" id="d05d3d84-ba16-41b5-b825-5a3d2aaabbfc" chipset="mtlgt2" name="Ext11" />
@@ -2463,10 +2463,10 @@ <guid config_hash="a68a66449827d355064d3db9473b4df5" mdapi_config_hash="129fbcf33c8f25a6c15935e5aeaef3b4" id="8e09a7a1-b0e8-464a-a28d-90250f64ec9e" chipset="mtlgt2" name="Ext501" /> <guid config_hash="b66b6fe10d453212eb1bd501ae6a29bd" mdapi_config_hash="17c05f7a6933e3fcf7669b142bb55705" id="57a19b6a-1b7d-4337-a9c9-710c56c46f84" chipset="mtlgt2" name="Ext502" /> <guid config_hash="610d0cdc34fe0442b0c8e6277703f21a" mdapi_config_hash="32ce7dfe4ea7f5e79c69cc04d41d3f01" id="394b21ab-311c-47a5-9b10-88159f5ac999" chipset="mtlgt2" name="Ext503" /> - <guid config_hash="92ba0e22539647cf0eb2bc7f10cd4cf8" mdapi_config_hash="41e11d55b96e18999fad3efe5f8bf16a" id="143440a0-d7e2-4f41-8372-8fdca1ecc2a8" chipset="mtlgt2" name="Ext508" /> - <guid config_hash="e36ab792e7756ea6ea71e387c873dfdd" mdapi_config_hash="18af689ecd1d15e707c0192ea02f5824" id="7c5d3f41-b690-44b2-8352-00215ac94bae" chipset="mtlgt2" name="Ext509" /> - <guid config_hash="25febf37102198080c0e680e94beaced" mdapi_config_hash="bb8ff9dfe34ad6197c7540e7ddee356b" id="02f43996-feff-4e13-a8fd-eea9de2f13fc" chipset="mtlgt2" name="Ext510" /> - <guid config_hash="29bcf55f5b34e961768cd5cbbd828532" mdapi_config_hash="670a9e1fd79cd9610418c85d13df3436" id="2cbd327c-40e2-452b-a9fc-c7787869a352" chipset="mtlgt2" name="Ext511" /> + <guid config_hash="3c81d715dab552c96a708e5561cddf32" mdapi_config_hash="2ef3813b66f81eda0cb04dbe437234d8" id="143440a0-d7e2-4f41-8372-8fdca1ecc2a8" chipset="mtlgt2" name="Ext508" /> + <guid config_hash="15984b5fb58b51a666ece004db6ae774" mdapi_config_hash="26232e447ea7dcf0c3a97e4353250a53" id="7c5d3f41-b690-44b2-8352-00215ac94bae" chipset="mtlgt2" name="Ext509" /> + <guid config_hash="d44c98ea5ef5bff89e9ceb275d0da118" mdapi_config_hash="a8071d6fc9bd3959731ab78598f80294" id="02f43996-feff-4e13-a8fd-eea9de2f13fc" chipset="mtlgt2" name="Ext510" /> + <guid config_hash="df750e7700406492d3bcd261c4af73e6" mdapi_config_hash="c2e0e09a27bb2ad5f80b0766ab56b37b" id="2cbd327c-40e2-452b-a9fc-c7787869a352" chipset="mtlgt2" name="Ext511" /> <guid config_hash="6d9b68c2c4b89d9a952160fe503ac6a6" mdapi_config_hash="4508de639c858687559dd85a870d624f" id="3a9dba68-9402-48b0-a8ec-28e4e4a534de" chipset="mtlgt2" name="Ext516" /> <guid config_hash="039124a8e61c2e323aace525da916ab0" mdapi_config_hash="ac8b6cf6d21ba83fe04789064b2caa97" id="ea503506-9afa-42dc-b85b-1237dce6e8af" chipset="mtlgt2" name="Ext517" /> <guid config_hash="589d2f86e9b14cf16b9c8c33e473d1e4" mdapi_config_hash="1184ac825d3d0cba18e7ca501e515fc9" id="5056524c-12e3-4ba6-8788-eb934f284753" chipset="mtlgt2" name="Ext518" />
@@ -2740,4 +2740,7 @@ <guid config_hash="e7efe91c7aeb591043358c1b5e3c019d" mdapi_config_hash="94ecec147a25de742814fbb01fd4e9c3" id="f739508f-51b2-48df-839c-e92c14d14c64" chipset="mtlgt3" name="Ext1006" /> <guid config_hash="a96fb9e9d0949e6cc372ef445fded872" mdapi_config_hash="7fb3e6405e4b54b8566589aa79cd960e" id="926b1773-807e-4ee5-8561-30c9eb0a6344" chipset="mtlgt3" name="Ext1007" /> <guid config_hash="310dddcb04d1088a3865f698d758cbc2" mdapi_config_hash="c6a3be7d49b5697074021ca673a39a57" id="82f69b49-772a-4169-bf9a-b1ef08e0823b" chipset="mtlgt3" name="Ext1010" /> + <guid config_hash="482cebdeeb78bb56e67b42d24644c8db" mdapi_config_hash="11e33e01a371bf15e59b9786f4fe1050" id="de84260e-32ac-4863-ba4f-998a685174a2" chipset="mtlgt2" name="MediaSet1" /> + <guid config_hash="5bfab887a79b99cf34a606dcca5f4f8a" mdapi_config_hash="1c238e39e5c73eefd870cef2fb7a18af" id="b9d5c6d5-39f2-4069-b343-e7a886353b89" chipset="mtlgt2" name="MediaSet2" /> + <guid config_hash="44bcb438bea8b46b57779739bebfbd69" mdapi_config_hash="fbbd97d1f3b60c17eae57bbd3c42e7fe" id="a1700053-56bc-4b7e-87b9-e29b07a08f62" chipset="mtlgt2" name="TestOam" /> </guids>
lib/i915/perf-configs/oa-mtlgt2.xml +911 -103
2,104 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 22/30 lib/i915/perf: Update MTL GT3 metrics
In reply to Umesh Nerlige RamappaAdd OAM metrics configurations and update MTL GT3 metrics.
v2: Fix commit description
--- lib/i915/perf-configs/guids.xml | 23 +- lib/i915/perf-configs/oa-mtlgt3.xml | 1328 ++++++++++++++++++++++----- 2 files changed, 1133 insertions(+), 218 deletions(-)
lib/i915/perf-configs/guids.xml +13 -10
@@ -2507,12 +2507,12 @@ <guid config_hash="21fd6477790dc8803dd6331b8c41dd24" mdapi_config_hash="48c076d960ec7e094bc846058a20264f" id="9604dfeb-2724-459c-a25b-5e5e06d93fd8" chipset="mtlgt3" name="TDL3" /> <guid config_hash="95b5a166dff16d27293d7d657c146c20" mdapi_config_hash="742195ae50b801b9c5d680a5a9558cb0" id="b5333a47-add0-46a5-82d9-e62dcee14e81" chipset="mtlgt3" name="TDL4" /> <guid config_hash="269711b73f95981cabbcdee5a96a9ccb" mdapi_config_hash="c4289990e5c8cbd4918e9c2c333f251c" id="7272a7b8-6df2-4180-a95f-2ef7ad4412cc" chipset="mtlgt3" name="TestOa" /> - <guid config_hash="d439e67a55ee3ca7a70a35714c53bb52" mdapi_config_hash="8247df78555a4b792c33f0efa550952f" id="682c3520-dffc-4a76-8e17-1d9effc01a1a" chipset="mtlgt3" name="Ext1" /> + <guid config_hash="6d1cd0ed097d034869eb468b43dd879a" mdapi_config_hash="d6e43578c93c9c1ba32a063e36fa10cc" id="682c3520-dffc-4a76-8e17-1d9effc01a1a" chipset="mtlgt3" name="Ext1" /> <guid config_hash="e06924155d4acde10c45e89e6c65868d" mdapi_config_hash="eb6499f1a47dad7eae75cdb85b0bef2a" id="b24b7052-70a1-4ef7-b61d-7ee4d7e159ab" chipset="mtlgt3" name="Ext3" /> <guid config_hash="fc06c18d17085caa964777920a316cf4" mdapi_config_hash="e80db872fee6810d6f47a683a4a1c9ce" id="205ab9ab-56fd-4fdc-b3b3-91dc57be0fd3" chipset="mtlgt3" name="Ext4" /> <guid config_hash="939e13be9335004538a9e1d6944b4836" mdapi_config_hash="71a1bb2c5722c63fcf7176f6c61975a4" id="26cb7ee1-a26d-410a-9283-e07d6ced5fce" chipset="mtlgt3" name="Ext5" /> <guid config_hash="6e82d13da5cd70235fefab3b43e9e4c9" mdapi_config_hash="561b960bd69e9823d50cfae86614fabd" id="e62c9cd7-ada7-487d-87aa-b1ad4ab9a2c5" chipset="mtlgt3" name="Ext6" /> - <guid config_hash="070c9de0d068a9aacf8674c062374e05" mdapi_config_hash="1293975723eab282470ebaa4c97faa70" id="714e9d80-e4e3-40e6-9e79-2ca6d1d0a5a5" chipset="mtlgt3" name="Ext7" /> + <guid config_hash="baa81cf9fb16c0a5e738fc023f371350" mdapi_config_hash="614db897903581ee199202e79c94ca6c" id="714e9d80-e4e3-40e6-9e79-2ca6d1d0a5a5" chipset="mtlgt3" name="Ext7" /> <guid config_hash="5660b1f0e0ba49d22c1eaef513c8b58a" mdapi_config_hash="31ab651e5dc06042c8d2248f65a75d73" id="30499dfb-3977-4808-a34c-93e7b50e0454" chipset="mtlgt3" name="Ext8" /> <guid config_hash="b3b01ef016a1c55d9d932400511dd7cc" mdapi_config_hash="b4c689c289687c4df0e2523faf70cc4f" id="417618f2-7a87-4745-bccd-6ba14d17bfa4" chipset="mtlgt3" name="Ext9" /> <guid config_hash="97c49cf8f71f5bf86035d3bf6cb690c9" mdapi_config_hash="e25449627d90b790133b98f4a92657e1" id="443c32c7-e5e4-43da-b4f2-77efe45a60ed" chipset="mtlgt3" name="Ext10" />
@@ -2698,14 +2698,14 @@ <guid config_hash="25302806331fba9bc9f3450e0e642e96" mdapi_config_hash="d5a07d5812d1d12b522960872fd28137" id="f6e20d5b-52be-4035-85c2-818a690bf601" chipset="mtlgt3" name="Ext501" /> <guid config_hash="b206b0dc53133698a7ca18febc7e320a" mdapi_config_hash="80d90f8d67609d99b1b85717ee3f9cd2" id="d09cedef-e3e3-41b5-8ce8-ddc3933339ca" chipset="mtlgt3" name="Ext502" /> <guid config_hash="2c857922a97a5830183ca8b8efb72008" mdapi_config_hash="dbc6d492e27a8a6cfa2063ba2ca11edf" id="96067625-3663-4f9a-8b26-74e47ab1aff4" chipset="mtlgt3" name="Ext503" /> - <guid config_hash="c77afaf69426cacf0d39b737afa6cbac" mdapi_config_hash="09e22d191f45567e982863a37d9c382d" id="2bc8b90d-997c-4d62-b101-fe1aa74036e5" chipset="mtlgt3" name="Ext508" /> - <guid config_hash="530cf98a637fc90c254c75c3bd9dedfb" mdapi_config_hash="25f6d07bddccffeaab56aadb24ae6be5" id="79252877-1dcd-4700-b4bd-58bce74b796d" chipset="mtlgt3" name="Ext509" /> - <guid config_hash="e8ab95f7c69adc8f259904c1de459856" mdapi_config_hash="2c1390b1ce682645b58f2396701c0d4b" id="68ac1770-b062-48cd-94f4-44c6ae16867a" chipset="mtlgt3" name="Ext510" /> - <guid config_hash="a15516d4ed73424ae36e6d4d1b95a200" mdapi_config_hash="59c1035f145bb7e00fb0b0d622feace5" id="443b8a84-7e77-4e9f-8a2a-56743897cba3" chipset="mtlgt3" name="Ext511" /> - <guid config_hash="ae9653c036a3dc324743f6ccac40eb92" mdapi_config_hash="285cd0a99124ba6a244a47577c34e3eb" id="68581669-8e57-4ff9-bb70-71a99f8454c8" chipset="mtlgt3" name="Ext512" /> - <guid config_hash="a1122c9120f4a345403dcb9be51afc13" mdapi_config_hash="26f2e86d15758105a9406c379bc83b80" id="1b49d31f-4d7c-4dd7-ad31-030ccb59649e" chipset="mtlgt3" name="Ext513" /> - <guid config_hash="54126b539d950f606053619014452c83" mdapi_config_hash="06e7700eb4e4ba08285b4fc0316db6ad" id="1b0ce68b-c301-4d05-8659-85fad0825057" chipset="mtlgt3" name="Ext514" /> - <guid config_hash="8667c4542c2ece365f0439a3659c4267" mdapi_config_hash="c5d806b0e6a6c7be6d1ad75a69a2527b" id="fde32e67-1a87-4946-bf96-c1ff68105749" chipset="mtlgt3" name="Ext515" /> + <guid config_hash="b89becafa0012d0119ce4251d4266b2c" mdapi_config_hash="83261cb3061414efb24e04580990df45" id="2bc8b90d-997c-4d62-b101-fe1aa74036e5" chipset="mtlgt3" name="Ext508" /> + <guid config_hash="aec3fc91255b37e4f7a9f5019f5a01e0" mdapi_config_hash="993dc808e586668f20473bfc21356dae" id="79252877-1dcd-4700-b4bd-58bce74b796d" chipset="mtlgt3" name="Ext509" /> + <guid config_hash="059b5bdee62d6b61c00848beeb2751e2" mdapi_config_hash="624661deaf5382d8c447936b0760f2ac" id="68ac1770-b062-48cd-94f4-44c6ae16867a" chipset="mtlgt3" name="Ext510" /> + <guid config_hash="2c302efab54ba8133e020e08c44f19e5" mdapi_config_hash="0d150ac4cdc7a15a37706b2499af5490" id="443b8a84-7e77-4e9f-8a2a-56743897cba3" chipset="mtlgt3" name="Ext511" /> + <guid config_hash="d01972b09245455a8a53df3ee5b0de48" mdapi_config_hash="1b6e276e805087093a4002d1a2fc59d4" id="68581669-8e57-4ff9-bb70-71a99f8454c8" chipset="mtlgt3" name="Ext512" /> + <guid config_hash="980fc02bcda49523aae80255d30dd8d9" mdapi_config_hash="9083f055e06214711443b1aa92209a51" id="1b49d31f-4d7c-4dd7-ad31-030ccb59649e" chipset="mtlgt3" name="Ext513" /> + <guid config_hash="d4c01604867190e57eb85b43ea35b19d" mdapi_config_hash="f0cc4cfd7a9d70f2d1c3464dedad851d" id="1b0ce68b-c301-4d05-8659-85fad0825057" chipset="mtlgt3" name="Ext514" /> + <guid config_hash="019a6367c845719ff7381414a99781ff" mdapi_config_hash="2b95a32768f0449b837fb9915ed514d9" id="fde32e67-1a87-4946-bf96-c1ff68105749" chipset="mtlgt3" name="Ext515" /> <guid config_hash="5ad38daa6cb00090cfb6658a43d30d06" mdapi_config_hash="ba325785aeb3c90926c9955686094006" id="bf950c5b-7250-47f4-aa59-d97b22db02ff" chipset="mtlgt3" name="Ext516" /> <guid config_hash="5093d322d1b278f2e323e259408c7b30" mdapi_config_hash="2e6f2f19cb9752141887cbe4bd057819" id="9027ff05-4348-4061-a434-0befaba7c379" chipset="mtlgt3" name="Ext517" /> <guid config_hash="9d968609fbc2e37f71dca7e2b5eddea6" mdapi_config_hash="b2cbdc9610f599b7c65f6100260049f0" id="6ad0dee9-17bf-4b54-8b70-e30afcc8710b" chipset="mtlgt3" name="Ext518" />
@@ -2743,4 +2743,7 @@ <guid config_hash="482cebdeeb78bb56e67b42d24644c8db" mdapi_config_hash="11e33e01a371bf15e59b9786f4fe1050" id="de84260e-32ac-4863-ba4f-998a685174a2" chipset="mtlgt2" name="MediaSet1" /> <guid config_hash="5bfab887a79b99cf34a606dcca5f4f8a" mdapi_config_hash="1c238e39e5c73eefd870cef2fb7a18af" id="b9d5c6d5-39f2-4069-b343-e7a886353b89" chipset="mtlgt2" name="MediaSet2" /> <guid config_hash="44bcb438bea8b46b57779739bebfbd69" mdapi_config_hash="fbbd97d1f3b60c17eae57bbd3c42e7fe" id="a1700053-56bc-4b7e-87b9-e29b07a08f62" chipset="mtlgt2" name="TestOam" /> + <guid config_hash="482cebdeeb78bb56e67b42d24644c8db" mdapi_config_hash="11e33e01a371bf15e59b9786f4fe1050" id="4d9b2817-19b9-4461-a54b-dc9fdb7d69cb" chipset="mtlgt3" name="MediaSet1" /> + <guid config_hash="5bfab887a79b99cf34a606dcca5f4f8a" mdapi_config_hash="1c238e39e5c73eefd870cef2fb7a18af" id="651a6694-0ac1-4bd5-a4a1-94bcf479d4f4" chipset="mtlgt3" name="MediaSet2" /> + <guid config_hash="44bcb438bea8b46b57779739bebfbd69" mdapi_config_hash="fbbd97d1f3b60c17eae57bbd3c42e7fe" id="bac01106-5869-489c-a306-67303a434173" chipset="mtlgt3" name="TestOam" /> </guids>
lib/i915/perf-configs/oa-mtlgt3.xml +1120 -208
2,957 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.36.1
Part of the diff is not shown here. View the raw message.
PATCH v5 23/30 i915/perf: Add support for engine specific metrics
In reply to Umesh Nerlige RamappaMetrics config is different for media vs render engines. Choose the metrics configurations as per the engine used for the test.
--- tests/i915/perf.c | 236 ++++++++++++++++++++++++++-------------------- 1 file changed, 136 insertions(+), 100 deletions(-)
tests/i915/perf.c +136 -100
@@ -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_deltastatic 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_ssstatic 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_execustatic 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 */
Signature · 1 line
2.36.1
PATCH v5 24/30 i915/perf: Run non-zero-reason on media engines as well
In reply to Umesh Nerlige RamappaEnable non-zero-reason test to run on media engines as well.
v2: Check if new params are available before passing (CI failure)
--- tests/i915/perf.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
tests/i915/perf.c +18 -11
@@ -2895,26 +2895,33 @@ test_buffer_fill(const struct intel_execution_engine2 *e) }static void -test_non_zero_reason (void ) +test_non_zero_reason (const struct intel_execution_engine2 *e) {/* ~20 micro second period */ int oa_exponent =max_oa_exponent_for_period_lte (20000 ); +struct intel_perf_metric_set *test_set =metric_set (e); +uint64_t fmt = test_set->perf_oa_format; +size_t report_size =get_oa_format (fmt).size;uint64_t properties[] = {/* Include OA reports in samples */ DRM_I915_PERF_PROP_SAMPLE_OA , true,/* OA unit configuration */ -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_METRICS_SET , test_set->perf_oa_metrics_set, +DRM_I915_PERF_PROP_OA_FORMAT , fmt,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, };struct drm_i915_perf_open_param param = { .flags =I915_PERF_FLAG_FD_CLOEXEC , - .num_properties =ARRAY_SIZE (properties) /2 , + .num_properties =has_param_class_instance () ? +ARRAY_SIZE (properties) /2 : + (ARRAY_SIZE (properties) /2 ) -2 , .properties_ptr =to_user_pointer (properties), };struct drm_i915_perf_record_header *header; -uint32_t buf_size =3 *65536 * (256 +sizeof (struct drm_i915_perf_record_header )); +uint32_t buf_size =3 *65536 * (report_size +sizeof (struct drm_i915_perf_record_header ));uint8_t *buf =malloc (buf_size);uint32_t total_len =0 , reports_lost;const uint32_t *last_report;
@@ -2959,10 +2966,9 @@ test_non_zero_reason(void)igt_assert_neq (reason,0 ); -if (last_report) { -sanity_check_reports (last_report, report, - default_test_set->perf_oa_format); - } +if (last_report) +sanity_check_reports (last_report, report, fmt); + last_report = report;break ; }
@@ -5789,10 +5795,11 @@ igt_maintest_buffer_fill (e);igt_describe ("Test that reason field in OA reports is never 0 on Gen8+" ); - igt_subtest("non-zero-reason") { + igt_subtest_with_dynamic("non-zero-reason") {/* Reason field is only available on Gen8+ */ igt_require (intel_gen (devid) >=8 ); -test_non_zero_reason (); + __for_random_engine_in_each_group(perf_oa_groups, ctx, e) +test_non_zero_reason (e); }igt_subtest ("disabled-read-error" )
Signature · 1 line
2.36.1
PATCH v5 25/30 i915/perf: Make sanity check failures descriptive
In reply to Umesh Nerlige RamappaMake the asserts in the sanity check descriptive.
--- tests/i915/perf.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tests/i915/perf.c +12 -4
@@ -1017,7 +1017,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,continue ;igt_debug ("A40_%d: delta = %" PRIu64"\n" , j, delta); -igt_assert (delta <= max_delta); +igt_assert_f (delta <= max_delta, +"A40_%d: delta = %" PRIu64", max_delta = %" PRIu64"\n" , + j, delta, max_delta); }for (int j =0 ; j < format.n_a64; j++) {
@@ -1029,7 +1031,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,continue ;igt_debug ("A64_%d: delta = %" PRIu64"\n" , format.first_a + j, delta); -igt_assert (delta <= max_delta); +igt_assert_f (delta <= max_delta, +"A64_%d: delta = %" PRIu64", max_delta = %" PRIu64"\n" , + format.first_a + j, delta, max_delta); }for (int j =0 ; j < format.n_a; j++) {
@@ -1044,7 +1048,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,continue ;igt_debug ("A%d: delta = %" PRIu32"\n" , a_id, delta); -igt_assert (delta <= max_delta); +igt_assert_f (delta <= max_delta, +"A%d: delta = %" PRIu32", max_delta = %" PRIu64"\n" , + a_id, delta, max_delta); }/* The TestOa metric set defines all B counters to be a
@@ -1106,7 +1112,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,igt_debug ("C%d: delta = %" PRIu32", max_delta=%" PRIu64"\n" , j, delta, max_delta); -igt_assert (delta <= max_delta); +igt_assert_f (delta <= max_delta, +"C%d: delta = %" PRIu32", max_delta = %" PRIu64"\n" , + j, delta, max_delta); } }
Signature · 1 line
2.36.1
PATCH v5 26/30 lib/i915/perf: Enable multi-tile support for perf library
In reply to Umesh Nerlige RamappaAdd class instance awareness to perf library and enable GPUvis to select specific GT in perf recorder.
v2: Use gt 0 for gem_barrier_race test since the race is independent of
gt used. (Umesh)
v3: Use i915_drm_local.h in perf tools
--- lib/i915/perf.c | 15 ++++-- lib/i915/perf.h | 2 +- tests/core_hotunplug.c | 2 +- tests/i915/gem_barrier_race.c | 2 +- tests/i915/perf.c | 2 +- tools/i915-perf/i915_perf_configs.c | 2 +- tools/i915-perf/i915_perf_recorder.c | 74 ++++++++++++++++++++++++++-- 7 files changed, 84 insertions(+), 15 deletions(-)
lib/i915/perf.c +10 -5
@@ -574,7 +574,7 @@ typedef enum {RPS_MAX_ATTR , } intel_sysfs_attr_id; -static const char *intel_sysfs_attr_name[2 ][RPS_MAX_ATTR ] = +static const char *intel_sysfs_attr_name[][RPS_MAX_ATTR ] = { {"gt_min_freq_mhz" ,
@@ -584,20 +584,25 @@ static const char *intel_sysfs_attr_name[2][RPS_MAX_ATTR] = "gt/gt0/rps_min_freq_mhz", "gt/gt0/rps_max_freq_mhz", }, + { +"gt/gt1/rps_min_freq_mhz" , + "gt/gt1/rps_max_freq_mhz", + }, };static const char * -intel_sysfs_attr_id_to_name (int sysfs_dirfd,intel_sysfs_attr_id id) +intel_sysfs_attr_id_to_name (int sysfs_dirfd,intel_sysfs_attr_id id,int gt) {assert (id <RPS_MAX_ATTR ); +assert (gt <sizeof (intel_sysfs_attr_name) -1 );return !faccessat (sysfs_dirfd,"gt" ,O_RDONLY ,0 ) ? - intel_sysfs_attr_name[1 ][id] : + intel_sysfs_attr_name[gt +1 ][id] : intel_sysfs_attr_name[0 ][id]; }struct intel_perf * -intel_perf_for_fd (int drm_fd) +intel_perf_for_fd (int drm_fd,int gt) {uint32_t device_id;uint32_t device_revision;
@@ -612,7 +617,7 @@ intel_perf_for_fd(int drm_fd)return NULL ;#define read_sysfs_rps (fd, id, value) \ - read_sysfs(fd, intel_sysfs_attr_id_to_name(fd, id), value) + read_sysfs(fd, intel_sysfs_attr_id_to_name(fd, id, gt), value)if (!read_sysfs_rps (sysfs_dir_fd,RPS_MIN_FREQ_MHZ , >_min_freq) || !read_sysfs_rps (sysfs_dir_fd,RPS_MAX_FREQ_MHZ , >_max_freq)) {
lib/i915/perf.h +1 -1
@@ -316,7 +316,7 @@ intel_perf_devinfo_eu_available(const struct intel_perf_devinfo *devinfo,return (devinfo->eu_masks[subslice_offset + eu /8 ] & (1U << eu %8 )) !=0 ; } -struct intel_perf *intel_perf_for_fd (int drm_fd); +struct intel_perf *intel_perf_for_fd (int drm_fd,int gt); struct intel_perf *intel_perf_for_devinfo(uint32_t device_id, uint32_t revision, uint64_t timestamp_frequency,
tests/core_hotunplug.c +1 -1
@@ -377,7 +377,7 @@ static bool local_i915_perf_healthcheck(int i915) {struct intel_perf *intel_perf; - intel_perf =intel_perf_for_fd (i915); + intel_perf =intel_perf_for_fd (i915,0 );if (intel_perf)intel_perf_free (intel_perf);return intel_perf;
tests/i915/gem_barrier_race.c +1 -1
@@ -29,7 +29,7 @@ static void remote_request_workload(int fd, int *done)* Based on code patterns found in tests/i915/perf.c */ struct intel_perf_metric_set *metric_set =NULL , *metric_set_iter; -struct intel_perf *intel_perf =intel_perf_for_fd (fd); +struct intel_perf *intel_perf =intel_perf_for_fd (fd,0 );uint64_t properties[] = {DRM_I915_PERF_PROP_SAMPLE_OA , true,DRM_I915_PERF_PROP_OA_METRICS_SET ,0 ,
tests/i915/perf.c +1 -1
@@ -1123,7 +1123,7 @@ init_sys_info(void) {igt_assert_neq (devid,0 ); - intel_perf =intel_perf_for_fd (drm_fd); + intel_perf =intel_perf_for_fd (drm_fd,0 );igt_require (intel_perf);igt_debug ("n_eu_slices: %" PRIu64"\n" , intel_perf->devinfo.n_eu_slices);
tools/i915-perf/i915_perf_configs.c +1 -1
@@ -230,7 +230,7 @@ main(int argc, char *argv[])fprintf (stdout,"Device graphics_ver=%i gt=%i\n" , devinfo->graphics_ver, devinfo->gt); - perf =intel_perf_for_fd (drm_fd); + perf =intel_perf_for_fd (drm_fd,0 );if (!perf) {fprintf (stderr,"No perf data found.\n" );return EXIT_FAILURE ;
tools/i915-perf/i915_perf_recorder.c +69 -5
154 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v5 27/30 lib/i915/perf: Update MTL OA timestamp and EU thread config
In reply to Umesh Nerlige RamappaMTL has configuration similar to DG2 for OA timestamp and threads per EU. Update the same for MTL as per Wa_14015846243:mtl.
--- lib/i915/perf.c | 8 ++++++++ 1 file changed, 8 insertions(+)
lib/i915/perf.c +8 -0
@@ -432,6 +432,14 @@ intel_perf_for_devinfo(uint32_t device_id,else return unsupported_i915_perf_platform (perf); }else if (devinfo->is_meteorlake) { + perf->devinfo.eu_threads_count =8 ; +/* OA reports have the timestamp value shifted to the +* right by 1 bits, it also means we cannot use the +* top bit for comparison. +*/ + perf->devinfo.oa_timestamp_shift =-1 ; + perf->devinfo.oa_timestamp_mask =0x7fffffff ; +if (is_mtl_gt2 (&perf->devinfo))intel_perf_load_metrics_mtlgt2 (perf);else if (is_mtl_gt3 (&perf->devinfo))
Signature · 1 line
2.36.1
PATCH v5 28/30 lib/i915/perf: Add support for select MPEC formats
In reply to Umesh Nerlige RamappaMTL OAM xml files have been updated to specify the OA format used to interpret the counter. The format supported for OAM is I915_OAM_FORMAT_MPEC8u32_B8_C8, hence add support in perf library for I915_OAM_FORMAT_MPEC8u32_B8_C8 format.
--- lib/i915/perf.c | 38 +++++++++++++++++++++++++++++++++++++ lib/i915/perf_data_reader.c | 14 +++++++++----- 2 files changed, 47 insertions(+), 5 deletions(-)
lib/i915/perf.c +38 -0
@@ -915,6 +915,34 @@ void intel_perf_accumulate_reports(struct intel_perf_accumulator *acc,for (i =0 ; i <61 ; i++)accumulate_uint32 (start +3 + i, end +3 + i, deltas +1 + i);break ; + +case I915_OAM_FORMAT_MPEC8u32_B8_C8: { +const uint64_t *start64 = (const uint64_t *)(record0 +1 ); +const uint64_t *end64 = (const uint64_t *)(record1 +1 ); + +/* 64 bit timestamp */ +if (perf->devinfo.oa_timestamp_shift >=0 ) + deltas[idx++] += (end64[1 ] - start64[1 ]) << perf->devinfo.oa_timestamp_shift; +else + deltas[idx++] += (end64[1 ] - start64[1 ]) >> (-perf->devinfo.oa_timestamp_shift); + +/* 64 bit clock */ + deltas[idx++] = end64[3 ] - start64[3 ]; + +/* 8x 32bit MPEC counters */ +for (i =0 ; i <8 ; i++) +accumulate_uint32 (start +8 + i, end +8 + i, deltas + idx++); + +/* 8x 32bit B counters */ +for (i =0 ; i <8 ; i++) +accumulate_uint32 (start +16 + i, end +16 + i, deltas + idx++); + +/* 8x 32bit C counters */ +for (i =0 ; i <8 ; i++) +accumulate_uint32 (start +24 + i, end +24 + i, deltas + idx++); + +break ; + }default :assert (0 ); }
@@ -926,6 +954,7 @@ uint64_t intel_perf_read_record_timestamp(const struct intel_perf *perf, const struct drm_i915_perf_record_header *record) {const uint32_t *report32 = (const uint32_t *)(record +1 ); +const uint64_t *report64 = (const uint64_t *)(record +1 );uint64_t ts;switch (metric_set->perf_oa_format) {
@@ -935,6 +964,10 @@ uint64_t intel_perf_read_record_timestamp(const struct intel_perf *perf, ts = report32[1 ];break ; +case I915_OAM_FORMAT_MPEC8u32_B8_C8: + ts = report64[1 ]; +break ; +default :assert (0 ); }
@@ -952,6 +985,7 @@ uint64_t intel_perf_read_record_timestamp_raw(const struct intel_perf *perf, const struct drm_i915_perf_record_header *record) {const uint32_t *report32 = (const uint32_t *)(record +1 ); +const uint64_t *report64 = (const uint64_t *)(record +1 );uint64_t ts;switch (metric_set->perf_oa_format) {
@@ -961,6 +995,10 @@ uint64_t intel_perf_read_record_timestamp_raw(const struct intel_perf *perf, ts = report32[1 ];break ; +case I915_OAM_FORMAT_MPEC8u32_B8_C8: + ts = report64[1 ]; +break ; +default :assert (0 ); }
lib/i915/perf_data_reader.c +9 -5
@@ -58,11 +58,15 @@ oa_report_ctx_is_valid(const struct intel_perf_devinfo *devinfo, }static uint32_t -oa_report_ctx_id (const struct intel_perf_devinfo *devinfo,const uint8_t *report) +oa_report_ctx_id (struct intel_perf_data_reader *reader,const uint8_t *report) { -if (!oa_report_ctx_is_valid (devinfo, report)) +if (!oa_report_ctx_is_valid (&reader->devinfo, report))return 0xffffffff ; -return ((const uint32_t *) report)[2 ]; + +if (reader->metric_set->perf_oa_format == I915_OAM_FORMAT_MPEC8u32_B8_C8) +return ((const uint32_t *) report)[4 ]; +else +return ((const uint32_t *) report)[2 ]; } static void
@@ -289,8 +293,8 @@ generate_cpu_events(struct intel_perf_data_reader *reader) start_report = (const uint8_t *) (last_header +1 ); end_report = (const uint8_t *) (current_header +1 ); - last_ctx_id =oa_report_ctx_id (&reader->devinfo, start_report); - current_ctx_id =oa_report_ctx_id (&reader->devinfo, end_report); + last_ctx_id =oa_report_ctx_id (reader, start_report); + current_ctx_id =oa_report_ctx_id (reader, end_report); gpu_ts_start = intel_perf_read_record_timestamp(reader->perf, reader->metric_set,
Signature · 1 line
2.36.1
PATCH v5 29/30 lib/i915/perf: Adjust the GPU timestamp for new OA formats
In reply to Umesh Nerlige RamappaIn some OA formats, gpu_ts is a 64 bit value and the right shift can result in bit[31] being set. This throws off the correlation and the timelines. Apply the mask on gpu_ts as well.
--- lib/i915/perf_data_reader.c | 6 ++++++ 1 file changed, 6 insertions(+)
lib/i915/perf_data_reader.c +6 -0
@@ -216,6 +216,12 @@ correlate_gpu_timestamp(struct intel_perf_data_reader *reader,uint64_t mask = reader->perf->devinfo.oa_timestamp_mask;int corr_idx =-1 ; +/* On some OA formats, gpu_ts is a 64 bit value and the shift can +* result in bit[31] being set. This throws off the correlation and the +* timelines. Apply the mask on gpu_ts as well. +*/ + gpu_ts = gpu_ts & mask; +for (uint32_t i =0 ; i < reader->n_correlation_chunks; i++) {if (gpu_ts >= (reader->correlation_chunks[i].gpu_ts_begin & mask) && gpu_ts <= (reader->correlation_chunks[i].gpu_ts_end & mask)) {
Signature · 1 line
2.36.1
PATCH v5 30/30 lib/i915/perf: Apply shift to raw timestamp as well
In reply to Umesh Nerlige RamappaApply the OA timestamp shift to the raw timestamp as well.
--- lib/i915/perf.c | 5 +++++ 1 file changed, 5 insertions(+)
lib/i915/perf.c +5 -0
@@ -1003,6 +1003,11 @@ uint64_t intel_perf_read_record_timestamp_raw(const struct intel_perf *perf,assert (0 ); } +if (perf->devinfo.oa_timestamp_shift >=0 ) + ts <<= perf->devinfo.oa_timestamp_shift; +else + ts >>= -perf->devinfo.oa_timestamp_shift; +return ts; }
Signature · 1 line
2.36.1
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for Enable OAM support in IGT and GPUvis (rev5)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Enable OAM support in IGT and GPUvis (rev5)
URL : https://patchwork.freedesktop.org/series/114023/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12906 -> IGTPW_8672
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html
Participating hosts (37 -> 36)
------------------------------
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in IGTPW_8672 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: NOTRUN -> [ABORT][1] ([i915#6687] / [i915#7978])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@gt_lrc:
- bat-dg2-11: NOTRUN -> [INCOMPLETE][2] ([i915#7609] / [i915#7913])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html
- bat-adln-1: [PASS][3] -> [INCOMPLETE][4] ([i915#4983] / [i915#7609])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/bat-adln-1/igt@i915_selftest@live@gt_lrc.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-adln-1/igt@i915_selftest@live@gt_lrc.html
#### Possible fixes ####
* igt@i915_selftest@live@migrate:
- bat-atsm-1: [DMESG-FAIL][5] ([i915#7699]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/bat-atsm-1/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-atsm-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-1: [ABORT][7] ([i915#4983]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/bat-rpls-1/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@workarounds:
- bat-dg2-11: [INCOMPLETE][9] ([i915#7913]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/bat-dg2-11/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-dg2-11/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@slpc:
- bat-rpls-2: [DMESG-FAIL][11] ([i915#6367] / [i915#7913] / [i915#7996]) -> [DMESG-FAIL][12] ([i915#6367] / [i915#7913])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/bat-rpls-2/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/bat-rpls-2/igt@i915_selftest@[email protected]
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7214 -> IGTPW_8672
CI-20190529: 20190529
CI_DRM_12906: 93af0351c09889439b0c7d09b53161239ea3d2f3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8672: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html
IGT_7214: ac3a71c0497977c41fc3d4fc8282a77f05d1bc50 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
+igt@perf@gen12-group-concurrent-oa-buffer-read
+igt@perf@gen12-group-exclusive-stream-ctx-handle
+igt@perf@gen12-group-exclusive-stream-sample-oa
+igt@perf@gen12-invalid-class-instance
-igt@xe_intel_bb@add-remove-objects
-igt@xe_intel_bb@bb-with-allocator
-igt@xe_intel_bb@blit-reloc
-igt@xe_intel_bb@blit-simple
-igt@xe_intel_bb@delta-check
-igt@xe_intel_bb@destroy-bb
-igt@xe_intel_bb@full-batch
-igt@xe_intel_bb@intel-bb-blit-none
-igt@xe_intel_bb@intel-bb-blit-x
-igt@xe_intel_bb@intel-bb-blit-y
-igt@xe_intel_bb@lot-of-buffers
-igt@xe_intel_bb@offset-control
-igt@xe_intel_bb@purge-bb
-igt@xe_intel_bb@render
-igt@xe_intel_bb@reset-bb
-igt@xe_intel_bb@simple-bb
-igt@xe_intel_bb@simple-bb-ctx
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for Enable OAM support in IGT and GPUvis (rev5)
In reply to Umesh Nerlige Ramappa== Series Details ==
== Series Details ==
Series: Enable OAM support in IGT and GPUvis (rev5)
URL : https://patchwork.freedesktop.org/series/114023/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12906_full -> IGTPW_8672_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html
Participating hosts (8 -> 8)
------------------------------
Additional (1): shard-tglu0
Missing (1): shard-rkl0
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8672_full:
### IGT changes ###
#### Possible regressions ####
* {igt@perf@gen12-group-concurrent-oa-buffer-read} (NEW):
- {shard-rkl}: NOTRUN -> [SKIP][1] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-2/igt@[email protected]
* {igt@perf@gen12-group-exclusive-stream-ctx-handle} (NEW):
- {shard-dg1}: NOTRUN -> [SKIP][2] +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-dg1-14/igt@[email protected]
* {igt@perf@gen12-invalid-class-instance} (NEW):
- {shard-tglu}: NOTRUN -> [SKIP][3] +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-3/igt@[email protected]
* {igt@perf@polling@0-rcs0} (NEW):
- {shard-rkl}: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-1/igt@perf@[email protected]
* {igt@perf@stress-open-close@0-rcs0} (NEW):
- shard-glk: NOTRUN -> [ABORT][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk3/igt@perf@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_12906_full and IGTPW_8672_full:
### New IGT tests (17) ###
* igt@perf@blocking@0-rcs0:
- Statuses : 3 pass(s)
- Exec time: [0.0] s
* igt@perf@buffer-fill@0-rcs0:
- Statuses : 4 pass(s)
- Exec time: [0.0] s
* igt@perf@enable-disable@0-rcs0:
- Statuses : 4 pass(s)
- Exec time: [0.0] s
* igt@perf@gen12-group-concurrent-oa-buffer-read:
- Statuses : 5 skip(s)
- Exec time: [0.0] s
* igt@perf@gen12-group-exclusive-stream-ctx-handle:
- Statuses : 6 skip(s)
- Exec time: [0.0] s
* igt@perf@gen12-group-exclusive-stream-sample-oa:
- Statuses : 6 skip(s)
- Exec time: [0.0] s
* igt@perf@gen12-invalid-class-instance:
- Statuses : 5 skip(s)
- Exec time: [0.0] s
* igt@perf@gen12-mi-rpc@rcs0:
- Statuses : 3 pass(s)
- Exec time: [0.0] s
* igt@perf@gen12-oa-tlb-invalidate@0-rcs0:
- Statuses : 1 pass(s)
- Exec time: [0.0] s
* igt@perf@gen12-unprivileged-single-ctx-counters@rcs0:
- Statuses : 2 pass(s)
- Exec time: [0.0] s
* igt@perf@global-sseu-config-invalid@0-rcs0:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
* igt@perf@global-sseu-config@0-rcs0:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
* igt@perf@non-zero-reason@0-rcs0:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
* igt@perf@oa-exponents@0-rcs0:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
* igt@perf@oa-formats@0-rcs0:
- Statuses : 5 pass(s)
- Exec time: [0.0] s
* igt@perf@polling@0-rcs0:
- Statuses : 1 fail(s) 3 pass(s)
- Exec time: [0.0] s
* igt@perf@stress-open-close@0-rcs0:
- Statuses : 1 abort(s) 3 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in IGTPW_8672_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-deadline:
- shard-apl: NOTRUN -> [FAIL][6] ([i915#2846])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl4/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-glk5/igt@gem_exec_fair@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk7/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@verify-random-ccs:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl1/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-apl: NOTRUN -> [WARN][10] ([i915#2658])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl6/igt@[email protected]
* igt@gem_render_copy@x-tiled-to-vebox-yf-tiled:
- shard-apl: NOTRUN -> [SKIP][11] ([fdo#109271]) +96 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl1/igt@[email protected]
* igt@gem_spin_batch@legacy@bsd1:
- shard-apl: [PASS][12] -> [FAIL][13] ([i915#2898])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-apl1/igt@gem_spin_batch@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl2/igt@gem_spin_batch@[email protected]
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#3886]) +7 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl3/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_content_protection@uevent@pipe-a-dp-1:
- shard-apl: NOTRUN -> [FAIL][15] ([i915#1339])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl6/igt@kms_content_protection@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][16] -> [FAIL][17] ([i915#2346])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-glk8/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk3/igt@[email protected]
- shard-apl: [PASS][18] -> [FAIL][19] ([i915#2346])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-apl2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl6/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#658]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl3/igt@[email protected]
* {igt@perf@gen12-group-concurrent-oa-buffer-read} (NEW):
- shard-snb: NOTRUN -> [SKIP][21] ([fdo#109271]) +3 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-snb2/igt@[email protected]
* {igt@perf@gen12-invalid-class-instance} (NEW):
- shard-glk: NOTRUN -> [SKIP][22] ([fdo#109271]) +3 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk7/igt@[email protected]
#### Possible fixes ####
* igt@fbdev@unaligned-read:
- {shard-rkl}: [SKIP][23] ([i915#2582]) -> [PASS][24] +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@fbdev@write:
- {shard-tglu}: [SKIP][25] ([i915#2582]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-10/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-8/igt@[email protected]
* igt@gem_eio@suspend:
- {shard-rkl}: [FAIL][27] ([i915#5115] / [i915#7052]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][29] ([i915#2842]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-glk7/igt@gem_exec_fair@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk1/igt@gem_exec_fair@[email protected]
- {shard-rkl}: [FAIL][31] ([i915#2842]) -> [PASS][32] +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-5/igt@gem_exec_fair@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-apl: [FAIL][33] ([i915#2842]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-apl1/igt@gem_exec_fair@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_reloc@basic-write-read-active:
- {shard-rkl}: [SKIP][35] ([i915#3281]) -> [PASS][36] +5 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@gem_exec_schedule@semaphore-power:
- {shard-rkl}: [SKIP][37] ([i915#7276]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@gem_pwrite@basic-self:
- {shard-rkl}: [SKIP][39] ([i915#3282]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@gen9_exec_parse@batch-without-end:
- {shard-rkl}: [SKIP][41] ([i915#2527]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- {shard-rkl}: [SKIP][43] ([i915#3361]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-5/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-1/igt@[email protected]
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-tglu}: [SKIP][45] ([i915#1397]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-10/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-6/igt@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-rkl}: [SKIP][47] ([i915#1397]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@fences:
- {shard-rkl}: [SKIP][49] ([i915#1849]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-2/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- {shard-tglu}: [SKIP][51] ([i915#3547]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-9/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-6/igt@[email protected]
- {shard-rkl}: [SKIP][53] ([fdo#109308]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- {shard-rkl}: [FAIL][55] ([fdo#103375]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-5/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs:
- {shard-rkl}: [SKIP][57] ([i915#1845] / [i915#4098]) -> [PASS][58] +16 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-1/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs:
- {shard-tglu}: [SKIP][59] ([i915#1845] / [i915#7651]) -> [PASS][60] +23 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-9/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-1/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
* igt@kms_fbcon_fbt@psr:
- {shard-rkl}: [SKIP][61] ([fdo#110189] / [i915#3955]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [ABORT][63] ([i915#180]) -> [PASS][64] +2 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-apl4/igt@kms_flip@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-apl1/igt@kms_flip@[email protected]
* igt@kms_flip@modeset-vs-vblank-race-interruptible@b-hdmi-a1:
- shard-glk: [FAIL][65] ([i915#407]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-glk6/igt@kms_flip@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-glk3/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite:
- {shard-tglu}: [SKIP][67] ([i915#1849]) -> [PASS][68] +8 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-9/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-gtt:
- {shard-rkl}: [SKIP][69] ([i915#1849] / [i915#4098]) -> [PASS][70] +12 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
* igt@kms_psr@sprite_plane_onoff:
- {shard-rkl}: [SKIP][71] ([i915#1072]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-rkl-2/igt@kms_psr@sprite_plane_onoff.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-rkl-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_pwrite_crc:
- {shard-tglu}: [SKIP][73] ([fdo#109274] / [i915#1845]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-9/igt@kms_pwrite_crc.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-1/igt@kms_pwrite_crc.html
* igt@kms_universal_plane@universal-plane-pipe-b-sanity:
- {shard-tglu}: [SKIP][75] ([i915#1845]) -> [PASS][76] +10 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12906/shard-tglu-9/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/shard-tglu-8/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1339]: https://gitlab.freedesktop.org/drm/intel/issues/1339
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2898]: https://gitlab.freedesktop.org/drm/intel/issues/2898
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3778]: https://gitlab.freedesktop.org/drm/intel/issues/3778
[i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#407]: https://gitlab.freedesktop.org/drm/intel/issues/407
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4854]: https://gitlab.freedesktop.org/drm/intel/issues/4854
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#4885]: https://gitlab.freedesktop.org/drm/intel/issues/4885
[i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
[i915#5115]: https://gitlab.freedesktop.org/drm/intel/issues/5115
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5431]: https://gitlab.freedesktop.org/drm/intel/issues/5431
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
[i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8150]: https://gitlab.freedesktop.org/drm/intel/issues/8150
[i915#8152]: https://gitlab.freedesktop.org/drm/intel/issues/8152
[i915#8308]: https://gitlab.freedesktop.org/drm/intel/issues/8308
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7214 -> IGTPW_8672
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12906: 93af0351c09889439b0c7d09b53161239ea3d2f3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8672: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html
IGT_7214: ac3a71c0497977c41fc3d4fc8282a77f05d1bc50 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8672/index.html