From 0463b607ed58ceede542f9bad6a9dad8d77d6f9c Mon Sep 17 00:00:00 2001 From: Riana Tauro Date: Tue, 21 Jun 2022 19:15:26 +0530 Subject: tests/i915/pm_rc6_residency: Extend rc6-idle test on remaining engines Run rc6_idle on a single instance of every engine v2: add dynamic subtest (Anshuman) Signed-off-by: Riana Tauro Reviewed-by: Anshuman Gupta --- tests/i915/i915_pm_rc6_residency.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/i915/i915_pm_rc6_residency.c b/tests/i915/i915_pm_rc6_residency.c index 7c1ff32b..e377e70c 100644 --- a/tests/i915/i915_pm_rc6_residency.c +++ b/tests/i915/i915_pm_rc6_residency.c @@ -292,7 +292,7 @@ static void sighandler(int sig) { } -static void bg_load(int i915, unsigned int flags, unsigned long *ctl) +static void bg_load(int i915, uint64_t engine_flags, unsigned int flags, unsigned long *ctl) { const bool has_execlists = intel_gen(intel_get_drm_devid(i915)) >= 8; struct drm_i915_gem_exec_object2 obj = { @@ -301,6 +301,7 @@ static void bg_load(int i915, unsigned int flags, unsigned long *ctl) struct drm_i915_gem_execbuffer2 execbuf = { .buffers_ptr = to_user_pointer(&obj), .buffer_count = 1, + .flags = engine_flags, }; struct sigaction act = { .sa_handler = sighandler @@ -358,7 +359,7 @@ static void kill_children(int sig) signal(sig, old); } -static void rc6_idle(int i915) +static void rc6_idle(int i915, uint64_t flags) { const int64_t duration_ns = SLEEP_DURATION * (int64_t)NSEC_PER_SEC; const int tolerance = 20; /* Some RC6 is better than none! */ @@ -404,7 +405,7 @@ static void rc6_idle(int i915) for (int p = 0; p < ARRAY_SIZE(phases); p++) { memset(done, 0, 2 * sizeof(*done)); igt_fork(child, 1) /* Setup up a very light load */ - bg_load(i915, phases[p].flags, done); + bg_load(i915, flags, phases[p].flags, done); rapl_read(&rapl, &sample[0]); cycles = -READ_ONCE(done[1]); @@ -539,11 +540,18 @@ igt_main ctx = intel_ctx_create_all_physical(i915); } - igt_subtest("rc6-idle") { + igt_subtest_with_dynamic("rc6-idle") { + const struct intel_execution_engine2 *e; + igt_require_gem(i915); gem_quiescent_gpu(i915); - rc6_idle(i915); + for_each_ctx_engine(i915, ctx, e) { + if (e->instance == 0) { + igt_dynamic_f("%s", e->name) + rc6_idle(i915, e->flags); + } + } } igt_subtest("rc6-fence") { -- cgit v1.2.3