[igt-dev] [PATCH i-g-t v5] tests/xe: Verify actual frequency on the basis of GT state
Gupta, Anshuman
anshuman.gupta at intel.com
Thu Jul 20 07:59:52 UTC 2023
> -----Original Message-----
> From: Nilawar, Badal <badal.nilawar at intel.com>
> Sent: Wednesday, July 19, 2023 8:16 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Tauro, Riana <riana.tauro at intel.com>; Gupta, Anshuman
> <anshuman.gupta at intel.com>; Dixit, Ashutosh <ashutosh.dixit at intel.com>;
> Belgaumkar, Vinay <vinay.belgaumkar at intel.com>
> Subject: [PATCH i-g-t v5] tests/xe: Verify actual frequency on the basis of GT
> state
>
> When GT is in RC6 actual frequency reported will be 0. So verify actual on the
> basic of GT state.
>
> v2:
> - Rebased
> - Move function xe_is_gt_in_c6, to check rc6 state, to igt_pm library
> - Assert if freq reported is not 0 when idle (Ashutosh)
> v3:
> - Fix review comments (Ashutosh)
> v4:
> - Move igt_require to igt_main under idle test cases (Ashutosh)
> - For idle case wait for C6 instead of usleep (Ashutosh)
> v5:
> - Remove igt_require from test_freq_range
>
> Fixes: acaaca0bf317 ("tests/xe: Add Xe IGT tests")
> Signed-off-by: Badal Nilawar <badal.nilawar at intel.com>
> Reviewed-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
> ---
> lib/igt_pm.c | 20 +++++++++++++++++
> lib/igt_pm.h | 1 +
> tests/xe/xe_guc_pc.c | 46 +++++++++++++++++++++++++++++---------
> tests/xe/xe_pm_residency.c | 38 ++++++++++---------------------
> 4 files changed, 69 insertions(+), 36 deletions(-)
>
> diff --git a/lib/igt_pm.c b/lib/igt_pm.c index ba591f0f8..ccfa5178b 100644
> --- a/lib/igt_pm.c
> +++ b/lib/igt_pm.c
> @@ -1417,3 +1417,23 @@ void igt_pm_ignore_slpc_efficient_freq(int i915,
> int gtfd, bool val)
> igt_require(igt_sysfs_has_attr(gtfd, "slpc_ignore_eff_freq"));
> igt_sysfs_set_u32(gtfd, "slpc_ignore_eff_freq", val); }
> +
> +/**
> + * xe_is_gt_in_c6:
It should follow the igt_pm naming convention.
Though major concern is around igt_pm library, can we have driver specific functions() ? xe_is_gt_in_c6() is xe specific.
@Konieczny, Kamil could you please provide your input.
Thanks,
Anshuman.
> + * @fd: pointer to xe drm fd
> + * @gt: gt number
> + *
> + * Check if GT is in C6 state
> + */
> +bool xe_is_gt_in_c6(int fd, int gt)
> +{
> + char gt_c_state[16];
> + int gt_fd;
> +
> + gt_fd = xe_sysfs_gt_open(fd, gt);
> + igt_assert(gt_fd >= 0);
> + igt_assert(igt_sysfs_scanf(gt_fd, "gtidle/idle_status", "%s",
> gt_c_state) == 1);
> + close(gt_fd);
> +
> + return strcmp(gt_c_state, "gt-c6") == 0; }
> diff --git a/lib/igt_pm.h b/lib/igt_pm.h index 71ec2f239..2fc7b98a1 100644
> --- a/lib/igt_pm.h
> +++ b/lib/igt_pm.h
> @@ -89,5 +89,6 @@ bool i915_is_slpc_enabled(int drm_fd); int
> igt_pm_get_runtime_suspended_time(struct pci_device *pci_dev); int
> igt_pm_get_runtime_usage(struct pci_device *pci_dev); void
> igt_pm_ignore_slpc_efficient_freq(int i915, int gtfd, bool val);
> +bool xe_is_gt_in_c6(int fd, int gt);
>
> #endif /* IGT_PM_H */
> diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c index
> c34df8d60..d55790afd 100644
> --- a/tests/xe/xe_guc_pc.c
> +++ b/tests/xe/xe_guc_pc.c
> @@ -218,7 +218,7 @@ static void test_freq_basic_api(int fd, int gt_id)
> * Run type: FULL
> */
>
> -static void test_freq_fixed(int fd, int gt_id)
> +static void test_freq_fixed(int fd, int gt_id, bool gt_idle)
> {
> uint32_t rpn = get_freq(fd, gt_id, "rpn");
> uint32_t rpe = get_freq(fd, gt_id, "rpe"); @@ -235,13 +235,26 @@
> static void test_freq_fixed(int fd, int gt_id)
> igt_assert(set_freq(fd, gt_id, "max", rpn) > 0);
> usleep(ACT_FREQ_LATENCY_US);
> igt_assert(get_freq(fd, gt_id, "cur") == rpn);
> - igt_assert(get_freq(fd, gt_id, "act") == rpn);
> +
> + if (gt_idle) {
> + /* Wait for GT to go in C6 as previous get_freq wakes up
> GT*/
> + igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
> + igt_assert(get_freq(fd, gt_id, "act") == 0);
> + } else {
> + igt_assert(get_freq(fd, gt_id, "act") == rpn);
> + }
>
> igt_assert(set_freq(fd, gt_id, "min", rpe) > 0);
> igt_assert(set_freq(fd, gt_id, "max", rpe) > 0);
> usleep(ACT_FREQ_LATENCY_US);
> igt_assert(get_freq(fd, gt_id, "cur") == rpe);
> - igt_assert(get_freq(fd, gt_id, "act") == rpe);
> +
> + if (gt_idle) {
> + igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
> + igt_assert(get_freq(fd, gt_id, "act") == 0);
> + } else {
> + igt_assert(get_freq(fd, gt_id, "act") == rpe);
> + }
>
> igt_assert(set_freq(fd, gt_id, "min", rp0) > 0);
> igt_assert(set_freq(fd, gt_id, "max", rp0) > 0); @@ -253,6 +266,11
> @@ static void test_freq_fixed(int fd, int gt_id)
> */
> igt_assert(get_freq(fd, gt_id, "cur") == rp0);
>
> + if (gt_idle) {
> + igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
> + igt_assert(get_freq(fd, gt_id, "act") == 0);
> + }
> +
> igt_debug("Finished testing fixed request\n"); }
>
> @@ -266,7 +284,7 @@ static void test_freq_fixed(int fd, int gt_id)
> * Run type: FULL
> */
>
> -static void test_freq_range(int fd, int gt_id)
> +static void test_freq_range(int fd, int gt_id, bool gt_idle)
> {
> uint32_t rpn = get_freq(fd, gt_id, "rpn");
> uint32_t rpe = get_freq(fd, gt_id, "rpe"); @@ -279,8 +297,14 @@
> static void test_freq_range(int fd, int gt_id)
> usleep(ACT_FREQ_LATENCY_US);
> cur = get_freq(fd, gt_id, "cur");
> igt_assert(rpn <= cur && cur <= rpe);
> - act = get_freq(fd, gt_id, "act");
> - igt_assert(rpn <= act && act <= rpe);
> +
> + if (gt_idle) {
> + igt_assert(igt_wait(xe_is_gt_in_c6(fd, gt_id), 1000, 10));
> + igt_assert(get_freq(fd, gt_id, "act") == 0);
> + } else {
> + act = get_freq(fd, gt_id, "act");
> + igt_assert(rpn <= act && act <= rpe);
> + }
>
> igt_debug("Finished testing range request\n"); } @@ -385,7 +409,8
> @@ igt_main
>
> igt_subtest("freq_fixed_idle") {
> xe_for_each_gt(fd, gt) {
> - test_freq_fixed(fd, gt);
> + igt_require(igt_wait(xe_is_gt_in_c6(fd, gt), 1000,
> 10));
> + test_freq_fixed(fd, gt, true);
> }
> }
>
> @@ -398,14 +423,15 @@ igt_main
> igt_debug("Execution Finished\n");
> }
> /* While exec in threads above, let's check the freq
> */
> - test_freq_fixed(fd, gt);
> + test_freq_fixed(fd, gt, false);
> igt_waitchildren();
> }
> }
>
> igt_subtest("freq_range_idle") {
> xe_for_each_gt(fd, gt) {
> - test_freq_range(fd, gt);
> + igt_require(igt_wait(xe_is_gt_in_c6(fd, gt), 1000,
> 10));
> + test_freq_range(fd, gt, true);
> }
> }
>
> @@ -418,7 +444,7 @@ igt_main
> igt_debug("Execution Finished\n");
> }
> /* While exec in threads above, let's check the freq
> */
> - test_freq_range(fd, gt);
> + test_freq_range(fd, gt, false);
> igt_waitchildren();
> }
> }
> diff --git a/tests/xe/xe_pm_residency.c b/tests/xe/xe_pm_residency.c
> index a20c4449c..5c4516d03 100644
> --- a/tests/xe/xe_pm_residency.c
> +++ b/tests/xe/xe_pm_residency.c
> @@ -28,6 +28,16 @@ const double tolerance = 0.1;
> (tol) * 100.0, (tol) * 100.0, \
> (double)(ref))
>
> +/**
> + * SUBTEST: gt-c6-on-idle
> + * Description: Validate GT C6 state on idle
> + * Run type: BAT
> + *
> + * SUBTEST: idle-residency
> + * Description: basic residency test to validate idle residency
> + * measured over a time interval is within the tolerance
> + * Run type: FULL
> + */
> IGT_TEST_DESCRIPTION("Tests for gtidle properties");
>
> static unsigned int measured_usleep(unsigned int usec) @@ -45,24 +55,6
> @@ static unsigned int measured_usleep(unsigned int usec)
> return igt_nsec_elapsed(&ts) / 1000;
> }
>
> -/**
> - * SUBTEST: gt-c6-on-idle
> - * Description: Validate GT C6 state on idle
> - * Run type: BAT
> - */
> -static bool is_gt_in_c6(int fd, int gt) -{
> - char gt_c_state[16];
> - int gt_fd;
> -
> - gt_fd = xe_sysfs_gt_open(fd, gt);
> - igt_assert(gt_fd >= 0);
> - igt_assert(igt_sysfs_scanf(gt_fd, "gtidle/idle_status", "%s",
> gt_c_state) == 1);
> - close(gt_fd);
> -
> - return strcmp(gt_c_state, "gt-c6") == 0;
> -}
> -
> static unsigned long read_idle_residency(int fd, int gt) {
> unsigned long residency = 0;
> @@ -76,17 +68,11 @@ static unsigned long read_idle_residency(int fd, int gt)
> return residency;
> }
>
> -/**
> - * SUBTEST: idle-residency
> - * Description: basic residency test to validate idle residency
> - * measured over a time interval is within the tolerance
> - * Run type: FULL
> - */
> static void test_idle_residency(int fd, int gt) {
> unsigned long elapsed_ms, residency_start, residency_end;
>
> - igt_assert_f(igt_wait(is_gt_in_c6(fd, gt), 1000, 1), "GT not in C6\n");
> + igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 1), "GT not in
> +C6\n");
>
> residency_start = read_idle_residency(fd, gt);
> elapsed_ms = measured_usleep(SLEEP_DURATION * 1000) / 1000;
> @@ -110,7 +96,7 @@ igt_main
> igt_describe("Validate GT C6 on idle");
> igt_subtest("gt-c6-on-idle")
> xe_for_each_gt(fd, gt)
> - igt_assert_f(igt_wait(is_gt_in_c6(fd, gt), 1000, 1),
> "GT not in C6\n");
> + igt_assert_f(igt_wait(xe_is_gt_in_c6(fd, gt), 1000, 1),
> "GT not in
> +C6\n");
>
> igt_describe("Validate idle residency measured over a time interval is
> within the tolerance");
> igt_subtest("idle-residency")
> --
> 2.25.1
More information about the igt-dev
mailing list