[PATCH v4] tests/intel/xe_pm_residency: Skip on igt_power_open failure

[Kamil Konieczny]

Hi Jonathan,
On 2025-01-10 at 21:22:37 +0000, Jonathan Cavitt wrote:
> The xe_pm_residency at toggle-gt-c6 test fails when
> gt_c6_power >= gt_c0_power.  These values are reported by
> igt_power_get_mW, which will always report 0 in the case that
> igt_power_open fails to open either the hwmon_fd or rapl.fd.  Since the
> expected result will always be a failure in this case, skip the
> assertion that gt_c6_power < gt_c0_power.

Applied, thanks!

Regards,
Kamil

> 
> v2: Do not skip the full test, and instead only ignore the part that is
> guaranteed to fail.
> 
> v3: Use || instead of && (Riana)
> 
> v4: Reprovision
> 
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/958
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
> Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
> Reviewed-by: Riana Tauro <riana.tauro at intel.com>
> ---
>  tests/intel/xe_pm_residency.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/intel/xe_pm_residency.c b/tests/intel/xe_pm_residency.c
> index 06f4a0bc6b..f9e96d6087 100644
> --- a/tests/intel/xe_pm_residency.c
> +++ b/tests/intel/xe_pm_residency.c
> @@ -289,10 +289,14 @@ static void measure_power(struct igt_power *gpu, double *power)
>  static void toggle_gt_c6(int fd, int n)
>  {
>  	double gt_c0_power, gt_c6_power;
> -	int gt;
> +	int gt, ret;
>  	struct igt_power gpu;
>  
> -	igt_power_open(fd, &gpu, "gpu");
> +	/*
> +	 * igt_power_get_mW will always return 0 if igt_power_open fails,
> +	 * so skip the power check in this case.
> +	 */
> +	ret = igt_power_open(fd, &gpu, "gpu");
>  
>  	do {
>  		fw_handle = igt_debugfs_open(fd, "forcewake_all", O_RDONLY);
> @@ -319,7 +323,7 @@ static void toggle_gt_c6(int fd, int n)
>  	igt_info("GPU consumed %fmW in GT C6 and %fmW in GT C0\n", gt_c6_power, gt_c0_power);
>  
>  	/* FIXME: Remove dgfx check after hwmon is added */
> -	if (!xe_has_vram(fd))
> +	if (!(xe_has_vram(fd) || ret))
>  		igt_assert_f(gt_c6_power < gt_c0_power,
>  			     "Power consumed in GT C6 should be lower than GT C0\n");
>  }
> -- 
> 2.43.0
>