[igt-dev] [PATCH i-g-t] tests/intel/hwmon: Scale hwmon tests to support xe kmd

[igt-dev] [PATCH i-g-t] tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Badal Nilawar]

Scale hwmon tests to support xe kmd

Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
---
 lib/igt_hwmon.c                             |  5 ++++-
 tests/intel/{i915_hwmon.c => intel_hwmon.c} | 10 +++++-----
 tests/meson.build                           |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename tests/intel/{i915_hwmon.c => intel_hwmon.c} (89%)

diff --git a/lib/igt_hwmon.c b/lib/igt_hwmon.c
index 309019d69..ad5a388dd 100644
--- a/lib/igt_hwmon.c
+++ b/lib/igt_hwmon.c
@@ -66,7 +66,10 @@ int igt_hwmon_open(int device)
 {
 	char path[PATH_MAX];
 
-	if (!is_i915_device(device) || !igt_hwmon_path(device, path, "i915"))
+	if (!is_intel_device(device))
+		return -1;
+
+	if (!igt_hwmon_path(device, path, "i915") || !igt_hwmon_path(device, path, "xe"))
 		return -1;
 
 	return open(path, O_RDONLY);
diff --git a/tests/intel/i915_hwmon.c b/tests/intel/intel_hwmon.c
similarity index 89%
rename from tests/intel/i915_hwmon.c
rename to tests/intel/intel_hwmon.c
index 48ed9f3b7..1cc9cd399 100644
--- a/tests/intel/i915_hwmon.c
+++ b/tests/intel/intel_hwmon.c
@@ -9,11 +9,11 @@
 #include "igt_hwmon.h"
 #include "igt_sysfs.h"
 /**
- * TEST: i915 hwmon
- * Description: Tests for i915 hwmon
+ * TEST: intel hwmon
+ * Description: Tests for intel hwmon
  * Feature: hwmon
  * Run type: FULL
- * Test category: GEM_Legacy
+ * Test category: functionality
  *
  * SUBTEST: hwmon-read
  * Description: Verify we can read all hwmon attributes
@@ -22,7 +22,7 @@
  * Description: Verify writable hwmon attributes
  */
 
-IGT_TEST_DESCRIPTION("Tests for i915 hwmon");
+IGT_TEST_DESCRIPTION("Tests for intel hwmon");
 
 static void hwmon_read(int hwm)
 {
@@ -79,7 +79,7 @@ igt_main
 	int fd, hwm;
 
 	igt_fixture {
-		fd = drm_open_driver_master(DRIVER_INTEL);
+		fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
 		hwm = igt_hwmon_open(fd);
 		igt_require(hwm >= 0);
 	}
diff --git a/tests/meson.build b/tests/meson.build
index 31492bf7b..cf5c8a2fa 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -84,6 +84,7 @@ test_progs = [
 
 intel_i915_xe_progs = [
 	'api_intel_allocator',
+	'intel_hwmon',
 ]
 
 intel_i915_progs = [
@@ -218,7 +219,6 @@ intel_i915_progs = [
 	'i915_getparams_basic',
 	'i915_pm_freq_api',
 	'i915_hangman',
-	'i915_hwmon',
 	'i915_module_load',
 	'i915_pciid',
 	'i915_pipe_stress',
-- 
2.25.1

Re: [igt-dev] [PATCH i-g-t] tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Dixit, Ashutosh]

On Fri, 15 Sep 2023 07:45:29 -0700, Badal Nilawar wrote:
>
> Scale hwmon tests to support xe kmd
>
> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>

[igt-dev] ✗ Fi.CI.BAT: failure for tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Patchwork]

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

== Series Details ==

Series: tests/intel/hwmon: Scale hwmon tests to support xe kmd
URL   : https://patchwork.freedesktop.org/series/123778/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13643 -> IGTPW_9803
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_9803 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_9803, please notify your bug team (lgci.bug.filing@intel.com) 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_9803/index.html

Participating hosts (40 -> 39)
------------------------------

  Missing    (1): fi-snb-2520m 

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@debugfs_test@basic-hwmon:
    - bat-dg1-5:          [PASS][1] -> [FAIL][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-dg1-5/igt@debugfs_test@basic-hwmon.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-dg1-5/igt@debugfs_test@basic-hwmon.html
    - bat-atsm-1:         [PASS][3] -> [FAIL][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-atsm-1/igt@debugfs_test@basic-hwmon.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-atsm-1/igt@debugfs_test@basic-hwmon.html
    - bat-dg2-9:          [PASS][5] -> [FAIL][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-dg2-9/igt@debugfs_test@basic-hwmon.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-dg2-9/igt@debugfs_test@basic-hwmon.html
    - bat-dg2-11:         [PASS][7] -> [FAIL][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-dg2-11/igt@debugfs_test@basic-hwmon.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-dg2-11/igt@debugfs_test@basic-hwmon.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@gt_lrc:
    - bat-dg1-5:          [PASS][9] -> [ABORT][10] ([i915#4983])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-dg1-5/igt@i915_selftest@live@gt_lrc.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-dg1-5/igt@i915_selftest@live@gt_lrc.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-9:          [DMESG-FAIL][11] ([i915#7913]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13643/bat-dg2-9/igt@i915_selftest@live@workarounds.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/bat-dg2-9/igt@i915_selftest@live@workarounds.html

  
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7490 -> IGTPW_9803

  CI-20190529: 20190529
  CI_DRM_13643: dc4cd6e4e53d46211952fe7c0e408fce3e212993 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_9803: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/index.html
  IGT_7490: 7490


Testlist changes
----------------

+igt@intel_hwmon@hwmon-read
+igt@intel_hwmon@hwmon-write
-igt@i915_hwmon@hwmon-read
-igt@i915_hwmon@hwmon-write

== Logs ==

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

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

[igt-dev] ✓ CI.xeBAT: success for tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Patchwork]

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

== Series Details ==

Series: tests/intel/hwmon: Scale hwmon tests to support xe kmd
URL   : https://patchwork.freedesktop.org/series/123778/
State : success

== Summary ==

CI Bug Log - changes from XEIGT_7490_BAT -> XEIGTPW_9803_BAT
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Participating hosts (4 -> 4)
------------------------------

  No changes in participating hosts

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

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

### IGT changes ###

#### Warnings ####

  * igt@kms_frontbuffer_tracking@basic:
    - bat-adlp-7:         [INCOMPLETE][1] ([Intel XE#632]) -> [INCOMPLETE][2] ([Intel XE#606] / [Intel XE#632])
   [1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7490/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html
   [2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9803/bat-adlp-7/igt@kms_frontbuffer_tracking@basic.html

  
  [Intel XE#606]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/606
  [Intel XE#632]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/632


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

  * IGT: IGT_7490 -> IGTPW_9803
  * Linux: xe-375-4a9681392cecd56a372d06b648f7b3a37fdd5c63 -> xe-376-9da40abcc0ccdf8fdfed4e21d76060bfcd35fe7d

  IGTPW_9803: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_9803/index.html
  IGT_7490: 7490
  xe-375-4a9681392cecd56a372d06b648f7b3a37fdd5c63: 4a9681392cecd56a372d06b648f7b3a37fdd5c63
  xe-376-9da40abcc0ccdf8fdfed4e21d76060bfcd35fe7d: 9da40abcc0ccdf8fdfed4e21d76060bfcd35fe7d

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_9803/index.html

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

Re: [igt-dev] [PATCH i-g-t] tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Riana Tauro]

Hi Badal

On 9/15/2023 8:15 PM, Badal Nilawar wrote:
> Scale hwmon tests to support xe kmd
> 
> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
> ---
>   lib/igt_hwmon.c                             |  5 ++++-
>   tests/intel/{i915_hwmon.c => intel_hwmon.c} | 10 +++++-----
>   tests/meson.build                           |  2 +-
>   3 files changed, 10 insertions(+), 7 deletions(-)
>   rename tests/intel/{i915_hwmon.c => intel_hwmon.c} (89%)
> 
> diff --git a/lib/igt_hwmon.c b/lib/igt_hwmon.c
> index 309019d69..ad5a388dd 100644
> --- a/lib/igt_hwmon.c
> +++ b/lib/igt_hwmon.c
> @@ -66,7 +66,10 @@ int igt_hwmon_open(int device)
>   {
>   	char path[PATH_MAX];
>   
> -	if (!is_i915_device(device) || !igt_hwmon_path(device, path, "i915"))
> +	if (!is_intel_device(device))
> +		return -1;
> +
> +	if (!igt_hwmon_path(device, path, "i915") || !igt_hwmon_path(device, path, "xe"))
This should be &&

Thanks
Riana Tauro
>   		return -1;
>   
>   	return open(path, O_RDONLY);
> diff --git a/tests/intel/i915_hwmon.c b/tests/intel/intel_hwmon.c
> similarity index 89%
> rename from tests/intel/i915_hwmon.c
> rename to tests/intel/intel_hwmon.c
> index 48ed9f3b7..1cc9cd399 100644
> --- a/tests/intel/i915_hwmon.c
> +++ b/tests/intel/intel_hwmon.c
> @@ -9,11 +9,11 @@
>   #include "igt_hwmon.h"
>   #include "igt_sysfs.h"
>   /**
> - * TEST: i915 hwmon
> - * Description: Tests for i915 hwmon
> + * TEST: intel hwmon
> + * Description: Tests for intel hwmon
>    * Feature: hwmon
>    * Run type: FULL
> - * Test category: GEM_Legacy
> + * Test category: functionality
>    *
>    * SUBTEST: hwmon-read
>    * Description: Verify we can read all hwmon attributes
> @@ -22,7 +22,7 @@
>    * Description: Verify writable hwmon attributes
>    */
>   
> -IGT_TEST_DESCRIPTION("Tests for i915 hwmon");
> +IGT_TEST_DESCRIPTION("Tests for intel hwmon");
>   
>   static void hwmon_read(int hwm)
>   {
> @@ -79,7 +79,7 @@ igt_main
>   	int fd, hwm;
>   
>   	igt_fixture {
> -		fd = drm_open_driver_master(DRIVER_INTEL);
> +		fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
>   		hwm = igt_hwmon_open(fd);
>   		igt_require(hwm >= 0);
>   	}
> diff --git a/tests/meson.build b/tests/meson.build
> index 31492bf7b..cf5c8a2fa 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -84,6 +84,7 @@ test_progs = [
>   
>   intel_i915_xe_progs = [
>   	'api_intel_allocator',
> +	'intel_hwmon',
>   ]
>   
>   intel_i915_progs = [
> @@ -218,7 +219,6 @@ intel_i915_progs = [
>   	'i915_getparams_basic',
>   	'i915_pm_freq_api',
>   	'i915_hangman',
> -	'i915_hwmon',
>   	'i915_module_load',
>   	'i915_pciid',
>   	'i915_pipe_stress',

Re: [igt-dev] [PATCH i-g-t] tests/intel/hwmon: Scale hwmon tests to support xe kmd

[Nilawar, Badal]

On 18-09-2023 10:14, Riana Tauro wrote:
> Hi Badal
> 
> On 9/15/2023 8:15 PM, Badal Nilawar wrote:
>> Scale hwmon tests to support xe kmd
>>
>> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
>> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
>> ---
>>   lib/igt_hwmon.c                             |  5 ++++-
>>   tests/intel/{i915_hwmon.c => intel_hwmon.c} | 10 +++++-----
>>   tests/meson.build                           |  2 +-
>>   3 files changed, 10 insertions(+), 7 deletions(-)
>>   rename tests/intel/{i915_hwmon.c => intel_hwmon.c} (89%)
>>
>> diff --git a/lib/igt_hwmon.c b/lib/igt_hwmon.c
>> index 309019d69..ad5a388dd 100644
>> --- a/lib/igt_hwmon.c
>> +++ b/lib/igt_hwmon.c
>> @@ -66,7 +66,10 @@ int igt_hwmon_open(int device)
>>   {
>>       char path[PATH_MAX];
>> -    if (!is_i915_device(device) || !igt_hwmon_path(device, path, 
>> "i915"))
>> +    if (!is_intel_device(device))
>> +        return -1;
>> +
>> +    if (!igt_hwmon_path(device, path, "i915") || 
>> !igt_hwmon_path(device, path, "xe"))
> This should be &&
Sure I will fix this.
Regards,
Badal
> 
> Thanks
> Riana Tauro
>>           return -1;
>>       return open(path, O_RDONLY);
>> diff --git a/tests/intel/i915_hwmon.c b/tests/intel/intel_hwmon.c
>> similarity index 89%
>> rename from tests/intel/i915_hwmon.c
>> rename to tests/intel/intel_hwmon.c
>> index 48ed9f3b7..1cc9cd399 100644
>> --- a/tests/intel/i915_hwmon.c
>> +++ b/tests/intel/intel_hwmon.c
>> @@ -9,11 +9,11 @@
>>   #include "igt_hwmon.h"
>>   #include "igt_sysfs.h"
>>   /**
>> - * TEST: i915 hwmon
>> - * Description: Tests for i915 hwmon
>> + * TEST: intel hwmon
>> + * Description: Tests for intel hwmon
>>    * Feature: hwmon
>>    * Run type: FULL
>> - * Test category: GEM_Legacy
>> + * Test category: functionality
>>    *
>>    * SUBTEST: hwmon-read
>>    * Description: Verify we can read all hwmon attributes
>> @@ -22,7 +22,7 @@
>>    * Description: Verify writable hwmon attributes
>>    */
>> -IGT_TEST_DESCRIPTION("Tests for i915 hwmon");
>> +IGT_TEST_DESCRIPTION("Tests for intel hwmon");
>>   static void hwmon_read(int hwm)
>>   {
>> @@ -79,7 +79,7 @@ igt_main
>>       int fd, hwm;
>>       igt_fixture {
>> -        fd = drm_open_driver_master(DRIVER_INTEL);
>> +        fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_XE);
>>           hwm = igt_hwmon_open(fd);
>>           igt_require(hwm >= 0);
>>       }
>> diff --git a/tests/meson.build b/tests/meson.build
>> index 31492bf7b..cf5c8a2fa 100644
>> --- a/tests/meson.build
>> +++ b/tests/meson.build
>> @@ -84,6 +84,7 @@ test_progs = [
>>   intel_i915_xe_progs = [
>>       'api_intel_allocator',
>> +    'intel_hwmon',
>>   ]
>>   intel_i915_progs = [
>> @@ -218,7 +219,6 @@ intel_i915_progs = [
>>       'i915_getparams_basic',
>>       'i915_pm_freq_api',
>>       'i915_hangman',
>> -    'i915_hwmon',
>>       'i915_module_load',
>>       'i915_pciid',
>>       'i915_pipe_stress',