From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id B309F10E09E for ; Sat, 13 May 2023 02:46:00 +0000 (UTC) Date: Fri, 12 May 2023 19:45:51 -0700 Message-ID: <87a5y9dk4g.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Umesh Nerlige Ramappa In-Reply-To: <20230513022234.2832233-2-umesh.nerlige.ramappa@intel.com> References: <20230513022234.2832233-1-umesh.nerlige.ramappa@intel.com> <20230513022234.2832233-2-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [igt-dev] [PATCH i-g-t 01/15] perf_pmu: Support multi-tile in rc6 subtest List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Fri, 12 May 2023 19:22:20 -0700, Umesh Nerlige Ramappa wrote: > > From: Tvrtko Ursulin > > Teach test how to wake up a particular tile and make it iterate all of > them using dynamic subtests. > > v2: Finalize SHIFT to 60. Drop FIXME from i915_drm.h > v3: (Ashutosh) > - Use i915_for_each_gt > - Move uapi to i915_drm_local.h Reviewed-by: Ashutosh Dixit x > Signed-off-by: Tvrtko Ursulin > Signed-off-by: Umesh Nerlige Ramappa > --- > lib/i915/i915_drm_local.h | 15 +++++++++++++++ > tests/i915/perf_pmu.c | 34 +++++++++++++++++++++++----------- > 2 files changed, 38 insertions(+), 11 deletions(-) > > diff --git a/lib/i915/i915_drm_local.h b/lib/i915/i915_drm_local.h > index af0176500..bb2ebef38 100644 > --- a/lib/i915/i915_drm_local.h > +++ b/lib/i915/i915_drm_local.h > @@ -26,6 +26,21 @@ extern "C" { > #define DRM_I915_PERF_PROP_OA_ENGINE_CLASS 9 > #define DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE 10 > > +/* > + * Top 4 bits of every non-engine counter are GT id. > + */ > +#define __I915_PMU_GT_SHIFT (60) > + > +#define ___I915_PMU_OTHER(gt, x) \ > + (((__u64)__I915_PMU_ENGINE(0xff, 0xff, 0xf) + 1 + (x)) | \ > + ((__u64)(gt) << __I915_PMU_GT_SHIFT)) > + > +#define __I915_PMU_ACTUAL_FREQUENCY(gt) ___I915_PMU_OTHER(gt, 0) > +#define __I915_PMU_REQUESTED_FREQUENCY(gt) ___I915_PMU_OTHER(gt, 1) > +#define __I915_PMU_INTERRUPTS(gt) ___I915_PMU_OTHER(gt, 2) > +#define __I915_PMU_RC6_RESIDENCY(gt) ___I915_PMU_OTHER(gt, 3) > +#define __I915_PMU_SOFTWARE_GT_AWAKE_TIME(gt) ___I915_PMU_OTHER(gt, 4) > + > #if defined(__cplusplus) > } > #endif > diff --git a/tests/i915/perf_pmu.c b/tests/i915/perf_pmu.c > index c5f083bbd..86607be4d 100644 > --- a/tests/i915/perf_pmu.c > +++ b/tests/i915/perf_pmu.c > @@ -1707,8 +1707,16 @@ static bool wait_for_suspended(int gem_fd) > return suspended; > } > > +static int open_forcewake_handle(int fd, unsigned int gt) > +{ > + if (getenv("IGT_NO_FORCEWAKE")) > + return -1; > + > + return igt_debugfs_gt_open(fd, gt, "forcewake_user", O_WRONLY); > +} > + > static void > -test_rc6(int gem_fd, unsigned int flags) > +test_rc6(int gem_fd, unsigned int gt, unsigned int flags) > { > int64_t duration_ns = 2e9; > uint64_t idle, busy, prev, ts[2]; > @@ -1717,7 +1725,7 @@ test_rc6(int gem_fd, unsigned int flags) > > gem_quiescent_gpu(gem_fd); > > - fd = open_pmu(gem_fd, I915_PMU_RC6_RESIDENCY); > + fd = open_pmu(gem_fd, __I915_PMU_RC6_RESIDENCY(gt)); > > if (flags & TEST_RUNTIME_PM) { > drmModeRes *res; > @@ -1784,7 +1792,7 @@ test_rc6(int gem_fd, unsigned int flags) > assert_within_epsilon(idle - prev, ts[1] - ts[0], tolerance); > > /* Wake up device and check no RC6. */ > - fw = igt_open_forcewake_handle(gem_fd); > + fw = open_forcewake_handle(gem_fd, gt); > igt_assert(fw >= 0); > usleep(1e3); /* wait for the rc6 cycle counter to stop ticking */ > > @@ -2179,7 +2187,7 @@ igt_main > const struct intel_execution_engine2 *e; > unsigned int num_engines = 0; > const intel_ctx_t *ctx = NULL; > - int fd = -1; > + int gt, tmp, fd = -1; > > /** > * All PMU should be accompanied by a test. > @@ -2396,17 +2404,21 @@ igt_main > /** > * Test RC6 residency reporting. > */ > - igt_subtest("rc6") > - test_rc6(fd, 0); > + igt_subtest_with_dynamic("rc6") { > + i915_for_each_gt(fd, tmp, gt) { > + igt_dynamic_f("gt%u", gt) > + test_rc6(fd, gt, 0); > > - igt_subtest("rc6-runtime-pm") > - test_rc6(fd, TEST_RUNTIME_PM); > + igt_dynamic_f("runtime-pm-gt%u", gt) > + test_rc6(fd, gt, TEST_RUNTIME_PM); > > - igt_subtest("rc6-runtime-pm-long") > - test_rc6(fd, TEST_RUNTIME_PM | FLAG_LONG); > + igt_dynamic_f("runtime-pm-long-gt%u", gt) > + test_rc6(fd, gt, TEST_RUNTIME_PM | FLAG_LONG); > + } > + } > > igt_subtest("rc6-suspend") > - test_rc6(fd, TEST_S3); > + test_rc6(fd, 0, TEST_S3); > > /** > * Test GT wakeref tracking (similar to RC0, opposite of RC6) > -- > 2.36.1 >