diff options
author | Robert Bragg <robert@sixbynine.org> | 2017-02-07 16:22:59 +0000 |
---|---|---|
committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2017-08-04 12:02:07 +0100 |
commit | 0a2ca790212dc2823d4ef1851cfa9669bdbc7ddf (patch) | |
tree | acc946836f5f621a05cb006f930a911902ac6845 /tests/perf.c | |
parent | 6d4e853b87098925da2f7e4416b44a4f41390c6f (diff) |
tests/perf: s/test_perf_ctx_mi_rpc/hsw_test_single_ctx_counters/
Signed-off-by: Robert Bragg <robert@sixbynine.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Diffstat (limited to 'tests/perf.c')
-rw-r--r-- | tests/perf.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/tests/perf.c b/tests/perf.c index c8092eaa..62bfd80f 100644 --- a/tests/perf.c +++ b/tests/perf.c @@ -2177,9 +2177,15 @@ emit_stall_timestamp_and_rpc(struct intel_batchbuffer *batch, * should be able to configure the OA unit for per-context metrics (for a * context associated with that process' drm file descriptor) and the counters * should only relate to that specific context. + * + * Unfortunately only Haswell limits the progression of OA counters for a + * single context and so this unit test is Haswell specific. For Gen8+ although + * reports read via i915 perf can be filtered for a single context the counters + * themselves always progress as global/system-wide counters affected by all + * contexts. */ static void -test_per_ctx_mi_rpc(void) +hsw_test_single_ctx_counters(void) { uint64_t properties[] = { DRM_I915_PERF_PROP_CTX_HANDLE, UINT64_MAX, /* updated below */ @@ -2638,8 +2644,16 @@ igt_main igt_subtest("mi-rpc") test_mi_rpc(); - igt_subtest("mi-rpc-per-ctx") - test_per_ctx_mi_rpc(); + igt_subtest("unprivileged-singled-ctx-counters") { + /* For Gen8+ the OA unit can no longer be made to clock gate + * for a specific context. Additionally the partial-replacement + * functionality to HW filter timer reports for a specific + * context (SKL+) can't stop multiple applications viewing + * system-wide data via MI_REPORT_PERF_COUNT commands. + */ + igt_require(IS_HASWELL(devid)); + hsw_test_single_ctx_counters(); + } igt_subtest("rc6-disable") test_rc6_disable(); |