[igt-dev] [PATCH i-g-t] tests/xe/xe_guc_pc: Skip RC6 tests for PVC

[igt-dev] [PATCH i-g-t] tests/xe/xe_guc_pc: Skip RC6 tests for PVC

[Niranjana Vishwanathapura]

The Pontevecchio (PVC) platform doesn't have rc6 support yet.
Skip rc6_on_idle and rc0_on_exec subtests for PVC.

Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
---
 tests/xe/xe_guc_pc.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c
index 60c93288b..9fc2429d8 100644
--- a/tests/xe/xe_guc_pc.c
+++ b/tests/xe/xe_guc_pc.c
@@ -375,6 +375,38 @@ static bool in_rc6(int sysfs, int gt_id)
 	return strcmp(rc, "rc6") == 0;
 }
 
+static bool is_rc6_supported(int fd)
+{
+	struct drm_xe_query_config *config;
+	struct drm_xe_device_query query = {
+		.query = DRM_XE_DEVICE_QUERY_CONFIG,
+	};
+	uint16_t devid;
+
+	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+
+	config = malloc(query.size);
+	igt_assert(config);
+
+	query.data = to_user_pointer(config);
+	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
+
+	/* No rc6 support yet on Pontevecchio */
+	devid = config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff;
+	return !(
+		devid == 0x0BD0 ||
+		devid == 0x0BD1 ||
+		devid == 0x0BD2 ||
+		devid == 0x0BD5 ||
+		devid == 0x0BD6 ||
+		devid == 0x0BD7 ||
+		devid == 0x0BD8 ||
+		devid == 0x0BD9 ||
+		devid == 0x0BDA ||
+		devid == 0x0BDB
+		);
+}
+
 igt_main
 {
 	struct drm_xe_engine_class_instance *hwe;
@@ -467,12 +499,14 @@ igt_main
 	}
 
 	igt_subtest("rc6_on_idle") {
+		igt_skip_on(!is_rc6_supported(fd));
 		xe_for_each_gt(fd, gt) {
 			assert(igt_wait(in_rc6(sysfs, gt), 1000, 1));
 		}
 	}
 
 	igt_subtest("rc0_on_exec") {
+		igt_skip_on(!is_rc6_supported(fd));
 		xe_for_each_gt(fd, gt) {
 			assert(igt_wait(in_rc6(sysfs, gt), 1000, 1));
 			xe_for_each_hw_engine(fd, hwe)
-- 
2.21.0.rc0.32.g243a4c7e27

Re: [igt-dev] [PATCH i-g-t] tests/xe/xe_guc_pc: Skip RC6 tests for PVC

[Mauro Carvalho Chehab]

On Mon, 27 Mar 2023 22:33:03 -0700
Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> wrote:

> The Pontevecchio (PVC) platform doesn't have rc6 support yet.
> Skip rc6_on_idle and rc0_on_exec subtests for PVC.
> 
> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> ---
>  tests/xe/xe_guc_pc.c | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c
> index 60c93288b..9fc2429d8 100644
> --- a/tests/xe/xe_guc_pc.c
> +++ b/tests/xe/xe_guc_pc.c
> @@ -375,6 +375,38 @@ static bool in_rc6(int sysfs, int gt_id)
>  	return strcmp(rc, "rc6") == 0;
>  }
>  
> +static bool is_rc6_supported(int fd)
> +{
> +	struct drm_xe_query_config *config;
> +	struct drm_xe_device_query query = {
> +		.query = DRM_XE_DEVICE_QUERY_CONFIG,
> +	};
> +	uint16_t devid;
> +
> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> +
> +	config = malloc(query.size);
> +	igt_assert(config);
> +
> +	query.data = to_user_pointer(config);
> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> +
> +	/* No rc6 support yet on Pontevecchio */
> +	devid = config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff;
> +	return !(
> +		devid == 0x0BD0 ||
> +		devid == 0x0BD1 ||
> +		devid == 0x0BD2 ||
> +		devid == 0x0BD5 ||
> +		devid == 0x0BD6 ||
> +		devid == 0x0BD7 ||
> +		devid == 0x0BD8 ||
> +		devid == 0x0BD9 ||
> +		devid == 0x0BDA ||
> +		devid == 0x0BDB
> +		);
> +}

Instead of hardcoding a list of devices, better to check for GPU version.
Something like this (completely untested) patch:

diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index c2c8998dd955..21ddb016960e 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -203,6 +203,7 @@ void intel_check_pch(void);
 #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
 
 #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
+#define IS_GEN_VER(devid, x, y)	(intel_graphics_ver(devid) == IP_VER(x, y))
 #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
 
 #define IS_GEN2(devid)		IS_GEN(devid, 2)
@@ -217,6 +218,8 @@ void intel_check_pch(void);
 #define IS_GEN11(devid)		IS_GEN(devid, 11)
 #define IS_GEN12(devid)		IS_GEN(devid, 12)
 
+#define IS_PONTEVECCHIO(devid)	IS_GEN_VER(devid, 12, 60)
+
 #define IS_MOBILE(devid)	(intel_get_device_info(devid)->is_mobile)
 #define IS_965(devid)		AT_LEAST_GEN(devid, 4)
 
diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c
index 60c93288bfdb..819d415372ae 100644
--- a/tests/xe/xe_guc_pc.c
+++ b/tests/xe/xe_guc_pc.c
@@ -467,6 +467,7 @@ igt_main
 	}
 
 	igt_subtest("rc6_on_idle") {
+		igt_require(IS_PONTEVECCHIO(intel_get_drm_devid(fd)));
 		xe_for_each_gt(fd, gt) {
 			assert(igt_wait(in_rc6(sysfs, gt), 1000, 1));
 		}

[igt-dev] ✗ Fi.CI.BAT: failure for tests/xe/xe_guc_pc: Skip RC6 tests for PVC (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 6116 bytes --]

== Series Details ==

Series: tests/xe/xe_guc_pc: Skip RC6 tests for PVC (rev2)
URL   : https://patchwork.freedesktop.org/series/115705/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12923 -> IGTPW_8695
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_8695 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_8695, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/index.html

Participating hosts (36 -> 36)
------------------------------

  No changes in participating hosts

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in IGTPW_8695:

### IGT changes ###

#### Possible regressions ####

  * igt@kms_pipe_crc_basic@suspend-read-crc@pipe-c-dp-1:
    - fi-cfl-8109u:       [PASS][1] -> [ABORT][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/fi-cfl-8109u/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-c-dp-1.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/fi-cfl-8109u/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-c-dp-1.html

  
Known issues
------------

  Here are the changes found in IGTPW_8695 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_suspend@basic-s3@smem:
    - bat-rpls-1:         [PASS][3] -> [ABORT][4] ([i915#6687] / [i915#7978])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html

  * igt@i915_selftest@live@gt_heartbeat:
    - fi-glk-j4005:       [PASS][5] -> [DMESG-FAIL][6] ([i915#5334])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html

  * igt@i915_selftest@live@reset:
    - bat-rpls-2:         [PASS][7] -> [ABORT][8] ([i915#4983] / [i915#7913])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-rpls-2/igt@i915_selftest@live@reset.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-rpls-2/igt@i915_selftest@live@reset.html

  * igt@kms_chamelium_hpd@common-hpd-after-suspend:
    - bat-dg2-11:         NOTRUN -> [SKIP][9] ([i915#7828])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-dg2-11/igt@kms_chamelium_hpd@common-hpd-after-suspend.html

  * igt@kms_pipe_crc_basic@compare-crc-sanitycheck@pipe-d-dp-1:
    - bat-dg2-8:          [PASS][10] -> [FAIL][11] ([i915#7932])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-dg2-8/igt@kms_pipe_crc_basic@compare-crc-sanitycheck@pipe-d-dp-1.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-dg2-8/igt@kms_pipe_crc_basic@compare-crc-sanitycheck@pipe-d-dp-1.html

  * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
    - bat-dg2-11:         NOTRUN -> [SKIP][12] ([i915#5354]) +1 similar issue
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@gt_lrc:
    - bat-dg2-11:         [INCOMPLETE][13] ([i915#7609] / [i915#7913]) -> [PASS][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-dg2-11/igt@i915_selftest@live@gt_lrc.html

  * igt@i915_selftest@live@guc:
    - bat-rpls-1:         [DMESG-WARN][15] ([i915#7852]) -> [PASS][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-rpls-1/igt@i915_selftest@live@guc.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-rpls-1/igt@i915_selftest@live@guc.html

  * igt@i915_selftest@live@slpc:
    - bat-rpls-1:         [DMESG-FAIL][17] ([i915#6367] / [i915#7996]) -> [PASS][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-rpls-1/igt@i915_selftest@live@slpc.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-rpls-1/igt@i915_selftest@live@slpc.html

  * igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1:
    - bat-dg2-8:          [FAIL][19] ([i915#7932]) -> [PASS][20]
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12923/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1.html

  
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
  [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
  [i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
  [i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
  [i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
  [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
  [i915#7852]: https://gitlab.freedesktop.org/drm/intel/issues/7852
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
  [i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996


Build changes
-------------

  * CI: CI-20190529 -> None
  * IGT: IGT_7221 -> IGTPW_8695

  CI-20190529: 20190529
  CI_DRM_12923: cdd32ac83137835a85bad4ca4b4751ea90960e72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8695: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/index.html
  IGT_7221: 4b77c6d85024d22ca521d510f8eee574128fe04f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8695/index.html

[-- Attachment #2: Type: text/html, Size: 7119 bytes --]

Re: [igt-dev] [PATCH i-g-t] tests/xe/xe_guc_pc: Skip RC6 tests for PVC

[Niranjana Vishwanathapura]

On Tue, Mar 28, 2023 at 08:27:17AM +0200, Mauro Carvalho Chehab wrote:
>On Mon, 27 Mar 2023 22:33:03 -0700
>Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> wrote:
>
>> The Pontevecchio (PVC) platform doesn't have rc6 support yet.
>> Skip rc6_on_idle and rc0_on_exec subtests for PVC.
>>
>> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
>> ---
>>  tests/xe/xe_guc_pc.c | 34 ++++++++++++++++++++++++++++++++++
>>  1 file changed, 34 insertions(+)
>>
>> diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c
>> index 60c93288b..9fc2429d8 100644
>> --- a/tests/xe/xe_guc_pc.c
>> +++ b/tests/xe/xe_guc_pc.c
>> @@ -375,6 +375,38 @@ static bool in_rc6(int sysfs, int gt_id)
>>  	return strcmp(rc, "rc6") == 0;
>>  }
>>
>> +static bool is_rc6_supported(int fd)
>> +{
>> +	struct drm_xe_query_config *config;
>> +	struct drm_xe_device_query query = {
>> +		.query = DRM_XE_DEVICE_QUERY_CONFIG,
>> +	};
>> +	uint16_t devid;
>> +
>> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
>> +
>> +	config = malloc(query.size);
>> +	igt_assert(config);
>> +
>> +	query.data = to_user_pointer(config);
>> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
>> +
>> +	/* No rc6 support yet on Pontevecchio */
>> +	devid = config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff;
>> +	return !(
>> +		devid == 0x0BD0 ||
>> +		devid == 0x0BD1 ||
>> +		devid == 0x0BD2 ||
>> +		devid == 0x0BD5 ||
>> +		devid == 0x0BD6 ||
>> +		devid == 0x0BD7 ||
>> +		devid == 0x0BD8 ||
>> +		devid == 0x0BD9 ||
>> +		devid == 0x0BDA ||
>> +		devid == 0x0BDB
>> +		);
>> +}
>
>Instead of hardcoding a list of devices, better to check for GPU version.
>Something like this (completely untested) patch:
>
>diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
>index c2c8998dd955..21ddb016960e 100644
>--- a/lib/intel_chipset.h
>+++ b/lib/intel_chipset.h
>@@ -203,6 +203,7 @@ void intel_check_pch(void);
> #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
>
> #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
>+#define IS_GEN_VER(devid, x, y)	(intel_graphics_ver(devid) == IP_VER(x, y))
> #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
>
> #define IS_GEN2(devid)		IS_GEN(devid, 2)
>@@ -217,6 +218,8 @@ void intel_check_pch(void);
> #define IS_GEN11(devid)		IS_GEN(devid, 11)
> #define IS_GEN12(devid)		IS_GEN(devid, 12)
>
>+#define IS_PONTEVECCHIO(devid)	IS_GEN_VER(devid, 12, 60)
>+
> #define IS_MOBILE(devid)	(intel_get_device_info(devid)->is_mobile)
> #define IS_965(devid)		AT_LEAST_GEN(devid, 4)
>
>diff --git a/tests/xe/xe_guc_pc.c b/tests/xe/xe_guc_pc.c
>index 60c93288bfdb..819d415372ae 100644
>--- a/tests/xe/xe_guc_pc.c
>+++ b/tests/xe/xe_guc_pc.c
>@@ -467,6 +467,7 @@ igt_main
> 	}
>
> 	igt_subtest("rc6_on_idle") {
>+		igt_require(IS_PONTEVECCHIO(intel_get_drm_devid(fd)));
> 		xe_for_each_gt(fd, gt) {
> 			assert(igt_wait(in_rc6(sysfs, gt), 1000, 1));
> 		}
>

Ok, thanks. I have posted a revised patch series.
[PATCH i-g-t 0/2] tests/xe/xe_guc_pc: Skip RC6 tests on PVC

Niranjana

>