All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH i-g-t 0/5] IGT documentation refactoring
@ 2024-02-29 11:19 Katarzyna Piecielska
  2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
                   ` (5 more replies)
  0 siblings, 6 replies; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

First series to unify XE and i915 test documentation. This series is just first
step to refactor what is already documented, like remove duplications, change
layout etc.
This series is not addressing huge amount of warnings that we have now while
building IGTs, but will make review process easier.

Warnings of missing documentation fields will come as next series.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Katarzyna Piecielska (5):
  Documentation refactoring part 1
  Documentation refactoring part 2
  Documentation refactoring part 3
  Documentation refactoring part 4
  Documentation refactoring part 5

 tests/core_hotunplug.c                 |  57 ++---
 tests/device_reset.c                   |  17 +-
 tests/dmabuf.c                         |  13 +-
 tests/drm_mm.c                         |  84 +------
 tests/intel/api_intel_bb.c             | 152 +-----------
 tests/intel/debugfs_test.c             |  32 +--
 tests/intel/gem_basic.c                |  22 +-
 tests/intel/gem_blits.c                |   2 +-
 tests/intel/gem_ccs.c                  |   9 +-
 tests/intel/gem_close_race.c           |  39 +--
 tests/intel/gem_create.c               |  87 ++-----
 tests/intel/gem_ctx_create.c           |  77 ++----
 tests/intel/gem_ctx_exec.c             |  51 ++--
 tests/intel/gem_ctx_isolation.c        |  43 +---
 tests/intel/gem_ctx_param.c            | 144 +++--------
 tests/intel/gem_ctx_persistence.c      | 117 +--------
 tests/intel/gem_ctx_shared.c           |  42 +---
 tests/intel/gem_eio.c                  | 133 +---------
 tests/intel/gem_exec_balancer.c        | 139 +----------
 tests/intel/gem_exec_basic.c           |  13 +-
 tests/intel/gem_exec_big.c             |   8 +-
 tests/intel/gem_exec_capture.c         |  25 +-
 tests/intel/gem_exec_create.c          |  48 ++--
 tests/intel/gem_exec_fence.c           | 277 +++++----------------
 tests/intel/gem_exec_gttfill.c         |  23 +-
 tests/intel/gem_exec_nop.c             |  27 +--
 tests/intel/gem_exec_parallel.c        |  37 +--
 tests/intel/gem_exec_params.c          | 112 +--------
 tests/intel/gem_exec_schedule.c        | 324 +------------------------
 tests/intel/gem_exec_suspend.c         |  40 +--
 tests/intel/gem_exec_whisper.c         | 181 +-------------
 tests/intel/gem_flink_basic.c          |  35 +--
 tests/intel/gem_linear_blits.c         |  23 +-
 tests/intel/gem_lmem_swapping.c        | 101 +-------
 tests/intel/gem_madvise.c              |  29 +--
 tests/intel/gem_mmap.c                 |  34 +--
 tests/intel/gem_mmap_gtt.c             | 175 +------------
 tests/intel/gem_mmap_offset.c          |  75 +-----
 tests/intel/gem_mmap_wc.c              |  43 +---
 tests/intel/gem_partial_pwrite_pread.c |  48 ++--
 tests/intel/gem_ppgtt.c                |  16 +-
 tests/intel/gem_pxp.c                  |  24 +-
 tests/intel/gem_render_linear_blits.c  |   4 +-
 tests/intel/gem_render_tiled_blits.c   |  17 +-
 tests/intel/gem_ringfill.c             |  29 +--
 tests/intel/gem_shrink.c               |   8 +-
 tests/intel/gem_softpin.c              | 134 +---------
 tests/intel/gem_spin_batch.c           |  60 +----
 tests/intel/gem_sync.c                 |  86 +------
 tests/intel/gem_tiled_blits.c          |   3 +-
 tests/intel/gem_userptr_blits.c        | 247 +------------------
 tests/intel/gem_wait.c                 |  34 +--
 tests/intel/gem_workarounds.c          |  43 +---
 tests/intel/i915_module_load.c         |  23 +-
 tests/intel/i915_pm_rc6_residency.c    |   6 +-
 tests/intel/i915_pm_rpm.c              |  50 +---
 tests/intel/i915_pm_rps.c              |  34 +--
 tests/intel/i915_query.c               |  52 +---
 tests/intel/i915_suspend.c             |  31 +--
 tests/intel/perf.c                     |  54 +----
 tests/intel/perf_pmu.c                 |  73 +-----
 tests/intel/sysfs_heartbeat_interval.c |   6 +-
 tests/intel/sysfs_preempt_timeout.c    |  15 +-
 tests/intel/sysfs_timeslice_duration.c |  17 +-
 tests/prime_vgem.c                     |  57 +----
 tests/vgem_basic.c                     |  30 +--
 66 files changed, 513 insertions(+), 3578 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH i-g-t 1/5] Documentation refactoring part 1
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
@ 2024-02-29 11:19 ` Katarzyna Piecielska
  2024-02-29 15:25   ` Kamil Konieczny
  2024-02-29 18:18   ` Kamil Konieczny
  2024-02-29 11:19 ` [PATCH i-g-t 2/5] Documentation refactoring part 2 Katarzyna Piecielska
                   ` (4 subsequent siblings)
  5 siblings, 2 replies; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

Unify documentation for Intel i915 tests that we have by  moving
common parts to be available for all tests.

This is part 1 to make review easier.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 tests/core_hotunplug.c       |  57 +++++--------
 tests/device_reset.c         |  17 ++--
 tests/dmabuf.c               |  13 ++-
 tests/drm_mm.c               |  84 +------------------
 tests/intel/api_intel_bb.c   | 152 ++---------------------------------
 tests/intel/debugfs_test.c   |  32 +++-----
 tests/intel/gem_basic.c      |  22 ++---
 tests/intel/gem_blits.c      |   2 +-
 tests/intel/gem_ccs.c        |   9 +--
 tests/intel/gem_close_race.c |  39 +++------
 tests/intel/gem_create.c     |  87 ++++++--------------
 11 files changed, 94 insertions(+), 420 deletions(-)

diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index be80d479f..f578afa4a 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -44,64 +44,43 @@
  * Description: Examine behavior of a driver on device hot unplug
  * Feature: SMI, core
  * Test category: functionality test
- *
- * SUBTEST: hotrebind
  * Category: Software building block
  * Sub-category: driver
  * Functionality: device hotplug
- * Description:
- *   Check if the driver can be cleanly rebound to a device with a still open hot unbound driver
- *   instance
  * Run type: FULL
  *
+ * SUBTEST: hotrebind
+ * Description: Check if the driver can be cleanly rebound to a device with a
+ *		still open hot unbound driver instance
+ *
  * SUBTEST: hotrebind-lateclose
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if a hot unbound driver instance still open after hot rebind can be cleanly released
- * Run type: FULL
+ * Description: Check if a hot unbound driver instance still open after hot
+ *		rebind can be cleanly released
  *
  * SUBTEST: hotreplug
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if a hot unplugged and still open device can be cleanly restored
- * Run type: FULL
+ * Description: Check if a hot unplugged and still open device can be cleanly
+ *		restored
  *
  * SUBTEST: hotreplug-lateclose
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if an instance of a still open while hot replugged device can be cleanly released
- * Run type: FULL
+ * Description: Check if an instance of a still open while hot replugged device
+ *		can be cleanly released
  *
  * SUBTEST: hotunbind-rebind
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if the driver can be cleanly unbound from an open device, then released and rebound
- * Run type: FULL
+ * Description: Check if the driver can be cleanly unbound from an open device,
+ *		then released and rebound
  *
  * SUBTEST: hotunplug-rescan
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if an open device can be cleanly unplugged, then released and restored
- * Run type: FULL
+ * Description: Check if an open device can be cleanly unplugged, then released
+ *		and restored
  *
  * SUBTEST: unbind-rebind
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if the driver can be cleanly unbound from a device believed to be closed, then rebound
+ * Description: Check if the driver can be cleanly unbound from a device
+ *		believed to be closed, then rebound
  * Run type: BAT
  *
  * SUBTEST: unplug-rescan
- * Category: Software building block
- * Sub-category: driver
- * Functionality: device hotplug
- * Description: Check if a device believed to be closed can be cleanly unplugged, then restored
- * Run type: FULL
+ * Description: Check if a device believed to be closed can be cleanly
+ *		unplugged, then restored
  */
 
 IGT_TEST_DESCRIPTION("Examine behavior of a driver on device hot unplug");
diff --git a/tests/device_reset.c b/tests/device_reset.c
index ef08164aa..e1e3ac78d 100644
--- a/tests/device_reset.c
+++ b/tests/device_reset.c
@@ -17,29 +17,26 @@
 /**
  * TEST: device reset
  * Description: Examine behavior of a driver on device sysfs reset
+ * Category: Server
+ * Feature: reset
+ * Functionality: reset
+ * Sub-category: Reset
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: cold-reset-bound
  * Description: Cold Resets device with bound driver
- * Feature: reset
  *
  * SUBTEST: reset-bound
  * Description: Resets device with bound driver
- * Feature: reset
  *
  * SUBTEST: unbind-cold-reset-rebind
  * Description: Unbinds driver from device, initiates cold reset then rebinds driver to device
- * Feature: reset
  *
  * SUBTEST: unbind-reset-rebind
- * Category: Server
- * Description:
- *   Unbinds driver from device, initiates reset then rebinds driver to device
- *   validating device resets
+ * Description: Unbinds driver from device, initiates reset then rebinds driver
+ *		to device validating device resets
  * Feature: reset, sriov-reset
- * Functionality: reset
- * Sub-category: sysman
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Examine behavior of a driver on device sysfs reset");
diff --git a/tests/dmabuf.c b/tests/dmabuf.c
index 2ac105423..977b04043 100644
--- a/tests/dmabuf.c
+++ b/tests/dmabuf.c
@@ -27,21 +27,18 @@
  * TEST: dmabuf
  * Description: Kernel selftests for the dmabuf API
  * Feature: mapping, prime
+ * Category: Infrastructure
+ * Description: drm_mm range manager SW validation
+ * Functionality: DRM
+ * Sub-category: Memory management
+ * Test category: GEM_Legacy
  * Run type: BAT
  *
  * SUBTEST: all-tests
  *
  * SUBTEST: all-tests@dma_fence
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: all-tests@sanitycheck
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Kernel selftests for the dmabuf API");
diff --git a/tests/drm_mm.c b/tests/drm_mm.c
index e6ba22474..f2e6c6cd1 100644
--- a/tests/drm_mm.c
+++ b/tests/drm_mm.c
@@ -27,129 +27,53 @@
  * TEST: drm mm
  * Description: Basic sanity check of DRM's range manager (struct drm_mm)
  * Feature: mapping
+ * Category: Infrastructure
+ * Functionality: DRM memory mangemnt
+ * Sub-category: Memory management
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: drm_mm
  *
  * SUBTEST: drm_mm@align
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@align32
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@align64
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@bottomup
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@color
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@color_evict
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@color_evict_range
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@debug
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@evict
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@evict_range
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@frag
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@highest
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@init
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@insert
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@insert_range
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@lowest
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@replace
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@reserve
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@sanitycheck
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  *
  * SUBTEST: drm_mm@topdown
- * Category: Infrastructure
- * Description: drm_mm range manager SW validation
- * Functionality: DRM memory mangemnt
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)");
diff --git a/tests/intel/api_intel_bb.c b/tests/intel/api_intel_bb.c
index 59ed244f0..24f96fcf5 100644
--- a/tests/intel/api_intel_bb.c
+++ b/tests/intel/api_intel_bb.c
@@ -43,210 +43,72 @@
 #include "intel_blt.h"
 /**
  * TEST: api intel bb
- * Description: intel_bb API check.
- * Run type: FULL
- *
- * SUBTEST: add-remove-objects
  * Category: Infrastructure
  * Description: checking dummy buffer creation & submission
  * Feature: igt_core
  * Functionality: dummy buffer creation & submission
  * Sub-category: IGT Lib
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: add-remove-objects
  *
  * SUBTEST: bb-with-allocator
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-noreloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-noreloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-reloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: blit-reloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: crc32
  * Description: Compare cpu and gpu crc32 sums on input object
- * Feature: igt_core
- * Test category: GEM_Legacy
  *
  * SUBTEST: delta-check
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: destroy-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: full-batch
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: intel-bb-blit-none
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: intel-bb-blit-x
- * Feature: igt_core
  *
  * SUBTEST: intel-bb-blit-y
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: lot-of-buffers
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: misplaced-blitter
- * Category: Infrastructure
- * Description:
- *   Execute intel_bb with set of engines provided by userspace
- *   checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
+ * Description: Execute intel_bb with set of engines provided by userspace
+ *		checking dummy buffer creation & submission
  *
  * SUBTEST: object-noreloc-keep-cache-simple
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-noreloc-purge-cache-simple
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-reloc-keep-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: object-reloc-purge-cache
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: offset-control
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: purge-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: render
- * Feature: igt_core
  *
  * SUBTEST: render-ccs
- * Feature: igt_core
  *
  * SUBTEST: reset-bb
- * Category: Infrastructure
- * Description:
- *   Ensure reset is possible on fresh bb
- *   checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
+ * Description: Ensure reset is possible on fresh bb checking dummy buffer
+ *		creation & submission
  *
  * SUBTEST: reset-flags
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: simple-bb
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  *
  * SUBTEST: simple-bb-ctx
- * Category: Infrastructure
- * Description: checking dummy buffer creation & submission
- * Feature: igt_core
- * Functionality: dummy buffer creation & submission
- * Sub-category: IGT Lib
- * Test category: GEM_Legacy
  */
 
 #define PAGE_SIZE 4096
diff --git a/tests/intel/debugfs_test.c b/tests/intel/debugfs_test.c
index b67bfabac..9706b81e1 100644
--- a/tests/intel/debugfs_test.c
+++ b/tests/intel/debugfs_test.c
@@ -33,43 +33,29 @@
  * TEST: debugfs test
  * Description: Read entries from debugfs, hwmon and sysfs paths.
  * Feature: core
+ * Category: Infrastructure
+ * Functionality: debugfs
+ * Sub-category: uapi
+ * Test category: uapi
+ * Run type: FULL
  *
  * SUBTEST: basic-hwmon
- * Category: Infrastructure
- * Description:
- *   Read all entries from hwmon path
- *   validating debugfs entries
- * Functionality: debugfs entries
+ * Description: Read all entries from hwmon path validating debugfs entries
  * Run type: BAT
- * Test category: GEM_Legacy
  *
  * SUBTEST: read_all_entries
- * Category: Infrastructure
- * Description:
- *   Read all entries from debugfs path.
- *   validating debugfs entries
- * Functionality: debugfs entries
+ * Description: Read all entries from debugfs path validating debugfs entries
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: read_all_entries_display_off
  * Description: Read all debugfs entries with display on/off.
- * Run type: FULL
  *
  * SUBTEST: read_all_entries_display_on
  * Description: Read all debugfs entries with display on/off.
- * Run type: FULL
  *
  * SUBTEST: sysfs
- * Category: Infrastructure
- * Description:
- *   Read all entries from sysfs path.
- *   validating debugfs entries
- * Functionality: debugfs entries
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Read all entries from sysfs path validating debugfs entries
+ *
  */
 
 IGT_TEST_DESCRIPTION("Read entries from debugfs, hwmon and sysfs paths.");
diff --git a/tests/intel/gem_basic.c b/tests/intel/gem_basic.c
index 3485f92c8..513113cd1 100644
--- a/tests/intel/gem_basic.c
+++ b/tests/intel/gem_basic.c
@@ -44,33 +44,21 @@
 /**
  * TEST: gem basic
  * Description: Tests basic gem_create and gem_close IOCTLs
- *
- * SUBTEST: bad-close
  * Category: Infrastructure
- * Description: Verify that gem_close fails with bad params.
  * Feature: gem_core
  * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
+ * Sub-category: uapi
  * Test category: GEM_Legacy
+ * Run type: BAT
+ *
+ * SUBTEST: bad-close
+ * Description: Verify that gem_close fails with bad params.
  *
  * SUBTEST: create-close
- * Category: Infrastructure
  * Description: Verify basic functionality of gem_create and gem_close.
- * Feature: gem_core
- * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-fd-close
- * Category: Infrastructure
  * Description: Verify that closing drm driver is possible with opened gem object.
- * Feature: gem_core
- * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: multigpu-create-close
  * Description: Verify basic functionality of gem_create and gem_close on multi-GPU.
diff --git a/tests/intel/gem_blits.c b/tests/intel/gem_blits.c
index e567cdf33..b9d0b5f87 100644
--- a/tests/intel/gem_blits.c
+++ b/tests/intel/gem_blits.c
@@ -34,7 +34,7 @@
  * Feature: blitter
  * Functionality: command streamer
  * Run type: FULL
- * Sub-category: HW
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
  *
  * SUBTEST: basic
diff --git a/tests/intel/gem_ccs.c b/tests/intel/gem_ccs.c
index e8f16d7d8..3442ecfd3 100644
--- a/tests/intel/gem_ccs.c
+++ b/tests/intel/gem_ccs.c
@@ -19,11 +19,11 @@
 /**
  * TEST: gem ccs
  * Description: Exercise gen12 blitter with and without flatccs compression
+ * Feature: flat_ccs_mapping
  * Run type: FULL
  *
  * SUBTEST: block-copy-compressed
  * Description: Check block-copy flatccs compressed blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: block-copy-uncompressed
  * Description: Check block-copy uncompressed blit
@@ -31,19 +31,16 @@
  *
  * SUBTEST: block-multicopy-compressed
  * Description: Check block-multicopy flatccs compressed blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: block-multicopy-inplace
  * Description: Check block-multicopy flatccs inplace decompression blit
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: ctrl-surf-copy
  * Description: Check flatccs data can be copied from/to surface
- * Feature: flat_ccs_mapping
  *
  * SUBTEST: ctrl-surf-copy-new-ctx
- * Description: Check flatccs data are physically tagged and visible in different contexts
- * Feature: flat_ccs_mapping
+ * Description: Check flatccs data are physically tagged and visible i
+ *		different contexts
  *
  * SUBTEST: suspend-resume
  * Description: Check flatccs data persists after suspend / resume (S0)
diff --git a/tests/intel/gem_close_race.c b/tests/intel/gem_close_race.c
index cef0ff025..9c2034ad3 100644
--- a/tests/intel/gem_close_race.c
+++ b/tests/intel/gem_close_race.c
@@ -51,57 +51,42 @@
 /**
  * TEST: gem close race
  * Description: Test try to race gem_close against workload submission.
- *
- * SUBTEST: basic-process
  * Category: Infrastructure
- * Description: Basic workload submission.
  * Feature: synchronization
  * Functionality: driver handler
- * Run type: BAT
- * Sub-category: i915
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic-process
+ * Description: Basic workload submission.
+ * Run type: BAT
  *
  * SUBTEST: basic-threads
- * Category: Infrastructure
- * Description:
- *   Share buffer handle across different drm fd's and trying to race gem_close against
- *   continuous workload with minimum timeout.
- * Feature: synchronization
- * Functionality: driver handler
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race gem_close against continuous workload with minimum timeout.
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: contexts
- * Description:
- *   Share buffer handle across different drm fd's and trying to race gem_close against
- *   continuous workload in other contexts.
- * Feature: synchronization
- * Run type: FULL
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race gem_close against continuous workload in other contexts.
  *
  * SUBTEST: gem-close-race
- * Description:
- *   Share buffer handle across different drm fd's and trying to race of gem_close against
- *   continuous workload.
- * Feature: synchronization
- * Run type: FULL
+ * Description: Share buffer handle across different drm fd's and trying to
+ *		race of gem_close against continuous workload.
  *
  * SUBTEST: multigpu-basic-process
  * Description: Basic workload submission on multi-GPU machine.
  * Feature: multigpu, synchronization
- * Run type: FULL
  * Test category: MultiGPU
  *
  * SUBTEST: multigpu-basic-threads
  * Description: Run basic-threads race on multi-GPU machine.
  * Feature: multigpu, synchronization
- * Run type: FULL
  * Test category: MultiGPU
  *
  * SUBTEST: process-exit
  * Description: Test try to race gem_close against submission of continuous workload.
- * Feature: synchronization
- * Run type: FULL
  */
 
 #define OBJECT_SIZE (256 * 1024)
diff --git a/tests/intel/gem_create.c b/tests/intel/gem_create.c
index 87fde2963..77ffceda4 100644
--- a/tests/intel/gem_create.c
+++ b/tests/intel/gem_create.c
@@ -64,101 +64,60 @@
 #include "i915_drm.h"
 /**
  * TEST: gem create
- * Description:
- *   Ensure that basic gem_create and gem_create_ext works and that invalid input combinations
- *   are rejected.
- * Run type: FULL
- *
- * SUBTEST: busy-create
+ * Description: Ensure that basic gem_create and gem_create_ext works and that
+ *		invalid input combinations are rejected.
  * Category: Infrastructure
- * Description: Create buffer objects while GPU is busy.
  * Feature: mapping
  * Functionality: buffer management
- * Sub-category: i915
+ * Sub-category: uapi
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: busy-create
+ * Description: Create buffer objects while GPU is busy.
  *
  * SUBTEST: create-clear
- * Category: Infrastructure
  * Description: Verify that all new objects are clear.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-ext-cpu-access-big
- * Description:
- *   Verify the extreme cases with very large objects and.
- *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
- * Feature: mapping
+ * Description: Verify the extreme cases with very large objects and
+ *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
  *
  * SUBTEST: create-ext-cpu-access-sanity-check
- * Description:
- *   Verify the basic functionally and expected ABI contract around.
- *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
- * Feature: mapping
+ * Description: Verify the basic functionally and expected ABI contract around
+ *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
  *
  * SUBTEST: create-ext-placement-all
  * Category: Infrastructure
  * Description: Create objects in every memory region using create_ext.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-ext-placement-each
- * Category: Infrastructure
- * Description: Create one object with memory pieces in each memory region using create_ext.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Create one object with memory pieces in each memory region
+ *		using create_ext.
  *
  * SUBTEST: create-ext-placement-sanity-check
- * Category: Infrastructure
  * Description: Exercise create_ext placements extension.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-invalid-size
- * Category: Infrastructure
- * Description: Try to create a gem object of invalid size 0 and check if ioctl returns error.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create a gem object of invalid size 0 and check if
+ *		ioctl returns error.
  *
  * SUBTEST: create-massive
- * Category: Infrastructure
- * Description: Exercise creation of buffer object with impossible size and check for the expected error.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Exercise creation of buffer object with impossible size and
+ *		check for the expected error.
  *
  * SUBTEST: create-size-update
- * Category: Infrastructure
- * Description: Try to create a gem object with size 15 and check actual created size.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create a gem object with size 15 and check actual
+ *		created size.
  *
  * SUBTEST: create-valid-nonaligned
- * Category: Infrastructure
- * Description:
- *   Try to create an object with non-aligned size, check we got one with size aligned up to page
- *   size and test we can write into the padded extra memory.
- * Feature: mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Try to create an object with non-aligned size, check we got one
+ *		with size aligned up to page size and test we can write into
+ *		the padded extra memory.
  *
  * SUBTEST: hog-create
  * Description: Create buffer objects while GPU is busy.
- * Feature: mapping
- * Test category: GEM_Legacy
+ *
  */
 
 IGT_TEST_DESCRIPTION("Ensure that basic gem_create and gem_create_ext works"
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH i-g-t 2/5] Documentation refactoring part 2
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
  2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
@ 2024-02-29 11:19 ` Katarzyna Piecielska
  2024-02-29 15:35   ` Kamil Konieczny
  2024-02-29 11:19 ` [PATCH i-g-t 3/5] Documentation refactoring part 3 Katarzyna Piecielska
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

 Unify documentation for Intel i915 tests that we have by  moving
 common parts to be available for all tests.

 This is part 2 to make review easier.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 tests/intel/gem_ctx_create.c      |  77 ++++++----------
 tests/intel/gem_ctx_exec.c        |  51 +++--------
 tests/intel/gem_ctx_isolation.c   |  43 ++-------
 tests/intel/gem_ctx_param.c       | 144 ++++++------------------------
 tests/intel/gem_ctx_persistence.c | 117 ++----------------------
 tests/intel/gem_ctx_shared.c      |  42 ++-------
 tests/intel/gem_eio.c             | 133 ++-------------------------
 tests/intel/gem_exec_balancer.c   | 139 ++--------------------------
 8 files changed, 99 insertions(+), 647 deletions(-)

diff --git a/tests/intel/gem_ctx_create.c b/tests/intel/gem_ctx_create.c
index 6d0877954..4fe383e02 100644
--- a/tests/intel/gem_ctx_create.c
+++ b/tests/intel/gem_ctx_create.c
@@ -38,91 +38,64 @@
 /**
  * TEST: gem ctx create
  * Description: Test the context create ioctls
- *
- * SUBTEST: active
- * Description:
- *   For each engine calculate the average performance of context creation execution and
- *   exercise context reclaim
+ * Category: Infrastructure
  * Feature: context
+ * Functionality: context
+ * Sub-category: Context
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
+ * SUBTEST: active
+ * Description: For each engine calculate the average performance of context
+ *		creation execution and exercise context reclaim
+ *
  * SUBTEST: active-all
- * Description: Calculate the average performance of context creation and it's execution using all engines
- * Feature: context
- * Run type: FULL
+ * Description: Calculate the average performance of context creation and it's
+ *		execution using all engines
  *
  * SUBTEST: basic
- * Category: Infrastructure
  * Description: Test random context creation
- * Feature: context
- * Functionality: context management
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-files
- * Category: Infrastructure
  * Description: Exercise implicit per-fd context creation
- * Feature: context
- * Functionality: context management
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: ext-param
  * Description: Verify valid and invalid context extensions
- * Feature: context
- * Run type: FULL
  *
  * SUBTEST: files
  * Description: Exercise implicit per-fd context creation on 1 CPU for long duration
- * Feature: context
- * Run type: FULL
  *
  * SUBTEST: forked-active
- * Description:
- *   For each engine calculate the average performance of context creation and execution on
- *   multiple parallel processes
- * Feature: context
- * Run type: FULL
+ * Description: For each engine calculate the average performance of context
+ *		creation and execution on multiple parallel processes
  *
  * SUBTEST: forked-active-all
- * Description:
- *   Calculate the average performance of context creation and it's execution using all engines
- *   on multiple parallel processes
- * Feature: context
- * Run type: FULL
+ * Description: Calculate the average performance of context creation and it's
+ *		execution using all engines on multiple parallel processes
  *
  * SUBTEST: forked-files
- * Description: Exercise implicit per-fd context creation on all CPUs for long duration
- * Feature: context
- * Run type: FULL
+ * Description: Exercise implicit per-fd context creation on all CPUs for long
+ *		duration
  *
  * SUBTEST: hog
- * Description:
- *   For each engine calculate the average performance of context creation and execution while
- *   all other engines are hogging the resources
- * Feature: context
- * Run type: FULL
+ * Description: For each engine calculate the average performance of context
+ *		creation and execution while all other engines are hogging the
+ *		resources
  *
  * SUBTEST: iris-pipeline
  * Description: Set, validate and execute particular context params
- * Feature: context
- * Run type: FULL
  *
  * SUBTEST: maximum-mem
- * Description:
- *   Create contexts upto available RAM size, calculate the average performance of their
- *   execution on multiple parallel processes
- * Feature: context
- * Run type: FULL
+ * Description: Create contexts upto available RAM size, calculate the average
+ *		performance of their execution on multiple parallel processes
  *
  * SUBTEST: maximum-swap
- * Description:
- *   Create contexts upto available RAM+SWAP size, calculate the average performance of their
- *   execution on multiple parallel processes
- * Feature: context
- * Run type: FULL
+ * Description: Create contexts upto available RAM+SWAP size, calculate the
+ *		average performance of their execution on multiple parallel
+ *		processes
+ *
  */
 
 IGT_TEST_DESCRIPTION("Test the context create ioctls");
diff --git a/tests/intel/gem_ctx_exec.c b/tests/intel/gem_ctx_exec.c
index 4376397a2..556b21651 100644
--- a/tests/intel/gem_ctx_exec.c
+++ b/tests/intel/gem_ctx_exec.c
@@ -50,61 +50,38 @@
 /**
  * TEST: gem ctx exec
  * Description: Test context batch buffer execution.
+ * Category: Infrastructure
+ * Feature: context
+ * Functionality: execbuf
+ * Sub-category: Context
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
  * SUBTEST: basic
- * Category: Infrastructure
  * Description: Check the basic context batch buffer execution.
- * Feature: context
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-close-race
- * Category: Infrastructure
- * Description: Race the execution and interrupt handlers along a context, while closing it at a random time.
- * Feature: context
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Race the execution and interrupt handlers along a context,
+ *		while closing it at a random time.
  *
  * SUBTEST: basic-invalid-context
- * Category: Infrastructure
  * Description: Verify that execbuf with invalid context fails.
- * Feature: context
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-nohangcheck
- * Category: Server
- * Description: Verify that contexts are automatically shotdown on close, if hangchecking is disabled.
- * Feature: context
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that contexts are automatically shotdown on close,
+ *		if hangchecking is disabled.
  *
  * SUBTEST: basic-norecovery
- * Category: Server
- * Description: Check the status of context after a hang by setting and unsetting the RECOVERABLE.
- * Feature: context
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Check the status of context after a hang by setting and
+ *		unsetting the RECOVERABLE.
  *
  * SUBTEST: eviction
  * Description: Check maximum number of buffers it can evict for a context.
- * Feature: context
- * Run type: FULL
  *
  * SUBTEST: reset-pin-leak
- * Description: Check if the kernel doesn't leak the vma pin_count for the last context on reset.
- * Feature: context
- * Run type: FULL
+ * Description: Check if the kernel doesn't leak the vma pin_count for the last
+ *		context on reset.
  */
 
 IGT_TEST_DESCRIPTION("Test context batch buffer execution.");
diff --git a/tests/intel/gem_ctx_isolation.c b/tests/intel/gem_ctx_isolation.c
index d50a90597..89c023e09 100644
--- a/tests/intel/gem_ctx_isolation.c
+++ b/tests/intel/gem_ctx_isolation.c
@@ -28,62 +28,31 @@
 #include "igt_types.h"
 /**
  * TEST: gem ctx isolation
- * Run type: FULL
- *
- * SUBTEST: clean
  * Category: Infrastructure
  * Feature: context
- * Functionality: security
- * Sub-category: HW
+ * Functionality: priv/non-priv registers
+ * Sub-category: Security
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: clean
  *
  * SUBTEST: dirty-create
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: dirty-switch
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: nonpriv
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: nonpriv-switch
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: preservation
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: preservation-S3
- * Feature: context
  *
  * SUBTEST: preservation-S4
- * Feature: context
  *
  * SUBTEST: preservation-reset
- * Category: Infrastructure
- * Feature: context
- * Functionality: security
- * Sub-category: HW
- * Test category: GEM_Legacy
+ *
  */
 
 /* MAX_REG must be greater than the maximum register address. */
diff --git a/tests/intel/gem_ctx_param.c b/tests/intel/gem_ctx_param.c
index 9b44c86a0..c6fa31875 100644
--- a/tests/intel/gem_ctx_param.c
+++ b/tests/intel/gem_ctx_param.c
@@ -33,166 +33,80 @@
 /**
  * TEST: gem ctx param
  * Description: Basic test for context set/get param input validation.
+ * Category: Infrastructure
+ * Feature: context
+ * Functionality: context
+ * Sub-category: uapi
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: basic
- * Category: Infrastructure
  * Description: Basic test for context get/set param ioctls using valid context
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-default
- * Category: Infrastructure
  * Description: Basic test for context get/set param ioctls using default context
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: get-priority-new-ctx
- * Category: Infrastructure
- * Description:
- *   Test performed with context param set to priority.
- *   Verify that priority is default for newly created context
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Test performed with context param set to priority. Verify that
+ *		priority is default for newly created context
  *
  * SUBTEST: invalid-ctx-get
- * Category: Infrastructure
- * Description: Verify that context get param ioctl using invalid context returns relevant error
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that context get param ioctl using invalid context
+ *		returns relevant error
  *
  * SUBTEST: invalid-ctx-set
- * Category: Infrastructure
- * Description: Verify that context set param ioctl using invalid context returns relevant error
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that context set param ioctl using invalid context
+ *		returns relevant error
  *
  * SUBTEST: invalid-get-engines
- * Category: Infrastructure
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-get-no-zeromap
- * Category: Infrastructure
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-get-ringsize
- * Category: Infrastructure
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-param-get
- * Category: Infrastructure
- * Description: Checks that fetching context parameters using an unused param value is erroneous
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Checks that fetching context parameters using an unused param
+ *		value is erroneous
  *
  * SUBTEST: invalid-param-set
- * Category: Infrastructure
- * Description: Checks that setting context parameters using an unused param value is erroneous
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Checks that setting context parameters using an unused param
+ *		value is erroneous
  *
  * SUBTEST: invalid-set-no-zeromap
- * Category: Infrastructure
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-set-ringsize
- * Category: Infrastructure
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-size-get
- * Category: Infrastructure
- * Description: Verify that context get param ioctl returns valid size for valid context
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that context get param ioctl returns valid size for
+ *		valid context
  *
  * SUBTEST: invalid-size-set
- * Category: Infrastructure
- * Description: Verify that context set param ioctl using invalid size returns relevant error
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that context set param ioctl using invalid size returns
+ *		relevant error
  *
  * SUBTEST: non-root-set
- * Category: Infrastructure
- * Description: Verify that context set param ioctl returns relevant error in non root mode
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verify that context set param ioctl returns relevant error in
+ *		non root mode
  *
  * SUBTEST: root-set
- * Category: Infrastructure
  * Description: Verify that context set param ioctl works fine in root mode
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: set-priority-invalid-size
- * Category: Infrastructure
- * Description:
- *   Test performed with context param set to priority.
- *   Verify that relevant error is returned on setting invalid ctx size with default priority
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Test performed with context param set to priority. Verify that
+ *		relevant error is returned on setting invalid ctx size with
+ *		default priority
  *
  * SUBTEST: set-priority-not-supported
- * Description:
- *   Verify that context set param ioctl returns relevant error if driver doesn't supports
- *   assigning custom priorities from userspace
- * Feature: context, no-set-priority
+ * Description: Verify that context set param ioctl returns relevant error if
+ *		driver doesn't supports assigning custom priorities from
+ *		userspace
  *
  * SUBTEST: set-priority-range
- * Category: Infrastructure
- * Description:
- *   Test performed with context param set to priority.
- *   Change priority range to test value overflow
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Test performed with context param set to priority. Change
+ *		priority range to test value overflow
  *
  * SUBTEST: vm
- * Category: Infrastructure
  * Description: Tests that multiple contexts can share the same VMA
- * Feature: context
- * Functionality: context management
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Basic test for context set/get param input validation.");
diff --git a/tests/intel/gem_ctx_persistence.c b/tests/intel/gem_ctx_persistence.c
index c6e2c5d77..3f10c0fa3 100644
--- a/tests/intel/gem_ctx_persistence.c
+++ b/tests/intel/gem_ctx_persistence.c
@@ -48,183 +48,76 @@
 /**
  * TEST: gem ctx persistence
  * Feature: context
- * Run type: FULL
- *
- * SUBTEST: engines-cleanup
  * Category: Server
- * Functionality: security
+ * Functionality: context
  * Sub-category: Compute
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: engines-cleanup
  *
  * SUBTEST: engines-hang
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-hostile
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-hostile-preempt
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-mixed
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-mixed-process
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-persistence
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines-queued
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: file
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: hang
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: heartbeat-close
  *
  * SUBTEST: heartbeat-hang
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: heartbeat-hostile
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: heartbeat-many
  *
  * SUBTEST: heartbeat-stop
  *
  * SUBTEST: hostile
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: idempotent
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-cleanup
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-hang
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-hostile
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-hostile-preempt
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-mixed
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-mixed-process
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-persistence
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: legacy-engines-queued
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: many-contexts
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: process
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: processes
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: saturated-hostile
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: saturated-hostile-nopreempt
  *
  * SUBTEST: smoketest
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: userptr
- * Category: Server
- * Functionality: security
- * Sub-category: Compute
- * Test category: GEM_Legacy
+ *
  */
 
 #define RESET_TIMEOUT_MS 2 * MSEC_PER_SEC; /* default: 640ms */
diff --git a/tests/intel/gem_ctx_shared.c b/tests/intel/gem_ctx_shared.c
index fd429306e..8b045e20a 100644
--- a/tests/intel/gem_ctx_shared.c
+++ b/tests/intel/gem_ctx_shared.c
@@ -50,71 +50,41 @@
 /**
  * TEST: gem ctx shared
  * Description: Test shared contexts.
+ * Category: Desktop client
+ * Feature: context
+ * Functionality: shared contex
+ * Sub-category: Context
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: Q-in-order
- * Feature: context
  *
  * SUBTEST: Q-independent
- * Feature: context
  *
  * SUBTEST: Q-out-order
- * Feature: context
  *
  * SUBTEST: Q-promotion
- * Feature: context
  *
  * SUBTEST: Q-smoketest
- * Feature: context
  *
  * SUBTEST: Q-smoketest-all
- * Feature: context
  *
  * SUBTEST: create-shared-gtt
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: detached-shared-gtt
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: disjoint-timelines
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: exec-shared-gtt
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: exec-single-timeline
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Test category: GEM_Legacy
  *
  * SUBTEST: exhaust-shared-gtt
- * Feature: context
  *
  * SUBTEST: exhaust-shared-gtt-lrc
- * Feature: context
  *
  * SUBTEST: single-timeline
- * Category: Desktop client
- * Feature: context
- * Functionality: context management
- * Test category: GEM_Legacy
+ *
  */
 
 #define LO 0
diff --git a/tests/intel/gem_eio.c b/tests/intel/gem_eio.c
index 99891ad15..d6d12bd08 100644
--- a/tests/intel/gem_eio.c
+++ b/tests/intel/gem_eio.c
@@ -56,197 +56,78 @@
 /**
  * TEST: gem eio
  * Description: Test that specific ioctls report a wedged GPU (EIO).
- * Run type: FULL
- *
- * SUBTEST: banned
  * Category: Infrastructure
  * Feature: reset
  * Functionality: reset
- * Sub-category: i915
+ * Sub-category: uapi
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: banned
  *
  * SUBTEST: context-create
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create
- * Category: Infrastructure
  * Description: Validate i915_gem_create_ioctl, while gpu is wedged for fb scanout.
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: create-ext
- * Category: Infrastructure
- * Description:
- *   Validate i915_gem_create_ext_ioctl and checks if returns clear backing store while gpu is
- *   wedged for fb scanout.
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Validate i915_gem_create_ext_ioctl and checks if returns clear
+ *		backing store while gpu is wedged for fb scanout.
  *
  * SUBTEST: execbuf
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: hibernate
  * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
- * Feature: hibernate, reset, suspend
- * Test category: suspend
  *
  * SUBTEST: in-flight-10ms
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-1us
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-contexts-10ms
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-contexts-1us
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-contexts-immediate
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-external
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-immediate
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-internal-10ms
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-internal-1us
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-internal-immediate
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: in-flight-suspend
  * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
  * Feature: reset, suspend
- * Test category: suspend
  *
  * SUBTEST: kms
  * Feature: kms_gem_interop, reset
  *
  * SUBTEST: reset-stress
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: suspend
  * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
  * Feature: reset, suspend
- * Test category: suspend
  *
  * SUBTEST: throttle
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: unwedge-stress
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-10ms
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-1us
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-immediate
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-wedge-10ms
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-wedge-1us
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait-wedge-immediate
- * Category: Infrastructure
- * Feature: reset
- * Functionality: reset
- * Sub-category: i915
- * Test category: GEM_Legacy
+ *
  */
 
 IGT_TEST_DESCRIPTION("Test that specific ioctls report a wedged GPU (EIO).");
diff --git a/tests/intel/gem_exec_balancer.c b/tests/intel/gem_exec_balancer.c
index 9190fc238..efa875889 100644
--- a/tests/intel/gem_exec_balancer.c
+++ b/tests/intel/gem_exec_balancer.c
@@ -41,219 +41,94 @@
 /**
  * TEST: gem exec balancer
  * Description: Exercise in-kernel load-balancing
+ * Category: Desktop \ Server
+ * Feature: cmd_submission, media_scalability
+ * Functionality: load balancing
+ * Sub-category: CMD submission
+ * Test category: Media & Compute
  * Run type: FULL
  *
  * SUBTEST: bonded-chain
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: bonded-dual
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: bonded-false-hang
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: bonded-pair
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: bonded-semaphore
  * Feature: cmd_submission, media_scalability, multictx
  *
  * SUBTEST: bonded-sync
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: bonded-true-hang
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: busy
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: fairslice
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: full
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: full-late
- * Category: Desktop \ Server
  * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: full-late-pulse
- * Category: Desktop \ Server
  * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: full-pulse
- * Category: Desktop \ Server
  * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: hang
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: hog
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: indices
- * Category: Desktop \ Server
  * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: individual
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-balancer
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-bonds
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: nohangcheck
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: noheartbeat
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: nop
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-balancer
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-bb-first
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-contexts
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-dmabuf-import-out-fence
- * Description: Regression test to check that dmabuf imported sync file can handle fence array
- * Feature: cmd_submission, media_scalability
+ * Description: Regression test to check that dmabuf imported sync file can
+ *		handle fence array
  *
  * SUBTEST: parallel-keep-in-fence
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-keep-submit-fence
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-ordering
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-out-fence
- * Category: Desktop client
- * Feature: cmd_submission, media_scalability
- * Functionality: command submission
- * Sub-category: Media
- * Test category: GEM_Legacy
  *
  * SUBTEST: persistence
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: semaphore
- * Category: Desktop \ Server
  * Feature: cmd_submission, media_scalability, multictx
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: sequential
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: sliced
- * Feature: cmd_submission, media_scalability
  *
  * SUBTEST: smoke
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: waits
- * Category: Desktop \ Server
- * Feature: cmd_submission, media_scalability
- * Functionality: load balancing
- * Sub-category: Media & Compute
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing");
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH i-g-t 3/5] Documentation refactoring part 3
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
  2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
  2024-02-29 11:19 ` [PATCH i-g-t 2/5] Documentation refactoring part 2 Katarzyna Piecielska
@ 2024-02-29 11:19 ` Katarzyna Piecielska
  2024-02-29 15:57   ` Kamil Konieczny
  2024-02-29 11:19 ` [PATCH i-g-t 4/5] Documentation refactoring part 4 Katarzyna Piecielska
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

Unify documentation for Intel i915 tests that we have by moving
common parts to be available for all tests.

This is part 3 to make review easier.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 tests/intel/gem_exec_basic.c    |  13 +-
 tests/intel/gem_exec_big.c      |   8 +-
 tests/intel/gem_exec_capture.c  |  25 +--
 tests/intel/gem_exec_create.c   |  48 ++---
 tests/intel/gem_exec_fence.c    | 277 ++++++---------------------
 tests/intel/gem_exec_gttfill.c  |  23 +--
 tests/intel/gem_exec_nop.c      |  27 +--
 tests/intel/gem_exec_parallel.c |  37 +---
 tests/intel/gem_exec_params.c   | 112 +----------
 tests/intel/gem_exec_schedule.c | 324 +-------------------------------
 tests/intel/gem_exec_suspend.c  |  40 +---
 tests/intel/gem_exec_whisper.c  | 181 +-----------------
 12 files changed, 119 insertions(+), 996 deletions(-)

diff --git a/tests/intel/gem_exec_basic.c b/tests/intel/gem_exec_basic.c
index 83f71e289..aae773987 100644
--- a/tests/intel/gem_exec_basic.c
+++ b/tests/intel/gem_exec_basic.c
@@ -28,17 +28,16 @@
 /**
  * TEST: gem exec basic
  * Description: Basic sanity check of execbuf-ioctl rings.
- *
- * SUBTEST: basic
  * Category: Infrastructure
- * Description:
- *   Check basic functionality of GEM_EXECBUFFER2 ioctl on every ring and iterating over memory
- *   regions.
  * Feature: cmd_submission
- * Functionality: command submission
+ * Functionality: execbuf
  * Run type: BAT
- * Sub-category: i915
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ *
+ * SUBTEST: basic
+ * Description: Check basic functionality of GEM_EXECBUFFER2 ioctl on every
+ *		ring and iterating over memory regions.
  */
 
 IGT_TEST_DESCRIPTION("Basic sanity check of execbuf-ioctl rings.");
diff --git a/tests/intel/gem_exec_big.c b/tests/intel/gem_exec_big.c
index 9de9941d5..f22be96db 100644
--- a/tests/intel/gem_exec_big.c
+++ b/tests/intel/gem_exec_big.c
@@ -52,15 +52,15 @@
  * TEST: gem exec big
  * Description: Run a large nop batch to stress test the error capture code.
  * Feature: cmd_submission
+ * Category: Infrastructure
+ * Functionality: large nop batch
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: exhaustive
  *
  * SUBTEST: single
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Run a large nop batch to stress test the error capture"
diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/gem_exec_capture.c
index d231c53b9..3617dd994 100644
--- a/tests/intel/gem_exec_capture.c
+++ b/tests/intel/gem_exec_capture.c
@@ -35,21 +35,21 @@
  * TEST: gem exec capture
  * Description: Check that we capture the user specified objects on a hang
  * Feature: cmd_submission
- * Run type: FULL
- *
- * SUBTEST: capture
  * Category: Server
  * Functionality: offline debugging
- * Sub-category: debugger
+ * Sub-category: Debugger
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: capture
  *
  * SUBTEST: capture-invisible
- * Description:
- *   Check that the kernel doesn't crash if the pages can't be copied from the CPU during error
- *   capture.
+ * Description: Check that the kernel doesn't crash if the pages can't be
+ *		copied from the CPU during error capture.
  *
  * SUBTEST: capture-recoverable
- * Description: Verify that the kernel rejects EXEC_OBJECT_CAPTURE with recoverable contexts.
+ * Description: Verify that the kernel rejects EXEC_OBJECT_CAPTURE with
+ *		recoverable contexts.
  *
  * SUBTEST: many-256M-incremental
  *
@@ -62,16 +62,9 @@
  * SUBTEST: many-4K-zero
  *
  * SUBTEST: pi
- * Category: Server
- * Functionality: offline debugging
- * Sub-category: debugger
- * Test category: GEM_Legacy
  *
  * SUBTEST: userptr
- * Category: Server
- * Functionality: offline debugging
- * Sub-category: debugger
- * Test category: GEM_Legacy
+ *
  */
 
 #define MAX_RESET_TIME	600
diff --git a/tests/intel/gem_exec_create.c b/tests/intel/gem_exec_create.c
index 4eb77ecbb..1d5c2512f 100644
--- a/tests/intel/gem_exec_create.c
+++ b/tests/intel/gem_exec_create.c
@@ -48,48 +48,32 @@
 #include "i915/intel_memory_region.h"
 /**
  * TEST: gem exec create
- * Description:
- *   This test overloads the driver with transient active objects and checks if we don't kill the
- *   system under the memory pressure some of the symptoms this test look for include mysterious
- *   hangs.
- *
- * SUBTEST: basic
  * Category: Infrastructure
- * Description: Check if we kill system by overloading it with active objects iterating over all engines.
+ * Description: This test overloads the driver with transient active objects
+ *		and checks if we don't kill the system under the memory pressure
+ *		some of the symptoms this test look for include mysterious hangs.
  * Feature: cmd_submission
  * Functionality: buffer management
- * Run type: BAT
- * Sub-category: i915
+ * Run type: FULL
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
  *
+ * SUBTEST: basic
+ * Run type: BAT
+ * Description: Check if we kill system by overloading it with active objects
+ *		iterating over all engines.
+ *
  * SUBTEST: forked
- * Category: Infrastructure
- * Description: Concurrently overloads system with active objects and checks if we kill system.
- * Feature: cmd_submission
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Concurrently overloads system with active objects and checks
+ *		if we kill system.
  *
  * SUBTEST: legacy
- * Category: Infrastructure
- * Description:
- *   Check if we kill the system by overloading it with active objects iterating over legacy
- *   engines.
- * Feature: cmd_submission
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Check if we kill the system by overloading it with active
+ *		objects iterating over legacy engines.
  *
  * SUBTEST: madvise
- * Category: Infrastructure
- * Description: This test does a forced reclaim, behaving like a bad application leaking its bo cache.
- * Feature: cmd_submission
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: This test does a forced reclaim, behaving like a bad application
+ *		leaking its bo cache.
  */
 
 IGT_TEST_DESCRIPTION("This test overloads the driver with transient active objects"
diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/gem_exec_fence.c
index 4bf29a3e4..a0cfc1378 100644
--- a/tests/intel/gem_exec_fence.c
+++ b/tests/intel/gem_exec_fence.c
@@ -38,352 +38,189 @@
 /**
  * TEST: gem exec fence
  * Description: Check that execbuf waits for explicit fences
- *
- * SUBTEST: await-hang
- * Description: Check for explicit fence with async wait on each engine with a pending gpu hang.
+ * Category: Infrastructure
  * Feature: cmd_submission, synchronization
+ * Functionality: semaphore
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
+ * SUBTEST: await-hang
+ * Description: Check for explicit fence with async wait on each engine with a
+ *		pending gpu hang.
+ *
  * SUBTEST: basic-await
  * Description: Basic check for explicit fence with async wait on each engine.
- * Feature: cmd_submission, multitile, synchronization
- * Functionality: semaphore
  * Run type: BAT
  * Test category: MultiTile
  *
  * SUBTEST: basic-busy
  * Description: Basic check for explicit fence on each busy engine.
  * Feature: cmd_submission, multitile, synchronization
- * Functionality: semaphore
  * Run type: BAT
  * Test category: MultiTile
  *
  * SUBTEST: basic-busy-all
  * Description: Basic check for composite fence on all busy engines.
  * Feature: cmd_submission, multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: basic-wait
- * Description: Basic check for explicit fence with additional wait time on each busy engine.
+ * Description: Basic check for explicit fence with additional wait time on
+ *		each busy engine.
  * Feature: cmd_submission, multitile, synchronization
- * Functionality: semaphore
  * Run type: BAT
  * Test category: MultiTile
  *
  * SUBTEST: basic-wait-all
- * Description:
- *   Basic check for composite fence with additional wait on all busy engines.
- *   Execute the same batch on each engine and check that the composite fence across all engines completes only after the batch is completed on every engine.
+ * Description: Basic check for composite fence with additional wait on all
+ *		busy engines. Execute the same batch on each engine and check
+ *		that the composite fence across all engines completes only
+ *		after the batch is completed on every engine.
  * Feature: cmd_submission, multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: busy-hang
- * Description: Check for explicit fence on each busy engine with a pending gpu hang.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check for explicit fence on each busy engine with a pending
+ *		gpu hang.
  *
  * SUBTEST: busy-hang-all
- * Description: Check for composite fence on all busy engines with a pending gpu hang.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check for composite fence on all busy engines with a pending
+ *		gpu hang.
  *
  * SUBTEST: concurrent
  * Description: Check blocking bonded fences on each engine.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
  *
  * SUBTEST: expired-history
  * Category: Infrastructure
  * Description: Verifies long history of fences are expired.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-fence-array
- * Category: Infrastructure
  * Description: Verifies invalid fence-array pointers are rejected.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-timeline-fence-array
- * Category: Infrastructure
- * Description:
- *   Verifies invalid execbuf parameters in drm_i915_gem_execbuffer_ext_timeline_fences
- *   are rejected
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies invalid execbuf parameters in
+ *		drm_i915_gem_execbuffer_ext_timeline_fences are rejected
  *
  * SUBTEST: keep-in-fence
  * Description: Check in-fence is not overwritten with out-fence on each engine.
  * Feature: cmd_submission, multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: long-history
- * Category: Infrastructure
  * Description: Verifies accumulation of long history of fences.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: nb-await
  * Description: Check for explicit fence with non-blocking wait on each engine.
  * Feature: cmd_submission, multitile, synchronization
- * Functionality: semaphore
  * Run type: BAT
  * Test category: MultiTile
  *
  * SUBTEST: nb-await-hang
- * Description: Check for explicit fence with non-blocking async wait on each engine with a pending gpu hang.
+ * Description: Check for explicit fence with non-blocking async wait on each
+ *		engine with a pending gpu hang.
  * Feature: cmd_submission, multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: parallel
- * Description: Check for EXEC_FENCE_SUBMIT in parallel execution scenarios on each engine.
+ * Description: Check for EXEC_FENCE_SUBMIT in parallel execution scenarios
+ *		on each engine.
  * Feature: cmd_submission, multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: submit
  * Description: Check timeslicing on submit-fence.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
  *
  * SUBTEST: submit-chain
- * Description: Check launching a chain of spinners across all engines using submit-fence.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check launching a chain of spinners across all engines using
+ *		submit-fence.
  *
  * SUBTEST: submit3
  * Description: Check timeslicing on submit-fence by submitting coupled batches.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
  *
  * SUBTEST: submit67
- * Description:
- *   Check timeslicing on submit-fence by submitting more coupled batches than can possibly fit
- *   into the ELSP.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check timeslicing on submit-fence by submitting more coupled
+ *		batches than can possibly fit into the ELSP.
  *
  * SUBTEST: syncobj-backward-timeline-chain-engines
- * Category: Infrastructure
- * Description:
- *   Engine chaining tests to verify ordering of timeline syncobjs with backward timeline
- *   points.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Engine chaining tests to verify ordering of timeline syncobjs
+ *		with backward timeline points.
  *
  * SUBTEST: syncobj-channel
- * Category: Infrastructure
  * Description: Verifies two clients racing for syncobj using channel.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-export
- * Category: Infrastructure
  * Description: Verify exporting of fence-array syncobj signaled by i915.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-import
- * Category: Infrastructure
  * Description: Verifies creating of a syncobj from explicit fence.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-invalid-flags
- * Category: Infrastructure
  * Description: Verifies that invalid fence flags in fence-array are rejected.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-invalid-wait
- * Category: Infrastructure
- * Description: Verifies that submitting an execbuf with a wait on a syncobj that doesn't exists is rejected.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that submitting an execbuf with a wait on a syncobj
+ *		that doesn't exists is rejected.
  *
  * SUBTEST: syncobj-repeat
- * Category: Infrastructure
- * Description: Verifies that waiting & signaling a same fence-array syncobj within the same execbuf works.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that waiting & signaling a same fence-array syncobj
+ *		within the same execbuf works.
  *
  * SUBTEST: syncobj-signal
- * Category: Infrastructure
  * Description: Verifies proper signaling of a fence-array syncobj through execbuf.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-stationary-timeline-chain-engines
- * Category: Infrastructure
- * Description:
- *   Engine chaining tests to verify ordering of timeline syncobj with stationary timeline
- *   points.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Engine chaining tests to verify ordering of timeline syncobj
+ *		with stationary timeline points.
  *
  * SUBTEST: syncobj-timeline-chain-engines
- * Category: Infrastructure
- * Description: Engine chaining tests to verify ordering of timeline syncobjs through execbuf.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Engine chaining tests to verify ordering of timeline syncobjs
+ *		through execbuf.
  *
  * SUBTEST: syncobj-timeline-export
- * Category: Infrastructure
  * Description: Verify exporting of timeline syncobj signaled by i915
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-timeline-invalid-flags
- * Category: Infrastructure
- * Description:
- *   Verifies that invalid fence flags in drm_i915_gem_execbuffer_ext_timeline_fences are
- *   rejected
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that invalid fence flags in
+ *		drm_i915_gem_execbuffer_ext_timeline_fences are rejected
  *
  * SUBTEST: syncobj-timeline-invalid-wait
- * Category: Infrastructure
- * Description:
- *   Verifies that submitting an execbuf with a wait on a timeline syncobj point that does not
- *   exists is rejected
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that submitting an execbuf with a wait on a timeline
+ *		syncobj point that does not exists is rejected
  *
  * SUBTEST: syncobj-timeline-multiple-ext-nodes
- * Category: Infrastructure
  * Description: Verify that passing multiple execbuffer_ext nodes works
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-timeline-repeat
- * Category: Infrastructure
- * Description:
- *   Verifies that waiting & signaling a same timeline syncobj point within the same execbuf
- *   fworks
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that waiting & signaling a same timeline syncobj point
+ *		within the same execbuf works
  *
  * SUBTEST: syncobj-timeline-signal
- * Category: Infrastructure
  * Description: Verifies proper signaling of a timeline syncobj through execbuf
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: syncobj-timeline-unused-fence
- * Category: Infrastructure
- * Description:
- *   Verifies that a timeline syncobj passed into
- *   drm_i915_gem_execbuffer_ext_timeline_fences but with no signal/wait flag is left
- *   untouched
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that a timeline syncobj passed into
+ *		drm_i915_gem_execbuffer_ext_timeline_fences but with no
+ *		signal/wait flag is left untouched
  *
  * SUBTEST: syncobj-timeline-wait
- * Category: Infrastructure
- * Description: Verifies that waiting on a timeline syncobj point between engines works
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that waiting on a timeline syncobj point between
+ *		engines works
  *
  * SUBTEST: syncobj-unused-fence
- * Category: Infrastructure
- * Description: Verifies that a syncobj passed into execbuf but with no signal/wait flag is left untouched.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that a syncobj passed into execbuf but with no
+ *		signal/wait flag is left untouched.
  *
  * SUBTEST: syncobj-wait
- * Category: Infrastructure
- * Description: Verifies that waiting on a timeline syncobj point between engines works.
- * Feature: cmd_submission, synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Verifies that waiting on a timeline syncobj point between
+ *		engines works.
  *
  * SUBTEST: wait-hang
- * Description:
- *   Check for explicit fence with additional wait time on each busy engine with a pending gpu
- *   hang.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check for explicit fence with additional wait time on each
+ *		busy engine with a pending gpu hang.
  *
  * SUBTEST: wait-hang-all
- * Description:
- *   Check for composite fence with additional wait on all busy engines and with a pending gpu
- *   hang.
- * Feature: cmd_submission, synchronization
- * Run type: FULL
+ * Description: Check for composite fence with additional wait on all busy
+ *		engines and with a pending gpu hang.
  */
 
 IGT_TEST_DESCRIPTION("Check that execbuf waits for explicit fences");
diff --git a/tests/intel/gem_exec_gttfill.c b/tests/intel/gem_exec_gttfill.c
index 28c251915..b1063437b 100644
--- a/tests/intel/gem_exec_gttfill.c
+++ b/tests/intel/gem_exec_gttfill.c
@@ -29,36 +29,25 @@
 /**
  * TEST: gem exec gttfill
  * Description: Fill the GTT with batches.
- *
- * SUBTEST: all-engines
  * Category: Infrastructure
- * Description: Stress test check behaviour/correctness of handling batches to fill gtt
  * Feature: cmd_submission, gtt
- * Functionality: command submission
- * Run type: FULL
+ * Functionality: execbuf
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: all-engines
+ * Description: Stress test check behaviour/correctness of handling batches to fill gtt
  *
  * SUBTEST: basic
- * Category: Infrastructure
  * Description: Checks if it can handle enough batches to fill gtt
- * Feature: cmd_submission, gtt
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines
- * Category: Infrastructure
  * Description: Checks the correctness of handling enough batches to fill gtt for each engine
- * Feature: cmd_submission, gtt
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: multigpu-basic
  * Feature: cmd_submission, gtt, multigpu
- * Run type: FULL
  * Test category: MultiGPU
  */
 
diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/gem_exec_nop.c
index 6dea8b167..88a6ba224 100644
--- a/tests/intel/gem_exec_nop.c
+++ b/tests/intel/gem_exec_nop.c
@@ -50,61 +50,41 @@
 
 /**
  * TEST: gem exec nop
- * Run type: FULL
- *
- * SUBTEST: basic-parallel
  * Category: Infrastructure
  * Feature: cmd_submission
  * Functionality: command submission
  * Sub-category: i915
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic-parallel
  *
  * SUBTEST: basic-sequential
- * Category: Infrastructure
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-series
- * Category: Infrastructure
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: context-sequential
- * Feature: cmd_submission
  *
  * SUBTEST: forked-sequential
- * Feature: cmd_submission
  *
  * SUBTEST: headless
- * Feature: cmd_submission
  *
  * SUBTEST: independent
- * Feature: cmd_submission
  *
  * SUBTEST: multiple
- * Feature: cmd_submission
  *
  * SUBTEST: parallel
- * Feature: cmd_submission
  *
  * SUBTEST: poll
- * Feature: cmd_submission
  *
  * SUBTEST: poll-sequential
- * Feature: cmd_submission
  *
  * SUBTEST: preempt
  * Feature: cmd_submission, multitile
  *
  * SUBTEST: sequential
- * Feature: cmd_submission
  *
  * SUBTEST: series
- * Feature: cmd_submission
  *
  * SUBTEST: signal
  * Feature: cmd_submission, multitile
@@ -113,7 +93,6 @@
  * Feature: cmd_submission, multitile
  *
  * SUBTEST: single
- * Feature: cmd_submission
  */
 
 #define ENGINE_FLAGS  (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
diff --git a/tests/intel/gem_exec_parallel.c b/tests/intel/gem_exec_parallel.c
index cae1553f6..fdf22cbea 100644
--- a/tests/intel/gem_exec_parallel.c
+++ b/tests/intel/gem_exec_parallel.c
@@ -36,51 +36,24 @@
 /**
  * TEST: gem exec parallel
  * Description: Exercise filling buffers by many clients working in parallel.
- *
- * SUBTEST: basic
  * Category: Infrastructure
  * Description: Check basic functionality per engine.
  * Feature: cmd_submission
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
+ * Functionality: parallel clients
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic
  *
  * SUBTEST: contexts
- * Category: Infrastructure
- * Description: Check with many contexts.
- * Feature: cmd_submission
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: engines
- * Category: Infrastructure
- * Description: Check with engines working in parallel.
- * Feature: cmd_submission
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: fds
- * Category: Infrastructure
- * Description: Check with many fds.
- * Feature: cmd_submission
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: userptr
- * Category: Infrastructure
- * Description: Check basic userptr thrashing.
- * Feature: cmd_submission
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Exercise filling buffers by many clients working in parallel.");
diff --git a/tests/intel/gem_exec_params.c b/tests/intel/gem_exec_params.c
index caaa5fee0..912c4f856 100644
--- a/tests/intel/gem_exec_params.c
+++ b/tests/intel/gem_exec_params.c
@@ -46,166 +46,70 @@
 #include "sw_sync.h"
 /**
  * TEST: gem exec params
+ * Category: Desktop client
+ * Feature: cmd_submission
+ * Functionality: execbuf
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: DR1-dirt
- * Feature: cmd_submission
  *
  * SUBTEST: DR4-dirt
- * Feature: cmd_submission
  *
  * SUBTEST: batch-first
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: cliprects-invalid
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: cliprects_ptr-dirt
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-batch-start-offset
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-bsd-ring
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-bsd1-flag-on-blt
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-bsd1-flag-on-render
- * Feature: cmd_submission
  *
  * SUBTEST: invalid-bsd1-flag-on-vebox
- * Feature: cmd_submission
  *
  * SUBTEST: invalid-bsd2-flag-on-blt
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-bsd2-flag-on-render
- * Feature: cmd_submission
  *
  * SUBTEST: invalid-bsd2-flag-on-vebox
- * Feature: cmd_submission
  *
  * SUBTEST: invalid-fence-in
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-fence-in-submit
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-flag
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-ring
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-ring2
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: larger-than-life-batch
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: mmapped
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: no-blt
- * Feature: cmd_submission
  *
  * SUBTEST: no-bsd
- * Feature: cmd_submission
  *
  * SUBTEST: no-vebox
- * Feature: cmd_submission
  *
  * SUBTEST: readonly
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: rel-constants-invalid
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: rel-constants-invalid-rel-gen5
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: rel-constants-invalid-ring
- * Feature: cmd_submission
  *
  * SUBTEST: rs-invalid
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: rsvd2-dirt
- * Feature: cmd_submission
  *
  * SUBTEST: secure-non-master
  * Feature: cmd_submission, obsolete
@@ -214,14 +118,8 @@
  * Feature: cmd_submission, obsolete
  *
  * SUBTEST: sol-reset-invalid
- * Feature: cmd_submission
  *
  * SUBTEST: sol-reset-not-gen7
- * Category: Desktop client
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 #define ALIGNMENT (1 << 22)
diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/gem_exec_schedule.c
index 3fd91b2fa..41dfc394b 100644
--- a/tests/intel/gem_exec_schedule.c
+++ b/tests/intel/gem_exec_schedule.c
@@ -47,388 +47,72 @@
 /**
  * TEST: gem exec schedule
  * Description: Check that we can control the order of execution
- * Run type: FULL
- *
- * SUBTEST: deep
  * Category: Desktop \ Server
  * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
+ * Functionality: execution order
+ * Sub-category: CMD submission
  * Test category: GEM_Legacy
+ * Run type: FULL
  *
+ * SUBTEST: deep
  * SUBTEST: fairslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: fairslice-all
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: fifo
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: implicit-boths
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: implicit-read-write
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: implicit-write-read
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: in-order
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: independent
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: lateslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: manyslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: noreorder
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: noreorder-corked
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: noreorder-priority
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: out-order
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: pi-common
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: pi-distinct-iova
- * Feature: cmd_submission
- *
  * SUBTEST: pi-ringfull
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: pi-shared-iova
- * Feature: cmd_submission
- *
  * SUBTEST: pi-userfault
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-contexts
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-engines
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-hang
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-other
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-other-chain
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-queue
- * Feature: cmd_submission, multictx
- *
  * SUBTEST: preempt-queue-chain
- * Feature: cmd_submission, multictx
- *
  * SUBTEST: preempt-queue-contexts
- * Feature: cmd_submission, multictx
- *
  * SUBTEST: preempt-queue-contexts-chain
- * Feature: cmd_submission, multictx
- *
  * SUBTEST: preempt-self
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preempt-user
- * Category: Desktop \ Server
- * Feature: cmd_submission, multictx
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: preemptive-hang
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: promotion
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: reorder-wide
- * Feature: cmd_submission
- *
  * SUBTEST: semaphore-codependency
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: semaphore-noskip
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: semaphore-power
- * Feature: cmd_submission
- *
  * SUBTEST: semaphore-resolve
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: semaphore-user
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: smoketest
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: smoketest-all
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: submit-early-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: submit-golden-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: submit-late-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: thriceslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: timeslicing
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-fairslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-fairslice-all
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-independent
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-lateslice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-semaphore-codependency
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-semaphore-noskip
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-semaphore-resolve
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-semaphore-user
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-submit-early-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-submit-golden-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: u-submit-late-slice
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: wide
- * Category: Desktop \ Server
- * Feature: cmd_submission
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 #define LO 0
diff --git a/tests/intel/gem_exec_suspend.c b/tests/intel/gem_exec_suspend.c
index 39d75ee03..faf2e10f5 100644
--- a/tests/intel/gem_exec_suspend.c
+++ b/tests/intel/gem_exec_suspend.c
@@ -39,101 +39,65 @@
 /**
  * TEST: gem exec suspend
  * Description: Exercise simple execbufs runs across various suspend/resume cycles.
+ * Feature: cmd_submission, suspend
+ * Run type: FULL
  *
  * SUBTEST: basic
  * Description: Check basic functionality without any suspend/resume cycle.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: basic-S0
  * Description: Check with suspend-to-idle target state.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: basic-S3
  * Description: Check full cycle of suspend-to-mem.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: basic-S3-devices
  * Description: Check with suspend-to-mem with devices only.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: basic-S4
  * Description: Check full cycle of suspend-to-disk.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: basic-S4-devices
  * Description: Check with suspend-to-disk with devices only.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: cached
  * Description: Check without suspend/resume cycle state with cached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: cached-S3
  * Description: Check suspend-to-mem state with cached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: cached-S4
  * Description: Check suspend-to-disk state with cached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: fixed
  * Description: Check without suspend/resume cycle state with fixed object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: fixed-S3
  * Description: Check suspend-to-mem state with fixed object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: fixed-S4
  * Description: Check suspend-to-disk state with fixed object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: hang-S3
  * Description: Check full cycle of suspend-to-mem with a pending GPU hang.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: hang-S4
  * Description: Check full cycle of suspend-to-disk with a pending GPU hang.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: power-S0
  * Description: Check power consumption during idle state.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: power-S3
  * Description: Check power consumption during suspend-to-mem state.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: uncached
  * Description: Check without suspend/resume cycle state with uncached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: uncached-S3
  * Description: Check suspend-to-mem state with uncached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  *
  * SUBTEST: uncached-S4
  * Description: Check suspend-to-disk state with uncached object.
- * Feature: cmd_submission, suspend
- * Run type: FULL
  */
 
 IGT_TEST_DESCRIPTION("Exercise simple execbufs runs across various suspend/resume cycles.");
diff --git a/tests/intel/gem_exec_whisper.c b/tests/intel/gem_exec_whisper.c
index 46712c3e8..effb47335 100644
--- a/tests/intel/gem_exec_whisper.c
+++ b/tests/intel/gem_exec_whisper.c
@@ -40,280 +40,103 @@
 /**
  * TEST: gem exec whisper
  * Feature: cmd_submission
- * Run type: FULL
- *
- * SUBTEST: basic-contexts
  * Category: Infrastructure
  * Functionality: command submission
  * Sub-category: i915
  * Test category: GEM_Legacy
+ * Run type: FULL
  *
+ * SUBTEST: basic-contexts
  * SUBTEST: basic-contexts-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-contexts-forked
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-contexts-forked-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-contexts-priority
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-contexts-priority-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds-forked
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds-forked-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds-priority
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-fds-priority-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-forked
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-forked-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-normal
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-normal-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues-all
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues-forked
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues-forked-all
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues-priority
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-queues-priority-all
- * Category: Infrastructure
- * Functionality: command submission
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-sync
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-sync-all
- * Category: Infrastructure
- * Functionality: command submission
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
  * SUBTEST: chain
- *
  * SUBTEST: chain-all
- *
  * SUBTEST: chain-forked
- *
  * SUBTEST: chain-forked-all
- *
  * SUBTEST: chain-interruptible
- *
  * SUBTEST: chain-interruptible-all
- *
  * SUBTEST: chain-sync
- *
  * SUBTEST: chain-sync-all
- *
  * SUBTEST: contexts-chain
- *
  * SUBTEST: contexts-chain-all
- *
  * SUBTEST: contexts-engine
- *
  * SUBTEST: contexts-forked-engine
- *
  * SUBTEST: contexts-interruptible
- *
  * SUBTEST: contexts-interruptible-all
- *
  * SUBTEST: contexts-interruptible-engine
- *
  * SUBTEST: contexts-priority-engine
- *
  * SUBTEST: contexts-sync
- *
  * SUBTEST: contexts-sync-all
- *
  * SUBTEST: contexts-sync-engine
- *
  * SUBTEST: fds-chain
- *
  * SUBTEST: fds-chain-all
- *
  * SUBTEST: fds-engine
- *
  * SUBTEST: fds-forked-engine
- *
  * SUBTEST: fds-interruptible
- *
  * SUBTEST: fds-interruptible-all
- *
  * SUBTEST: fds-interruptible-engine
- *
  * SUBTEST: fds-priority-engine
- *
  * SUBTEST: fds-sync
- *
  * SUBTEST: fds-sync-all
- *
  * SUBTEST: fds-sync-engine
- *
  * SUBTEST: forked-engine
- *
  * SUBTEST: hang-chain
- *
  * SUBTEST: hang-chain-forked
- *
  * SUBTEST: hang-chain-sync
- *
  * SUBTEST: hang-contexts
- *
  * SUBTEST: hang-contexts-chain
- *
  * SUBTEST: hang-contexts-forked
- *
  * SUBTEST: hang-contexts-priority
- *
  * SUBTEST: hang-contexts-sync
- *
  * SUBTEST: hang-fds
- *
  * SUBTEST: hang-fds-chain
- *
  * SUBTEST: hang-fds-forked
- *
  * SUBTEST: hang-fds-priority
- *
  * SUBTEST: hang-fds-sync
- *
  * SUBTEST: hang-forked
- *
  * SUBTEST: hang-normal
- *
  * SUBTEST: hang-queues
- *
  * SUBTEST: hang-queues-chain
- *
  * SUBTEST: hang-queues-forked
- *
  * SUBTEST: hang-queues-priority
- *
  * SUBTEST: hang-queues-sync
- *
  * SUBTEST: hang-sync
- *
  * SUBTEST: interruptible
- *
  * SUBTEST: interruptible-all
- *
  * SUBTEST: interruptible-engine
- *
  * SUBTEST: normal-engine
- *
  * SUBTEST: queues-chain
- *
  * SUBTEST: queues-chain-all
- *
  * SUBTEST: queues-engine
- *
  * SUBTEST: queues-forked-engine
- *
  * SUBTEST: queues-interruptible
- *
  * SUBTEST: queues-interruptible-all
- *
  * SUBTEST: queues-interruptible-engine
- *
  * SUBTEST: queues-priority-engine
- *
  * SUBTEST: queues-sync
- *
  * SUBTEST: queues-sync-all
- *
  * SUBTEST: queues-sync-engine
- *
  * SUBTEST: sync-engine
  */
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH i-g-t 4/5] Documentation refactoring part 4
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
                   ` (2 preceding siblings ...)
  2024-02-29 11:19 ` [PATCH i-g-t 3/5] Documentation refactoring part 3 Katarzyna Piecielska
@ 2024-02-29 11:19 ` Katarzyna Piecielska
  2024-02-29 16:05   ` Kamil Konieczny
  2024-02-29 11:19 ` [PATCH i-g-t 5/5] Documentation refactoring part 5 Katarzyna Piecielska
  2024-02-29 16:34 ` ✗ Fi.CI.BUILD: failure for IGT documentation refactoring Patchwork
  5 siblings, 1 reply; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

Unify documentation for Intel i915 tests that we have by  moving
common parts to be available for all tests.

This is part 4 to make review easier.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 tests/intel/gem_flink_basic.c   |  35 ++-----
 tests/intel/gem_linear_blits.c  |  23 ++---
 tests/intel/gem_lmem_swapping.c | 101 +-----------------
 tests/intel/gem_madvise.c       |  29 +++---
 tests/intel/gem_mmap_gtt.c      | 175 ++------------------------------
 tests/intel/gem_mmap_offset.c   |  75 ++------------
 tests/intel/gem_mmap_wc.c       |  43 +-------
 tests/intel/gem_ppgtt.c         |  16 +--
 tests/intel/gem_pxp.c           |  24 +----
 tests/intel/gem_ringfill.c      |  29 ++----
 tests/intel/gem_shrink.c        |   8 +-
 tests/intel/gem_softpin.c       | 134 ++----------------------
 tests/intel/gem_spin_batch.c    |  60 +----------
 tests/intel/gem_sync.c          |  86 ++--------------
 14 files changed, 78 insertions(+), 760 deletions(-)

diff --git a/tests/intel/gem_flink_basic.c b/tests/intel/gem_flink_basic.c
index e70cab4d1..85cd78a46 100644
--- a/tests/intel/gem_flink_basic.c
+++ b/tests/intel/gem_flink_basic.c
@@ -40,52 +40,29 @@
 #include "igt_types.h"
 /**
  * TEST: gem flink basic
- * Description: Tests for flink - a way to export a gem object by name
- *
- * SUBTEST: bad-flink
  * Category: Desktop client
- * Description: Verify that GEM_FLINK ioctl with invalid gem object fails.
+ * Description: Tests for flink - a way to export a gem object by name
  * Feature: xorg_dri2
  * Functionality: buffer management
- * Run type: BAT
  * Sub-category: DRM
  * Test category: GEM_Legacy
+ * Run type: BAT
+ *
+ * SUBTEST: bad-flink
+ * Description: Verify that GEM_FLINK ioctl with invalid gem object fails.
  *
  * SUBTEST: bad-open
- * Category: Desktop client
  * Description: Verify that GEM_OPEN ioctl with invalid flink name fails.
- * Feature: xorg_dri2
- * Functionality: buffer management
- * Run type: BAT
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic
- * Category: Desktop client
  * Description: Check if gem object can be exported to global namespace and then opened.
- * Feature: xorg_dri2
- * Functionality: buffer management
- * Run type: BAT
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: double-flink
- * Category: Desktop client
  * Description: Tests that multiple flinks for the same gem object share the same name.
- * Feature: xorg_dri2
- * Functionality: buffer management
- * Run type: BAT
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: flink-lifetime
- * Category: Desktop client
  * Description: Tests flink lifetime by referencing from multiple descriptors.
- * Feature: xorg_dri2
- * Functionality: buffer management
- * Run type: BAT
- * Sub-category: DRM
- * Test category: GEM_Legacy
+ *
  */
 
 IGT_TEST_DESCRIPTION("Tests for flink - a way to export a gem object by name");
diff --git a/tests/intel/gem_linear_blits.c b/tests/intel/gem_linear_blits.c
index cc28e43fe..64f220cb3 100644
--- a/tests/intel/gem_linear_blits.c
+++ b/tests/intel/gem_linear_blits.c
@@ -51,34 +51,23 @@
 #include "intel_blt.h"
 /**
  * TEST: gem linear blits
+ * Category: Infrastructure
  * Description: Test doing many blits with a working set larger than the aperture size.
+ * Feature: blitter
+ * Functionality: blitter
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
  * SUBTEST: basic
- * Category: Infrastructure
  * Description: Basic blitter functionality check with 2 buffers
- * Feature: blitter
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: interruptible
- * Category: Infrastructure
  * Description: Test with interrupts in between the parent process
- * Feature: blitter
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: normal
- * Category: Infrastructure
  * Description: The intent is to push beyond the working GTT size to force the driver to rebind the buffers
- * Feature: blitter
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Test doing many blits with a working set larger than the"
diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/gem_lmem_swapping.c
index 381510f1a..451d55423 100644
--- a/tests/intel/gem_lmem_swapping.c
+++ b/tests/intel/gem_lmem_swapping.c
@@ -26,170 +26,79 @@
 #include "intel_mocs.h"
 /**
  * TEST: gem lmem swapping
- * Description: Exercise local memory swapping.
- *
- * SUBTEST: basic
  * Category: Server
- * Description: Exercise local memory swapping to system memory
+ * Description: Exercise local memory swapping.
  * Feature: local_memory
  * Functionality: buffer management
- * Run type: BAT
  * Sub-category: i915
  * Test category: GEM_Legacy
  *
+ * SUBTEST: basic
+ * Description: Exercise local memory swapping to system memory
+ * Run type: BAT
+ *
  * SUBTEST: heavy-multi
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: heavy-random
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: heavy-verify-multi
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: heavy-verify-multi-ccs
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
  *
  * SUBTEST: heavy-verify-random
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: heavy-verify-random-ccs
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
  *
  * SUBTEST: massive
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
- * Test category: GEM_Legacy
  *
  * SUBTEST: massive-random
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-multi
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-random
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-random-engines
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-random-verify
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: parallel-random-verify-ccs
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
  *
  * SUBTEST: random
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: random-engines
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: smem-oom
- * Category: Server
  * Description: Exercise local memory swapping during exhausting system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: verify
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: verify-ccs
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
  *
  * SUBTEST: verify-random
- * Category: Server
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Functionality: buffer management
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: verify-random-ccs
  * Description: Exercise local memory swapping to system memory
- * Feature: local_memory
- * Run type: FULL
  */
 
 IGT_TEST_DESCRIPTION("Exercise local memory swapping.");
diff --git a/tests/intel/gem_madvise.c b/tests/intel/gem_madvise.c
index 06b3ddf32..b443d16ae 100644
--- a/tests/intel/gem_madvise.c
+++ b/tests/intel/gem_madvise.c
@@ -40,35 +40,30 @@
 #include "i915/gem_create.h"
 /**
  * TEST: gem madvise
- * Description: Checks that the kernel reports EFAULT when trying to use purged bo.
- * Run type: FULL
- *
- * SUBTEST: dontneed-after-mmap
  * Category: Desktop client
- * Description:
- *   Check signal for Segmentation Fault and bus error after obtaining a purgeable object and
- *   calling for sighandler.
+ * Description: Checks that the kernel reports EFAULT when trying to use purged bo.
  * Feature: caching, mapping
  * Functionality: buffer management
  * Sub-category: i915
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: dontneed-after-mmap
+ * Description: Check signal for Segmentation Fault and bus error after
+ *		obtaining a purgeable object and calling for sighandler.
  *
  * SUBTEST: dontneed-before-exec
- * Description: Check if EXECBUFFER2 reports EFAULT when trying to submit purged bo for GPU.
+ * Description: Check if EXECBUFFER2 reports EFAULT when trying to submit
+ *		purged bo for GPU.
  * Feature: caching, gtt, mapping
  *
  * SUBTEST: dontneed-before-mmap
- * Category: Desktop client
- * Description:
- *   Check signal for Segmentation Fault and bus error before obtaining a purgeable object and
- *   calling for sighandler.
- * Feature: caching, mapping
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
+ * Description: Check signal for Segmentation Fault and bus error before
+ *		obtaining a purgeable object and calling for sighandler.
  *
  * SUBTEST: dontneed-before-pwrite
- * Description: Check if PWRITE reports EFAULT when trying to use purged bo for write operation.
+ * Description: Check if PWRITE reports EFAULT when trying to use purged bo
+ *		for write operation.
  * Feature: caching, gtt, mapping
  */
 
diff --git a/tests/intel/gem_mmap_gtt.c b/tests/intel/gem_mmap_gtt.c
index 9c06785d2..9aecd08ce 100644
--- a/tests/intel/gem_mmap_gtt.c
+++ b/tests/intel/gem_mmap_gtt.c
@@ -49,490 +49,331 @@
 /**
  * TEST: gem mmap gtt
  * Description: Ensure that all operations around MMAP_GTT ioctl works.
+ * Feature: gtt
+ * Run type: FULL
  *
  * SUBTEST: bad-object
  * Description: Verify mapping to invalid gem objects fails.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic
  * Description: Basic checks of GEM_MMAP_GTT ioctl.
- * Feature: gtt
- * Run type: BAT
  *
  * SUBTEST: basic-copy
  * Description: Test copy between two GTT mmappings.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-read
  * Description: Test to read content from GTT mmapped object.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-read-write
  * Description: Check basic read->write order of a GTT mmapped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-read-write-distinct
  * Description: Check distinct read->write order of a GTT mmapped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-short
  * Description: Test mmaping less than the full object.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-small-bo
- * Description: Check mmap access to a small buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
+ * Description: Check mmap access to a small buffer object by CPU directly and
+ *		through GTT in sequence.
  *
  * SUBTEST: basic-small-bo-tiledX
- * Description:
- *   Check mmap access to a small X-tiled buffer object by CPU directly and through GTT in
- *   sequence.
- * Feature: gtt
- * Run type: FULL
+ * Description: Check mmap access to a small X-tiled buffer object by CPU
+ *		directly and through GTT in sequence.
  *
  * SUBTEST: basic-small-bo-tiledY
- * Description:
- *   Check mmap access to a small Y-tiled buffer object by CPU directly and through GTT in
+ * Description: Check mmap access to a small Y-tiled buffer object by CPU
+ *		directly and through GTT in
  *   sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-small-copy
  * Description: Check page by page copying between two GTT mmapped normal-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-small-copy-XY
  * Description: Check page by page copying between two GTT mmapped tiled-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-small-copy-odd
  * Description: Check page by page copying between two GTT mmapped odd tiled-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-wc
  * Description:
  *   Check the performance of WC writes with WC reads of GTT and WC writes of GTT with WB writes of.
  *   CPU.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-write
  * Description: Test to write content to GTT mmapped object.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-write-cpu-read-gtt
  * Description: Check coherency between GTT and CPU mmappings with LLC.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-write-gtt
  * Description: Test creates a prefault object into GTT and writes into it from another GTT mmapped.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-write-read
  * Description: Check basic write->read order of a GTT mmapped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: basic-write-read-distinct
  * Description: Check distinct write->read order of a GTT mmapped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-bo
  * Description: Check mmap access to a big buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-bo-tiledX
  * Description: Check mmap access to a big X-tiled buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-bo-tiledY
  * Description: Check mmap access to a big Y-tiled buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-copy
  * Description: Check page by page copying between two GTT mmapped normal-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-copy-XY
  * Description: Check page by page copying between two GTT mmapped tiled-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: big-copy-odd
  * Description: Check page by page copying between two GTT mmapped odd tiled-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: clflush
  * Description: Check the userspace clflushing of the GTT mmap.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: close-race
  * Description:
  *   Test to check that a few threads opening and closing handles cause explosion in other threads
  *   in the process of mmaping that handle.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: coherency
  * Description: Check whether a write through the GTT is immediately visible to the CPU.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-basic-small-copy
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped normal-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-basic-small-copy-XY
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped tiled-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-basic-small-copy-odd
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped odd tiled-small bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-big-copy
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped normal-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-big-copy-XY
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped tiled-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-big-copy-odd
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped odd tiled-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-huge-copy
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped normal-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-huge-copy-XY
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped tiled-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-huge-copy-odd
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped odd tiled-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-medium-copy
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped normal-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-medium-copy-XY
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped tiled-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-medium-copy-odd
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped odd tiled-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-swap-copy
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped normal-huge bo's larger than physical memory and resulting in
  *   thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-swap-copy-XY
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped tiled-huge bo's larger than physical memory and resulting in
  *   thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: cpuset-swap-copy-odd
  * Description:
  *   Add forked contention with lighter variant (single cpu) and check page by page copying
  *   between two GTT mmapped odd tiled-huge bo's larger than physical memory and resulting in
  *   thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: fault-concurrent
  * Description: Excercise concurrent pagefaulting of a GTT mmaped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: fault-concurrent-X
  * Description: Excercise concurrent pagefaulting of a X-tiled GTT mmaped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: fault-concurrent-Y
  * Description: Excercise concurrent pagefaulting of a Y-tiled GTT mmaped bo.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: flink-race
  * Description:
  *   Test to check that a few threads opening and closing flink handles cause explosion in other
  *   threads in the process of mmaping that handle.
  * Feature: gtt, xorg_dri2
- * Run type: FULL
  *
  * SUBTEST: forked-basic-small-copy
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped normal-small
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-basic-small-copy-XY
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped tiled-small
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-basic-small-copy-odd
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-small
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-big-copy
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped normal-big
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-big-copy-XY
  * Description: Add forked contention and check page by page copying between two GTT mmapped tiled-big bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-big-copy-odd
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-big
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-huge-copy
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped normal-huge
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-huge-copy-XY
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped tiled-huge
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-huge-copy-odd
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-huge
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-medium-copy
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped normal-medium
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-medium-copy-XY
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped tiled-medium
  *   bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-medium-copy-odd
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped odd
  *   tiled-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-swap-copy
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped normal-huge
  *   bo's larger than physical memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-swap-copy-XY
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped tiled-huge bo's
  *   larger than physical memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: forked-swap-copy-odd
  * Description:
  *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-huge
  *   bo's larger than physical memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: hang
  * Description: Check read/writes across a GPU reset.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: hang-busy
  * Description: Exercise the GTT mmap revocation for a reset on a busy object.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: hang-user
  * Description: Mix a busy hang with GTT and userptr.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-bo
  * Description: Check mmap access to a huge buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-bo-tiledX
  * Description: Check mmap access to a huge X-tiled buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-bo-tiledY
  * Description: Check mmap access to a huge Y-tiled buffer object by CPU directly and through GTT in sequence.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-copy
  * Description: Check page by page copying between two GTT mmapped normal-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-copy-XY
  * Description: Check page by page copying between two GTT mmapped tiled-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: huge-copy-odd
  * Description: Check page by page copying between two GTT mmapped odd tiled-huge bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: isolation
  * Description:
  *   Test mmap_offset lifetime, closing the object on another file should not affect the local
  *   mmap_offset.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: medium-copy
  * Description: Check page by page copying between two GTT mmapped normal-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: medium-copy-XY
  * Description: Check page by page copying between two GTT mmapped tiled-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: medium-copy-odd
  * Description: Check page by page copying between two GTT mmapped odd tiled-medium bo's.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: pf-nonblock
  * Description: Check that the initial pagefault is non-blocking.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: ptrace
  * Description: Inspect a GTT mmap using ptrace().
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: swap-copy
  * Description:
  *   Check page by page copying between two GTT mmapped normal-huge bo's larger than physical
  *   memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: swap-copy-XY
  * Description:
  *   Check page by page copying between two GTT mmapped tiled-huge bo's larger than physical
  *   memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: swap-copy-odd
  * Description:
  *   Check page by page copying between two GTT mmapped odd tiled-huge bo's larger than physical
  *   memory and resulting in thrashing of swap space.
- * Feature: gtt
- * Run type: FULL
  *
  * SUBTEST: zero-extend
  * Description: Test MMAP_GTT extension validity.
- * Feature: gtt
- * Run type: FULL
  */
 
 #ifndef PAGE_SIZE
diff --git a/tests/intel/gem_mmap_offset.c b/tests/intel/gem_mmap_offset.c
index bc801cd04..b069b80f6 100644
--- a/tests/intel/gem_mmap_offset.c
+++ b/tests/intel/gem_mmap_offset.c
@@ -40,90 +40,27 @@
 /**
  * TEST: gem mmap offset
  * Description: Basic MMAP_OFFSET IOCTL tests for mem regions
- * Run type: FULL
- * Test category: GEM_Legacy
- *
- * SUBTEST: bad-extensions
  * Category: Infrastructure
  * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
+ * Functionality: mapping
+ * Sub-category: Memory management
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
+ * SUBTEST: bad-extensions
  * SUBTEST: bad-flags
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: bad-object
- * Category: Infrastructure
- * Description: Verify mapping to invalid gem objects won't be created
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: basic-uaf
- * Category: Infrastructure
- * Description: Check buffer object mapping persists after gem_close
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: blt-coherency
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: clear
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: close-race
- * Category: Infrastructure
- * Description: Check race between close and mmap offset between threads
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: isolation
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: oob-read
- * Category: Infrastructure
- * Description: Check for out-of-bound access in vm_access
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: open-flood
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: perf
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: pf-nonblock
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
- *
  * SUBTEST: ptrace
- * Category: Infrastructure
- * Feature: mapping
- * Functionality: memory management
- * Sub-category: i915
+ *
  */
 
 IGT_TEST_DESCRIPTION("Basic MMAP_OFFSET IOCTL tests for mem regions\n");
diff --git a/tests/intel/gem_mmap_wc.c b/tests/intel/gem_mmap_wc.c
index c56e8c353..a82d779f9 100644
--- a/tests/intel/gem_mmap_wc.c
+++ b/tests/intel/gem_mmap_wc.c
@@ -41,70 +41,31 @@
 #include "i915/gem_create.h"
 /**
  * TEST: gem mmap wc
+ * Feature: caching, mapping
  * Run type: FULL
  *
  * SUBTEST: bad-object
- * Feature: caching, mapping
- *
  * SUBTEST: bad-offset
- * Feature: caching, mapping
- *
  * SUBTEST: bad-size
- * Feature: caching, mapping
- *
  * SUBTEST: close
- * Feature: caching, mapping
- *
  * SUBTEST: coherency
- * Feature: caching, mapping
- *
  * SUBTEST: copy
- * Feature: caching, mapping
- *
  * SUBTEST: fault-concurrent
- * Feature: caching, mapping
- *
  * SUBTEST: invalid-flags
- * Feature: caching, mapping
- *
  * SUBTEST: pf-nonblock
- * Feature: caching, mapping
- *
  * SUBTEST: read
- * Feature: caching, mapping
- *
  * SUBTEST: read-write
- * Feature: caching, mapping
- *
  * SUBTEST: read-write-distinct
- * Feature: caching, mapping
- *
  * SUBTEST: set-cache-level
- * Feature: caching, mapping
- *
  * SUBTEST: write
- * Feature: caching, mapping
- *
  * SUBTEST: write-cpu-read-wc
- * Feature: caching, mapping
- *
  * SUBTEST: write-cpu-read-wc-unflushed
- * Feature: caching, mapping
- *
  * SUBTEST: write-gtt-read-wc
- * Feature: caching, gtt, mapping
- *
  * SUBTEST: write-prefaulted
- * Feature: caching, mapping
- *
  * SUBTEST: write-read
- * Feature: caching, mapping
- *
  * SUBTEST: write-read-distinct
- * Feature: caching, mapping
- *
  * SUBTEST: write-wc-read-gtt
- * Feature: caching, gtt, mapping
+ *
  */
 
 static int OBJECT_SIZE = 16*1024*1024;
diff --git a/tests/intel/gem_ppgtt.c b/tests/intel/gem_ppgtt.c
index b6081b1e9..c25bf5f88 100644
--- a/tests/intel/gem_ppgtt.c
+++ b/tests/intel/gem_ppgtt.c
@@ -41,30 +41,24 @@
 #include "igt_debugfs.h"
 /**
  * TEST: gem ppgtt
+ * Category: Desktop client
+ * Feature: mapping, xorg_dri2
+ * Functionality: buffer management
+ * Sub-category: Memory management
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: blt-vs-render-ctx0
- * Feature: mapping
  *
  * SUBTEST: blt-vs-render-ctxN
- * Feature: mapping
  *
  * SUBTEST: flink-and-close-vma-leak
- * Category: Desktop client
- * Feature: mapping, xorg_dri2
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: shrink-vs-evict-any
  * Description: Regression test to verify GTT eviction can't randomly fail due to object lock contention
- * Feature: mapping
- * Test category: GEM_Legacy
  *
  * SUBTEST: shrink-vs-evict-pinned
  * Description: Regression test to verify GTT eviction can't randomly fail due to object lock contention
- * Feature: mapping
- * Test category: GEM_Legacy
  */
 
 #define WIDTH 512
diff --git a/tests/intel/gem_pxp.c b/tests/intel/gem_pxp.c
index 9cc6b9c2f..6a7f8e487 100644
--- a/tests/intel/gem_pxp.c
+++ b/tests/intel/gem_pxp.c
@@ -10,81 +10,63 @@
 /**
  * TEST: gem pxp
  * Description: Test PXP that manages protected content through arbitrated HW-PXP-session
+ * Feature: PXP
+ * Functionality: pxp
+ * Sub-category: Power management
  * Run type: FULL
  *
  * SUBTEST: create-protected-buffer
- * Feature: PXP
  *
  * SUBTEST: create-regular-buffer
  * Description: Verify protected buffer on supported hw:
- * Feature: PXP
  *
  * SUBTEST: create-regular-context-1
  * Description: Verify protected context on supported hw:
- * Feature: PXP
  *
  * SUBTEST: create-regular-context-2
- * Feature: PXP
  *
  * SUBTEST: create-valid-protected-context
- * Feature: PXP
  *
  * SUBTEST: display-protected-crc
  * Description: Test the display CRC
- * Feature: PXP
  *
  * SUBTEST: dmabuf-shared-protected-dst-is-context-refcounted
  * Feature: PXP, prime
  *
  * SUBTEST: fail-invalid-protected-context
- * Feature: PXP
  *
  * SUBTEST: hw-rejects-pxp-buffer
  * Description: Verify protected buffer on unsupported hw:
- * Feature: PXP
  *
  * SUBTEST: hw-rejects-pxp-context
  * Description: Verify protected context on unsupported hw:
- * Feature: PXP
  *
  * SUBTEST: protected-encrypted-src-copy-not-readible
- * Feature: PXP
  *
  * SUBTEST: protected-raw-src-copy-not-readible
- * Feature: PXP
  *
  * SUBTEST: regular-baseline-src-copy-readible
  * Description: Verify protected render operations:
- * Feature: PXP
  *
  * SUBTEST: reject-modify-context-protection-off-1
- * Feature: PXP
  *
  * SUBTEST: reject-modify-context-protection-off-2
- * Feature: PXP
  *
  * SUBTEST: reject-modify-context-protection-off-3
- * Feature: PXP
  *
  * SUBTEST: reject-modify-context-protection-on
  * Description: Verify protected context integrity:
- * Feature: PXP
  *
  * SUBTEST: verify-pxp-execution-after-suspend-resume
- * Feature: PXP
  *
  * SUBTEST: verify-pxp-key-change-after-suspend-resume
  * Description: Verify suspend-resume teardown management:
- * Feature: PXP
  *
  * SUBTEST: verify-pxp-stale-buf-execution
- * Feature: PXP
  *
  * SUBTEST: verify-pxp-stale-buf-optout-execution
- * Feature: PXP
  *
  * SUBTEST: verify-pxp-stale-ctx-execution
- * Feature: PXP
  */
 
 IGT_TEST_DESCRIPTION("Test PXP that manages protected content through arbitrated HW-PXP-session");
diff --git a/tests/intel/gem_ringfill.c b/tests/intel/gem_ringfill.c
index 66fbd27fa..a73c0ef5c 100644
--- a/tests/intel/gem_ringfill.c
+++ b/tests/intel/gem_ringfill.c
@@ -43,35 +43,33 @@
 #include <sys/ioctl.h>
 /**
  * TEST: gem ringfill
+ * Category: Infrastructure
  * Description:
  *   Exercise many tiny batchbuffer operations, in the hope of catching failure to manage the ring
  *   properly near full.
- *
- * SUBTEST: basic-all
- * Category: Infrastructure
- * Description: Basic check to fill the ring upto maximum on all engines simultaneously.
  * Feature: cmd_submission
  * Functionality: command submission
- * Run type: BAT
  * Sub-category: i915
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic-all
+ * Run type: BAT
+ * Description: Basic check to fill the ring upto maximum on all engines simultaneously.
  *
  * SUBTEST: engines-S3
  * Description: Handle a full ring across suspend cycle.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-S4
  * Description: Handle a full ring across hibernate cycle.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-basic
  * Description:
  *   Basic check how the driver handles a full ring.
  *   Test spamming ring with contexts
  * Feature: cmd_submission, multitile
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: engines-bomb
@@ -79,51 +77,42 @@
  *   Fills the ring upto maximim parallely using fork with different fd's along with
  *   interruptions.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-child
  * Description: Check to fill the ring parallely using fork.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-fd
  * Description: Fills the ring upto maximim parallely using fork with different fd's.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-forked
  * Description: Check to fill the ring parallely using fork.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-hang
  * Description: Exercise many batchbuffer operations along with a hang batch until ring is full.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: engines-interruptible
  * Description:
  *   Exercise all potential injection sites by using igt_sigiter interface to repeat the
  *   ringfill testing.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-S3
  * Description: Handle a full ring across suspend cycle - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-S4
  * Description: Handle a full ring across hibernate cycle - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-basic
  * Description:
  *   Basic check how the driver handles a full ring - on legacy ring.
  *   Test spamming ring with contexts - legacy path
  * Feature: cmd_submission, multitile
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: legacy-bomb
@@ -131,36 +120,30 @@
  *   Fills the ring upto maximim parallely using fork with different fd's along with
  *   interruptions - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-child
  * Description: Check to fill the ring parallely using fork - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-fd
  * Description: Fills the ring upto maximim parallely using fork with different fd's - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-forked
  * Description: Check to fill the ring parallely using fork - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-hang
  * Description:
  *   Exercise many batchbuffer operations along with a hang batch until ring is full - on legacy
  *   ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  *
  * SUBTEST: legacy-interruptible
  * Description:
  *   Exercise all potential injection sites by using igt_sigiter interface to repeat the
  *   ringfill testing - on legacy ring.
  * Feature: cmd_submission, multitile
- * Run type: FULL
  */
 
 #define INTERRUPTIBLE 0x1
diff --git a/tests/intel/gem_shrink.c b/tests/intel/gem_shrink.c
index 1f16f8a78..094881a15 100644
--- a/tests/intel/gem_shrink.c
+++ b/tests/intel/gem_shrink.c
@@ -36,6 +36,10 @@
 /**
  * TEST: gem shrink
  * Feature: mapping
+ * Category: Desktop client
+ * Functionality: buffer management
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: execbuf1
@@ -139,10 +143,6 @@
  * SUBTEST: pwrite-userptr-dirty
  *
  * SUBTEST: reclaim
- * Category: Desktop client
- * Functionality: buffer management
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 #ifndef MADV_FREE
diff --git a/tests/intel/gem_softpin.c b/tests/intel/gem_softpin.c
index f5f0ba257..f06e58be9 100644
--- a/tests/intel/gem_softpin.c
+++ b/tests/intel/gem_softpin.c
@@ -33,219 +33,97 @@
 #include "intel_allocator.h"
 /**
  * TEST: gem softpin
+ * Category: Infrastructure
  * Description:
  *   Tests softpin feature with normal usage, invalid inputs scenarios and couple of eviction
  *   tests which copy buffers between CPU and GPU.
+ * Feature: mapping
+ * Functionality: softpin
+ * Sub-category: CMD submission
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
  * SUBTEST: 32b-excludes-last-page
- * Category: Infrastructure
  * Description: Check the last 32b page is excluded.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-basic
- * Category: Infrastructure
  * Description: Check that we can place objects at start/end of the GTT using the allocator.
- * Feature: mapping
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-basic-reserve
- * Category: Infrastructure
  * Description: Check that if we can reserve a space for an object starting from a given offset.
- * Feature: mapping
- * Functionality: command submission
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-evict
- * Category: Infrastructure
  * Description: Exercise eviction with softpinning.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-fork
- * Category: Infrastructure
  * Description: Check if multiple processes can use allocator.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-nopin
- * Category: Infrastructure
  * Description: Check that we can combine manual placement with automatic GTT placement.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: allocator-nopin-reserve
- * Category: Infrastructure
  * Description:
  *   Check that we can combine manual placement with automatic GTT placement and
  *   reserves/unreserves space for objects.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-active
- * Category: Infrastructure
  * Description: Check eviction with active bo.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-active-interruptible
- * Category: Infrastructure
  * Description: Check eviction with active bo with interrupts.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-hang
  * Description: Check eviction of softpinned bo with hung batch.
- * Feature: mapping
- * Run type: FULL
  *
  * SUBTEST: evict-prime
  * Description: Check eviction of vma on importing prime fd in reopened drm fds
- * Feature: mapping
- * Run type: FULL
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-prime-sanity-check
  * Description: Check eviction of vma on importing prime fd in reopened drm fd in single thread
- * Feature: mapping
- * Run type: FULL
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-single-offset
- * Category: Infrastructure
  * Description: Use same offset for all engines and for different handles.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: evict-snoop
  * Description: Check eviction against snooping.
- * Feature: mapping
- * Run type: FULL
  *
  * SUBTEST: evict-snoop-interruptible
  * Description: Check eviction against snooping with interrupts.
- * Feature: mapping
- * Run type: FULL
  *
  * SUBTEST: full
- * Category: Infrastructure
  * Description: Check the total occupancy by using pad-to-size to fill the entire GTT.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid
- * Category: Infrastructure
  * Description: Check that invalid inputs are handled correctly.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: noreloc
- * Category: Infrastructure
  * Description: Check that noreloc support works.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: noreloc-S3
  * Description: Check noreloc survives after suspend to RAM/resume cycle.
- * Feature: mapping
- * Run type: FULL
  *
  * SUBTEST: noreloc-S4
  * Description: Check noreloc survives after suspend to disk/resume cycle.
- * Feature: mapping
- * Run type: FULL
  *
  * SUBTEST: noreloc-interruptible
- * Category: Infrastructure
  * Description: Check noreloc support with interruptible.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: overlap
- * Category: Infrastructure
  * Description: Check all the possible pages aligned overlaps.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: reverse
- * Category: Infrastructure
  * Description: Check that if the user demands the vma will be swapped.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: safe-alignment
- * Category: Infrastructure
  * Description: Check start offset and alignment detection.
- * Feature: mapping
- * Functionality: command submission
- * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: softpin
- * Category: Infrastructure
  * Description: Check softpinning of a gem buffer object.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: zero
- * Category: Infrastructure
  * Description: Check full placement control under full-ppGTT.
- * Feature: mapping
- * Functionality: command submission
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Tests softpin feature with normal usage, invalid inputs"
diff --git a/tests/intel/gem_spin_batch.c b/tests/intel/gem_spin_batch.c
index ec1458e35..2e617289c 100644
--- a/tests/intel/gem_spin_batch.c
+++ b/tests/intel/gem_spin_batch.c
@@ -27,80 +27,26 @@
 #include "igt.h"
 /**
  * TEST: gem spin batch
- * Run type: FULL
  * Test category: GEM_Legacy
- *
- * SUBTEST: engines
  * Category: Infrastructure
  * Feature: context, igt_core
  * Functionality: dummy workload
  * Sub-category: IGT Lib
+ * Run type: FULL
  *
+ * SUBTEST: engines
  * SUBTEST: legacy
- * Category: Infrastructure
- * Feature: context, igt_core
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: legacy-resubmit
- * Category: Infrastructure
- * Feature: context, igt_core
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: legacy-resubmit-new
- * Category: Infrastructure
- * Feature: context, igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: resubmit
- * Category: Infrastructure
- * Feature: context, igt_core
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: resubmit-all
- * Category: Infrastructure
- * Feature: context, igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: resubmit-new
- * Category: Infrastructure
- * Feature: context, igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: resubmit-new-all
- * Category: Infrastructure
- * Feature: context, igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: spin-all
- * Category: Infrastructure
- * Feature: igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: spin-all-new
- * Category: Infrastructure
- * Feature: igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: spin-each
- * Category: Infrastructure
- * Feature: igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
- *
  * SUBTEST: user-each
- * Category: Infrastructure
- * Feature: igt_core, multictx
- * Functionality: dummy workload
- * Sub-category: IGT Lib
+ *
  */
 
 #define MAX_ERROR 5 /* % */
diff --git a/tests/intel/gem_sync.c b/tests/intel/gem_sync.c
index f98d4364c..d3de2e77e 100644
--- a/tests/intel/gem_sync.c
+++ b/tests/intel/gem_sync.c
@@ -34,43 +34,37 @@
 #include "igt_sysfs.h"
 /**
  * TEST: gem sync
+ * Category: Infrastructure
  * Description: Basic check of ring<->ring write synchronisation.
+ * Feature: synchronization
+ * Functionality: semaphore
+ * Sub-category: i915
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
  * SUBTEST: active
  * Description: Exercise waiting while keeping the GPU busy on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: active-each
  * Description: Exercise waiting while keeping the GPU busy.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: active-wakeup
  * Description: Measure wakeup latency while also scheduling the next batch on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: active-wakeup-each
  * Description: Measure wakeup latency while also scheduling the next batch.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: basic-all
- * Category: Infrastructure
  * Description: Basic test to wait upon a batch on all rings.
- * Feature: synchronization
- * Functionality: semaphore
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-each
  * Description:
  *   Check synchronisation of ring.
  *   Exercise all physical engine selection and legacy rings
  * Feature: multitile, synchronization
- * Functionality: semaphore
  * Run type: BAT
  * Test category: MultiTile
  *
@@ -79,139 +73,91 @@
  *   Create race condition and see if we can catch interrupts.
  *   Basic check of ring to ring write synchronisation
  * Feature: multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: basic-store-all
- * Category: Infrastructure
  * Description: Basic version of store synchronisation test.
- * Feature: synchronization
- * Functionality: semaphore
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-store-each
  * Description:
  *   Check that store synchronisation works.
  *   Basic check of ring to ring write, store synchronisation
  * Feature: multitile, synchronization
- * Run type: FULL
  * Test category: MultiTile
  *
  * SUBTEST: default
  * Description: Check synchronisation of rings on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: double-wakeup
  * Description: Double stress test for nop + sync on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: double-wakeup-each
  * Description: Double stress test for nop + sync.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: forked
  * Description: Check synchronisation of ring with parallel executions on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-all
  * Description: Parallel execution of batch on all rings and then wait.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-each
  * Description:
  *   Forked variant of sync_ring, which checks synchronisation of ring with parallel
  *   executions.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-store
  * Description: Check store synchronisation works with parallel multiple executions on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-store-all
  * Description: Parallel execution of store synchronisation.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-store-each
  * Description: Forked variant of store_ring, check if parallel store synchronisation works.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-switch
  * Description: Check sync after context switch parallelly on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: forked-switch-each
  * Description: Check sync after context switch parallelly.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: idle
  * Description: Exercise and measure idle requests on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-active
  * Description: Exercise waiting while keeping the GPU busy for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-active-wakeup
  * Description: Measure wakeup latency while also scheduling the next batch for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-default
  * Description: Check synchronisation of rings for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-double-wakeup
  * Description: Double stress test for nop + sync for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-forked
  * Description: Check synchronisation of ring with parallel executions for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-forked-store
  * Description:
  *   Check store synchronisation works with parallel multiple executions for each legacy
  *   engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-forked-switch
  * Description: Check sync after context switch parallelly for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-idle
  * Description: Exercise and measure idle requests for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-many
  * Description: Create race condition and see if we can catch interrupts for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-store
  * Description: Check that store synchronisation works for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: legacy-switch
  * Description: Check sync after context switch for each legacy engine.
@@ -220,60 +166,40 @@
  *
  * SUBTEST: legacy-wakeup
  * Description: Stress for nop + sync for each legacy engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: many
  * Description: Create race condition and see if we can catch interrupts on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: preempt
  * Description: For each context engine check how priority of task are submitted when engine is already busy.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: preempt-all
  * Description:
  *   Check and measure how well we can submit a second high priority task when the engine is already
  *   busy with a low priority task on all engines.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: store
  * Description: Check that store synchronisation works on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: store-all
  * Description: Extended version of existing basic-store-all test.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: switch
  * Description: Check sync after context switch on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: switch-each
  * Description: Check sync after context switch.
  * Feature: multitile, synchronization
- * Run type: FULL
  *
  * SUBTEST: wait-all
  * Description: Extended version of existing basic-all test.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: wakeup
  * Description: Stress for nop + sync on each engine.
- * Feature: synchronization
- * Run type: FULL
  *
  * SUBTEST: wakeup-each
  * Description: Stress test for nop + sync.
  * Feature: multitile, synchronization
- * Run type: FULL
  */
 
 #define MAX_PRIO I915_CONTEXT_MAX_USER_PRIORITY
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH i-g-t 5/5] Documentation refactoring part 5
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
                   ` (3 preceding siblings ...)
  2024-02-29 11:19 ` [PATCH i-g-t 4/5] Documentation refactoring part 4 Katarzyna Piecielska
@ 2024-02-29 11:19 ` Katarzyna Piecielska
  2024-02-29 17:07   ` Kamil Konieczny
  2024-02-29 16:34 ` ✗ Fi.CI.BUILD: failure for IGT documentation refactoring Patchwork
  5 siblings, 1 reply; 13+ messages in thread
From: Katarzyna Piecielska @ 2024-02-29 11:19 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab, Kamil Konieczny

Unify documentation for Intel i915 tests that we have by  moving
common parts to be available for all tests.

This is part 5 to make review easier.

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
 tests/intel/gem_mmap.c                 |  34 ++--
 tests/intel/gem_partial_pwrite_pread.c |  48 ++---
 tests/intel/gem_render_linear_blits.c  |   4 +-
 tests/intel/gem_render_tiled_blits.c   |  17 +-
 tests/intel/gem_tiled_blits.c          |   3 +-
 tests/intel/gem_userptr_blits.c        | 247 +------------------------
 tests/intel/gem_wait.c                 |  34 +---
 tests/intel/gem_workarounds.c          |  43 +----
 tests/intel/i915_module_load.c         |  23 +--
 tests/intel/i915_pm_rc6_residency.c    |   6 +-
 tests/intel/i915_pm_rpm.c              |  50 +----
 tests/intel/i915_pm_rps.c              |  34 +---
 tests/intel/i915_query.c               |  52 +-----
 tests/intel/i915_suspend.c             |  31 +---
 tests/intel/perf.c                     |  54 +-----
 tests/intel/perf_pmu.c                 |  73 +-------
 tests/intel/sysfs_heartbeat_interval.c |   6 +-
 tests/intel/sysfs_preempt_timeout.c    |  15 +-
 tests/intel/sysfs_timeslice_duration.c |  17 +-
 tests/prime_vgem.c                     |  57 +-----
 tests/vgem_basic.c                     |  30 +--
 21 files changed, 123 insertions(+), 755 deletions(-)

diff --git a/tests/intel/gem_mmap.c b/tests/intel/gem_mmap.c
index d4ca1eda7..a7c5f0bce 100644
--- a/tests/intel/gem_mmap.c
+++ b/tests/intel/gem_mmap.c
@@ -42,58 +42,50 @@
  * TEST: gem mmap
  * Description: Basic MMAP IOCTL tests for memory regions.
  * Feature: mapping
+ * Run type: FULL
  *
  * SUBTEST: bad-object
  * Description: Verify mapping to invalid gem objects won't be created.
- * Run type: FULL
  *
  * SUBTEST: bad-offset
  * Description: Verify mapping to gem object with invalid offset won't be created.
- * Run type: FULL
  *
  * SUBTEST: bad-size
  * Description: Verify mapping to gem object with invalid size won't be created.
- * Run type: FULL
  *
  * SUBTEST: basic
  * Description:
- *   Test basics of newly mapped gem object like default content, write and read coherency,
- *   mapping existence after gem_close and unmapping.
+ *   Test basics of newly mapped gem object like default content, write and read
+ *   coherency, mapping existence after gem_close and unmapping.
  * Run type: BAT
  *
  * SUBTEST: basic-small-bo
  * Description:
- *   Test the write read coherency and simultaneous access of different pages of a small buffer
- *   object.
- * Run type: FULL
+ *   Test the write read coherency and simultaneous access of different pages
+ *   of a small buffer object.
  *
  * SUBTEST: big-bo
  * Description:
- *   Test the write read coherency and simultaneous access of different pages of a big buffer
- *   object.
- * Run type: FULL
+ *   Test the write read coherency and simultaneous access of different pages
+ *   of a big buffer object.
  *
  * SUBTEST: huge-bo
  * Description:
- *   Test the write read coherency and simultaneous access of different pages of a huge buffer
- *   object.
- * Run type: FULL
+ *   Test the write read coherency and simultaneous access of different pages
+ *   of a huge buffer object.
  *
  * SUBTEST: pf-nonblock
  * Description:
- *   Verify that GTT page faults are asynchronous to GPU rendering and completes within a
- *   specific time.
- * Run type: FULL
+ *   Verify that GTT page faults are asynchronous to GPU rendering and completes
+ *   within a specific time.
  *
  * SUBTEST: short-mmap
  * Description: Map small buffer object though direct CPU access, bypassing GPU.
- * Run type: FULL
  *
  * SUBTEST: swap-bo
  * Description:
- *   Test the write read coherency and simultaneous access of different pages while swapping
- *   buffer object.
- * Run type: FULL
+ *   Test the write read coherency and simultaneous access of different pages
+ *   while swapping buffer object.
  */
 
 IGT_TEST_DESCRIPTION("Basic MMAP IOCTL tests for memory regions.");
diff --git a/tests/intel/gem_partial_pwrite_pread.c b/tests/intel/gem_partial_pwrite_pread.c
index 659a96b6e..9a5855752 100644
--- a/tests/intel/gem_partial_pwrite_pread.c
+++ b/tests/intel/gem_partial_pwrite_pread.c
@@ -46,59 +46,63 @@
  *
  * SUBTEST: reads
  * Description:
- *   Verify if pread is consistent while accessing partial cachelines with default caching
- *   level
+ *   Verify if pread is consistent while accessing partial cachelines with
+ *   default caching level
  *
  * SUBTEST: reads-display
  * Description:
- *   Verify if pread is consistent while accessing partial cachelines with display caching
- *   level
+ *   Verify if pread is consistent while accessing partial cachelines with
+ *   display caching level
  *
  * SUBTEST: reads-snoop
- * Description: Verify if pread is consistent while accessing partial cachelines with snoop caching level
+ * Description:
+ *   Verify if pread is consistent while accessing partial cachelines
+ *   with snoop caching level
  *
  * SUBTEST: reads-uncached
  * Description:
- *   Verify if pread is consistent while accessing partial cachelines with uncached caching
- *   level
+ *   Verify if pread is consistent while accessing partial cachelines with
+ *   uncached caching level
  *
  * SUBTEST: write
  * Description:
- *   Verify if pwrite is consistent while accessing partial cachelines with default caching
- *   level
+ *   Verify if pwrite is consistent while accessing partial cachelines with
+ *   default caching level
  *
  * SUBTEST: write-display
  * Description:
- *   Verify if pwrite is consistent while accessing partial cachelines with display caching
- *   level
+ *   Verify if pwrite is consistent while accessing partial cachelines with
+ *   display caching level
  *
  * SUBTEST: write-snoop
- * Description: Verify if pwrite is consistent while accessing partial cachelines with snoop caching level
+ * Description:
+ *   Verify if pwrite is consistent while accessing partial
+ *   cachelines with snoop caching level
  *
  * SUBTEST: write-uncached
  * Description:
- *   Verify if pwrite is consistent while accessing partial cachelines with uncached caching
- *   level
+ *   Verify if pwrite is consistent while accessing partial cachelines with
+ *   uncached caching level
  *
  * SUBTEST: writes-after-reads
  * Description:
- *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
- *   default caching level
+ *   Verify if both pread, pwrite are consistent while accessing partial
+ *   cachelines with default caching level
  *
  * SUBTEST: writes-after-reads-display
  * Description:
- *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
- *   display caching level
+ *   Verify if both pread, pwrite are consistent while accessing partial
+ *   cachelines with display caching level
  *
  * SUBTEST: writes-after-reads-snoop
  * Description:
- *   Verify if both pread, pwrite are consistent while accessing partial cachelines with snoop
- *   caching level
+ *   Verify if both pread, pwrite are consistent while accessing partial
+ *   cachelines with snoop caching level
  *
  * SUBTEST: writes-after-reads-uncached
  * Description:
- *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
- *   uncached caching level
+ *   Verify if both pread, pwrite are consistent while accessing partial
+ *   cachelines with uncached caching level
  */
 
 IGT_TEST_DESCRIPTION("Test pwrite/pread consistency when touching partial"
diff --git a/tests/intel/gem_render_linear_blits.c b/tests/intel/gem_render_linear_blits.c
index 1fcfb019b..61ec1593f 100644
--- a/tests/intel/gem_render_linear_blits.c
+++ b/tests/intel/gem_render_linear_blits.c
@@ -52,18 +52,16 @@
 /**
  * TEST: gem render linear blits
  * Feature: mapping
+ * Run type: FULL
  *
  * SUBTEST: aperture-shrink
- * Run type: FULL
  *
  * SUBTEST: aperture-thrash
- * Run type: FULL
  *
  * SUBTEST: basic
  * Run type: BAT
  *
  * SUBTEST: swap-thrash
- * Run type: FULL
  */
 
 #define WIDTH 512
diff --git a/tests/intel/gem_render_tiled_blits.c b/tests/intel/gem_render_tiled_blits.c
index ba9e62a25..a25ea0812 100644
--- a/tests/intel/gem_render_tiled_blits.c
+++ b/tests/intel/gem_render_tiled_blits.c
@@ -51,19 +51,19 @@
 /**
  * TEST: gem render tiled blits
  * Description:
- *   Tests performs cyclic forward, backward and random blits on tiled buffer objects using render
- *   engine with various working set sizes and compares outputs with expected ones.
+ *   Tests performs cyclic forward, backward and random blits on tiled buffer
+ *   objects using render engine with various working set sizes and compares
+ *   outputs with expected ones.
  * Feature: mapping
+ * Run type: FULL
  *
  * SUBTEST: aperture-shrink
  * Description:
- *   Check with working set size larger than aperture size and a helper process to shrink buffer
- *   object caches.
- * Run type: FULL
+ *   Check with working set size larger than aperture size and a helper process
+ *   to shrink buffer object caches.
  *
  * SUBTEST: aperture-thrash
  * Description: Check with working set size larger than aperture size.
- * Run type: FULL
  *
  * SUBTEST: basic
  * Description: Check basic functionality.
@@ -71,9 +71,8 @@
  *
  * SUBTEST: swap-thrash
  * Description:
- *   Check with working set size larger than system memory size resulting in usage and thrashing
- *   of swap space.
- * Run type: FULL
+ *   Check with working set size larger than system memory size resulting in
+ *   usage and thrashing of swap space.
  */
 
 IGT_TEST_DESCRIPTION("Tests performs cyclic forward, backward and random blits on tiled buffer "
diff --git a/tests/intel/gem_tiled_blits.c b/tests/intel/gem_tiled_blits.c
index 072fef3c3..27971a2b9 100644
--- a/tests/intel/gem_tiled_blits.c
+++ b/tests/intel/gem_tiled_blits.c
@@ -58,6 +58,7 @@
  * TEST: gem tiled blits
  * Description: Test doing many tiled blits, with a working set larger than the aperture size.
  * Feature: gtt, mapping
+ * Run type: FULL
  *
  * SUBTEST: basic
  * Description: Check basic functionality.
@@ -65,11 +66,9 @@
  *
  * SUBTEST: interruptible
  * Description: Check with interrupts in parallel execution.
- * Run type: FULL
  *
  * SUBTEST: normal
  * Description: Check with parallel execution.
- * Run type: FULL
  */
 
 IGT_TEST_DESCRIPTION("Test doing many tiled blits, with a working set larger"
diff --git a/tests/intel/gem_userptr_blits.c b/tests/intel/gem_userptr_blits.c
index 14f833232..3e1f48a4f 100644
--- a/tests/intel/gem_userptr_blits.c
+++ b/tests/intel/gem_userptr_blits.c
@@ -69,171 +69,65 @@
 #include "intel_blt.h"
 /**
  * TEST: gem userptr blits
- * Run type: FULL
- *
- * SUBTEST: access-control
- * Feature: userptr
- *
- * SUBTEST: coherency-sync
- * Feature: userptr
- *
- * SUBTEST: coherency-unsync
- * Feature: userptr
- *
- * SUBTEST: create-destroy-sync
  * Category: Server
  * Feature: userptr
  * Functionality: buffer management
  * Sub-category: Compute
  * Test category: GEM_Legacy
+ * Run type: FULL
  *
+ * SUBTEST: access-control
+ * SUBTEST: coherency-sync
+ * SUBTEST: coherency-unsync
+ * SUBTEST: create-destroy-sync
  * SUBTEST: create-destroy-unsync
- * Feature: userptr
- *
  * SUBTEST: dmabuf-sync
- * Feature: prime, userptr
- *
  * SUBTEST: dmabuf-unsync
- * Feature: prime, userptr
- *
  * SUBTEST: forbidden-operations
- * Feature: userptr
- *
  * SUBTEST: forked-access
- * Feature: userptr
- *
  * SUBTEST: forked-sync-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-multifd-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-multifd-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-multifd-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-multifd-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-multifd-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-multifd-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-multifd-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-multifd-normal
- * Feature: userptr
- *
  * SUBTEST: forked-sync-swapping-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-multifd-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-multifd-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-multifd-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-multifd-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-multifd-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-multifd-mempressure-interruptible
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-multifd-mempressure-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-multifd-normal
- * Feature: userptr
- *
  * SUBTEST: forked-unsync-swapping-normal
- * Feature: userptr
- *
  * SUBTEST: huge-split
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: input-checking
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-mmap-offset-unsync
  * Description: Verify unsynchronized userptr on mmap-offset mappings fails
- * Feature: userptr
  *
  * SUBTEST: invalid-null-pointer
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: major-normal-sync
- * Feature: userptr
- *
  * SUBTEST: major-sync-interruptible
- * Feature: userptr
- *
  * SUBTEST: major-unsync-interruptible
- * Feature: userptr
- *
  * SUBTEST: major-unsync-normal
- * Feature: userptr
  *
  * SUBTEST: map-fixed-invalidate
  * Description: Try to anger lockdep with MMU notifier still active after MAP_FIXED remap
@@ -252,176 +146,45 @@
  * Feature: gtt, userptr
  *
  * SUBTEST: minor-normal-sync
- * Feature: userptr
- *
  * SUBTEST: minor-sync-interruptible
- * Feature: userptr
- *
  * SUBTEST: minor-unsync-interruptible
- * Feature: userptr
- *
  * SUBTEST: minor-unsync-normal
- * Feature: userptr
- *
  * SUBTEST: mlocked-normal-sync
- * Feature: userptr
- *
  * SUBTEST: mlocked-sync-interruptible
- * Feature: userptr
- *
  * SUBTEST: mlocked-unsync-interruptible
- * Feature: userptr
- *
  * SUBTEST: mlocked-unsync-normal
- * Feature: userptr
  *
  * SUBTEST: mmap-offset-banned
- * Category: Server
  * Description: Verify mmap_offset to userptr is banned
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
  *
  * SUBTEST: nohangcheck
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: probe
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: process-exit
- * Feature: userptr
- *
  * SUBTEST: process-exit-busy
- * Feature: userptr
- *
  * SUBTEST: readonly-pwrite-unsync
- * Feature: userptr
- *
  * SUBTEST: readonly-unsync
- * Feature: userptr
- *
  * SUBTEST: relocations
- * Feature: userptr
- *
  * SUBTEST: sd-probe
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: set-cache-level
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: stress-mm
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: stress-mm-invalidate-close
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: stress-mm-invalidate-close-overlap
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: stress-purge
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: swapping-normal-sync
- * Feature: userptr
- *
  * SUBTEST: swapping-sync-interruptible
- * Feature: userptr
- *
  * SUBTEST: swapping-unsync-interruptible
- * Feature: userptr
- *
  * SUBTEST: swapping-unsync-normal
- * Feature: userptr
- *
  * SUBTEST: sync-overlap
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: sync-unmap
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: sync-unmap-after-close
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: sync-unmap-cycles
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: unsync-overlap
- * Feature: userptr
- *
  * SUBTEST: unsync-unmap
- * Feature: userptr
- *
  * SUBTEST: unsync-unmap-after-close
- * Feature: userptr
- *
  * SUBTEST: unsync-unmap-cycles
- * Feature: userptr
- *
  * SUBTEST: usage-restrictions
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
- *
  * SUBTEST: userfault
- * Feature: userptr
- *
  * SUBTEST: vma-merge
- * Category: Server
- * Feature: userptr
- * Functionality: buffer management
- * Sub-category: Compute
- * Test category: GEM_Legacy
  */
 
 #ifndef PAGE_SIZE
diff --git a/tests/intel/gem_wait.c b/tests/intel/gem_wait.c
index 674deb57d..e2a598c64 100644
--- a/tests/intel/gem_wait.c
+++ b/tests/intel/gem_wait.c
@@ -33,26 +33,21 @@
 #include "igt_vgem.h"
 /**
  * TEST: gem wait
+ * Category: Infrastructure
  * Description: Tests the GEM_WAIT ioctl
  * Feature: synchronization
+ * Functionality: semaphore
+ * Sub-category: i915
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: await
- * Category: Infrastructure
  * Description: Verify GEM_WAIT functionality in await mode.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: busy
- * Category: Infrastructure
  * Description: Verify GEM_WAIT functionality in busy mode.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: busy@all
- * Functionality: semaphore
  *
  * SUBTEST: busy@all-engines
  * Run type: BAT
@@ -70,45 +65,24 @@
  * Description: Verify GEM_WAIT functionality in wait-write mode, when hang is allowed.
  *
  * SUBTEST: invalid-buf
- * Category: Infrastructure
  * Description: Verify that GEM_WAIT called with invalid buffer object will fail.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: invalid-flags
- * Category: Infrastructure
  * Description: Verify that GEM_WAIT called with invalid flag will fail.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait
- * Category: Infrastructure
  * Description: Verify GEM_WAIT functionality in wait mode.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait@all
- * Functionality: semaphore
  *
  * SUBTEST: wait@all-engines
  * Run type: BAT
  *
  * SUBTEST: write-busy
- * Category: Infrastructure
  * Description: Verify GEM_WAIT functionality in write-busy mode.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: write-wait
- * Category: Infrastructure
  * Description: Verify GEM_WAIT functionality in write-wait mode.
- * Functionality: semaphore
- * Sub-category: i915
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Tests the GEM_WAIT ioctl");
diff --git a/tests/intel/gem_workarounds.c b/tests/intel/gem_workarounds.c
index c5ca26c08..d83c0a1db 100644
--- a/tests/intel/gem_workarounds.c
+++ b/tests/intel/gem_workarounds.c
@@ -34,63 +34,28 @@
 #include "igt_types.h"
 /**
  * TEST: gem workarounds
- * Run type: FULL
- *
- * SUBTEST: basic-read
  * Category: Infrastructure
  * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
+ * Functionality: workarounds
+ * Sub-category: Context
  * Test category: GEM_Legacy
+ * Run type: FULL
  *
+ * SUBTEST: basic-read
  * SUBTEST: basic-read-context
- * Category: Infrastructure
- * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
- * Test category: GEM_Legacy
- *
  * SUBTEST: basic-read-fd
- * Category: Infrastructure
- * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
- * Test category: GEM_Legacy
- *
  * SUBTEST: hibernate-resume
  * Feature: hibernate, workarounds
- *
  * SUBTEST: hibernate-resume-context
  * Feature: hibernate, workarounds
- *
  * SUBTEST: hibernate-resume-fd
  * Feature: hibernate, workarounds
- *
  * SUBTEST: reset
- * Category: Infrastructure
- * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
- * Test category: GEM_Legacy
- *
  * SUBTEST: reset-context
- * Category: Infrastructure
- * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
- * Test category: GEM_Legacy
- *
  * SUBTEST: reset-fd
- * Category: Infrastructure
- * Feature: workarounds
- * Functionality: context management
- * Sub-category: HW
- * Test category: GEM_Legacy
  *
  * SUBTEST: suspend-resume
  * Description: Test to verify gem WA registers during suspend-resume
- * Feature: suspend, workarounds
- * Test category: suspend
  *
  * SUBTEST: suspend-resume-context
  * Description: Test to verify gem WA registers during suspend-resume
diff --git a/tests/intel/i915_module_load.c b/tests/intel/i915_module_load.c
index 9fffe93d9..b02e3e005 100644
--- a/tests/intel/i915_module_load.c
+++ b/tests/intel/i915_module_load.c
@@ -25,44 +25,33 @@
 #include <sys/utsname.h>
 /**
  * TEST: i915 module load
+ * Category: Infrastructure
  * Description: Tests the i915 module loading.
+ * Feature: core
+ * Functionality: driver handler
+ * Sub-category: driver
+ * Test category: GEM_Legacy
+ * Run type: FULL
  *
  * SUBTEST: load
- * Category: Infrastructure
  * Description: Check if i915 and friends are not yet loaded, then load them.
- * Feature: core
- * Functionality: driver handler
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: reload
- * Category: Infrastructure
  * Description: Verify the basic functionality of i915 driver after it's reloaded.
  * Feature: core, sriov-core
- * Functionality: driver handler
  * Run type: BAT
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: reload-no-display
  * Description: Verify that i915 driver can be successfully loaded with disabled display.
  * Feature: core, sriov-core
- * Run type: FULL
  *
  * SUBTEST: reload-with-fault-injection
- * Category: Infrastructure
  * Description: Verify that i915 driver can be successfully reloaded at least once with fault injection.
  * Feature: core, sriov-core
- * Functionality: driver handler
- * Run type: FULL
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: resize-bar
  * Description: Check whether lmem bar size can be resized to only supported sizes.
- * Feature: core
- * Run type: FULL
  */
 
 #ifdef __linux__
diff --git a/tests/intel/i915_pm_rc6_residency.c b/tests/intel/i915_pm_rc6_residency.c
index e309abcfe..30f57858d 100644
--- a/tests/intel/i915_pm_rc6_residency.c
+++ b/tests/intel/i915_pm_rc6_residency.c
@@ -43,19 +43,19 @@
 #include "sw_sync.h"
 /**
  * TEST: i915 pm rc6 residency
+ * Feature: GuCRC, pm_rc6
+ * Functionality: rc6
+ * Sub-category: Power management
  * Run type: FULL
  *
  * SUBTEST: media-rc6-accuracy
  * Feature: pm_rc6
  *
  * SUBTEST: rc6-accuracy
- * Feature: GuCRC, pm_rc6
  *
  * SUBTEST: rc6-fence
- * Feature: GuCRC, pm_rc6
  *
  * SUBTEST: rc6-idle
- * Feature: GuCRC, pm_rc6
  */
 
 #define SLEEP_DURATION 3 /* in seconds */
diff --git a/tests/intel/i915_pm_rpm.c b/tests/intel/i915_pm_rpm.c
index 7f64d1069..9fbfac744 100644
--- a/tests/intel/i915_pm_rpm.c
+++ b/tests/intel/i915_pm_rpm.c
@@ -42,75 +42,31 @@
 #include <sys/stat.h>
 /**
  * TEST: i915 pm rpm
- *
- * SUBTEST: debugfs-forcewake-user
  * Feature: pm_rpm
+ * Functionality: D3 state entry-exit
+ * Test category: pm_rpm
  * Run type: FULL
  *
+ * SUBTEST: debugfs-forcewake-user
  * SUBTEST: debugfs-read
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: gem-evict-pwrite
- * Feature: gtt, pm_rpm
- * Run type: FULL
- *
  * SUBTEST: gem-execbuf
- * Feature: pm_rpm
- * Run type: FULL
  *
  * SUBTEST: gem-execbuf-stress
  * Description: Validate execbuf submission while exercising rpm suspend/resume cycles.
- * Feature: pm_rpm
- * Run type: FULL
  *
  * SUBTEST: gem-execbuf-stress-pc8
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: gem-idle
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: gem-mmap-type
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: gem-pread
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: module-reload
- * Feature: pm_rpm
- * Run type: BAT
- *
  * SUBTEST: reg-read-ioctl
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: sysfs-read
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: system-hibernate
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: system-hibernate-devices
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: system-suspend
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: system-suspend-devices
- * Feature: pm_rpm
- * Run type: FULL
- *
  * SUBTEST: system-suspend-execbuf
- * Feature: pm_rpm
- * Run type: FULL
  */
 
 #if defined(__linux__)
diff --git a/tests/intel/i915_pm_rps.c b/tests/intel/i915_pm_rps.c
index 3ef5842dd..820edd45e 100644
--- a/tests/intel/i915_pm_rps.c
+++ b/tests/intel/i915_pm_rps.c
@@ -47,58 +47,32 @@
 /**
  * TEST: i915 pm rps
  * Description: Render P-States tests - verify GPU frequency changes
+ * Feature: pm_rps
+ * Test category: pm_rps
+ * Run type: FULL
  *
  * SUBTEST: basic-api
- * Feature: pm_rps
  * Run type: BAT
  *
  * SUBTEST: engine-order
  * Description:
  *   Check if context reuse does not affect waitboosting.
  *   Render P-States tests - verify GPU frequency changes
- * Feature: pm_rps
- * Run type: FULL
- * Test category: pm_rps
  *
  * SUBTEST: fence-order
  * Description:
  *   Check if the order of fences does not affect waitboosting.
  *   Render P-States tests - verify GPU frequency changes
  * Feature: pm_rps, synchronization
- * Run type: FULL
- * Test category: pm_rps
  *
  * SUBTEST: min-max-config-idle
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: min-max-config-loaded
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: reset
- * Feature: pm_rps
- * Run type: FULL
- *
- * SUBTEST: waitboost
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: thresholds
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: thresholds-idle
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: thresholds-idle-park
- * Feature: pm_rps
- * Run type: FULL
- *
  * SUBTEST: thresholds-park
- * Feature: pm_rps
- * Run type: FULL
+ * SUBTEST: waitboost
  */
 
 IGT_TEST_DESCRIPTION("Render P-States tests - verify GPU frequency changes");
diff --git a/tests/intel/i915_query.c b/tests/intel/i915_query.c
index e9cc49597..557134062 100644
--- a/tests/intel/i915_query.c
+++ b/tests/intel/i915_query.c
@@ -29,90 +29,51 @@
 #include <limits.h>
 /**
  * TEST: i915 query
+ * Category: Infrastructure
  * Description: Testing the i915 query uAPI.
+ * Feature: gem_core
+ * Functionality: device topology
+ * Sub-category: uapi
+ * Test category: GEM_Legacy
  * Run type: FULL
  *
  * SUBTEST: engine-info
- * Category: Infrastructure
  * Description: Positive tests for DRM_I915_QUERY_ENGINE_INFO
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: engine-info-invalid
- * Category: Infrastructure
  * Description: Negative tests for DRM_I915_QUERY_ENGINE_INFO
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: hwconfig_table
- * Category: Infrastructure
  * Description: Test DRM_I915_QUERY_HWCONFIG_BLOB query
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: query-garbage
- * Category: Infrastructure
  * Description: Test response to an invalid query call
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: query-regions-garbage-items
- * Category: Infrastructure
  * Description: Dodgy returned data tests for DRM_I915_QUERY_MEMORY_REGIONS
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: query-regions-sanity-check
- * Category: Infrastructure
  * Description: Basic tests for DRM_I915_QUERY_MEMORY_REGIONS
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: query-regions-unallocated
  * Description: Sanity check the region unallocated tracking
- * Feature: gem_core
  *
  * SUBTEST: query-topology-coherent-slice-mask
  * Description: Compare new DRM_I915_QUERY_TOPOLOGY_INFO query with legacy (sub)slice getparams
- * Feature: gem_core
  *
  * SUBTEST: query-topology-garbage-items
- * Category: Infrastructure
  * Description: Test response to invalid DRM_I915_QUERY_TOPOLOGY_INFO query
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
- *
+ * 
  * SUBTEST: query-topology-kernel-writes
- * Category: Infrastructure
  * Description: Guardband test for DRM_I915_QUERY_TOPOLOGY_INFO query
- * Feature: gem_core
- * Functionality: device topology
- * Sub-category: i915
- * Test category: GEM_Legacy
  *
  * SUBTEST: query-topology-known-pci-ids
  * Description:
  *   Verify DRM_I915_QUERY_TOPOLOGY_INFO query against hardcoded known values for certain
  *   platforms
- * Feature: gem_core
  *
  * SUBTEST: query-topology-matches-eu-total
  * Description: More compare new DRM_I915_QUERY_TOPOLOGY_INFO query with legacy (sub)slice getparams
- * Feature: gem_core
  *
  * SUBTEST: query-topology-unsupported
  * Description: Verify DRM_I915_QUERY_TOPOLOGY_INFO query fails when it is not supported
@@ -120,7 +81,6 @@
  *
  * SUBTEST: test-query-geometry-subslices
  * Description: Test DRM_I915_QUERY_GEOMETRY_SUBSLICES query
- * Feature: gem_core
  */
 
 IGT_TEST_DESCRIPTION("Testing the i915 query uAPI.");
diff --git a/tests/intel/i915_suspend.c b/tests/intel/i915_suspend.c
index 82cabfa41..4ee815031 100644
--- a/tests/intel/i915_suspend.c
+++ b/tests/intel/i915_suspend.c
@@ -46,71 +46,48 @@
 #include "igt_device_scan.h"
 /**
  * TEST: i915 suspend
- *
- * SUBTEST: basic-s2idle-without-i915
- * Description: Validate suspend-to-idle without i915 module
  * Feature: suspend
  * Functionality: s2idle w/o i915
- * Run type: BAT
  * Test category: suspend
+ * Run type: FULL
+ *
+ * SUBTEST: basic-s2idle-without-i915
+ * Description: Validate suspend-to-idle without i915 module
  *
  * SUBTEST: basic-s3-without-i915
  * Description:
  *   Validate S3 without i915 module.
  *   Validate S3 state without i915 module
- * Feature: suspend
  * Run type: BAT
- * Test category: suspend
  *
  * SUBTEST: debugfs-reader
  * Description: Test debugfs behavior during suspend to idle
- * Feature: suspend
- * Run type: FULL
- * Test category: suspend
  *
  * SUBTEST: debugfs-reader-hibernate
- * Feature: suspend
- * Run type: FULL
  *
  * SUBTEST: fence-restore-tiled2untiled
  * Feature: gtt, suspend, synchronization
- * Run type: FULL
  *
  * SUBTEST: fence-restore-tiled2untiled-hibernate
  * Feature: gtt, suspend, synchronization
- * Run type: FULL
  *
  * SUBTEST: fence-restore-untiled
  * Feature: gtt, suspend, synchronization
- * Run type: FULL
  *
  * SUBTEST: fence-restore-untiled-hibernate
  * Feature: gtt, suspend, synchronization
- * Run type: FULL
  *
  * SUBTEST: forcewake
  * Description: Test to prevent GT from suspend by opening forcewake handle
- * Feature: suspend
- * Run type: FULL
- * Test category: suspend
  *
  * SUBTEST: forcewake-hibernate
- * Feature: suspend
- * Run type: FULL
  *
  * SUBTEST: shrink
- * Feature: suspend
- * Run type: FULL
  *
  * SUBTEST: sysfs-reader
  * Description: Test sysfs behavior during suspend to idle
- * Feature: suspend
- * Run type: FULL
- * Test category: suspend
  *
  * SUBTEST: sysfs-reader-hibernate
- * Feature: suspend
- * Run type: FULL
  */
 
 #define OBJECT_SIZE (16*1024*1024)
diff --git a/tests/intel/perf.c b/tests/intel/perf.c
index 3565d61cc..e5d3fbd0e 100644
--- a/tests/intel/perf.c
+++ b/tests/intel/perf.c
@@ -48,32 +48,26 @@
 /**
  * TEST: perf
  * Description: Test the i915 perf metrics streaming interface
+ * Feature: i915 streaming interface, oa
+ * Test category: Perf
+ * Functionality: oa
+ * Sub-category: Performance
  * Run type: FULL
  *
  * SUBTEST: blocking
  * Description: Test blocking read with default hrtimer frequency
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: blocking-parameterized
  * Description: Test blocking read with different hrtimer frequencies
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: buffer-fill
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: create-destroy-userspace-config
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: disabled-read-error
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: enable-disable
  * Feature: oa
@@ -92,8 +86,6 @@
  *
  * SUBTEST: gen12-invalid-class-instance
  * Description: Verify invalid class instance
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: gen12-mi-rpc
  * Description: Test MI REPORT PERF COUNT for Gen 12
@@ -101,8 +93,6 @@
  *
  * SUBTEST: gen12-oa-tlb-invalidate
  * Description: Test OA TLB invalidate
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: gen12-unprivileged-single-ctx-counters
  * Description: Measure performance for a specific context using OAR in Gen 12
@@ -121,98 +111,66 @@
  *
  * SUBTEST: i915-ref-count
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-create-userspace-config
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-oa-exponent
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-oa-format-id
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-oa-metric-set-id
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-open-flags
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: invalid-remove-userspace-config
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: low-oa-exponent-permissions
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: mi-rpc
  * Feature: oa
  *
  * SUBTEST: missing-sample-flags
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: non-sampling-read-error
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: non-system-wide-paranoid
  * Feature: oa
  *
  * SUBTEST: non-zero-reason
  * Description: Test that reason field in OA reports is never 0 on Gen8+
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: oa-exponents
  * Feature: oa
  *
  * SUBTEST: oa-formats
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: per-context-mode-unprivileged
  * Feature: oa, obsolete
  *
  * SUBTEST: polling
  * Description: Test polled read with default hrtimer frequency
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: polling-parameterized
  * Description: Test polled read with different hrtimer frequencies
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: polling-small-buf
  * Description: Test polled read with buffer size smaller than available data
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: rc6-disable
  * Feature: oa
  *
  * SUBTEST: short-reads
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: stress-open-close
  * Description: Stress tests opening & closing the i915-perf stream in a busy loop
@@ -220,16 +178,12 @@
  *
  * SUBTEST: sysctl-defaults
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  *
  * SUBTEST: unprivileged-single-ctx-counters
  * Feature: oa, obsolete
  *
  * SUBTEST: whitelisted-registers-userspace-config
  * Description: Test the i915 perf metrics streaming interface
- * Feature: i915 streaming interface, oa
- * Test category: Perf
  */
 
 IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");
diff --git a/tests/intel/perf_pmu.c b/tests/intel/perf_pmu.c
index 4ae2b60ae..718a3ed37 100644
--- a/tests/intel/perf_pmu.c
+++ b/tests/intel/perf_pmu.c
@@ -52,87 +52,59 @@
 /**
  * TEST: perf pmu
  * Description: Test the i915 pmu perf interface
+ * Feature: i915 pmu perf interface, pmu
+ * Test category: Perf
+ * Sub-category: Performance
+ * Functionality: pmu
  * Run type: FULL
  *
  * SUBTEST: all-busy-check-all
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: all-busy-idle-check-all
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy
  * Description: Test to ensure gpu is busy when there a workload by reading engine busyness pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-accuracy-2
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-accuracy-50
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-accuracy-98
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-check-all
  * Description: Test to ensure gpu all engines report busy when there is a workload by reading engine busyness pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-double-start
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-hang
  * Description: Test to ensure there is no hanf when all engines are busy
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-idle
  * Description: Test to ensure gpu engine reports idle when there is no workload
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-idle-check-all
  * Description: Test to ensure gpu all engine reports idle when there is no workload
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-idle-no-semaphores
  * Description: Test to verify gpu idle through engine business pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-no-semaphores
  * Description: Test to verify gpu busyness through engine business pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: busy-start
  * Description: Test to verify gpu busyness through engine business pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: cpu-hotplug
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: enable-race
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: event-wait
  * Feature: obsolete, pmu
@@ -142,83 +114,52 @@
  *
  * SUBTEST: frequency
  * Description: Read requested freq and actual frequency via PMU within specified time interval for any given workload changes
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: gt-awake
  * Description: Setup workload on all engines,measure gt awake time via pmu
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: idle
  * Description: Test to ensure gpu is idle when there is no workload by reading engine busyness pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: idle-no-semaphores
  * Description: Test to ensure gpu is idle when there is no workload by reading engine busyness pmu counters
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: init-busy
  * Description: Test to verify gpu busyness init through pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: init-sema
  * Description: Test to verify gpu busyness init through pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: init-wait
  * Description: Test to verify gpu busyness init through pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: interrupts
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: interrupts-sync
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: invalid-init
  * Description: Tests that i915 PMU corectly errors out in invalid initialization
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: invalid-open
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: module-unload
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: most-busy-check-all
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: most-busy-idle-check-all
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: multi-client
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: pmu-read
  * Description: Verify i915 pmu dir exists and read all events
  * Feature: pmu
- * Test category: Perf
  *
  * SUBTEST: rc6
  * Feature: pmu
@@ -237,18 +178,12 @@
  *
  * SUBTEST: semaphore-busy
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: semaphore-wait
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  *
  * SUBTEST: semaphore-wait-idle
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
- * Test category: Perf
  */
 
 IGT_TEST_DESCRIPTION("Test the i915 pmu perf interface");
diff --git a/tests/intel/sysfs_heartbeat_interval.c b/tests/intel/sysfs_heartbeat_interval.c
index 22c5888c6..09dbc4129 100644
--- a/tests/intel/sysfs_heartbeat_interval.c
+++ b/tests/intel/sysfs_heartbeat_interval.c
@@ -44,31 +44,27 @@
 /**
  * TEST: sysfs heartbeat interval
  * Feature: SMI, cmd_submission
+ * Test category: SysMan
  * Run type: FULL
  *
  * SUBTEST: idempotent
  * Description: Test to check whether the heartbeat parameter reports the values set.
- * Test category: SysMan
  *
  * SUBTEST: invalid
  * Description: Test to check if heartbeat parameter rejects any unrepresentable intervals.
- * Test category: SysMan
  *
  * SUBTEST: long
  *
  * SUBTEST: mixed
  * Description: Run a mixed workload with non-preemptable hogs that exceed the heartbeat, and quicker innocents. Inspect the fence status of each to verify that only the hogs are reset.
- * Test category: SysMan
  *
  * SUBTEST: nopreempt
  * Description: Test heartbeats with forced preemption disabled.
- * Test category: SysMan
  *
  * SUBTEST: off
  *
  * SUBTEST: precise
  * Description: Tests the heartbeats with preemption and heartbeat parameter enabled.
- * Test category: SysMan
  */
 
 #define ATTR "heartbeat_interval_ms"
diff --git a/tests/intel/sysfs_preempt_timeout.c b/tests/intel/sysfs_preempt_timeout.c
index 964b78ae8..606491c34 100644
--- a/tests/intel/sysfs_preempt_timeout.c
+++ b/tests/intel/sysfs_preempt_timeout.c
@@ -43,21 +43,24 @@
 /**
  * TEST: sysfs preempt timeout
  * Feature: SMI, context
+ * Test category: SysMan
  * Run type: FULL
  *
  * SUBTEST: idempotent
- * Description: Test to check whether the preempt_timeout parameter reports the values set.
- * Test category: SysMan
+ * Description: Test to check whether the preempt_timeout parameter reports the
+ *		values set.
  *
  * SUBTEST: invalid
- * Description: Test to check if preempt_timeout parameter rejects any unrepresentable intervals.
- * Test category: SysMan
+ * Description: Test to check if preempt_timeout parameter rejects any
+ *		unrepresentable intervals.
  *
  * SUBTEST: off
  *
  * SUBTEST: timeout
- * Description: Test to measure the delay from requestion the preemption to its completion. Send down some non-preemptable workloads and then request a switch to a higher priority context. The HW will not be able to respond, so the kernel will be forced to reset the hog.
- * Test category: SysMan
+ * Description: Test to measure the delay from requestion the preemption to its
+ *		completion. Send down some non-preemptable workloads and then
+ *		request a switch to a higher priority context. The HW will not
+ *		be able to respond, so the kernel will be forced to reset the hog.
  */
 
 #define ATTR "preempt_timeout_ms"
diff --git a/tests/intel/sysfs_timeslice_duration.c b/tests/intel/sysfs_timeslice_duration.c
index fc2b14e16..cceac94f2 100644
--- a/tests/intel/sysfs_timeslice_duration.c
+++ b/tests/intel/sysfs_timeslice_duration.c
@@ -46,25 +46,28 @@
 /**
  * TEST: sysfs timeslice duration
  * Feature: SMI, cmd_submission
+ * Test category: SysMan
  * Run type: FULL
  *
  * SUBTEST: duration
- * Description: Test to measure the timeslice duration by watching the xCS_TIMESTAMP and recording its value every time we switch into the context, using a couple of semaphores to busyspin for the timeslice.
- * Test category: SysMan
+ * Description: Test to measure the timeslice duration by watching the
+ *		xCS_TIMESTAMP and recording its value every time we switch
+ *		into the context, using a couple of semaphores to busyspin for
+ *		the timeslice.
  *
  * SUBTEST: idempotent
  * Description: Test to check whether timeslice parameter reports the values set.
- * Test category: SysMan
  *
  * SUBTEST: invalid
- * Description: Test to check if timeslice parameter rejects any unrepresentable intervals.
- * Test category: SysMan
+ * Description: Test to check if timeslice parameter rejects any unrepresentable
+ *		intervals.
  *
  * SUBTEST: off
  *
  * SUBTEST: timeout
- * Description: Couple a unpreemptable hog with a fast forced reset and measure the timeslice by how long it takes for the hog to be reset and the high priority context to complete.
- * Test category: SysMan
+ * Description: Couple a unpreemptable hog with a fast forced reset and measure
+ *		the timeslice by how long it takes for the hog to be reset and
+ *		the high priority context to complete.
  */
 
 #define ATTR "timeslice_duration_ms"
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 551a731f5..e21bedc94 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -32,29 +32,22 @@
 #include "intel_batchbuffer.h"	/* igt_blitter_copy() */
 /**
  * TEST: prime vgem
- * Description: Basic check of polling for prime/vgem fences.
- *
- * SUBTEST: basic-blt
  * Category: Infrastructure
- * Description: Examine blitter access path.
+ * Description: Basic check of polling for prime/vgem fences.
  * Feature: prime
  * Functionality: mock device
- * Run type: FULL
  * Sub-category: DRM
  * Test category: GEM_Legacy
+ * Run type: FULL
+ *
+ * SUBTEST: basic-blt
+ * Description: Examine blitter access path.
  *
  * SUBTEST: basic-fence-blt
- * Category: Infrastructure
  * Description: Examine blitter access path fencing.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: basic-fence-flip
  * Description: Examine vgem bo front/back flip fencing.
- * Feature: prime
  * Run type: BAT
  *
  * SUBTEST: basic-fence-mmap
@@ -83,78 +76,38 @@
  * Run type: BAT
  *
  * SUBTEST: busy
- * Category: Infrastructure
  * Description: Examine busy check of polling for vgem fence.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: coherency-blt
- * Category: Infrastructure
  * Description: Examine blitter access path WC coherency.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: coherency-gtt
  * Description: Examine concurrent access of vgem bo.
  * Feature: gtt, prime
- * Run type: FULL
  *
  * SUBTEST: fence-flip-hang
  * Description: Examine vgem bo front/back flip fencing with a pending gpu hang.
  * Feature: blacklist, prime, synchronization
- * Run type: FULL
  *
  * SUBTEST: fence-read-hang
  * Description: Examine read access path fencing with a pending gpu hang.
  * Feature: blacklist, prime, synchronization
- * Run type: FULL
  *
  * SUBTEST: fence-wait
- * Category: Infrastructure
  * Description: Examine basic dma-buf fence interop.
- * Feature: prime, synchronization
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: fence-write-hang
  * Description: Examine write access path fencing with a pending gpu hang.
  * Feature: blacklist, prime, synchronization
- * Run type: FULL
  *
  * SUBTEST: shrink
- * Category: Infrastructure
  * Description: Examine link establishment between shrinker and vgem bo.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: sync
- * Category: Infrastructure
  * Description: Examine sync on vgem fence.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  *
  * SUBTEST: wait
- * Category: Infrastructure
  * Description: Examine wait on vgem fence.
- * Feature: prime
- * Functionality: mock device
- * Run type: FULL
- * Sub-category: DRM
- * Test category: GEM_Legacy
  */
 
 IGT_TEST_DESCRIPTION("Basic check of polling for prime/vgem fences.");
diff --git a/tests/vgem_basic.c b/tests/vgem_basic.c
index 63c5c0971..6cfb02e82 100644
--- a/tests/vgem_basic.c
+++ b/tests/vgem_basic.c
@@ -37,97 +37,71 @@
  * Description: Basic sanity check of Virtual GEM module (vGEM).
  * Functionality: mock device
  * Test category: GEM_Legacy
+ * Feature: vgem
+ * Run type: FULL
  *
  * SUBTEST: bad-fence
  * Description: Make sure a non-existent fence cannot be signaled.
- * Feature: vgem
- * Run type: FULL
  *
  * SUBTEST: bad-flag
  * Description: Make sure a fence cannot be attached and signaled with invalid flags.
- * Feature: vgem
- * Run type: FULL
  *
  * SUBTEST: bad-handle
  * Description: Make sure a fence cannot be attached to a invalid handle.
- * Feature: vgem
- * Run type: FULL
  *
  * SUBTEST: bad-pad
  * Description: Make sure a non-zero pad is rejected.
- * Feature: vgem
- * Run type: FULL
  *
  * SUBTEST: busy-fence
  * Description: Make sure a conflicting fence cannot be attached.
- * Feature: vgem
- * Run type: FULL
  *
  * SUBTEST: create
  * Description: Check the basic working of vgem_create ioctl.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: debugfs
  * Description: Check the basic access to debugfs and also try to read entries in the directory.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: dmabuf-export
  * Description: Check whether it can export/import the vgem handle using prime.
  * Feature: prime, vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: dmabuf-fence
  * Description: Check the working of dma-buf fence interop.
  * Feature: prime, vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: dmabuf-fence-before
  * Description: Attach a fence before exporting a vgem handle and check the working of fence.
  * Feature: prime, vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: dmabuf-mmap
  * Description: Export the vgem handle along with RDWR capabilities using prime and check if it can be mmaped.
  * Feature: prime, vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: mmap
  * Description: Create a vgem handle and check if it can be mmaped.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: second-client
  * Description: Check whether it can open multiple clients.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: setversion
  * Description: Check the working of SET_VERSION ioctl.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: sysfs
  * Description: Check the basic access to sysfs and also try to read entries in the directory.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  *
  * SUBTEST: unload
  * Description: Basic test for handling of module unload.
- * Feature: vgem
  * Run type: BAT
- * Sub-category: DRM
  */
 
 IGT_TEST_DESCRIPTION("Basic sanity check of Virtual GEM module (vGEM).");
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 1/5] Documentation refactoring part 1
  2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
@ 2024-02-29 15:25   ` Kamil Konieczny
  2024-02-29 18:18   ` Kamil Konieczny
  1 sibling, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 15:25 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab

Hi Katarzyna,
On 2024-02-29 at 11:19:05 +0000, Katarzyna Piecielska wrote:
> Unify documentation for Intel i915 tests that we have by  moving
> common parts to be available for all tests.

Some of the tests are core/generic ones, like core_hotunplug.c

I would like to also see some prefix in subject, like:

[PATCH i-g-t 1/5] tests: Documentation refactoring part 1

> 
> This is part 1 to make review easier.
- ^^^^^^^^^^^^^^
This belongs to cover letter, not here. With that fixed:

Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Regards,
Kamil

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/core_hotunplug.c       |  57 +++++--------
>  tests/device_reset.c         |  17 ++--
>  tests/dmabuf.c               |  13 ++-
>  tests/drm_mm.c               |  84 +------------------
>  tests/intel/api_intel_bb.c   | 152 ++---------------------------------
>  tests/intel/debugfs_test.c   |  32 +++-----
>  tests/intel/gem_basic.c      |  22 ++---
>  tests/intel/gem_blits.c      |   2 +-
>  tests/intel/gem_ccs.c        |   9 +--
>  tests/intel/gem_close_race.c |  39 +++------
>  tests/intel/gem_create.c     |  87 ++++++--------------
>  11 files changed, 94 insertions(+), 420 deletions(-)
> 
> diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
> index be80d479f..f578afa4a 100644
> --- a/tests/core_hotunplug.c
> +++ b/tests/core_hotunplug.c
> @@ -44,64 +44,43 @@
>   * Description: Examine behavior of a driver on device hot unplug
>   * Feature: SMI, core
>   * Test category: functionality test
> - *
> - * SUBTEST: hotrebind
>   * Category: Software building block
>   * Sub-category: driver
>   * Functionality: device hotplug
> - * Description:
> - *   Check if the driver can be cleanly rebound to a device with a still open hot unbound driver
> - *   instance
>   * Run type: FULL
>   *
> + * SUBTEST: hotrebind
> + * Description: Check if the driver can be cleanly rebound to a device with a
> + *		still open hot unbound driver instance
> + *
>   * SUBTEST: hotrebind-lateclose
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a hot unbound driver instance still open after hot rebind can be cleanly released
> - * Run type: FULL
> + * Description: Check if a hot unbound driver instance still open after hot
> + *		rebind can be cleanly released
>   *
>   * SUBTEST: hotreplug
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a hot unplugged and still open device can be cleanly restored
> - * Run type: FULL
> + * Description: Check if a hot unplugged and still open device can be cleanly
> + *		restored
>   *
>   * SUBTEST: hotreplug-lateclose
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if an instance of a still open while hot replugged device can be cleanly released
> - * Run type: FULL
> + * Description: Check if an instance of a still open while hot replugged device
> + *		can be cleanly released
>   *
>   * SUBTEST: hotunbind-rebind
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if the driver can be cleanly unbound from an open device, then released and rebound
> - * Run type: FULL
> + * Description: Check if the driver can be cleanly unbound from an open device,
> + *		then released and rebound
>   *
>   * SUBTEST: hotunplug-rescan
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if an open device can be cleanly unplugged, then released and restored
> - * Run type: FULL
> + * Description: Check if an open device can be cleanly unplugged, then released
> + *		and restored
>   *
>   * SUBTEST: unbind-rebind
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if the driver can be cleanly unbound from a device believed to be closed, then rebound
> + * Description: Check if the driver can be cleanly unbound from a device
> + *		believed to be closed, then rebound
>   * Run type: BAT
>   *
>   * SUBTEST: unplug-rescan
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a device believed to be closed can be cleanly unplugged, then restored
> - * Run type: FULL
> + * Description: Check if a device believed to be closed can be cleanly
> + *		unplugged, then restored
>   */
>  
>  IGT_TEST_DESCRIPTION("Examine behavior of a driver on device hot unplug");
> diff --git a/tests/device_reset.c b/tests/device_reset.c
> index ef08164aa..e1e3ac78d 100644
> --- a/tests/device_reset.c
> +++ b/tests/device_reset.c
> @@ -17,29 +17,26 @@
>  /**
>   * TEST: device reset
>   * Description: Examine behavior of a driver on device sysfs reset
> + * Category: Server
> + * Feature: reset
> + * Functionality: reset
> + * Sub-category: Reset
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: cold-reset-bound
>   * Description: Cold Resets device with bound driver
> - * Feature: reset
>   *
>   * SUBTEST: reset-bound
>   * Description: Resets device with bound driver
> - * Feature: reset
>   *
>   * SUBTEST: unbind-cold-reset-rebind
>   * Description: Unbinds driver from device, initiates cold reset then rebinds driver to device
> - * Feature: reset
>   *
>   * SUBTEST: unbind-reset-rebind
> - * Category: Server
> - * Description:
> - *   Unbinds driver from device, initiates reset then rebinds driver to device
> - *   validating device resets
> + * Description: Unbinds driver from device, initiates reset then rebinds driver
> + *		to device validating device resets
>   * Feature: reset, sriov-reset
> - * Functionality: reset
> - * Sub-category: sysman
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Examine behavior of a driver on device sysfs reset");
> diff --git a/tests/dmabuf.c b/tests/dmabuf.c
> index 2ac105423..977b04043 100644
> --- a/tests/dmabuf.c
> +++ b/tests/dmabuf.c
> @@ -27,21 +27,18 @@
>   * TEST: dmabuf
>   * Description: Kernel selftests for the dmabuf API
>   * Feature: mapping, prime
> + * Category: Infrastructure
> + * Description: drm_mm range manager SW validation
> + * Functionality: DRM
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
>   * Run type: BAT
>   *
>   * SUBTEST: all-tests
>   *
>   * SUBTEST: all-tests@dma_fence
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: all-tests@sanitycheck
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Kernel selftests for the dmabuf API");
> diff --git a/tests/drm_mm.c b/tests/drm_mm.c
> index e6ba22474..f2e6c6cd1 100644
> --- a/tests/drm_mm.c
> +++ b/tests/drm_mm.c
> @@ -27,129 +27,53 @@
>   * TEST: drm mm
>   * Description: Basic sanity check of DRM's range manager (struct drm_mm)
>   * Feature: mapping
> + * Category: Infrastructure
> + * Functionality: DRM memory mangemnt
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: drm_mm
>   *
>   * SUBTEST: drm_mm@align
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@align32
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@align64
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@bottomup
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color_evict
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color_evict_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@debug
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@evict
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@evict_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@frag
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@highest
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@init
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@insert
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@insert_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@lowest
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@replace
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@reserve
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@sanitycheck
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@topdown
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)");
> diff --git a/tests/intel/api_intel_bb.c b/tests/intel/api_intel_bb.c
> index 59ed244f0..24f96fcf5 100644
> --- a/tests/intel/api_intel_bb.c
> +++ b/tests/intel/api_intel_bb.c
> @@ -43,210 +43,72 @@
>  #include "intel_blt.h"
>  /**
>   * TEST: api intel bb
> - * Description: intel_bb API check.
> - * Run type: FULL
> - *
> - * SUBTEST: add-remove-objects
>   * Category: Infrastructure
>   * Description: checking dummy buffer creation & submission
>   * Feature: igt_core
>   * Functionality: dummy buffer creation & submission
>   * Sub-category: IGT Lib
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: add-remove-objects
>   *
>   * SUBTEST: bb-with-allocator
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-noreloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-noreloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-reloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-reloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: crc32
>   * Description: Compare cpu and gpu crc32 sums on input object
> - * Feature: igt_core
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: delta-check
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: destroy-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: full-batch
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: intel-bb-blit-none
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: intel-bb-blit-x
> - * Feature: igt_core
>   *
>   * SUBTEST: intel-bb-blit-y
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: lot-of-buffers
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: misplaced-blitter
> - * Category: Infrastructure
> - * Description:
> - *   Execute intel_bb with set of engines provided by userspace
> - *   checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
> + * Description: Execute intel_bb with set of engines provided by userspace
> + *		checking dummy buffer creation & submission
>   *
>   * SUBTEST: object-noreloc-keep-cache-simple
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-noreloc-purge-cache-simple
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-reloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-reloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: offset-control
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: purge-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: render
> - * Feature: igt_core
>   *
>   * SUBTEST: render-ccs
> - * Feature: igt_core
>   *
>   * SUBTEST: reset-bb
> - * Category: Infrastructure
> - * Description:
> - *   Ensure reset is possible on fresh bb
> - *   checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
> + * Description: Ensure reset is possible on fresh bb checking dummy buffer
> + *		creation & submission
>   *
>   * SUBTEST: reset-flags
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: simple-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: simple-bb-ctx
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   */
>  
>  #define PAGE_SIZE 4096
> diff --git a/tests/intel/debugfs_test.c b/tests/intel/debugfs_test.c
> index b67bfabac..9706b81e1 100644
> --- a/tests/intel/debugfs_test.c
> +++ b/tests/intel/debugfs_test.c
> @@ -33,43 +33,29 @@
>   * TEST: debugfs test
>   * Description: Read entries from debugfs, hwmon and sysfs paths.
>   * Feature: core
> + * Category: Infrastructure
> + * Functionality: debugfs
> + * Sub-category: uapi
> + * Test category: uapi
> + * Run type: FULL
>   *
>   * SUBTEST: basic-hwmon
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from hwmon path
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> + * Description: Read all entries from hwmon path validating debugfs entries
>   * Run type: BAT
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: read_all_entries
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from debugfs path.
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> + * Description: Read all entries from debugfs path validating debugfs entries
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: read_all_entries_display_off
>   * Description: Read all debugfs entries with display on/off.
> - * Run type: FULL
>   *
>   * SUBTEST: read_all_entries_display_on
>   * Description: Read all debugfs entries with display on/off.
> - * Run type: FULL
>   *
>   * SUBTEST: sysfs
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from sysfs path.
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Read all entries from sysfs path validating debugfs entries
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Read entries from debugfs, hwmon and sysfs paths.");
> diff --git a/tests/intel/gem_basic.c b/tests/intel/gem_basic.c
> index 3485f92c8..513113cd1 100644
> --- a/tests/intel/gem_basic.c
> +++ b/tests/intel/gem_basic.c
> @@ -44,33 +44,21 @@
>  /**
>   * TEST: gem basic
>   * Description: Tests basic gem_create and gem_close IOCTLs
> - *
> - * SUBTEST: bad-close
>   * Category: Infrastructure
> - * Description: Verify that gem_close fails with bad params.
>   * Feature: gem_core
>   * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> + * Sub-category: uapi
>   * Test category: GEM_Legacy
> + * Run type: BAT
> + *
> + * SUBTEST: bad-close
> + * Description: Verify that gem_close fails with bad params.
>   *
>   * SUBTEST: create-close
> - * Category: Infrastructure
>   * Description: Verify basic functionality of gem_create and gem_close.
> - * Feature: gem_core
> - * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-fd-close
> - * Category: Infrastructure
>   * Description: Verify that closing drm driver is possible with opened gem object.
> - * Feature: gem_core
> - * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: multigpu-create-close
>   * Description: Verify basic functionality of gem_create and gem_close on multi-GPU.
> diff --git a/tests/intel/gem_blits.c b/tests/intel/gem_blits.c
> index e567cdf33..b9d0b5f87 100644
> --- a/tests/intel/gem_blits.c
> +++ b/tests/intel/gem_blits.c
> @@ -34,7 +34,7 @@
>   * Feature: blitter
>   * Functionality: command streamer
>   * Run type: FULL
> - * Sub-category: HW
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic
> diff --git a/tests/intel/gem_ccs.c b/tests/intel/gem_ccs.c
> index e8f16d7d8..3442ecfd3 100644
> --- a/tests/intel/gem_ccs.c
> +++ b/tests/intel/gem_ccs.c
> @@ -19,11 +19,11 @@
>  /**
>   * TEST: gem ccs
>   * Description: Exercise gen12 blitter with and without flatccs compression
> + * Feature: flat_ccs_mapping
>   * Run type: FULL
>   *
>   * SUBTEST: block-copy-compressed
>   * Description: Check block-copy flatccs compressed blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: block-copy-uncompressed
>   * Description: Check block-copy uncompressed blit
> @@ -31,19 +31,16 @@
>   *
>   * SUBTEST: block-multicopy-compressed
>   * Description: Check block-multicopy flatccs compressed blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: block-multicopy-inplace
>   * Description: Check block-multicopy flatccs inplace decompression blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: ctrl-surf-copy
>   * Description: Check flatccs data can be copied from/to surface
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: ctrl-surf-copy-new-ctx
> - * Description: Check flatccs data are physically tagged and visible in different contexts
> - * Feature: flat_ccs_mapping
> + * Description: Check flatccs data are physically tagged and visible i
> + *		different contexts
>   *
>   * SUBTEST: suspend-resume
>   * Description: Check flatccs data persists after suspend / resume (S0)
> diff --git a/tests/intel/gem_close_race.c b/tests/intel/gem_close_race.c
> index cef0ff025..9c2034ad3 100644
> --- a/tests/intel/gem_close_race.c
> +++ b/tests/intel/gem_close_race.c
> @@ -51,57 +51,42 @@
>  /**
>   * TEST: gem close race
>   * Description: Test try to race gem_close against workload submission.
> - *
> - * SUBTEST: basic-process
>   * Category: Infrastructure
> - * Description: Basic workload submission.
>   * Feature: synchronization
>   * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic-process
> + * Description: Basic workload submission.
> + * Run type: BAT
>   *
>   * SUBTEST: basic-threads
> - * Category: Infrastructure
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race gem_close against
> - *   continuous workload with minimum timeout.
> - * Feature: synchronization
> - * Functionality: driver handler
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race gem_close against continuous workload with minimum timeout.
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: contexts
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race gem_close against
> - *   continuous workload in other contexts.
> - * Feature: synchronization
> - * Run type: FULL
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race gem_close against continuous workload in other contexts.
>   *
>   * SUBTEST: gem-close-race
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race of gem_close against
> - *   continuous workload.
> - * Feature: synchronization
> - * Run type: FULL
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race of gem_close against continuous workload.
>   *
>   * SUBTEST: multigpu-basic-process
>   * Description: Basic workload submission on multi-GPU machine.
>   * Feature: multigpu, synchronization
> - * Run type: FULL
>   * Test category: MultiGPU
>   *
>   * SUBTEST: multigpu-basic-threads
>   * Description: Run basic-threads race on multi-GPU machine.
>   * Feature: multigpu, synchronization
> - * Run type: FULL
>   * Test category: MultiGPU
>   *
>   * SUBTEST: process-exit
>   * Description: Test try to race gem_close against submission of continuous workload.
> - * Feature: synchronization
> - * Run type: FULL
>   */
>  
>  #define OBJECT_SIZE (256 * 1024)
> diff --git a/tests/intel/gem_create.c b/tests/intel/gem_create.c
> index 87fde2963..77ffceda4 100644
> --- a/tests/intel/gem_create.c
> +++ b/tests/intel/gem_create.c
> @@ -64,101 +64,60 @@
>  #include "i915_drm.h"
>  /**
>   * TEST: gem create
> - * Description:
> - *   Ensure that basic gem_create and gem_create_ext works and that invalid input combinations
> - *   are rejected.
> - * Run type: FULL
> - *
> - * SUBTEST: busy-create
> + * Description: Ensure that basic gem_create and gem_create_ext works and that
> + *		invalid input combinations are rejected.
>   * Category: Infrastructure
> - * Description: Create buffer objects while GPU is busy.
>   * Feature: mapping
>   * Functionality: buffer management
> - * Sub-category: i915
> + * Sub-category: uapi
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: busy-create
> + * Description: Create buffer objects while GPU is busy.
>   *
>   * SUBTEST: create-clear
> - * Category: Infrastructure
>   * Description: Verify that all new objects are clear.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-ext-cpu-access-big
> - * Description:
> - *   Verify the extreme cases with very large objects and.
> - *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
> - * Feature: mapping
> + * Description: Verify the extreme cases with very large objects and
> + *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
>   *
>   * SUBTEST: create-ext-cpu-access-sanity-check
> - * Description:
> - *   Verify the basic functionally and expected ABI contract around.
> - *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
> - * Feature: mapping
> + * Description: Verify the basic functionally and expected ABI contract around
> + *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
>   *
>   * SUBTEST: create-ext-placement-all
>   * Category: Infrastructure
>   * Description: Create objects in every memory region using create_ext.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-ext-placement-each
> - * Category: Infrastructure
> - * Description: Create one object with memory pieces in each memory region using create_ext.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Create one object with memory pieces in each memory region
> + *		using create_ext.
>   *
>   * SUBTEST: create-ext-placement-sanity-check
> - * Category: Infrastructure
>   * Description: Exercise create_ext placements extension.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-invalid-size
> - * Category: Infrastructure
> - * Description: Try to create a gem object of invalid size 0 and check if ioctl returns error.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create a gem object of invalid size 0 and check if
> + *		ioctl returns error.
>   *
>   * SUBTEST: create-massive
> - * Category: Infrastructure
> - * Description: Exercise creation of buffer object with impossible size and check for the expected error.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Exercise creation of buffer object with impossible size and
> + *		check for the expected error.
>   *
>   * SUBTEST: create-size-update
> - * Category: Infrastructure
> - * Description: Try to create a gem object with size 15 and check actual created size.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create a gem object with size 15 and check actual
> + *		created size.
>   *
>   * SUBTEST: create-valid-nonaligned
> - * Category: Infrastructure
> - * Description:
> - *   Try to create an object with non-aligned size, check we got one with size aligned up to page
> - *   size and test we can write into the padded extra memory.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create an object with non-aligned size, check we got one
> + *		with size aligned up to page size and test we can write into
> + *		the padded extra memory.
>   *
>   * SUBTEST: hog-create
>   * Description: Create buffer objects while GPU is busy.
> - * Feature: mapping
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Ensure that basic gem_create and gem_create_ext works"
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 2/5] Documentation refactoring part 2
  2024-02-29 11:19 ` [PATCH i-g-t 2/5] Documentation refactoring part 2 Katarzyna Piecielska
@ 2024-02-29 15:35   ` Kamil Konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 15:35 UTC (permalink / raw)
  To: Katarzyna Piecielska; +Cc: igt-dev, Mauro Carvalho Chehab

Hi Katarzyna,

I would like to see a prefix at begin of subject:

[PATCH i-g-t 2/5] tests/intel: Documentation refactoring part 2

On 2024-02-29 at 11:19:06 +0000, Katarzyna Piecielska wrote:
>  Unify documentation for Intel i915 tests that we have by  moving
 ^^
Looks like space (or two?) at begin.

>  common parts to be available for all tests.
-^^
Same here.

> 
>  This is part 2 to make review easier.
- ^^^^^^^^^^^^^^^
Please remove it.

With that fixed:
Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

See also one nit below.

Regards,
Kamil

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/intel/gem_ctx_create.c      |  77 ++++++----------
>  tests/intel/gem_ctx_exec.c        |  51 +++--------
>  tests/intel/gem_ctx_isolation.c   |  43 ++-------
>  tests/intel/gem_ctx_param.c       | 144 ++++++------------------------
>  tests/intel/gem_ctx_persistence.c | 117 ++----------------------
>  tests/intel/gem_ctx_shared.c      |  42 ++-------
>  tests/intel/gem_eio.c             | 133 ++-------------------------
>  tests/intel/gem_exec_balancer.c   | 139 ++--------------------------
>  8 files changed, 99 insertions(+), 647 deletions(-)
> 
> diff --git a/tests/intel/gem_ctx_create.c b/tests/intel/gem_ctx_create.c
> index 6d0877954..4fe383e02 100644
> --- a/tests/intel/gem_ctx_create.c
> +++ b/tests/intel/gem_ctx_create.c
> @@ -38,91 +38,64 @@
>  /**
>   * TEST: gem ctx create
>   * Description: Test the context create ioctls
> - *
> - * SUBTEST: active
> - * Description:
> - *   For each engine calculate the average performance of context creation execution and
> - *   exercise context reclaim
> + * Category: Infrastructure
>   * Feature: context
> + * Functionality: context
> + * Sub-category: Context
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
> + * SUBTEST: active
> + * Description: For each engine calculate the average performance of context
> + *		creation execution and exercise context reclaim
> + *
>   * SUBTEST: active-all
> - * Description: Calculate the average performance of context creation and it's execution using all engines
> - * Feature: context
> - * Run type: FULL
> + * Description: Calculate the average performance of context creation and it's
> + *		execution using all engines
>   *
>   * SUBTEST: basic
> - * Category: Infrastructure
>   * Description: Test random context creation
> - * Feature: context
> - * Functionality: context management
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-files
> - * Category: Infrastructure
>   * Description: Exercise implicit per-fd context creation
> - * Feature: context
> - * Functionality: context management
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: ext-param
>   * Description: Verify valid and invalid context extensions
> - * Feature: context
> - * Run type: FULL
>   *
>   * SUBTEST: files
>   * Description: Exercise implicit per-fd context creation on 1 CPU for long duration
> - * Feature: context
> - * Run type: FULL
>   *
>   * SUBTEST: forked-active
> - * Description:
> - *   For each engine calculate the average performance of context creation and execution on
> - *   multiple parallel processes
> - * Feature: context
> - * Run type: FULL
> + * Description: For each engine calculate the average performance of context
> + *		creation and execution on multiple parallel processes
>   *
>   * SUBTEST: forked-active-all
> - * Description:
> - *   Calculate the average performance of context creation and it's execution using all engines
> - *   on multiple parallel processes
> - * Feature: context
> - * Run type: FULL
> + * Description: Calculate the average performance of context creation and it's
> + *		execution using all engines on multiple parallel processes
>   *
>   * SUBTEST: forked-files
> - * Description: Exercise implicit per-fd context creation on all CPUs for long duration
> - * Feature: context
> - * Run type: FULL
> + * Description: Exercise implicit per-fd context creation on all CPUs for long
> + *		duration
>   *
>   * SUBTEST: hog
> - * Description:
> - *   For each engine calculate the average performance of context creation and execution while
> - *   all other engines are hogging the resources
> - * Feature: context
> - * Run type: FULL
> + * Description: For each engine calculate the average performance of context
> + *		creation and execution while all other engines are hogging the
> + *		resources
>   *
>   * SUBTEST: iris-pipeline
>   * Description: Set, validate and execute particular context params
> - * Feature: context
> - * Run type: FULL
>   *
>   * SUBTEST: maximum-mem
> - * Description:
> - *   Create contexts upto available RAM size, calculate the average performance of their
> - *   execution on multiple parallel processes
> - * Feature: context
> - * Run type: FULL
> + * Description: Create contexts upto available RAM size, calculate the average
> + *		performance of their execution on multiple parallel processes
>   *
>   * SUBTEST: maximum-swap
> - * Description:
> - *   Create contexts upto available RAM+SWAP size, calculate the average performance of their
> - *   execution on multiple parallel processes
> - * Feature: context
> - * Run type: FULL
> + * Description: Create contexts upto available RAM+SWAP size, calculate the
> + *		average performance of their execution on multiple parallel
> + *		processes
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Test the context create ioctls");
> diff --git a/tests/intel/gem_ctx_exec.c b/tests/intel/gem_ctx_exec.c
> index 4376397a2..556b21651 100644
> --- a/tests/intel/gem_ctx_exec.c
> +++ b/tests/intel/gem_ctx_exec.c
> @@ -50,61 +50,38 @@
>  /**
>   * TEST: gem ctx exec
>   * Description: Test context batch buffer execution.
> + * Category: Infrastructure
> + * Feature: context
> + * Functionality: execbuf
> + * Sub-category: Context
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
>   * SUBTEST: basic
> - * Category: Infrastructure
>   * Description: Check the basic context batch buffer execution.
> - * Feature: context
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-close-race
> - * Category: Infrastructure
> - * Description: Race the execution and interrupt handlers along a context, while closing it at a random time.
> - * Feature: context
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Race the execution and interrupt handlers along a context,
> + *		while closing it at a random time.
>   *
>   * SUBTEST: basic-invalid-context
> - * Category: Infrastructure
>   * Description: Verify that execbuf with invalid context fails.
> - * Feature: context
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-nohangcheck
> - * Category: Server
> - * Description: Verify that contexts are automatically shotdown on close, if hangchecking is disabled.
> - * Feature: context
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that contexts are automatically shotdown on close,
> + *		if hangchecking is disabled.
>   *
>   * SUBTEST: basic-norecovery
> - * Category: Server
> - * Description: Check the status of context after a hang by setting and unsetting the RECOVERABLE.
> - * Feature: context
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Check the status of context after a hang by setting and
> + *		unsetting the RECOVERABLE.
>   *
>   * SUBTEST: eviction
>   * Description: Check maximum number of buffers it can evict for a context.
> - * Feature: context
> - * Run type: FULL
>   *
>   * SUBTEST: reset-pin-leak
> - * Description: Check if the kernel doesn't leak the vma pin_count for the last context on reset.
> - * Feature: context
> - * Run type: FULL
> + * Description: Check if the kernel doesn't leak the vma pin_count for the last
> + *		context on reset.
>   */
>  
>  IGT_TEST_DESCRIPTION("Test context batch buffer execution.");
> diff --git a/tests/intel/gem_ctx_isolation.c b/tests/intel/gem_ctx_isolation.c
> index d50a90597..89c023e09 100644
> --- a/tests/intel/gem_ctx_isolation.c
> +++ b/tests/intel/gem_ctx_isolation.c
> @@ -28,62 +28,31 @@
>  #include "igt_types.h"
>  /**
>   * TEST: gem ctx isolation
> - * Run type: FULL
> - *
> - * SUBTEST: clean
>   * Category: Infrastructure
>   * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> + * Functionality: priv/non-priv registers
> + * Sub-category: Security
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: clean
>   *
>   * SUBTEST: dirty-create
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: dirty-switch
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: nonpriv
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: nonpriv-switch
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: preservation
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: preservation-S3
> - * Feature: context
>   *
>   * SUBTEST: preservation-S4
> - * Feature: context
>   *
>   * SUBTEST: preservation-reset
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: security
> - * Sub-category: HW
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  /* MAX_REG must be greater than the maximum register address. */
> diff --git a/tests/intel/gem_ctx_param.c b/tests/intel/gem_ctx_param.c
> index 9b44c86a0..c6fa31875 100644
> --- a/tests/intel/gem_ctx_param.c
> +++ b/tests/intel/gem_ctx_param.c
> @@ -33,166 +33,80 @@
>  /**
>   * TEST: gem ctx param
>   * Description: Basic test for context set/get param input validation.
> + * Category: Infrastructure
> + * Feature: context
> + * Functionality: context
> + * Sub-category: uapi
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: basic
> - * Category: Infrastructure
>   * Description: Basic test for context get/set param ioctls using valid context
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-default
> - * Category: Infrastructure
>   * Description: Basic test for context get/set param ioctls using default context
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: get-priority-new-ctx
> - * Category: Infrastructure
> - * Description:
> - *   Test performed with context param set to priority.
> - *   Verify that priority is default for newly created context
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Test performed with context param set to priority. Verify that
> + *		priority is default for newly created context
>   *
>   * SUBTEST: invalid-ctx-get
> - * Category: Infrastructure
> - * Description: Verify that context get param ioctl using invalid context returns relevant error
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that context get param ioctl using invalid context
> + *		returns relevant error
>   *
>   * SUBTEST: invalid-ctx-set
> - * Category: Infrastructure
> - * Description: Verify that context set param ioctl using invalid context returns relevant error
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that context set param ioctl using invalid context
> + *		returns relevant error
>   *
>   * SUBTEST: invalid-get-engines
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-get-no-zeromap
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-get-ringsize
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-param-get
> - * Category: Infrastructure
> - * Description: Checks that fetching context parameters using an unused param value is erroneous
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Checks that fetching context parameters using an unused param
> + *		value is erroneous
>   *
>   * SUBTEST: invalid-param-set
> - * Category: Infrastructure
> - * Description: Checks that setting context parameters using an unused param value is erroneous
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Checks that setting context parameters using an unused param
> + *		value is erroneous
>   *
>   * SUBTEST: invalid-set-no-zeromap
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-set-ringsize
> - * Category: Infrastructure
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-size-get
> - * Category: Infrastructure
> - * Description: Verify that context get param ioctl returns valid size for valid context
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that context get param ioctl returns valid size for
> + *		valid context
>   *
>   * SUBTEST: invalid-size-set
> - * Category: Infrastructure
> - * Description: Verify that context set param ioctl using invalid size returns relevant error
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that context set param ioctl using invalid size returns
> + *		relevant error
>   *
>   * SUBTEST: non-root-set
> - * Category: Infrastructure
> - * Description: Verify that context set param ioctl returns relevant error in non root mode
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verify that context set param ioctl returns relevant error in
> + *		non root mode
>   *
>   * SUBTEST: root-set
> - * Category: Infrastructure
>   * Description: Verify that context set param ioctl works fine in root mode
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: set-priority-invalid-size
> - * Category: Infrastructure
> - * Description:
> - *   Test performed with context param set to priority.
> - *   Verify that relevant error is returned on setting invalid ctx size with default priority
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Test performed with context param set to priority. Verify that
> + *		relevant error is returned on setting invalid ctx size with
> + *		default priority
>   *
>   * SUBTEST: set-priority-not-supported
> - * Description:
> - *   Verify that context set param ioctl returns relevant error if driver doesn't supports
> - *   assigning custom priorities from userspace
> - * Feature: context, no-set-priority
> + * Description: Verify that context set param ioctl returns relevant error if
> + *		driver doesn't supports assigning custom priorities from
> + *		userspace
>   *
>   * SUBTEST: set-priority-range
> - * Category: Infrastructure
> - * Description:
> - *   Test performed with context param set to priority.
> - *   Change priority range to test value overflow
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Test performed with context param set to priority. Change
> + *		priority range to test value overflow
>   *
>   * SUBTEST: vm
> - * Category: Infrastructure
>   * Description: Tests that multiple contexts can share the same VMA
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic test for context set/get param input validation.");
> diff --git a/tests/intel/gem_ctx_persistence.c b/tests/intel/gem_ctx_persistence.c
> index c6e2c5d77..3f10c0fa3 100644
> --- a/tests/intel/gem_ctx_persistence.c
> +++ b/tests/intel/gem_ctx_persistence.c
> @@ -48,183 +48,76 @@
>  /**
>   * TEST: gem ctx persistence
>   * Feature: context
> - * Run type: FULL
> - *
> - * SUBTEST: engines-cleanup
>   * Category: Server
> - * Functionality: security
> + * Functionality: context
>   * Sub-category: Compute
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: engines-cleanup
>   *
>   * SUBTEST: engines-hang
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-hostile
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-hostile-preempt
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-mixed
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-mixed-process
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-persistence
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines-queued
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: file
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: hang
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heartbeat-close
>   *
>   * SUBTEST: heartbeat-hang
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heartbeat-hostile
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heartbeat-many
>   *
>   * SUBTEST: heartbeat-stop
>   *
>   * SUBTEST: hostile
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: idempotent
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-cleanup
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-hang
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-hostile
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-hostile-preempt
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-mixed
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-mixed-process
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-persistence
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: legacy-engines-queued
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: many-contexts
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: process
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: processes
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: saturated-hostile
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: saturated-hostile-nopreempt
>   *
>   * SUBTEST: smoketest
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: userptr
> - * Category: Server
> - * Functionality: security
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  #define RESET_TIMEOUT_MS 2 * MSEC_PER_SEC; /* default: 640ms */
> diff --git a/tests/intel/gem_ctx_shared.c b/tests/intel/gem_ctx_shared.c
> index fd429306e..8b045e20a 100644
> --- a/tests/intel/gem_ctx_shared.c
> +++ b/tests/intel/gem_ctx_shared.c
> @@ -50,71 +50,41 @@
>  /**
>   * TEST: gem ctx shared
>   * Description: Test shared contexts.
> + * Category: Desktop client
> + * Feature: context
> + * Functionality: shared contex
> + * Sub-category: Context
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: Q-in-order
> - * Feature: context
>   *
>   * SUBTEST: Q-independent
> - * Feature: context
>   *
>   * SUBTEST: Q-out-order
> - * Feature: context
>   *
>   * SUBTEST: Q-promotion
> - * Feature: context
>   *
>   * SUBTEST: Q-smoketest
> - * Feature: context
>   *
>   * SUBTEST: Q-smoketest-all
> - * Feature: context
>   *
>   * SUBTEST: create-shared-gtt
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: detached-shared-gtt
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: disjoint-timelines
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: exec-shared-gtt
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: exec-single-timeline
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: exhaust-shared-gtt
> - * Feature: context
>   *
>   * SUBTEST: exhaust-shared-gtt-lrc
> - * Feature: context
>   *
>   * SUBTEST: single-timeline
> - * Category: Desktop client
> - * Feature: context
> - * Functionality: context management
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  #define LO 0
> diff --git a/tests/intel/gem_eio.c b/tests/intel/gem_eio.c
> index 99891ad15..d6d12bd08 100644
> --- a/tests/intel/gem_eio.c
> +++ b/tests/intel/gem_eio.c
> @@ -56,197 +56,78 @@
>  /**
>   * TEST: gem eio
>   * Description: Test that specific ioctls report a wedged GPU (EIO).
> - * Run type: FULL
> - *
> - * SUBTEST: banned
>   * Category: Infrastructure
>   * Feature: reset
>   * Functionality: reset
> - * Sub-category: i915
> + * Sub-category: uapi
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: banned
>   *
>   * SUBTEST: context-create
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create
> - * Category: Infrastructure
>   * Description: Validate i915_gem_create_ioctl, while gpu is wedged for fb scanout.
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-ext
> - * Category: Infrastructure
> - * Description:
> - *   Validate i915_gem_create_ext_ioctl and checks if returns clear backing store while gpu is
> - *   wedged for fb scanout.
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Validate i915_gem_create_ext_ioctl and checks if returns clear
> + *		backing store while gpu is wedged for fb scanout.
>   *
>   * SUBTEST: execbuf
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: hibernate
>   * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
> - * Feature: hibernate, reset, suspend
> - * Test category: suspend
>   *
>   * SUBTEST: in-flight-10ms
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-1us
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-contexts-10ms
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-contexts-1us
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-contexts-immediate
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-external
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-immediate
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-internal-10ms
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-internal-1us
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-internal-immediate
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: in-flight-suspend
>   * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
>   * Feature: reset, suspend
> - * Test category: suspend
>   *
>   * SUBTEST: kms
>   * Feature: kms_gem_interop, reset
>   *
>   * SUBTEST: reset-stress
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: suspend
>   * Description: Test that specific ioctls report a wedged GPU (EIO) during suspend
>   * Feature: reset, suspend
> - * Test category: suspend
>   *
>   * SUBTEST: throttle
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: unwedge-stress
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-10ms
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-1us
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-immediate
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-wedge-10ms
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-wedge-1us
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait-wedge-immediate
> - * Category: Infrastructure
> - * Feature: reset
> - * Functionality: reset
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Test that specific ioctls report a wedged GPU (EIO).");
> diff --git a/tests/intel/gem_exec_balancer.c b/tests/intel/gem_exec_balancer.c
> index 9190fc238..efa875889 100644
> --- a/tests/intel/gem_exec_balancer.c
> +++ b/tests/intel/gem_exec_balancer.c
> @@ -41,219 +41,94 @@
>  /**
>   * TEST: gem exec balancer
>   * Description: Exercise in-kernel load-balancing
> + * Category: Desktop \ Server
> + * Feature: cmd_submission, media_scalability
> + * Functionality: load balancing
> + * Sub-category: CMD submission
> + * Test category: Media & Compute
>   * Run type: FULL
>   *
>   * SUBTEST: bonded-chain
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: bonded-dual
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: bonded-false-hang
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: bonded-pair
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: bonded-semaphore
>   * Feature: cmd_submission, media_scalability, multictx
>   *
>   * SUBTEST: bonded-sync
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: bonded-true-hang
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: busy
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: fairslice
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: full
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability, multictx

Why this is removed here?

> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: full-late
> - * Category: Desktop \ Server
>   * Feature: cmd_submission, media_scalability, multictx
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: full-late-pulse
> - * Category: Desktop \ Server
>   * Feature: cmd_submission, media_scalability, multictx
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: full-pulse
> - * Category: Desktop \ Server
>   * Feature: cmd_submission, media_scalability, multictx
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: hang
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: hog
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: indices
> - * Category: Desktop \ Server
>   * Feature: cmd_submission, media_scalability, multictx
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: individual
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-balancer
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-bonds
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: nohangcheck
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: noheartbeat
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: nop
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-balancer
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-bb-first
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-contexts
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-dmabuf-import-out-fence
> - * Description: Regression test to check that dmabuf imported sync file can handle fence array
> - * Feature: cmd_submission, media_scalability
> + * Description: Regression test to check that dmabuf imported sync file can
> + *		handle fence array
>   *
>   * SUBTEST: parallel-keep-in-fence
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-keep-submit-fence
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-ordering
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-out-fence
> - * Category: Desktop client
> - * Feature: cmd_submission, media_scalability
> - * Functionality: command submission
> - * Sub-category: Media
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: persistence
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: semaphore
> - * Category: Desktop \ Server
>   * Feature: cmd_submission, media_scalability, multictx
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: sequential
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: sliced
> - * Feature: cmd_submission, media_scalability
>   *
>   * SUBTEST: smoke
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: waits
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, media_scalability
> - * Functionality: load balancing
> - * Sub-category: Media & Compute
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing");
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 3/5] Documentation refactoring part 3
  2024-02-29 11:19 ` [PATCH i-g-t 3/5] Documentation refactoring part 3 Katarzyna Piecielska
@ 2024-02-29 15:57   ` Kamil Konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 15:57 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab

Hi Katarzyna,
On 2024-02-29 at 11:19:07 +0000, Katarzyna Piecielska wrote:

I would like to see prefix in subject: "tests/intel:", like

[PATCH i-g-t 3/5] tests/intel: Documentation refactoring part 3

> Unify documentation for Intel i915 tests that we have by moving
> common parts to be available for all tests.
> 
> This is part 3 to make review easier.
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Please remove at merge,

Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Regards,
Kamil

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/intel/gem_exec_basic.c    |  13 +-
>  tests/intel/gem_exec_big.c      |   8 +-
>  tests/intel/gem_exec_capture.c  |  25 +--
>  tests/intel/gem_exec_create.c   |  48 ++---
>  tests/intel/gem_exec_fence.c    | 277 ++++++---------------------
>  tests/intel/gem_exec_gttfill.c  |  23 +--
>  tests/intel/gem_exec_nop.c      |  27 +--
>  tests/intel/gem_exec_parallel.c |  37 +---
>  tests/intel/gem_exec_params.c   | 112 +----------
>  tests/intel/gem_exec_schedule.c | 324 +-------------------------------
>  tests/intel/gem_exec_suspend.c  |  40 +---
>  tests/intel/gem_exec_whisper.c  | 181 +-----------------
>  12 files changed, 119 insertions(+), 996 deletions(-)
> 
> diff --git a/tests/intel/gem_exec_basic.c b/tests/intel/gem_exec_basic.c
> index 83f71e289..aae773987 100644
> --- a/tests/intel/gem_exec_basic.c
> +++ b/tests/intel/gem_exec_basic.c
> @@ -28,17 +28,16 @@
>  /**
>   * TEST: gem exec basic
>   * Description: Basic sanity check of execbuf-ioctl rings.
> - *
> - * SUBTEST: basic
>   * Category: Infrastructure
> - * Description:
> - *   Check basic functionality of GEM_EXECBUFFER2 ioctl on every ring and iterating over memory
> - *   regions.
>   * Feature: cmd_submission
> - * Functionality: command submission
> + * Functionality: execbuf
>   * Run type: BAT
> - * Sub-category: i915
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + *
> + * SUBTEST: basic
> + * Description: Check basic functionality of GEM_EXECBUFFER2 ioctl on every
> + *		ring and iterating over memory regions.
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic sanity check of execbuf-ioctl rings.");
> diff --git a/tests/intel/gem_exec_big.c b/tests/intel/gem_exec_big.c
> index 9de9941d5..f22be96db 100644
> --- a/tests/intel/gem_exec_big.c
> +++ b/tests/intel/gem_exec_big.c
> @@ -52,15 +52,15 @@
>   * TEST: gem exec big
>   * Description: Run a large nop batch to stress test the error capture code.
>   * Feature: cmd_submission
> + * Category: Infrastructure
> + * Functionality: large nop batch
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: exhaustive
>   *
>   * SUBTEST: single
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Run a large nop batch to stress test the error capture"
> diff --git a/tests/intel/gem_exec_capture.c b/tests/intel/gem_exec_capture.c
> index d231c53b9..3617dd994 100644
> --- a/tests/intel/gem_exec_capture.c
> +++ b/tests/intel/gem_exec_capture.c
> @@ -35,21 +35,21 @@
>   * TEST: gem exec capture
>   * Description: Check that we capture the user specified objects on a hang
>   * Feature: cmd_submission
> - * Run type: FULL
> - *
> - * SUBTEST: capture
>   * Category: Server
>   * Functionality: offline debugging
> - * Sub-category: debugger
> + * Sub-category: Debugger
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: capture
>   *
>   * SUBTEST: capture-invisible
> - * Description:
> - *   Check that the kernel doesn't crash if the pages can't be copied from the CPU during error
> - *   capture.
> + * Description: Check that the kernel doesn't crash if the pages can't be
> + *		copied from the CPU during error capture.
>   *
>   * SUBTEST: capture-recoverable
> - * Description: Verify that the kernel rejects EXEC_OBJECT_CAPTURE with recoverable contexts.
> + * Description: Verify that the kernel rejects EXEC_OBJECT_CAPTURE with
> + *		recoverable contexts.
>   *
>   * SUBTEST: many-256M-incremental
>   *
> @@ -62,16 +62,9 @@
>   * SUBTEST: many-4K-zero
>   *
>   * SUBTEST: pi
> - * Category: Server
> - * Functionality: offline debugging
> - * Sub-category: debugger
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: userptr
> - * Category: Server
> - * Functionality: offline debugging
> - * Sub-category: debugger
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  #define MAX_RESET_TIME	600
> diff --git a/tests/intel/gem_exec_create.c b/tests/intel/gem_exec_create.c
> index 4eb77ecbb..1d5c2512f 100644
> --- a/tests/intel/gem_exec_create.c
> +++ b/tests/intel/gem_exec_create.c
> @@ -48,48 +48,32 @@
>  #include "i915/intel_memory_region.h"
>  /**
>   * TEST: gem exec create
> - * Description:
> - *   This test overloads the driver with transient active objects and checks if we don't kill the
> - *   system under the memory pressure some of the symptoms this test look for include mysterious
> - *   hangs.
> - *
> - * SUBTEST: basic
>   * Category: Infrastructure
> - * Description: Check if we kill system by overloading it with active objects iterating over all engines.
> + * Description: This test overloads the driver with transient active objects
> + *		and checks if we don't kill the system under the memory pressure
> + *		some of the symptoms this test look for include mysterious hangs.
>   * Feature: cmd_submission
>   * Functionality: buffer management
> - * Run type: BAT
> - * Sub-category: i915
> + * Run type: FULL
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
>   *
> + * SUBTEST: basic
> + * Run type: BAT
> + * Description: Check if we kill system by overloading it with active objects
> + *		iterating over all engines.
> + *
>   * SUBTEST: forked
> - * Category: Infrastructure
> - * Description: Concurrently overloads system with active objects and checks if we kill system.
> - * Feature: cmd_submission
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Concurrently overloads system with active objects and checks
> + *		if we kill system.
>   *
>   * SUBTEST: legacy
> - * Category: Infrastructure
> - * Description:
> - *   Check if we kill the system by overloading it with active objects iterating over legacy
> - *   engines.
> - * Feature: cmd_submission
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Check if we kill the system by overloading it with active
> + *		objects iterating over legacy engines.
>   *
>   * SUBTEST: madvise
> - * Category: Infrastructure
> - * Description: This test does a forced reclaim, behaving like a bad application leaking its bo cache.
> - * Feature: cmd_submission
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: This test does a forced reclaim, behaving like a bad application
> + *		leaking its bo cache.
>   */
>  
>  IGT_TEST_DESCRIPTION("This test overloads the driver with transient active objects"
> diff --git a/tests/intel/gem_exec_fence.c b/tests/intel/gem_exec_fence.c
> index 4bf29a3e4..a0cfc1378 100644
> --- a/tests/intel/gem_exec_fence.c
> +++ b/tests/intel/gem_exec_fence.c
> @@ -38,352 +38,189 @@
>  /**
>   * TEST: gem exec fence
>   * Description: Check that execbuf waits for explicit fences
> - *
> - * SUBTEST: await-hang
> - * Description: Check for explicit fence with async wait on each engine with a pending gpu hang.
> + * Category: Infrastructure
>   * Feature: cmd_submission, synchronization
> + * Functionality: semaphore
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
> + * SUBTEST: await-hang
> + * Description: Check for explicit fence with async wait on each engine with a
> + *		pending gpu hang.
> + *
>   * SUBTEST: basic-await
>   * Description: Basic check for explicit fence with async wait on each engine.
> - * Feature: cmd_submission, multitile, synchronization
> - * Functionality: semaphore
>   * Run type: BAT
>   * Test category: MultiTile
>   *
>   * SUBTEST: basic-busy
>   * Description: Basic check for explicit fence on each busy engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Functionality: semaphore
>   * Run type: BAT
>   * Test category: MultiTile
>   *
>   * SUBTEST: basic-busy-all
>   * Description: Basic check for composite fence on all busy engines.
>   * Feature: cmd_submission, multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: basic-wait
> - * Description: Basic check for explicit fence with additional wait time on each busy engine.
> + * Description: Basic check for explicit fence with additional wait time on
> + *		each busy engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Functionality: semaphore
>   * Run type: BAT
>   * Test category: MultiTile
>   *
>   * SUBTEST: basic-wait-all
> - * Description:
> - *   Basic check for composite fence with additional wait on all busy engines.
> - *   Execute the same batch on each engine and check that the composite fence across all engines completes only after the batch is completed on every engine.
> + * Description: Basic check for composite fence with additional wait on all
> + *		busy engines. Execute the same batch on each engine and check
> + *		that the composite fence across all engines completes only
> + *		after the batch is completed on every engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: busy-hang
> - * Description: Check for explicit fence on each busy engine with a pending gpu hang.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check for explicit fence on each busy engine with a pending
> + *		gpu hang.
>   *
>   * SUBTEST: busy-hang-all
> - * Description: Check for composite fence on all busy engines with a pending gpu hang.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check for composite fence on all busy engines with a pending
> + *		gpu hang.
>   *
>   * SUBTEST: concurrent
>   * Description: Check blocking bonded fences on each engine.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: expired-history
>   * Category: Infrastructure
>   * Description: Verifies long history of fences are expired.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-fence-array
> - * Category: Infrastructure
>   * Description: Verifies invalid fence-array pointers are rejected.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-timeline-fence-array
> - * Category: Infrastructure
> - * Description:
> - *   Verifies invalid execbuf parameters in drm_i915_gem_execbuffer_ext_timeline_fences
> - *   are rejected
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies invalid execbuf parameters in
> + *		drm_i915_gem_execbuffer_ext_timeline_fences are rejected
>   *
>   * SUBTEST: keep-in-fence
>   * Description: Check in-fence is not overwritten with out-fence on each engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: long-history
> - * Category: Infrastructure
>   * Description: Verifies accumulation of long history of fences.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: nb-await
>   * Description: Check for explicit fence with non-blocking wait on each engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Functionality: semaphore
>   * Run type: BAT
>   * Test category: MultiTile
>   *
>   * SUBTEST: nb-await-hang
> - * Description: Check for explicit fence with non-blocking async wait on each engine with a pending gpu hang.
> + * Description: Check for explicit fence with non-blocking async wait on each
> + *		engine with a pending gpu hang.
>   * Feature: cmd_submission, multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: parallel
> - * Description: Check for EXEC_FENCE_SUBMIT in parallel execution scenarios on each engine.
> + * Description: Check for EXEC_FENCE_SUBMIT in parallel execution scenarios
> + *		on each engine.
>   * Feature: cmd_submission, multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: submit
>   * Description: Check timeslicing on submit-fence.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: submit-chain
> - * Description: Check launching a chain of spinners across all engines using submit-fence.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check launching a chain of spinners across all engines using
> + *		submit-fence.
>   *
>   * SUBTEST: submit3
>   * Description: Check timeslicing on submit-fence by submitting coupled batches.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: submit67
> - * Description:
> - *   Check timeslicing on submit-fence by submitting more coupled batches than can possibly fit
> - *   into the ELSP.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check timeslicing on submit-fence by submitting more coupled
> + *		batches than can possibly fit into the ELSP.
>   *
>   * SUBTEST: syncobj-backward-timeline-chain-engines
> - * Category: Infrastructure
> - * Description:
> - *   Engine chaining tests to verify ordering of timeline syncobjs with backward timeline
> - *   points.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Engine chaining tests to verify ordering of timeline syncobjs
> + *		with backward timeline points.
>   *
>   * SUBTEST: syncobj-channel
> - * Category: Infrastructure
>   * Description: Verifies two clients racing for syncobj using channel.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-export
> - * Category: Infrastructure
>   * Description: Verify exporting of fence-array syncobj signaled by i915.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-import
> - * Category: Infrastructure
>   * Description: Verifies creating of a syncobj from explicit fence.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-invalid-flags
> - * Category: Infrastructure
>   * Description: Verifies that invalid fence flags in fence-array are rejected.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-invalid-wait
> - * Category: Infrastructure
> - * Description: Verifies that submitting an execbuf with a wait on a syncobj that doesn't exists is rejected.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that submitting an execbuf with a wait on a syncobj
> + *		that doesn't exists is rejected.
>   *
>   * SUBTEST: syncobj-repeat
> - * Category: Infrastructure
> - * Description: Verifies that waiting & signaling a same fence-array syncobj within the same execbuf works.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that waiting & signaling a same fence-array syncobj
> + *		within the same execbuf works.
>   *
>   * SUBTEST: syncobj-signal
> - * Category: Infrastructure
>   * Description: Verifies proper signaling of a fence-array syncobj through execbuf.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-stationary-timeline-chain-engines
> - * Category: Infrastructure
> - * Description:
> - *   Engine chaining tests to verify ordering of timeline syncobj with stationary timeline
> - *   points.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Engine chaining tests to verify ordering of timeline syncobj
> + *		with stationary timeline points.
>   *
>   * SUBTEST: syncobj-timeline-chain-engines
> - * Category: Infrastructure
> - * Description: Engine chaining tests to verify ordering of timeline syncobjs through execbuf.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Engine chaining tests to verify ordering of timeline syncobjs
> + *		through execbuf.
>   *
>   * SUBTEST: syncobj-timeline-export
> - * Category: Infrastructure
>   * Description: Verify exporting of timeline syncobj signaled by i915
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-timeline-invalid-flags
> - * Category: Infrastructure
> - * Description:
> - *   Verifies that invalid fence flags in drm_i915_gem_execbuffer_ext_timeline_fences are
> - *   rejected
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that invalid fence flags in
> + *		drm_i915_gem_execbuffer_ext_timeline_fences are rejected
>   *
>   * SUBTEST: syncobj-timeline-invalid-wait
> - * Category: Infrastructure
> - * Description:
> - *   Verifies that submitting an execbuf with a wait on a timeline syncobj point that does not
> - *   exists is rejected
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that submitting an execbuf with a wait on a timeline
> + *		syncobj point that does not exists is rejected
>   *
>   * SUBTEST: syncobj-timeline-multiple-ext-nodes
> - * Category: Infrastructure
>   * Description: Verify that passing multiple execbuffer_ext nodes works
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-timeline-repeat
> - * Category: Infrastructure
> - * Description:
> - *   Verifies that waiting & signaling a same timeline syncobj point within the same execbuf
> - *   fworks
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that waiting & signaling a same timeline syncobj point
> + *		within the same execbuf works
>   *
>   * SUBTEST: syncobj-timeline-signal
> - * Category: Infrastructure
>   * Description: Verifies proper signaling of a timeline syncobj through execbuf
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: syncobj-timeline-unused-fence
> - * Category: Infrastructure
> - * Description:
> - *   Verifies that a timeline syncobj passed into
> - *   drm_i915_gem_execbuffer_ext_timeline_fences but with no signal/wait flag is left
> - *   untouched
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that a timeline syncobj passed into
> + *		drm_i915_gem_execbuffer_ext_timeline_fences but with no
> + *		signal/wait flag is left untouched
>   *
>   * SUBTEST: syncobj-timeline-wait
> - * Category: Infrastructure
> - * Description: Verifies that waiting on a timeline syncobj point between engines works
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that waiting on a timeline syncobj point between
> + *		engines works
>   *
>   * SUBTEST: syncobj-unused-fence
> - * Category: Infrastructure
> - * Description: Verifies that a syncobj passed into execbuf but with no signal/wait flag is left untouched.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that a syncobj passed into execbuf but with no
> + *		signal/wait flag is left untouched.
>   *
>   * SUBTEST: syncobj-wait
> - * Category: Infrastructure
> - * Description: Verifies that waiting on a timeline syncobj point between engines works.
> - * Feature: cmd_submission, synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Verifies that waiting on a timeline syncobj point between
> + *		engines works.
>   *
>   * SUBTEST: wait-hang
> - * Description:
> - *   Check for explicit fence with additional wait time on each busy engine with a pending gpu
> - *   hang.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check for explicit fence with additional wait time on each
> + *		busy engine with a pending gpu hang.
>   *
>   * SUBTEST: wait-hang-all
> - * Description:
> - *   Check for composite fence with additional wait on all busy engines and with a pending gpu
> - *   hang.
> - * Feature: cmd_submission, synchronization
> - * Run type: FULL
> + * Description: Check for composite fence with additional wait on all busy
> + *		engines and with a pending gpu hang.
>   */
>  
>  IGT_TEST_DESCRIPTION("Check that execbuf waits for explicit fences");
> diff --git a/tests/intel/gem_exec_gttfill.c b/tests/intel/gem_exec_gttfill.c
> index 28c251915..b1063437b 100644
> --- a/tests/intel/gem_exec_gttfill.c
> +++ b/tests/intel/gem_exec_gttfill.c
> @@ -29,36 +29,25 @@
>  /**
>   * TEST: gem exec gttfill
>   * Description: Fill the GTT with batches.
> - *
> - * SUBTEST: all-engines
>   * Category: Infrastructure
> - * Description: Stress test check behaviour/correctness of handling batches to fill gtt
>   * Feature: cmd_submission, gtt
> - * Functionality: command submission
> - * Run type: FULL
> + * Functionality: execbuf
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: all-engines
> + * Description: Stress test check behaviour/correctness of handling batches to fill gtt
>   *
>   * SUBTEST: basic
> - * Category: Infrastructure
>   * Description: Checks if it can handle enough batches to fill gtt
> - * Feature: cmd_submission, gtt
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines
> - * Category: Infrastructure
>   * Description: Checks the correctness of handling enough batches to fill gtt for each engine
> - * Feature: cmd_submission, gtt
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: multigpu-basic
>   * Feature: cmd_submission, gtt, multigpu
> - * Run type: FULL
>   * Test category: MultiGPU
>   */
>  
> diff --git a/tests/intel/gem_exec_nop.c b/tests/intel/gem_exec_nop.c
> index 6dea8b167..88a6ba224 100644
> --- a/tests/intel/gem_exec_nop.c
> +++ b/tests/intel/gem_exec_nop.c
> @@ -50,61 +50,41 @@
>  
>  /**
>   * TEST: gem exec nop
> - * Run type: FULL
> - *
> - * SUBTEST: basic-parallel
>   * Category: Infrastructure
>   * Feature: cmd_submission
>   * Functionality: command submission
>   * Sub-category: i915
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic-parallel
>   *
>   * SUBTEST: basic-sequential
> - * Category: Infrastructure
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-series
> - * Category: Infrastructure
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: context-sequential
> - * Feature: cmd_submission
>   *
>   * SUBTEST: forked-sequential
> - * Feature: cmd_submission
>   *
>   * SUBTEST: headless
> - * Feature: cmd_submission
>   *
>   * SUBTEST: independent
> - * Feature: cmd_submission
>   *
>   * SUBTEST: multiple
> - * Feature: cmd_submission
>   *
>   * SUBTEST: parallel
> - * Feature: cmd_submission
>   *
>   * SUBTEST: poll
> - * Feature: cmd_submission
>   *
>   * SUBTEST: poll-sequential
> - * Feature: cmd_submission
>   *
>   * SUBTEST: preempt
>   * Feature: cmd_submission, multitile
>   *
>   * SUBTEST: sequential
> - * Feature: cmd_submission
>   *
>   * SUBTEST: series
> - * Feature: cmd_submission
>   *
>   * SUBTEST: signal
>   * Feature: cmd_submission, multitile
> @@ -113,7 +93,6 @@
>   * Feature: cmd_submission, multitile
>   *
>   * SUBTEST: single
> - * Feature: cmd_submission
>   */
>  
>  #define ENGINE_FLAGS  (I915_EXEC_RING_MASK | I915_EXEC_BSD_MASK)
> diff --git a/tests/intel/gem_exec_parallel.c b/tests/intel/gem_exec_parallel.c
> index cae1553f6..fdf22cbea 100644
> --- a/tests/intel/gem_exec_parallel.c
> +++ b/tests/intel/gem_exec_parallel.c
> @@ -36,51 +36,24 @@
>  /**
>   * TEST: gem exec parallel
>   * Description: Exercise filling buffers by many clients working in parallel.
> - *
> - * SUBTEST: basic
>   * Category: Infrastructure
>   * Description: Check basic functionality per engine.
>   * Feature: cmd_submission
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> + * Functionality: parallel clients
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic
>   *
>   * SUBTEST: contexts
> - * Category: Infrastructure
> - * Description: Check with many contexts.
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engines
> - * Category: Infrastructure
> - * Description: Check with engines working in parallel.
> - * Feature: cmd_submission
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: fds
> - * Category: Infrastructure
> - * Description: Check with many fds.
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: userptr
> - * Category: Infrastructure
> - * Description: Check basic userptr thrashing.
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Exercise filling buffers by many clients working in parallel.");
> diff --git a/tests/intel/gem_exec_params.c b/tests/intel/gem_exec_params.c
> index caaa5fee0..912c4f856 100644
> --- a/tests/intel/gem_exec_params.c
> +++ b/tests/intel/gem_exec_params.c
> @@ -46,166 +46,70 @@
>  #include "sw_sync.h"
>  /**
>   * TEST: gem exec params
> + * Category: Desktop client
> + * Feature: cmd_submission
> + * Functionality: execbuf
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: DR1-dirt
> - * Feature: cmd_submission
>   *
>   * SUBTEST: DR4-dirt
> - * Feature: cmd_submission
>   *
>   * SUBTEST: batch-first
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: cliprects-invalid
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: cliprects_ptr-dirt
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-batch-start-offset
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-bsd-ring
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-bsd1-flag-on-blt
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-bsd1-flag-on-render
> - * Feature: cmd_submission
>   *
>   * SUBTEST: invalid-bsd1-flag-on-vebox
> - * Feature: cmd_submission
>   *
>   * SUBTEST: invalid-bsd2-flag-on-blt
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-bsd2-flag-on-render
> - * Feature: cmd_submission
>   *
>   * SUBTEST: invalid-bsd2-flag-on-vebox
> - * Feature: cmd_submission
>   *
>   * SUBTEST: invalid-fence-in
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-fence-in-submit
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-flag
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-ring
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-ring2
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: larger-than-life-batch
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: mmapped
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: no-blt
> - * Feature: cmd_submission
>   *
>   * SUBTEST: no-bsd
> - * Feature: cmd_submission
>   *
>   * SUBTEST: no-vebox
> - * Feature: cmd_submission
>   *
>   * SUBTEST: readonly
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: rel-constants-invalid
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: rel-constants-invalid-rel-gen5
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: rel-constants-invalid-ring
> - * Feature: cmd_submission
>   *
>   * SUBTEST: rs-invalid
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: rsvd2-dirt
> - * Feature: cmd_submission
>   *
>   * SUBTEST: secure-non-master
>   * Feature: cmd_submission, obsolete
> @@ -214,14 +118,8 @@
>   * Feature: cmd_submission, obsolete
>   *
>   * SUBTEST: sol-reset-invalid
> - * Feature: cmd_submission
>   *
>   * SUBTEST: sol-reset-not-gen7
> - * Category: Desktop client
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  #define ALIGNMENT (1 << 22)
> diff --git a/tests/intel/gem_exec_schedule.c b/tests/intel/gem_exec_schedule.c
> index 3fd91b2fa..41dfc394b 100644
> --- a/tests/intel/gem_exec_schedule.c
> +++ b/tests/intel/gem_exec_schedule.c
> @@ -47,388 +47,72 @@
>  /**
>   * TEST: gem exec schedule
>   * Description: Check that we can control the order of execution
> - * Run type: FULL
> - *
> - * SUBTEST: deep
>   * Category: Desktop \ Server
>   * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> + * Functionality: execution order
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + * Run type: FULL
>   *
> + * SUBTEST: deep
>   * SUBTEST: fairslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: fairslice-all
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: fifo
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: implicit-boths
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: implicit-read-write
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: implicit-write-read
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: in-order
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: independent
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: lateslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: manyslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: noreorder
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: noreorder-corked
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: noreorder-priority
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: out-order
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: pi-common
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: pi-distinct-iova
> - * Feature: cmd_submission
> - *
>   * SUBTEST: pi-ringfull
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: pi-shared-iova
> - * Feature: cmd_submission
> - *
>   * SUBTEST: pi-userfault
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-contexts
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-engines
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-hang
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-other
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-other-chain
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-queue
> - * Feature: cmd_submission, multictx
> - *
>   * SUBTEST: preempt-queue-chain
> - * Feature: cmd_submission, multictx
> - *
>   * SUBTEST: preempt-queue-contexts
> - * Feature: cmd_submission, multictx
> - *
>   * SUBTEST: preempt-queue-contexts-chain
> - * Feature: cmd_submission, multictx
> - *
>   * SUBTEST: preempt-self
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preempt-user
> - * Category: Desktop \ Server
> - * Feature: cmd_submission, multictx
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: preemptive-hang
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: promotion
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: reorder-wide
> - * Feature: cmd_submission
> - *
>   * SUBTEST: semaphore-codependency
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: semaphore-noskip
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: semaphore-power
> - * Feature: cmd_submission
> - *
>   * SUBTEST: semaphore-resolve
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: semaphore-user
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: smoketest
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: smoketest-all
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: submit-early-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: submit-golden-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: submit-late-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: thriceslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: timeslicing
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-fairslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-fairslice-all
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-independent
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-lateslice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-semaphore-codependency
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-semaphore-noskip
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-semaphore-resolve
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-semaphore-user
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-submit-early-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-submit-golden-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: u-submit-late-slice
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: wide
> - * Category: Desktop \ Server
> - * Feature: cmd_submission
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  #define LO 0
> diff --git a/tests/intel/gem_exec_suspend.c b/tests/intel/gem_exec_suspend.c
> index 39d75ee03..faf2e10f5 100644
> --- a/tests/intel/gem_exec_suspend.c
> +++ b/tests/intel/gem_exec_suspend.c
> @@ -39,101 +39,65 @@
>  /**
>   * TEST: gem exec suspend
>   * Description: Exercise simple execbufs runs across various suspend/resume cycles.
> + * Feature: cmd_submission, suspend
> + * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Description: Check basic functionality without any suspend/resume cycle.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: basic-S0
>   * Description: Check with suspend-to-idle target state.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: basic-S3
>   * Description: Check full cycle of suspend-to-mem.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: basic-S3-devices
>   * Description: Check with suspend-to-mem with devices only.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: basic-S4
>   * Description: Check full cycle of suspend-to-disk.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: basic-S4-devices
>   * Description: Check with suspend-to-disk with devices only.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: cached
>   * Description: Check without suspend/resume cycle state with cached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: cached-S3
>   * Description: Check suspend-to-mem state with cached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: cached-S4
>   * Description: Check suspend-to-disk state with cached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: fixed
>   * Description: Check without suspend/resume cycle state with fixed object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: fixed-S3
>   * Description: Check suspend-to-mem state with fixed object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: fixed-S4
>   * Description: Check suspend-to-disk state with fixed object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: hang-S3
>   * Description: Check full cycle of suspend-to-mem with a pending GPU hang.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: hang-S4
>   * Description: Check full cycle of suspend-to-disk with a pending GPU hang.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: power-S0
>   * Description: Check power consumption during idle state.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: power-S3
>   * Description: Check power consumption during suspend-to-mem state.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: uncached
>   * Description: Check without suspend/resume cycle state with uncached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: uncached-S3
>   * Description: Check suspend-to-mem state with uncached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   *
>   * SUBTEST: uncached-S4
>   * Description: Check suspend-to-disk state with uncached object.
> - * Feature: cmd_submission, suspend
> - * Run type: FULL
>   */
>  
>  IGT_TEST_DESCRIPTION("Exercise simple execbufs runs across various suspend/resume cycles.");
> diff --git a/tests/intel/gem_exec_whisper.c b/tests/intel/gem_exec_whisper.c
> index 46712c3e8..effb47335 100644
> --- a/tests/intel/gem_exec_whisper.c
> +++ b/tests/intel/gem_exec_whisper.c
> @@ -40,280 +40,103 @@
>  /**
>   * TEST: gem exec whisper
>   * Feature: cmd_submission
> - * Run type: FULL
> - *
> - * SUBTEST: basic-contexts
>   * Category: Infrastructure
>   * Functionality: command submission
>   * Sub-category: i915
>   * Test category: GEM_Legacy
> + * Run type: FULL
>   *
> + * SUBTEST: basic-contexts
>   * SUBTEST: basic-contexts-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-contexts-forked
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-contexts-forked-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-contexts-priority
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-contexts-priority-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds-forked
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds-forked-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds-priority
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-fds-priority-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-forked
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-forked-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-normal
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-normal-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues-forked
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues-forked-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues-priority
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-queues-priority-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-sync
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-sync-all
> - * Category: Infrastructure
> - * Functionality: command submission
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: chain
> - *
>   * SUBTEST: chain-all
> - *
>   * SUBTEST: chain-forked
> - *
>   * SUBTEST: chain-forked-all
> - *
>   * SUBTEST: chain-interruptible
> - *
>   * SUBTEST: chain-interruptible-all
> - *
>   * SUBTEST: chain-sync
> - *
>   * SUBTEST: chain-sync-all
> - *
>   * SUBTEST: contexts-chain
> - *
>   * SUBTEST: contexts-chain-all
> - *
>   * SUBTEST: contexts-engine
> - *
>   * SUBTEST: contexts-forked-engine
> - *
>   * SUBTEST: contexts-interruptible
> - *
>   * SUBTEST: contexts-interruptible-all
> - *
>   * SUBTEST: contexts-interruptible-engine
> - *
>   * SUBTEST: contexts-priority-engine
> - *
>   * SUBTEST: contexts-sync
> - *
>   * SUBTEST: contexts-sync-all
> - *
>   * SUBTEST: contexts-sync-engine
> - *
>   * SUBTEST: fds-chain
> - *
>   * SUBTEST: fds-chain-all
> - *
>   * SUBTEST: fds-engine
> - *
>   * SUBTEST: fds-forked-engine
> - *
>   * SUBTEST: fds-interruptible
> - *
>   * SUBTEST: fds-interruptible-all
> - *
>   * SUBTEST: fds-interruptible-engine
> - *
>   * SUBTEST: fds-priority-engine
> - *
>   * SUBTEST: fds-sync
> - *
>   * SUBTEST: fds-sync-all
> - *
>   * SUBTEST: fds-sync-engine
> - *
>   * SUBTEST: forked-engine
> - *
>   * SUBTEST: hang-chain
> - *
>   * SUBTEST: hang-chain-forked
> - *
>   * SUBTEST: hang-chain-sync
> - *
>   * SUBTEST: hang-contexts
> - *
>   * SUBTEST: hang-contexts-chain
> - *
>   * SUBTEST: hang-contexts-forked
> - *
>   * SUBTEST: hang-contexts-priority
> - *
>   * SUBTEST: hang-contexts-sync
> - *
>   * SUBTEST: hang-fds
> - *
>   * SUBTEST: hang-fds-chain
> - *
>   * SUBTEST: hang-fds-forked
> - *
>   * SUBTEST: hang-fds-priority
> - *
>   * SUBTEST: hang-fds-sync
> - *
>   * SUBTEST: hang-forked
> - *
>   * SUBTEST: hang-normal
> - *
>   * SUBTEST: hang-queues
> - *
>   * SUBTEST: hang-queues-chain
> - *
>   * SUBTEST: hang-queues-forked
> - *
>   * SUBTEST: hang-queues-priority
> - *
>   * SUBTEST: hang-queues-sync
> - *
>   * SUBTEST: hang-sync
> - *
>   * SUBTEST: interruptible
> - *
>   * SUBTEST: interruptible-all
> - *
>   * SUBTEST: interruptible-engine
> - *
>   * SUBTEST: normal-engine
> - *
>   * SUBTEST: queues-chain
> - *
>   * SUBTEST: queues-chain-all
> - *
>   * SUBTEST: queues-engine
> - *
>   * SUBTEST: queues-forked-engine
> - *
>   * SUBTEST: queues-interruptible
> - *
>   * SUBTEST: queues-interruptible-all
> - *
>   * SUBTEST: queues-interruptible-engine
> - *
>   * SUBTEST: queues-priority-engine
> - *
>   * SUBTEST: queues-sync
> - *
>   * SUBTEST: queues-sync-all
> - *
>   * SUBTEST: queues-sync-engine
> - *
>   * SUBTEST: sync-engine
>   */
>  
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 4/5] Documentation refactoring part 4
  2024-02-29 11:19 ` [PATCH i-g-t 4/5] Documentation refactoring part 4 Katarzyna Piecielska
@ 2024-02-29 16:05   ` Kamil Konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 16:05 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab

Hi Katarzyna,
On 2024-02-29 at 11:19:08 +0000, Katarzyna Piecielska wrote:

please append prefix:

[PATCH i-g-t 4/5] tests/intel: Documentation refactoring part 4

> Unify documentation for Intel i915 tests that we have by  moving
> common parts to be available for all tests.
> 
> This is part 4 to make review easier
- ^^^^^^^^^^^^^
Remove at merge,

with this:

Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Regards,
Kamil

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/intel/gem_flink_basic.c   |  35 ++-----
>  tests/intel/gem_linear_blits.c  |  23 ++---
>  tests/intel/gem_lmem_swapping.c | 101 +-----------------
>  tests/intel/gem_madvise.c       |  29 +++---
>  tests/intel/gem_mmap_gtt.c      | 175 ++------------------------------
>  tests/intel/gem_mmap_offset.c   |  75 ++------------
>  tests/intel/gem_mmap_wc.c       |  43 +-------
>  tests/intel/gem_ppgtt.c         |  16 +--
>  tests/intel/gem_pxp.c           |  24 +----
>  tests/intel/gem_ringfill.c      |  29 ++----
>  tests/intel/gem_shrink.c        |   8 +-
>  tests/intel/gem_softpin.c       | 134 ++----------------------
>  tests/intel/gem_spin_batch.c    |  60 +----------
>  tests/intel/gem_sync.c          |  86 ++--------------
>  14 files changed, 78 insertions(+), 760 deletions(-)
> 
> diff --git a/tests/intel/gem_flink_basic.c b/tests/intel/gem_flink_basic.c
> index e70cab4d1..85cd78a46 100644
> --- a/tests/intel/gem_flink_basic.c
> +++ b/tests/intel/gem_flink_basic.c
> @@ -40,52 +40,29 @@
>  #include "igt_types.h"
>  /**
>   * TEST: gem flink basic
> - * Description: Tests for flink - a way to export a gem object by name
> - *
> - * SUBTEST: bad-flink
>   * Category: Desktop client
> - * Description: Verify that GEM_FLINK ioctl with invalid gem object fails.
> + * Description: Tests for flink - a way to export a gem object by name
>   * Feature: xorg_dri2
>   * Functionality: buffer management
> - * Run type: BAT
>   * Sub-category: DRM
>   * Test category: GEM_Legacy
> + * Run type: BAT
> + *
> + * SUBTEST: bad-flink
> + * Description: Verify that GEM_FLINK ioctl with invalid gem object fails.
>   *
>   * SUBTEST: bad-open
> - * Category: Desktop client
>   * Description: Verify that GEM_OPEN ioctl with invalid flink name fails.
> - * Feature: xorg_dri2
> - * Functionality: buffer management
> - * Run type: BAT
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic
> - * Category: Desktop client
>   * Description: Check if gem object can be exported to global namespace and then opened.
> - * Feature: xorg_dri2
> - * Functionality: buffer management
> - * Run type: BAT
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: double-flink
> - * Category: Desktop client
>   * Description: Tests that multiple flinks for the same gem object share the same name.
> - * Feature: xorg_dri2
> - * Functionality: buffer management
> - * Run type: BAT
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: flink-lifetime
> - * Category: Desktop client
>   * Description: Tests flink lifetime by referencing from multiple descriptors.
> - * Feature: xorg_dri2
> - * Functionality: buffer management
> - * Run type: BAT
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Tests for flink - a way to export a gem object by name");
> diff --git a/tests/intel/gem_linear_blits.c b/tests/intel/gem_linear_blits.c
> index cc28e43fe..64f220cb3 100644
> --- a/tests/intel/gem_linear_blits.c
> +++ b/tests/intel/gem_linear_blits.c
> @@ -51,34 +51,23 @@
>  #include "intel_blt.h"
>  /**
>   * TEST: gem linear blits
> + * Category: Infrastructure
>   * Description: Test doing many blits with a working set larger than the aperture size.
> + * Feature: blitter
> + * Functionality: blitter
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
>   * SUBTEST: basic
> - * Category: Infrastructure
>   * Description: Basic blitter functionality check with 2 buffers
> - * Feature: blitter
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: interruptible
> - * Category: Infrastructure
>   * Description: Test with interrupts in between the parent process
> - * Feature: blitter
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: normal
> - * Category: Infrastructure
>   * Description: The intent is to push beyond the working GTT size to force the driver to rebind the buffers
> - * Feature: blitter
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Test doing many blits with a working set larger than the"
> diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/gem_lmem_swapping.c
> index 381510f1a..451d55423 100644
> --- a/tests/intel/gem_lmem_swapping.c
> +++ b/tests/intel/gem_lmem_swapping.c
> @@ -26,170 +26,79 @@
>  #include "intel_mocs.h"
>  /**
>   * TEST: gem lmem swapping
> - * Description: Exercise local memory swapping.
> - *
> - * SUBTEST: basic
>   * Category: Server
> - * Description: Exercise local memory swapping to system memory
> + * Description: Exercise local memory swapping.
>   * Feature: local_memory
>   * Functionality: buffer management
> - * Run type: BAT
>   * Sub-category: i915
>   * Test category: GEM_Legacy
>   *
> + * SUBTEST: basic
> + * Description: Exercise local memory swapping to system memory
> + * Run type: BAT
> + *
>   * SUBTEST: heavy-multi
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heavy-random
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heavy-verify-multi
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heavy-verify-multi-ccs
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
>   *
>   * SUBTEST: heavy-verify-random
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: heavy-verify-random-ccs
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
>   *
>   * SUBTEST: massive
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: massive-random
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-multi
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-random
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-random-engines
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-random-verify
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: parallel-random-verify-ccs
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
>   *
>   * SUBTEST: random
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: random-engines
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: smem-oom
> - * Category: Server
>   * Description: Exercise local memory swapping during exhausting system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: verify
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: verify-ccs
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
>   *
>   * SUBTEST: verify-random
> - * Category: Server
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Functionality: buffer management
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: verify-random-ccs
>   * Description: Exercise local memory swapping to system memory
> - * Feature: local_memory
> - * Run type: FULL
>   */
>  
>  IGT_TEST_DESCRIPTION("Exercise local memory swapping.");
> diff --git a/tests/intel/gem_madvise.c b/tests/intel/gem_madvise.c
> index 06b3ddf32..b443d16ae 100644
> --- a/tests/intel/gem_madvise.c
> +++ b/tests/intel/gem_madvise.c
> @@ -40,35 +40,30 @@
>  #include "i915/gem_create.h"
>  /**
>   * TEST: gem madvise
> - * Description: Checks that the kernel reports EFAULT when trying to use purged bo.
> - * Run type: FULL
> - *
> - * SUBTEST: dontneed-after-mmap
>   * Category: Desktop client
> - * Description:
> - *   Check signal for Segmentation Fault and bus error after obtaining a purgeable object and
> - *   calling for sighandler.
> + * Description: Checks that the kernel reports EFAULT when trying to use purged bo.
>   * Feature: caching, mapping
>   * Functionality: buffer management
>   * Sub-category: i915
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: dontneed-after-mmap
> + * Description: Check signal for Segmentation Fault and bus error after
> + *		obtaining a purgeable object and calling for sighandler.
>   *
>   * SUBTEST: dontneed-before-exec
> - * Description: Check if EXECBUFFER2 reports EFAULT when trying to submit purged bo for GPU.
> + * Description: Check if EXECBUFFER2 reports EFAULT when trying to submit
> + *		purged bo for GPU.
>   * Feature: caching, gtt, mapping
>   *
>   * SUBTEST: dontneed-before-mmap
> - * Category: Desktop client
> - * Description:
> - *   Check signal for Segmentation Fault and bus error before obtaining a purgeable object and
> - *   calling for sighandler.
> - * Feature: caching, mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Check signal for Segmentation Fault and bus error before
> + *		obtaining a purgeable object and calling for sighandler.
>   *
>   * SUBTEST: dontneed-before-pwrite
> - * Description: Check if PWRITE reports EFAULT when trying to use purged bo for write operation.
> + * Description: Check if PWRITE reports EFAULT when trying to use purged bo
> + *		for write operation.
>   * Feature: caching, gtt, mapping
>   */
>  
> diff --git a/tests/intel/gem_mmap_gtt.c b/tests/intel/gem_mmap_gtt.c
> index 9c06785d2..9aecd08ce 100644
> --- a/tests/intel/gem_mmap_gtt.c
> +++ b/tests/intel/gem_mmap_gtt.c
> @@ -49,490 +49,331 @@
>  /**
>   * TEST: gem mmap gtt
>   * Description: Ensure that all operations around MMAP_GTT ioctl works.
> + * Feature: gtt
> + * Run type: FULL
>   *
>   * SUBTEST: bad-object
>   * Description: Verify mapping to invalid gem objects fails.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Description: Basic checks of GEM_MMAP_GTT ioctl.
> - * Feature: gtt
> - * Run type: BAT
>   *
>   * SUBTEST: basic-copy
>   * Description: Test copy between two GTT mmappings.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-read
>   * Description: Test to read content from GTT mmapped object.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-read-write
>   * Description: Check basic read->write order of a GTT mmapped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-read-write-distinct
>   * Description: Check distinct read->write order of a GTT mmapped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-short
>   * Description: Test mmaping less than the full object.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-small-bo
> - * Description: Check mmap access to a small buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
> + * Description: Check mmap access to a small buffer object by CPU directly and
> + *		through GTT in sequence.
>   *
>   * SUBTEST: basic-small-bo-tiledX
> - * Description:
> - *   Check mmap access to a small X-tiled buffer object by CPU directly and through GTT in
> - *   sequence.
> - * Feature: gtt
> - * Run type: FULL
> + * Description: Check mmap access to a small X-tiled buffer object by CPU
> + *		directly and through GTT in sequence.
>   *
>   * SUBTEST: basic-small-bo-tiledY
> - * Description:
> - *   Check mmap access to a small Y-tiled buffer object by CPU directly and through GTT in
> + * Description: Check mmap access to a small Y-tiled buffer object by CPU
> + *		directly and through GTT in
>   *   sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-small-copy
>   * Description: Check page by page copying between two GTT mmapped normal-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-small-copy-XY
>   * Description: Check page by page copying between two GTT mmapped tiled-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-small-copy-odd
>   * Description: Check page by page copying between two GTT mmapped odd tiled-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-wc
>   * Description:
>   *   Check the performance of WC writes with WC reads of GTT and WC writes of GTT with WB writes of.
>   *   CPU.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-write
>   * Description: Test to write content to GTT mmapped object.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-write-cpu-read-gtt
>   * Description: Check coherency between GTT and CPU mmappings with LLC.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-write-gtt
>   * Description: Test creates a prefault object into GTT and writes into it from another GTT mmapped.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-write-read
>   * Description: Check basic write->read order of a GTT mmapped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: basic-write-read-distinct
>   * Description: Check distinct write->read order of a GTT mmapped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-bo
>   * Description: Check mmap access to a big buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-bo-tiledX
>   * Description: Check mmap access to a big X-tiled buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-bo-tiledY
>   * Description: Check mmap access to a big Y-tiled buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-copy
>   * Description: Check page by page copying between two GTT mmapped normal-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-copy-XY
>   * Description: Check page by page copying between two GTT mmapped tiled-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: big-copy-odd
>   * Description: Check page by page copying between two GTT mmapped odd tiled-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: clflush
>   * Description: Check the userspace clflushing of the GTT mmap.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: close-race
>   * Description:
>   *   Test to check that a few threads opening and closing handles cause explosion in other threads
>   *   in the process of mmaping that handle.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: coherency
>   * Description: Check whether a write through the GTT is immediately visible to the CPU.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-basic-small-copy
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped normal-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-basic-small-copy-XY
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped tiled-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-basic-small-copy-odd
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped odd tiled-small bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-big-copy
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped normal-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-big-copy-XY
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped tiled-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-big-copy-odd
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped odd tiled-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-huge-copy
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped normal-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-huge-copy-XY
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped tiled-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-huge-copy-odd
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped odd tiled-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-medium-copy
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped normal-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-medium-copy-XY
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped tiled-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-medium-copy-odd
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped odd tiled-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-swap-copy
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped normal-huge bo's larger than physical memory and resulting in
>   *   thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-swap-copy-XY
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped tiled-huge bo's larger than physical memory and resulting in
>   *   thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: cpuset-swap-copy-odd
>   * Description:
>   *   Add forked contention with lighter variant (single cpu) and check page by page copying
>   *   between two GTT mmapped odd tiled-huge bo's larger than physical memory and resulting in
>   *   thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: fault-concurrent
>   * Description: Excercise concurrent pagefaulting of a GTT mmaped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: fault-concurrent-X
>   * Description: Excercise concurrent pagefaulting of a X-tiled GTT mmaped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: fault-concurrent-Y
>   * Description: Excercise concurrent pagefaulting of a Y-tiled GTT mmaped bo.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: flink-race
>   * Description:
>   *   Test to check that a few threads opening and closing flink handles cause explosion in other
>   *   threads in the process of mmaping that handle.
>   * Feature: gtt, xorg_dri2
> - * Run type: FULL
>   *
>   * SUBTEST: forked-basic-small-copy
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped normal-small
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-basic-small-copy-XY
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped tiled-small
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-basic-small-copy-odd
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-small
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-big-copy
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped normal-big
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-big-copy-XY
>   * Description: Add forked contention and check page by page copying between two GTT mmapped tiled-big bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-big-copy-odd
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-big
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-huge-copy
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped normal-huge
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-huge-copy-XY
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped tiled-huge
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-huge-copy-odd
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-huge
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-medium-copy
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped normal-medium
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-medium-copy-XY
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped tiled-medium
>   *   bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-medium-copy-odd
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped odd
>   *   tiled-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-swap-copy
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped normal-huge
>   *   bo's larger than physical memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-swap-copy-XY
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped tiled-huge bo's
>   *   larger than physical memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: forked-swap-copy-odd
>   * Description:
>   *   Add forked contention and check page by page copying between two GTT mmapped odd tiled-huge
>   *   bo's larger than physical memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: hang
>   * Description: Check read/writes across a GPU reset.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: hang-busy
>   * Description: Exercise the GTT mmap revocation for a reset on a busy object.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: hang-user
>   * Description: Mix a busy hang with GTT and userptr.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-bo
>   * Description: Check mmap access to a huge buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-bo-tiledX
>   * Description: Check mmap access to a huge X-tiled buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-bo-tiledY
>   * Description: Check mmap access to a huge Y-tiled buffer object by CPU directly and through GTT in sequence.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-copy
>   * Description: Check page by page copying between two GTT mmapped normal-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-copy-XY
>   * Description: Check page by page copying between two GTT mmapped tiled-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: huge-copy-odd
>   * Description: Check page by page copying between two GTT mmapped odd tiled-huge bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: isolation
>   * Description:
>   *   Test mmap_offset lifetime, closing the object on another file should not affect the local
>   *   mmap_offset.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: medium-copy
>   * Description: Check page by page copying between two GTT mmapped normal-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: medium-copy-XY
>   * Description: Check page by page copying between two GTT mmapped tiled-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: medium-copy-odd
>   * Description: Check page by page copying between two GTT mmapped odd tiled-medium bo's.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: pf-nonblock
>   * Description: Check that the initial pagefault is non-blocking.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: ptrace
>   * Description: Inspect a GTT mmap using ptrace().
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: swap-copy
>   * Description:
>   *   Check page by page copying between two GTT mmapped normal-huge bo's larger than physical
>   *   memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: swap-copy-XY
>   * Description:
>   *   Check page by page copying between two GTT mmapped tiled-huge bo's larger than physical
>   *   memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: swap-copy-odd
>   * Description:
>   *   Check page by page copying between two GTT mmapped odd tiled-huge bo's larger than physical
>   *   memory and resulting in thrashing of swap space.
> - * Feature: gtt
> - * Run type: FULL
>   *
>   * SUBTEST: zero-extend
>   * Description: Test MMAP_GTT extension validity.
> - * Feature: gtt
> - * Run type: FULL
>   */
>  
>  #ifndef PAGE_SIZE
> diff --git a/tests/intel/gem_mmap_offset.c b/tests/intel/gem_mmap_offset.c
> index bc801cd04..b069b80f6 100644
> --- a/tests/intel/gem_mmap_offset.c
> +++ b/tests/intel/gem_mmap_offset.c
> @@ -40,90 +40,27 @@
>  /**
>   * TEST: gem mmap offset
>   * Description: Basic MMAP_OFFSET IOCTL tests for mem regions
> - * Run type: FULL
> - * Test category: GEM_Legacy
> - *
> - * SUBTEST: bad-extensions
>   * Category: Infrastructure
>   * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> + * Functionality: mapping
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
> + * SUBTEST: bad-extensions
>   * SUBTEST: bad-flags
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: bad-object
> - * Category: Infrastructure
> - * Description: Verify mapping to invalid gem objects won't be created
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: basic-uaf
> - * Category: Infrastructure
> - * Description: Check buffer object mapping persists after gem_close
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: blt-coherency
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: clear
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: close-race
> - * Category: Infrastructure
> - * Description: Check race between close and mmap offset between threads
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: isolation
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: oob-read
> - * Category: Infrastructure
> - * Description: Check for out-of-bound access in vm_access
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: open-flood
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: perf
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: pf-nonblock
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> - *
>   * SUBTEST: ptrace
> - * Category: Infrastructure
> - * Feature: mapping
> - * Functionality: memory management
> - * Sub-category: i915
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic MMAP_OFFSET IOCTL tests for mem regions\n");
> diff --git a/tests/intel/gem_mmap_wc.c b/tests/intel/gem_mmap_wc.c
> index c56e8c353..a82d779f9 100644
> --- a/tests/intel/gem_mmap_wc.c
> +++ b/tests/intel/gem_mmap_wc.c
> @@ -41,70 +41,31 @@
>  #include "i915/gem_create.h"
>  /**
>   * TEST: gem mmap wc
> + * Feature: caching, mapping
>   * Run type: FULL
>   *
>   * SUBTEST: bad-object
> - * Feature: caching, mapping
> - *
>   * SUBTEST: bad-offset
> - * Feature: caching, mapping
> - *
>   * SUBTEST: bad-size
> - * Feature: caching, mapping
> - *
>   * SUBTEST: close
> - * Feature: caching, mapping
> - *
>   * SUBTEST: coherency
> - * Feature: caching, mapping
> - *
>   * SUBTEST: copy
> - * Feature: caching, mapping
> - *
>   * SUBTEST: fault-concurrent
> - * Feature: caching, mapping
> - *
>   * SUBTEST: invalid-flags
> - * Feature: caching, mapping
> - *
>   * SUBTEST: pf-nonblock
> - * Feature: caching, mapping
> - *
>   * SUBTEST: read
> - * Feature: caching, mapping
> - *
>   * SUBTEST: read-write
> - * Feature: caching, mapping
> - *
>   * SUBTEST: read-write-distinct
> - * Feature: caching, mapping
> - *
>   * SUBTEST: set-cache-level
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-cpu-read-wc
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-cpu-read-wc-unflushed
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-gtt-read-wc
> - * Feature: caching, gtt, mapping
> - *
>   * SUBTEST: write-prefaulted
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-read
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-read-distinct
> - * Feature: caching, mapping
> - *
>   * SUBTEST: write-wc-read-gtt
> - * Feature: caching, gtt, mapping
> + *
>   */
>  
>  static int OBJECT_SIZE = 16*1024*1024;
> diff --git a/tests/intel/gem_ppgtt.c b/tests/intel/gem_ppgtt.c
> index b6081b1e9..c25bf5f88 100644
> --- a/tests/intel/gem_ppgtt.c
> +++ b/tests/intel/gem_ppgtt.c
> @@ -41,30 +41,24 @@
>  #include "igt_debugfs.h"
>  /**
>   * TEST: gem ppgtt
> + * Category: Desktop client
> + * Feature: mapping, xorg_dri2
> + * Functionality: buffer management
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: blt-vs-render-ctx0
> - * Feature: mapping
>   *
>   * SUBTEST: blt-vs-render-ctxN
> - * Feature: mapping
>   *
>   * SUBTEST: flink-and-close-vma-leak
> - * Category: Desktop client
> - * Feature: mapping, xorg_dri2
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: shrink-vs-evict-any
>   * Description: Regression test to verify GTT eviction can't randomly fail due to object lock contention
> - * Feature: mapping
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: shrink-vs-evict-pinned
>   * Description: Regression test to verify GTT eviction can't randomly fail due to object lock contention
> - * Feature: mapping
> - * Test category: GEM_Legacy
>   */
>  
>  #define WIDTH 512
> diff --git a/tests/intel/gem_pxp.c b/tests/intel/gem_pxp.c
> index 9cc6b9c2f..6a7f8e487 100644
> --- a/tests/intel/gem_pxp.c
> +++ b/tests/intel/gem_pxp.c
> @@ -10,81 +10,63 @@
>  /**
>   * TEST: gem pxp
>   * Description: Test PXP that manages protected content through arbitrated HW-PXP-session
> + * Feature: PXP
> + * Functionality: pxp
> + * Sub-category: Power management
>   * Run type: FULL
>   *
>   * SUBTEST: create-protected-buffer
> - * Feature: PXP
>   *
>   * SUBTEST: create-regular-buffer
>   * Description: Verify protected buffer on supported hw:
> - * Feature: PXP
>   *
>   * SUBTEST: create-regular-context-1
>   * Description: Verify protected context on supported hw:
> - * Feature: PXP
>   *
>   * SUBTEST: create-regular-context-2
> - * Feature: PXP
>   *
>   * SUBTEST: create-valid-protected-context
> - * Feature: PXP
>   *
>   * SUBTEST: display-protected-crc
>   * Description: Test the display CRC
> - * Feature: PXP
>   *
>   * SUBTEST: dmabuf-shared-protected-dst-is-context-refcounted
>   * Feature: PXP, prime
>   *
>   * SUBTEST: fail-invalid-protected-context
> - * Feature: PXP
>   *
>   * SUBTEST: hw-rejects-pxp-buffer
>   * Description: Verify protected buffer on unsupported hw:
> - * Feature: PXP
>   *
>   * SUBTEST: hw-rejects-pxp-context
>   * Description: Verify protected context on unsupported hw:
> - * Feature: PXP
>   *
>   * SUBTEST: protected-encrypted-src-copy-not-readible
> - * Feature: PXP
>   *
>   * SUBTEST: protected-raw-src-copy-not-readible
> - * Feature: PXP
>   *
>   * SUBTEST: regular-baseline-src-copy-readible
>   * Description: Verify protected render operations:
> - * Feature: PXP
>   *
>   * SUBTEST: reject-modify-context-protection-off-1
> - * Feature: PXP
>   *
>   * SUBTEST: reject-modify-context-protection-off-2
> - * Feature: PXP
>   *
>   * SUBTEST: reject-modify-context-protection-off-3
> - * Feature: PXP
>   *
>   * SUBTEST: reject-modify-context-protection-on
>   * Description: Verify protected context integrity:
> - * Feature: PXP
>   *
>   * SUBTEST: verify-pxp-execution-after-suspend-resume
> - * Feature: PXP
>   *
>   * SUBTEST: verify-pxp-key-change-after-suspend-resume
>   * Description: Verify suspend-resume teardown management:
> - * Feature: PXP
>   *
>   * SUBTEST: verify-pxp-stale-buf-execution
> - * Feature: PXP
>   *
>   * SUBTEST: verify-pxp-stale-buf-optout-execution
> - * Feature: PXP
>   *
>   * SUBTEST: verify-pxp-stale-ctx-execution
> - * Feature: PXP
>   */
>  
>  IGT_TEST_DESCRIPTION("Test PXP that manages protected content through arbitrated HW-PXP-session");
> diff --git a/tests/intel/gem_ringfill.c b/tests/intel/gem_ringfill.c
> index 66fbd27fa..a73c0ef5c 100644
> --- a/tests/intel/gem_ringfill.c
> +++ b/tests/intel/gem_ringfill.c
> @@ -43,35 +43,33 @@
>  #include <sys/ioctl.h>
>  /**
>   * TEST: gem ringfill
> + * Category: Infrastructure
>   * Description:
>   *   Exercise many tiny batchbuffer operations, in the hope of catching failure to manage the ring
>   *   properly near full.
> - *
> - * SUBTEST: basic-all
> - * Category: Infrastructure
> - * Description: Basic check to fill the ring upto maximum on all engines simultaneously.
>   * Feature: cmd_submission
>   * Functionality: command submission
> - * Run type: BAT
>   * Sub-category: i915
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic-all
> + * Run type: BAT
> + * Description: Basic check to fill the ring upto maximum on all engines simultaneously.
>   *
>   * SUBTEST: engines-S3
>   * Description: Handle a full ring across suspend cycle.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-S4
>   * Description: Handle a full ring across hibernate cycle.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-basic
>   * Description:
>   *   Basic check how the driver handles a full ring.
>   *   Test spamming ring with contexts
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: engines-bomb
> @@ -79,51 +77,42 @@
>   *   Fills the ring upto maximim parallely using fork with different fd's along with
>   *   interruptions.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-child
>   * Description: Check to fill the ring parallely using fork.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-fd
>   * Description: Fills the ring upto maximim parallely using fork with different fd's.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-forked
>   * Description: Check to fill the ring parallely using fork.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-hang
>   * Description: Exercise many batchbuffer operations along with a hang batch until ring is full.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: engines-interruptible
>   * Description:
>   *   Exercise all potential injection sites by using igt_sigiter interface to repeat the
>   *   ringfill testing.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-S3
>   * Description: Handle a full ring across suspend cycle - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-S4
>   * Description: Handle a full ring across hibernate cycle - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-basic
>   * Description:
>   *   Basic check how the driver handles a full ring - on legacy ring.
>   *   Test spamming ring with contexts - legacy path
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: legacy-bomb
> @@ -131,36 +120,30 @@
>   *   Fills the ring upto maximim parallely using fork with different fd's along with
>   *   interruptions - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-child
>   * Description: Check to fill the ring parallely using fork - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-fd
>   * Description: Fills the ring upto maximim parallely using fork with different fd's - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-forked
>   * Description: Check to fill the ring parallely using fork - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-hang
>   * Description:
>   *   Exercise many batchbuffer operations along with a hang batch until ring is full - on legacy
>   *   ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-interruptible
>   * Description:
>   *   Exercise all potential injection sites by using igt_sigiter interface to repeat the
>   *   ringfill testing - on legacy ring.
>   * Feature: cmd_submission, multitile
> - * Run type: FULL
>   */
>  
>  #define INTERRUPTIBLE 0x1
> diff --git a/tests/intel/gem_shrink.c b/tests/intel/gem_shrink.c
> index 1f16f8a78..094881a15 100644
> --- a/tests/intel/gem_shrink.c
> +++ b/tests/intel/gem_shrink.c
> @@ -36,6 +36,10 @@
>  /**
>   * TEST: gem shrink
>   * Feature: mapping
> + * Category: Desktop client
> + * Functionality: buffer management
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: execbuf1
> @@ -139,10 +143,6 @@
>   * SUBTEST: pwrite-userptr-dirty
>   *
>   * SUBTEST: reclaim
> - * Category: Desktop client
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  #ifndef MADV_FREE
> diff --git a/tests/intel/gem_softpin.c b/tests/intel/gem_softpin.c
> index f5f0ba257..f06e58be9 100644
> --- a/tests/intel/gem_softpin.c
> +++ b/tests/intel/gem_softpin.c
> @@ -33,219 +33,97 @@
>  #include "intel_allocator.h"
>  /**
>   * TEST: gem softpin
> + * Category: Infrastructure
>   * Description:
>   *   Tests softpin feature with normal usage, invalid inputs scenarios and couple of eviction
>   *   tests which copy buffers between CPU and GPU.
> + * Feature: mapping
> + * Functionality: softpin
> + * Sub-category: CMD submission
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
>   * SUBTEST: 32b-excludes-last-page
> - * Category: Infrastructure
>   * Description: Check the last 32b page is excluded.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-basic
> - * Category: Infrastructure
>   * Description: Check that we can place objects at start/end of the GTT using the allocator.
> - * Feature: mapping
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-basic-reserve
> - * Category: Infrastructure
>   * Description: Check that if we can reserve a space for an object starting from a given offset.
> - * Feature: mapping
> - * Functionality: command submission
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-evict
> - * Category: Infrastructure
>   * Description: Exercise eviction with softpinning.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-fork
> - * Category: Infrastructure
>   * Description: Check if multiple processes can use allocator.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-nopin
> - * Category: Infrastructure
>   * Description: Check that we can combine manual placement with automatic GTT placement.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: allocator-nopin-reserve
> - * Category: Infrastructure
>   * Description:
>   *   Check that we can combine manual placement with automatic GTT placement and
>   *   reserves/unreserves space for objects.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-active
> - * Category: Infrastructure
>   * Description: Check eviction with active bo.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-active-interruptible
> - * Category: Infrastructure
>   * Description: Check eviction with active bo with interrupts.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-hang
>   * Description: Check eviction of softpinned bo with hung batch.
> - * Feature: mapping
> - * Run type: FULL
>   *
>   * SUBTEST: evict-prime
>   * Description: Check eviction of vma on importing prime fd in reopened drm fds
> - * Feature: mapping
> - * Run type: FULL
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-prime-sanity-check
>   * Description: Check eviction of vma on importing prime fd in reopened drm fd in single thread
> - * Feature: mapping
> - * Run type: FULL
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-single-offset
> - * Category: Infrastructure
>   * Description: Use same offset for all engines and for different handles.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: evict-snoop
>   * Description: Check eviction against snooping.
> - * Feature: mapping
> - * Run type: FULL
>   *
>   * SUBTEST: evict-snoop-interruptible
>   * Description: Check eviction against snooping with interrupts.
> - * Feature: mapping
> - * Run type: FULL
>   *
>   * SUBTEST: full
> - * Category: Infrastructure
>   * Description: Check the total occupancy by using pad-to-size to fill the entire GTT.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid
> - * Category: Infrastructure
>   * Description: Check that invalid inputs are handled correctly.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: noreloc
> - * Category: Infrastructure
>   * Description: Check that noreloc support works.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: noreloc-S3
>   * Description: Check noreloc survives after suspend to RAM/resume cycle.
> - * Feature: mapping
> - * Run type: FULL
>   *
>   * SUBTEST: noreloc-S4
>   * Description: Check noreloc survives after suspend to disk/resume cycle.
> - * Feature: mapping
> - * Run type: FULL
>   *
>   * SUBTEST: noreloc-interruptible
> - * Category: Infrastructure
>   * Description: Check noreloc support with interruptible.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: overlap
> - * Category: Infrastructure
>   * Description: Check all the possible pages aligned overlaps.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: reverse
> - * Category: Infrastructure
>   * Description: Check that if the user demands the vma will be swapped.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: safe-alignment
> - * Category: Infrastructure
>   * Description: Check start offset and alignment detection.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: softpin
> - * Category: Infrastructure
>   * Description: Check softpinning of a gem buffer object.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: zero
> - * Category: Infrastructure
>   * Description: Check full placement control under full-ppGTT.
> - * Feature: mapping
> - * Functionality: command submission
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Tests softpin feature with normal usage, invalid inputs"
> diff --git a/tests/intel/gem_spin_batch.c b/tests/intel/gem_spin_batch.c
> index ec1458e35..2e617289c 100644
> --- a/tests/intel/gem_spin_batch.c
> +++ b/tests/intel/gem_spin_batch.c
> @@ -27,80 +27,26 @@
>  #include "igt.h"
>  /**
>   * TEST: gem spin batch
> - * Run type: FULL
>   * Test category: GEM_Legacy
> - *
> - * SUBTEST: engines
>   * Category: Infrastructure
>   * Feature: context, igt_core
>   * Functionality: dummy workload
>   * Sub-category: IGT Lib
> + * Run type: FULL
>   *
> + * SUBTEST: engines
>   * SUBTEST: legacy
> - * Category: Infrastructure
> - * Feature: context, igt_core
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: legacy-resubmit
> - * Category: Infrastructure
> - * Feature: context, igt_core
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: legacy-resubmit-new
> - * Category: Infrastructure
> - * Feature: context, igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: resubmit
> - * Category: Infrastructure
> - * Feature: context, igt_core
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: resubmit-all
> - * Category: Infrastructure
> - * Feature: context, igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: resubmit-new
> - * Category: Infrastructure
> - * Feature: context, igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: resubmit-new-all
> - * Category: Infrastructure
> - * Feature: context, igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: spin-all
> - * Category: Infrastructure
> - * Feature: igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: spin-all-new
> - * Category: Infrastructure
> - * Feature: igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: spin-each
> - * Category: Infrastructure
> - * Feature: igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> - *
>   * SUBTEST: user-each
> - * Category: Infrastructure
> - * Feature: igt_core, multictx
> - * Functionality: dummy workload
> - * Sub-category: IGT Lib
> + *
>   */
>  
>  #define MAX_ERROR 5 /* % */
> diff --git a/tests/intel/gem_sync.c b/tests/intel/gem_sync.c
> index f98d4364c..d3de2e77e 100644
> --- a/tests/intel/gem_sync.c
> +++ b/tests/intel/gem_sync.c
> @@ -34,43 +34,37 @@
>  #include "igt_sysfs.h"
>  /**
>   * TEST: gem sync
> + * Category: Infrastructure
>   * Description: Basic check of ring<->ring write synchronisation.
> + * Feature: synchronization
> + * Functionality: semaphore
> + * Sub-category: i915
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
>   * SUBTEST: active
>   * Description: Exercise waiting while keeping the GPU busy on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: active-each
>   * Description: Exercise waiting while keeping the GPU busy.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: active-wakeup
>   * Description: Measure wakeup latency while also scheduling the next batch on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: active-wakeup-each
>   * Description: Measure wakeup latency while also scheduling the next batch.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: basic-all
> - * Category: Infrastructure
>   * Description: Basic test to wait upon a batch on all rings.
> - * Feature: synchronization
> - * Functionality: semaphore
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-each
>   * Description:
>   *   Check synchronisation of ring.
>   *   Exercise all physical engine selection and legacy rings
>   * Feature: multitile, synchronization
> - * Functionality: semaphore
>   * Run type: BAT
>   * Test category: MultiTile
>   *
> @@ -79,139 +73,91 @@
>   *   Create race condition and see if we can catch interrupts.
>   *   Basic check of ring to ring write synchronisation
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: basic-store-all
> - * Category: Infrastructure
>   * Description: Basic version of store synchronisation test.
> - * Feature: synchronization
> - * Functionality: semaphore
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-store-each
>   * Description:
>   *   Check that store synchronisation works.
>   *   Basic check of ring to ring write, store synchronisation
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   * Test category: MultiTile
>   *
>   * SUBTEST: default
>   * Description: Check synchronisation of rings on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: double-wakeup
>   * Description: Double stress test for nop + sync on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: double-wakeup-each
>   * Description: Double stress test for nop + sync.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked
>   * Description: Check synchronisation of ring with parallel executions on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-all
>   * Description: Parallel execution of batch on all rings and then wait.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-each
>   * Description:
>   *   Forked variant of sync_ring, which checks synchronisation of ring with parallel
>   *   executions.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-store
>   * Description: Check store synchronisation works with parallel multiple executions on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-store-all
>   * Description: Parallel execution of store synchronisation.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-store-each
>   * Description: Forked variant of store_ring, check if parallel store synchronisation works.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-switch
>   * Description: Check sync after context switch parallelly on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forked-switch-each
>   * Description: Check sync after context switch parallelly.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: idle
>   * Description: Exercise and measure idle requests on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-active
>   * Description: Exercise waiting while keeping the GPU busy for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-active-wakeup
>   * Description: Measure wakeup latency while also scheduling the next batch for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-default
>   * Description: Check synchronisation of rings for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-double-wakeup
>   * Description: Double stress test for nop + sync for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-forked
>   * Description: Check synchronisation of ring with parallel executions for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-forked-store
>   * Description:
>   *   Check store synchronisation works with parallel multiple executions for each legacy
>   *   engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-forked-switch
>   * Description: Check sync after context switch parallelly for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-idle
>   * Description: Exercise and measure idle requests for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-many
>   * Description: Create race condition and see if we can catch interrupts for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-store
>   * Description: Check that store synchronisation works for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: legacy-switch
>   * Description: Check sync after context switch for each legacy engine.
> @@ -220,60 +166,40 @@
>   *
>   * SUBTEST: legacy-wakeup
>   * Description: Stress for nop + sync for each legacy engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: many
>   * Description: Create race condition and see if we can catch interrupts on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: preempt
>   * Description: For each context engine check how priority of task are submitted when engine is already busy.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: preempt-all
>   * Description:
>   *   Check and measure how well we can submit a second high priority task when the engine is already
>   *   busy with a low priority task on all engines.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: store
>   * Description: Check that store synchronisation works on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: store-all
>   * Description: Extended version of existing basic-store-all test.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: switch
>   * Description: Check sync after context switch on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: switch-each
>   * Description: Check sync after context switch.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: wait-all
>   * Description: Extended version of existing basic-all test.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: wakeup
>   * Description: Stress for nop + sync on each engine.
> - * Feature: synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: wakeup-each
>   * Description: Stress test for nop + sync.
>   * Feature: multitile, synchronization
> - * Run type: FULL
>   */
>  
>  #define MAX_PRIO I915_CONTEXT_MAX_USER_PRIORITY
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* ✗ Fi.CI.BUILD: failure for IGT documentation refactoring
  2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
                   ` (4 preceding siblings ...)
  2024-02-29 11:19 ` [PATCH i-g-t 5/5] Documentation refactoring part 5 Katarzyna Piecielska
@ 2024-02-29 16:34 ` Patchwork
  5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2024-02-29 16:34 UTC (permalink / raw)
  To: Katarzyna Piecielska; +Cc: igt-dev

== Series Details ==

Series: IGT documentation refactoring
URL   : https://patchwork.freedesktop.org/series/130555/
State : failure

== Summary ==

Applying: Documentation refactoring part 1
Using index info to reconstruct a base tree...
M	tests/device_reset.c
M	tests/intel/api_intel_bb.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/api_intel_bb.c
Auto-merging tests/device_reset.c
CONFLICT (content): Merge conflict in tests/device_reset.c
Patch failed at 0001 Documentation refactoring part 1
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".



^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 5/5] Documentation refactoring part 5
  2024-02-29 11:19 ` [PATCH i-g-t 5/5] Documentation refactoring part 5 Katarzyna Piecielska
@ 2024-02-29 17:07   ` Kamil Konieczny
  0 siblings, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 17:07 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab

Hi Katarzyna,
On 2024-02-29 at 11:19:09 +0000, Katarzyna Piecielska wrote:
> Unify documentation for Intel i915 tests that we have by  moving
> common parts to be available for all tests.
> 
> This is part 5 to make review easier.

With the same corrections as in previous:

Acked-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/intel/gem_mmap.c                 |  34 ++--
>  tests/intel/gem_partial_pwrite_pread.c |  48 ++---
>  tests/intel/gem_render_linear_blits.c  |   4 +-
>  tests/intel/gem_render_tiled_blits.c   |  17 +-
>  tests/intel/gem_tiled_blits.c          |   3 +-
>  tests/intel/gem_userptr_blits.c        | 247 +------------------------
>  tests/intel/gem_wait.c                 |  34 +---
>  tests/intel/gem_workarounds.c          |  43 +----
>  tests/intel/i915_module_load.c         |  23 +--
>  tests/intel/i915_pm_rc6_residency.c    |   6 +-
>  tests/intel/i915_pm_rpm.c              |  50 +----
>  tests/intel/i915_pm_rps.c              |  34 +---
>  tests/intel/i915_query.c               |  52 +-----
>  tests/intel/i915_suspend.c             |  31 +---
>  tests/intel/perf.c                     |  54 +-----
>  tests/intel/perf_pmu.c                 |  73 +-------
>  tests/intel/sysfs_heartbeat_interval.c |   6 +-
>  tests/intel/sysfs_preempt_timeout.c    |  15 +-
>  tests/intel/sysfs_timeslice_duration.c |  17 +-
>  tests/prime_vgem.c                     |  57 +-----
>  tests/vgem_basic.c                     |  30 +--
>  21 files changed, 123 insertions(+), 755 deletions(-)
> 
> diff --git a/tests/intel/gem_mmap.c b/tests/intel/gem_mmap.c
> index d4ca1eda7..a7c5f0bce 100644
> --- a/tests/intel/gem_mmap.c
> +++ b/tests/intel/gem_mmap.c
> @@ -42,58 +42,50 @@
>   * TEST: gem mmap
>   * Description: Basic MMAP IOCTL tests for memory regions.
>   * Feature: mapping
> + * Run type: FULL
>   *
>   * SUBTEST: bad-object
>   * Description: Verify mapping to invalid gem objects won't be created.
> - * Run type: FULL
>   *
>   * SUBTEST: bad-offset
>   * Description: Verify mapping to gem object with invalid offset won't be created.
> - * Run type: FULL
>   *
>   * SUBTEST: bad-size
>   * Description: Verify mapping to gem object with invalid size won't be created.
> - * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Description:
> - *   Test basics of newly mapped gem object like default content, write and read coherency,
> - *   mapping existence after gem_close and unmapping.
> + *   Test basics of newly mapped gem object like default content, write and read
> + *   coherency, mapping existence after gem_close and unmapping.
>   * Run type: BAT
>   *
>   * SUBTEST: basic-small-bo
>   * Description:
> - *   Test the write read coherency and simultaneous access of different pages of a small buffer
> - *   object.
> - * Run type: FULL
> + *   Test the write read coherency and simultaneous access of different pages
> + *   of a small buffer object.
>   *
>   * SUBTEST: big-bo
>   * Description:
> - *   Test the write read coherency and simultaneous access of different pages of a big buffer
> - *   object.
> - * Run type: FULL
> + *   Test the write read coherency and simultaneous access of different pages
> + *   of a big buffer object.
>   *
>   * SUBTEST: huge-bo
>   * Description:
> - *   Test the write read coherency and simultaneous access of different pages of a huge buffer
> - *   object.
> - * Run type: FULL
> + *   Test the write read coherency and simultaneous access of different pages
> + *   of a huge buffer object.
>   *
>   * SUBTEST: pf-nonblock
>   * Description:
> - *   Verify that GTT page faults are asynchronous to GPU rendering and completes within a
> - *   specific time.
> - * Run type: FULL
> + *   Verify that GTT page faults are asynchronous to GPU rendering and completes
> + *   within a specific time.
>   *
>   * SUBTEST: short-mmap
>   * Description: Map small buffer object though direct CPU access, bypassing GPU.
> - * Run type: FULL
>   *
>   * SUBTEST: swap-bo
>   * Description:
> - *   Test the write read coherency and simultaneous access of different pages while swapping
> - *   buffer object.
> - * Run type: FULL
> + *   Test the write read coherency and simultaneous access of different pages
> + *   while swapping buffer object.
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic MMAP IOCTL tests for memory regions.");
> diff --git a/tests/intel/gem_partial_pwrite_pread.c b/tests/intel/gem_partial_pwrite_pread.c
> index 659a96b6e..9a5855752 100644
> --- a/tests/intel/gem_partial_pwrite_pread.c
> +++ b/tests/intel/gem_partial_pwrite_pread.c
> @@ -46,59 +46,63 @@
>   *
>   * SUBTEST: reads
>   * Description:
> - *   Verify if pread is consistent while accessing partial cachelines with default caching
> - *   level
> + *   Verify if pread is consistent while accessing partial cachelines with
> + *   default caching level
>   *
>   * SUBTEST: reads-display
>   * Description:
> - *   Verify if pread is consistent while accessing partial cachelines with display caching
> - *   level
> + *   Verify if pread is consistent while accessing partial cachelines with
> + *   display caching level
>   *
>   * SUBTEST: reads-snoop
> - * Description: Verify if pread is consistent while accessing partial cachelines with snoop caching level
> + * Description:
> + *   Verify if pread is consistent while accessing partial cachelines
> + *   with snoop caching level
>   *
>   * SUBTEST: reads-uncached
>   * Description:
> - *   Verify if pread is consistent while accessing partial cachelines with uncached caching
> - *   level
> + *   Verify if pread is consistent while accessing partial cachelines with
> + *   uncached caching level
>   *
>   * SUBTEST: write
>   * Description:
> - *   Verify if pwrite is consistent while accessing partial cachelines with default caching
> - *   level
> + *   Verify if pwrite is consistent while accessing partial cachelines with
> + *   default caching level
>   *
>   * SUBTEST: write-display
>   * Description:
> - *   Verify if pwrite is consistent while accessing partial cachelines with display caching
> - *   level
> + *   Verify if pwrite is consistent while accessing partial cachelines with
> + *   display caching level
>   *
>   * SUBTEST: write-snoop
> - * Description: Verify if pwrite is consistent while accessing partial cachelines with snoop caching level
> + * Description:
> + *   Verify if pwrite is consistent while accessing partial
> + *   cachelines with snoop caching level
>   *
>   * SUBTEST: write-uncached
>   * Description:
> - *   Verify if pwrite is consistent while accessing partial cachelines with uncached caching
> - *   level
> + *   Verify if pwrite is consistent while accessing partial cachelines with
> + *   uncached caching level
>   *
>   * SUBTEST: writes-after-reads
>   * Description:
> - *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
> - *   default caching level
> + *   Verify if both pread, pwrite are consistent while accessing partial
> + *   cachelines with default caching level
>   *
>   * SUBTEST: writes-after-reads-display
>   * Description:
> - *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
> - *   display caching level
> + *   Verify if both pread, pwrite are consistent while accessing partial
> + *   cachelines with display caching level
>   *
>   * SUBTEST: writes-after-reads-snoop
>   * Description:
> - *   Verify if both pread, pwrite are consistent while accessing partial cachelines with snoop
> - *   caching level
> + *   Verify if both pread, pwrite are consistent while accessing partial
> + *   cachelines with snoop caching level
>   *
>   * SUBTEST: writes-after-reads-uncached
>   * Description:
> - *   Verify if both pread, pwrite are consistent while accessing partial cachelines with
> - *   uncached caching level
> + *   Verify if both pread, pwrite are consistent while accessing partial
> + *   cachelines with uncached caching level
>   */
>  
>  IGT_TEST_DESCRIPTION("Test pwrite/pread consistency when touching partial"
> diff --git a/tests/intel/gem_render_linear_blits.c b/tests/intel/gem_render_linear_blits.c
> index 1fcfb019b..61ec1593f 100644
> --- a/tests/intel/gem_render_linear_blits.c
> +++ b/tests/intel/gem_render_linear_blits.c
> @@ -52,18 +52,16 @@
>  /**
>   * TEST: gem render linear blits
>   * Feature: mapping
> + * Run type: FULL
>   *
>   * SUBTEST: aperture-shrink
> - * Run type: FULL
>   *
>   * SUBTEST: aperture-thrash
> - * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Run type: BAT
>   *
>   * SUBTEST: swap-thrash
> - * Run type: FULL
>   */
>  
>  #define WIDTH 512
> diff --git a/tests/intel/gem_render_tiled_blits.c b/tests/intel/gem_render_tiled_blits.c
> index ba9e62a25..a25ea0812 100644
> --- a/tests/intel/gem_render_tiled_blits.c
> +++ b/tests/intel/gem_render_tiled_blits.c
> @@ -51,19 +51,19 @@
>  /**
>   * TEST: gem render tiled blits
>   * Description:
> - *   Tests performs cyclic forward, backward and random blits on tiled buffer objects using render
> - *   engine with various working set sizes and compares outputs with expected ones.
> + *   Tests performs cyclic forward, backward and random blits on tiled buffer
> + *   objects using render engine with various working set sizes and compares
> + *   outputs with expected ones.
>   * Feature: mapping
> + * Run type: FULL
>   *
>   * SUBTEST: aperture-shrink
>   * Description:
> - *   Check with working set size larger than aperture size and a helper process to shrink buffer
> - *   object caches.
> - * Run type: FULL
> + *   Check with working set size larger than aperture size and a helper process
> + *   to shrink buffer object caches.
>   *
>   * SUBTEST: aperture-thrash
>   * Description: Check with working set size larger than aperture size.
> - * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Description: Check basic functionality.
> @@ -71,9 +71,8 @@
>   *
>   * SUBTEST: swap-thrash
>   * Description:
> - *   Check with working set size larger than system memory size resulting in usage and thrashing
> - *   of swap space.
> - * Run type: FULL
> + *   Check with working set size larger than system memory size resulting in
> + *   usage and thrashing of swap space.
>   */
>  
>  IGT_TEST_DESCRIPTION("Tests performs cyclic forward, backward and random blits on tiled buffer "
> diff --git a/tests/intel/gem_tiled_blits.c b/tests/intel/gem_tiled_blits.c
> index 072fef3c3..27971a2b9 100644
> --- a/tests/intel/gem_tiled_blits.c
> +++ b/tests/intel/gem_tiled_blits.c
> @@ -58,6 +58,7 @@
>   * TEST: gem tiled blits
>   * Description: Test doing many tiled blits, with a working set larger than the aperture size.
>   * Feature: gtt, mapping
> + * Run type: FULL
>   *
>   * SUBTEST: basic
>   * Description: Check basic functionality.
> @@ -65,11 +66,9 @@
>   *
>   * SUBTEST: interruptible
>   * Description: Check with interrupts in parallel execution.
> - * Run type: FULL
>   *
>   * SUBTEST: normal
>   * Description: Check with parallel execution.
> - * Run type: FULL
>   */
>  
>  IGT_TEST_DESCRIPTION("Test doing many tiled blits, with a working set larger"
> diff --git a/tests/intel/gem_userptr_blits.c b/tests/intel/gem_userptr_blits.c
> index 14f833232..3e1f48a4f 100644
> --- a/tests/intel/gem_userptr_blits.c
> +++ b/tests/intel/gem_userptr_blits.c
> @@ -69,171 +69,65 @@
>  #include "intel_blt.h"
>  /**
>   * TEST: gem userptr blits
> - * Run type: FULL
> - *
> - * SUBTEST: access-control
> - * Feature: userptr
> - *
> - * SUBTEST: coherency-sync
> - * Feature: userptr
> - *
> - * SUBTEST: coherency-unsync
> - * Feature: userptr
> - *
> - * SUBTEST: create-destroy-sync
>   * Category: Server
>   * Feature: userptr
>   * Functionality: buffer management
>   * Sub-category: Compute
>   * Test category: GEM_Legacy
> + * Run type: FULL
>   *
> + * SUBTEST: access-control
> + * SUBTEST: coherency-sync
> + * SUBTEST: coherency-unsync
> + * SUBTEST: create-destroy-sync
>   * SUBTEST: create-destroy-unsync
> - * Feature: userptr
> - *
>   * SUBTEST: dmabuf-sync
> - * Feature: prime, userptr
> - *
>   * SUBTEST: dmabuf-unsync
> - * Feature: prime, userptr
> - *
>   * SUBTEST: forbidden-operations
> - * Feature: userptr
> - *
>   * SUBTEST: forked-access
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-multifd-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-multifd-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-multifd-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-multifd-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-multifd-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-multifd-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-multifd-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-multifd-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-sync-swapping-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-multifd-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-multifd-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-multifd-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-multifd-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-multifd-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-multifd-mempressure-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-multifd-mempressure-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-multifd-normal
> - * Feature: userptr
> - *
>   * SUBTEST: forked-unsync-swapping-normal
> - * Feature: userptr
> - *
>   * SUBTEST: huge-split
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: input-checking
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-mmap-offset-unsync
>   * Description: Verify unsynchronized userptr on mmap-offset mappings fails
> - * Feature: userptr
>   *
>   * SUBTEST: invalid-null-pointer
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: major-normal-sync
> - * Feature: userptr
> - *
>   * SUBTEST: major-sync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: major-unsync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: major-unsync-normal
> - * Feature: userptr
>   *
>   * SUBTEST: map-fixed-invalidate
>   * Description: Try to anger lockdep with MMU notifier still active after MAP_FIXED remap
> @@ -252,176 +146,45 @@
>   * Feature: gtt, userptr
>   *
>   * SUBTEST: minor-normal-sync
> - * Feature: userptr
> - *
>   * SUBTEST: minor-sync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: minor-unsync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: minor-unsync-normal
> - * Feature: userptr
> - *
>   * SUBTEST: mlocked-normal-sync
> - * Feature: userptr
> - *
>   * SUBTEST: mlocked-sync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: mlocked-unsync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: mlocked-unsync-normal
> - * Feature: userptr
>   *
>   * SUBTEST: mmap-offset-banned
> - * Category: Server
>   * Description: Verify mmap_offset to userptr is banned
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: nohangcheck
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: probe
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: process-exit
> - * Feature: userptr
> - *
>   * SUBTEST: process-exit-busy
> - * Feature: userptr
> - *
>   * SUBTEST: readonly-pwrite-unsync
> - * Feature: userptr
> - *
>   * SUBTEST: readonly-unsync
> - * Feature: userptr
> - *
>   * SUBTEST: relocations
> - * Feature: userptr
> - *
>   * SUBTEST: sd-probe
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: set-cache-level
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: stress-mm
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: stress-mm-invalidate-close
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: stress-mm-invalidate-close-overlap
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: stress-purge
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: swapping-normal-sync
> - * Feature: userptr
> - *
>   * SUBTEST: swapping-sync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: swapping-unsync-interruptible
> - * Feature: userptr
> - *
>   * SUBTEST: swapping-unsync-normal
> - * Feature: userptr
> - *
>   * SUBTEST: sync-overlap
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: sync-unmap
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: sync-unmap-after-close
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: sync-unmap-cycles
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: unsync-overlap
> - * Feature: userptr
> - *
>   * SUBTEST: unsync-unmap
> - * Feature: userptr
> - *
>   * SUBTEST: unsync-unmap-after-close
> - * Feature: userptr
> - *
>   * SUBTEST: unsync-unmap-cycles
> - * Feature: userptr
> - *
>   * SUBTEST: usage-restrictions
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: userfault
> - * Feature: userptr
> - *
>   * SUBTEST: vma-merge
> - * Category: Server
> - * Feature: userptr
> - * Functionality: buffer management
> - * Sub-category: Compute
> - * Test category: GEM_Legacy
>   */
>  
>  #ifndef PAGE_SIZE
> diff --git a/tests/intel/gem_wait.c b/tests/intel/gem_wait.c
> index 674deb57d..e2a598c64 100644
> --- a/tests/intel/gem_wait.c
> +++ b/tests/intel/gem_wait.c
> @@ -33,26 +33,21 @@
>  #include "igt_vgem.h"
>  /**
>   * TEST: gem wait
> + * Category: Infrastructure
>   * Description: Tests the GEM_WAIT ioctl
>   * Feature: synchronization
> + * Functionality: semaphore
> + * Sub-category: i915
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: await
> - * Category: Infrastructure
>   * Description: Verify GEM_WAIT functionality in await mode.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: busy
> - * Category: Infrastructure
>   * Description: Verify GEM_WAIT functionality in busy mode.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: busy@all
> - * Functionality: semaphore
>   *
>   * SUBTEST: busy@all-engines
>   * Run type: BAT
> @@ -70,45 +65,24 @@
>   * Description: Verify GEM_WAIT functionality in wait-write mode, when hang is allowed.
>   *
>   * SUBTEST: invalid-buf
> - * Category: Infrastructure
>   * Description: Verify that GEM_WAIT called with invalid buffer object will fail.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: invalid-flags
> - * Category: Infrastructure
>   * Description: Verify that GEM_WAIT called with invalid flag will fail.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait
> - * Category: Infrastructure
>   * Description: Verify GEM_WAIT functionality in wait mode.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait@all
> - * Functionality: semaphore
>   *
>   * SUBTEST: wait@all-engines
>   * Run type: BAT
>   *
>   * SUBTEST: write-busy
> - * Category: Infrastructure
>   * Description: Verify GEM_WAIT functionality in write-busy mode.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: write-wait
> - * Category: Infrastructure
>   * Description: Verify GEM_WAIT functionality in write-wait mode.
> - * Functionality: semaphore
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Tests the GEM_WAIT ioctl");
> diff --git a/tests/intel/gem_workarounds.c b/tests/intel/gem_workarounds.c
> index c5ca26c08..d83c0a1db 100644
> --- a/tests/intel/gem_workarounds.c
> +++ b/tests/intel/gem_workarounds.c
> @@ -34,63 +34,28 @@
>  #include "igt_types.h"
>  /**
>   * TEST: gem workarounds
> - * Run type: FULL
> - *
> - * SUBTEST: basic-read
>   * Category: Infrastructure
>   * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> + * Functionality: workarounds
> + * Sub-category: Context
>   * Test category: GEM_Legacy
> + * Run type: FULL
>   *
> + * SUBTEST: basic-read
>   * SUBTEST: basic-read-context
> - * Category: Infrastructure
> - * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: basic-read-fd
> - * Category: Infrastructure
> - * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: hibernate-resume
>   * Feature: hibernate, workarounds
> - *
>   * SUBTEST: hibernate-resume-context
>   * Feature: hibernate, workarounds
> - *
>   * SUBTEST: hibernate-resume-fd
>   * Feature: hibernate, workarounds
> - *
>   * SUBTEST: reset
> - * Category: Infrastructure
> - * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: reset-context
> - * Category: Infrastructure
> - * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> - * Test category: GEM_Legacy
> - *
>   * SUBTEST: reset-fd
> - * Category: Infrastructure
> - * Feature: workarounds
> - * Functionality: context management
> - * Sub-category: HW
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: suspend-resume
>   * Description: Test to verify gem WA registers during suspend-resume
> - * Feature: suspend, workarounds
> - * Test category: suspend
>   *
>   * SUBTEST: suspend-resume-context
>   * Description: Test to verify gem WA registers during suspend-resume
> diff --git a/tests/intel/i915_module_load.c b/tests/intel/i915_module_load.c
> index 9fffe93d9..b02e3e005 100644
> --- a/tests/intel/i915_module_load.c
> +++ b/tests/intel/i915_module_load.c
> @@ -25,44 +25,33 @@
>  #include <sys/utsname.h>
>  /**
>   * TEST: i915 module load
> + * Category: Infrastructure
>   * Description: Tests the i915 module loading.
> + * Feature: core
> + * Functionality: driver handler
> + * Sub-category: driver
> + * Test category: GEM_Legacy
> + * Run type: FULL
>   *
>   * SUBTEST: load
> - * Category: Infrastructure
>   * Description: Check if i915 and friends are not yet loaded, then load them.
> - * Feature: core
> - * Functionality: driver handler
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: reload
> - * Category: Infrastructure
>   * Description: Verify the basic functionality of i915 driver after it's reloaded.
>   * Feature: core, sriov-core
> - * Functionality: driver handler
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: reload-no-display
>   * Description: Verify that i915 driver can be successfully loaded with disabled display.
>   * Feature: core, sriov-core
> - * Run type: FULL
>   *
>   * SUBTEST: reload-with-fault-injection
> - * Category: Infrastructure
>   * Description: Verify that i915 driver can be successfully reloaded at least once with fault injection.
>   * Feature: core, sriov-core
> - * Functionality: driver handler
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: resize-bar
>   * Description: Check whether lmem bar size can be resized to only supported sizes.
> - * Feature: core
> - * Run type: FULL
>   */
>  
>  #ifdef __linux__
> diff --git a/tests/intel/i915_pm_rc6_residency.c b/tests/intel/i915_pm_rc6_residency.c
> index e309abcfe..30f57858d 100644
> --- a/tests/intel/i915_pm_rc6_residency.c
> +++ b/tests/intel/i915_pm_rc6_residency.c
> @@ -43,19 +43,19 @@
>  #include "sw_sync.h"
>  /**
>   * TEST: i915 pm rc6 residency
> + * Feature: GuCRC, pm_rc6
> + * Functionality: rc6
> + * Sub-category: Power management
>   * Run type: FULL
>   *
>   * SUBTEST: media-rc6-accuracy
>   * Feature: pm_rc6
>   *
>   * SUBTEST: rc6-accuracy
> - * Feature: GuCRC, pm_rc6
>   *
>   * SUBTEST: rc6-fence
> - * Feature: GuCRC, pm_rc6
>   *
>   * SUBTEST: rc6-idle
> - * Feature: GuCRC, pm_rc6
>   */
>  
>  #define SLEEP_DURATION 3 /* in seconds */
> diff --git a/tests/intel/i915_pm_rpm.c b/tests/intel/i915_pm_rpm.c
> index 7f64d1069..9fbfac744 100644
> --- a/tests/intel/i915_pm_rpm.c
> +++ b/tests/intel/i915_pm_rpm.c
> @@ -42,75 +42,31 @@
>  #include <sys/stat.h>
>  /**
>   * TEST: i915 pm rpm
> - *
> - * SUBTEST: debugfs-forcewake-user
>   * Feature: pm_rpm
> + * Functionality: D3 state entry-exit
> + * Test category: pm_rpm
>   * Run type: FULL
>   *
> + * SUBTEST: debugfs-forcewake-user
>   * SUBTEST: debugfs-read
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: gem-evict-pwrite
> - * Feature: gtt, pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: gem-execbuf
> - * Feature: pm_rpm
> - * Run type: FULL
>   *
>   * SUBTEST: gem-execbuf-stress
>   * Description: Validate execbuf submission while exercising rpm suspend/resume cycles.
> - * Feature: pm_rpm
> - * Run type: FULL
>   *
>   * SUBTEST: gem-execbuf-stress-pc8
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: gem-idle
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: gem-mmap-type
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: gem-pread
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: module-reload
> - * Feature: pm_rpm
> - * Run type: BAT
> - *
>   * SUBTEST: reg-read-ioctl
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: sysfs-read
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: system-hibernate
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: system-hibernate-devices
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: system-suspend
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: system-suspend-devices
> - * Feature: pm_rpm
> - * Run type: FULL
> - *
>   * SUBTEST: system-suspend-execbuf
> - * Feature: pm_rpm
> - * Run type: FULL
>   */
>  
>  #if defined(__linux__)
> diff --git a/tests/intel/i915_pm_rps.c b/tests/intel/i915_pm_rps.c
> index 3ef5842dd..820edd45e 100644
> --- a/tests/intel/i915_pm_rps.c
> +++ b/tests/intel/i915_pm_rps.c
> @@ -47,58 +47,32 @@
>  /**
>   * TEST: i915 pm rps
>   * Description: Render P-States tests - verify GPU frequency changes
> + * Feature: pm_rps
> + * Test category: pm_rps
> + * Run type: FULL
>   *
>   * SUBTEST: basic-api
> - * Feature: pm_rps
>   * Run type: BAT
>   *
>   * SUBTEST: engine-order
>   * Description:
>   *   Check if context reuse does not affect waitboosting.
>   *   Render P-States tests - verify GPU frequency changes
> - * Feature: pm_rps
> - * Run type: FULL
> - * Test category: pm_rps
>   *
>   * SUBTEST: fence-order
>   * Description:
>   *   Check if the order of fences does not affect waitboosting.
>   *   Render P-States tests - verify GPU frequency changes
>   * Feature: pm_rps, synchronization
> - * Run type: FULL
> - * Test category: pm_rps
>   *
>   * SUBTEST: min-max-config-idle
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: min-max-config-loaded
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: reset
> - * Feature: pm_rps
> - * Run type: FULL
> - *
> - * SUBTEST: waitboost
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: thresholds
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: thresholds-idle
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: thresholds-idle-park
> - * Feature: pm_rps
> - * Run type: FULL
> - *
>   * SUBTEST: thresholds-park
> - * Feature: pm_rps
> - * Run type: FULL
> + * SUBTEST: waitboost
>   */
>  
>  IGT_TEST_DESCRIPTION("Render P-States tests - verify GPU frequency changes");
> diff --git a/tests/intel/i915_query.c b/tests/intel/i915_query.c
> index e9cc49597..557134062 100644
> --- a/tests/intel/i915_query.c
> +++ b/tests/intel/i915_query.c
> @@ -29,90 +29,51 @@
>  #include <limits.h>
>  /**
>   * TEST: i915 query
> + * Category: Infrastructure
>   * Description: Testing the i915 query uAPI.
> + * Feature: gem_core
> + * Functionality: device topology
> + * Sub-category: uapi
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: engine-info
> - * Category: Infrastructure
>   * Description: Positive tests for DRM_I915_QUERY_ENGINE_INFO
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: engine-info-invalid
> - * Category: Infrastructure
>   * Description: Negative tests for DRM_I915_QUERY_ENGINE_INFO
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: hwconfig_table
> - * Category: Infrastructure
>   * Description: Test DRM_I915_QUERY_HWCONFIG_BLOB query
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: query-garbage
> - * Category: Infrastructure
>   * Description: Test response to an invalid query call
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: query-regions-garbage-items
> - * Category: Infrastructure
>   * Description: Dodgy returned data tests for DRM_I915_QUERY_MEMORY_REGIONS
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: query-regions-sanity-check
> - * Category: Infrastructure
>   * Description: Basic tests for DRM_I915_QUERY_MEMORY_REGIONS
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: query-regions-unallocated
>   * Description: Sanity check the region unallocated tracking
> - * Feature: gem_core
>   *
>   * SUBTEST: query-topology-coherent-slice-mask
>   * Description: Compare new DRM_I915_QUERY_TOPOLOGY_INFO query with legacy (sub)slice getparams
> - * Feature: gem_core
>   *
>   * SUBTEST: query-topology-garbage-items
> - * Category: Infrastructure
>   * Description: Test response to invalid DRM_I915_QUERY_TOPOLOGY_INFO query
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> - *
> + * 
>   * SUBTEST: query-topology-kernel-writes
> - * Category: Infrastructure
>   * Description: Guardband test for DRM_I915_QUERY_TOPOLOGY_INFO query
> - * Feature: gem_core
> - * Functionality: device topology
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: query-topology-known-pci-ids
>   * Description:
>   *   Verify DRM_I915_QUERY_TOPOLOGY_INFO query against hardcoded known values for certain
>   *   platforms
> - * Feature: gem_core
>   *
>   * SUBTEST: query-topology-matches-eu-total
>   * Description: More compare new DRM_I915_QUERY_TOPOLOGY_INFO query with legacy (sub)slice getparams
> - * Feature: gem_core
>   *
>   * SUBTEST: query-topology-unsupported
>   * Description: Verify DRM_I915_QUERY_TOPOLOGY_INFO query fails when it is not supported
> @@ -120,7 +81,6 @@
>   *
>   * SUBTEST: test-query-geometry-subslices
>   * Description: Test DRM_I915_QUERY_GEOMETRY_SUBSLICES query
> - * Feature: gem_core
>   */
>  
>  IGT_TEST_DESCRIPTION("Testing the i915 query uAPI.");
> diff --git a/tests/intel/i915_suspend.c b/tests/intel/i915_suspend.c
> index 82cabfa41..4ee815031 100644
> --- a/tests/intel/i915_suspend.c
> +++ b/tests/intel/i915_suspend.c
> @@ -46,71 +46,48 @@
>  #include "igt_device_scan.h"
>  /**
>   * TEST: i915 suspend
> - *
> - * SUBTEST: basic-s2idle-without-i915
> - * Description: Validate suspend-to-idle without i915 module
>   * Feature: suspend
>   * Functionality: s2idle w/o i915
> - * Run type: BAT
>   * Test category: suspend
> + * Run type: FULL
> + *
> + * SUBTEST: basic-s2idle-without-i915
> + * Description: Validate suspend-to-idle without i915 module
>   *
>   * SUBTEST: basic-s3-without-i915
>   * Description:
>   *   Validate S3 without i915 module.
>   *   Validate S3 state without i915 module
> - * Feature: suspend
>   * Run type: BAT
> - * Test category: suspend
>   *
>   * SUBTEST: debugfs-reader
>   * Description: Test debugfs behavior during suspend to idle
> - * Feature: suspend
> - * Run type: FULL
> - * Test category: suspend
>   *
>   * SUBTEST: debugfs-reader-hibernate
> - * Feature: suspend
> - * Run type: FULL
>   *
>   * SUBTEST: fence-restore-tiled2untiled
>   * Feature: gtt, suspend, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: fence-restore-tiled2untiled-hibernate
>   * Feature: gtt, suspend, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: fence-restore-untiled
>   * Feature: gtt, suspend, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: fence-restore-untiled-hibernate
>   * Feature: gtt, suspend, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: forcewake
>   * Description: Test to prevent GT from suspend by opening forcewake handle
> - * Feature: suspend
> - * Run type: FULL
> - * Test category: suspend
>   *
>   * SUBTEST: forcewake-hibernate
> - * Feature: suspend
> - * Run type: FULL
>   *
>   * SUBTEST: shrink
> - * Feature: suspend
> - * Run type: FULL
>   *
>   * SUBTEST: sysfs-reader
>   * Description: Test sysfs behavior during suspend to idle
> - * Feature: suspend
> - * Run type: FULL
> - * Test category: suspend
>   *
>   * SUBTEST: sysfs-reader-hibernate
> - * Feature: suspend
> - * Run type: FULL
>   */
>  
>  #define OBJECT_SIZE (16*1024*1024)
> diff --git a/tests/intel/perf.c b/tests/intel/perf.c
> index 3565d61cc..e5d3fbd0e 100644
> --- a/tests/intel/perf.c
> +++ b/tests/intel/perf.c
> @@ -48,32 +48,26 @@
>  /**
>   * TEST: perf
>   * Description: Test the i915 perf metrics streaming interface
> + * Feature: i915 streaming interface, oa
> + * Test category: Perf
> + * Functionality: oa
> + * Sub-category: Performance
>   * Run type: FULL
>   *
>   * SUBTEST: blocking
>   * Description: Test blocking read with default hrtimer frequency
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: blocking-parameterized
>   * Description: Test blocking read with different hrtimer frequencies
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: buffer-fill
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: create-destroy-userspace-config
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: disabled-read-error
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: enable-disable
>   * Feature: oa
> @@ -92,8 +86,6 @@
>   *
>   * SUBTEST: gen12-invalid-class-instance
>   * Description: Verify invalid class instance
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: gen12-mi-rpc
>   * Description: Test MI REPORT PERF COUNT for Gen 12
> @@ -101,8 +93,6 @@
>   *
>   * SUBTEST: gen12-oa-tlb-invalidate
>   * Description: Test OA TLB invalidate
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: gen12-unprivileged-single-ctx-counters
>   * Description: Measure performance for a specific context using OAR in Gen 12
> @@ -121,98 +111,66 @@
>   *
>   * SUBTEST: i915-ref-count
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-create-userspace-config
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-oa-exponent
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-oa-format-id
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-oa-metric-set-id
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-open-flags
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-remove-userspace-config
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: low-oa-exponent-permissions
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: mi-rpc
>   * Feature: oa
>   *
>   * SUBTEST: missing-sample-flags
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: non-sampling-read-error
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: non-system-wide-paranoid
>   * Feature: oa
>   *
>   * SUBTEST: non-zero-reason
>   * Description: Test that reason field in OA reports is never 0 on Gen8+
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: oa-exponents
>   * Feature: oa
>   *
>   * SUBTEST: oa-formats
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: per-context-mode-unprivileged
>   * Feature: oa, obsolete
>   *
>   * SUBTEST: polling
>   * Description: Test polled read with default hrtimer frequency
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: polling-parameterized
>   * Description: Test polled read with different hrtimer frequencies
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: polling-small-buf
>   * Description: Test polled read with buffer size smaller than available data
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: rc6-disable
>   * Feature: oa
>   *
>   * SUBTEST: short-reads
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: stress-open-close
>   * Description: Stress tests opening & closing the i915-perf stream in a busy loop
> @@ -220,16 +178,12 @@
>   *
>   * SUBTEST: sysctl-defaults
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   *
>   * SUBTEST: unprivileged-single-ctx-counters
>   * Feature: oa, obsolete
>   *
>   * SUBTEST: whitelisted-registers-userspace-config
>   * Description: Test the i915 perf metrics streaming interface
> - * Feature: i915 streaming interface, oa
> - * Test category: Perf
>   */
>  
>  IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface");
> diff --git a/tests/intel/perf_pmu.c b/tests/intel/perf_pmu.c
> index 4ae2b60ae..718a3ed37 100644
> --- a/tests/intel/perf_pmu.c
> +++ b/tests/intel/perf_pmu.c
> @@ -52,87 +52,59 @@
>  /**
>   * TEST: perf pmu
>   * Description: Test the i915 pmu perf interface
> + * Feature: i915 pmu perf interface, pmu
> + * Test category: Perf
> + * Sub-category: Performance
> + * Functionality: pmu
>   * Run type: FULL
>   *
>   * SUBTEST: all-busy-check-all
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: all-busy-idle-check-all
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy
>   * Description: Test to ensure gpu is busy when there a workload by reading engine busyness pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-accuracy-2
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-accuracy-50
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-accuracy-98
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-check-all
>   * Description: Test to ensure gpu all engines report busy when there is a workload by reading engine busyness pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-double-start
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-hang
>   * Description: Test to ensure there is no hanf when all engines are busy
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-idle
>   * Description: Test to ensure gpu engine reports idle when there is no workload
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-idle-check-all
>   * Description: Test to ensure gpu all engine reports idle when there is no workload
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-idle-no-semaphores
>   * Description: Test to verify gpu idle through engine business pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-no-semaphores
>   * Description: Test to verify gpu busyness through engine business pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: busy-start
>   * Description: Test to verify gpu busyness through engine business pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: cpu-hotplug
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: enable-race
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: event-wait
>   * Feature: obsolete, pmu
> @@ -142,83 +114,52 @@
>   *
>   * SUBTEST: frequency
>   * Description: Read requested freq and actual frequency via PMU within specified time interval for any given workload changes
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: gt-awake
>   * Description: Setup workload on all engines,measure gt awake time via pmu
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: idle
>   * Description: Test to ensure gpu is idle when there is no workload by reading engine busyness pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: idle-no-semaphores
>   * Description: Test to ensure gpu is idle when there is no workload by reading engine busyness pmu counters
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: init-busy
>   * Description: Test to verify gpu busyness init through pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: init-sema
>   * Description: Test to verify gpu busyness init through pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: init-wait
>   * Description: Test to verify gpu busyness init through pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: interrupts
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: interrupts-sync
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-init
>   * Description: Tests that i915 PMU corectly errors out in invalid initialization
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: invalid-open
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: module-unload
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: most-busy-check-all
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: most-busy-idle-check-all
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: multi-client
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: pmu-read
>   * Description: Verify i915 pmu dir exists and read all events
>   * Feature: pmu
> - * Test category: Perf
>   *
>   * SUBTEST: rc6
>   * Feature: pmu
> @@ -237,18 +178,12 @@
>   *
>   * SUBTEST: semaphore-busy
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: semaphore-wait
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   *
>   * SUBTEST: semaphore-wait-idle
>   * Description: Test the i915 pmu perf interface
> - * Feature: i915 pmu perf interface, pmu
> - * Test category: Perf
>   */
>  
>  IGT_TEST_DESCRIPTION("Test the i915 pmu perf interface");
> diff --git a/tests/intel/sysfs_heartbeat_interval.c b/tests/intel/sysfs_heartbeat_interval.c
> index 22c5888c6..09dbc4129 100644
> --- a/tests/intel/sysfs_heartbeat_interval.c
> +++ b/tests/intel/sysfs_heartbeat_interval.c
> @@ -44,31 +44,27 @@
>  /**
>   * TEST: sysfs heartbeat interval
>   * Feature: SMI, cmd_submission
> + * Test category: SysMan
>   * Run type: FULL
>   *
>   * SUBTEST: idempotent
>   * Description: Test to check whether the heartbeat parameter reports the values set.
> - * Test category: SysMan
>   *
>   * SUBTEST: invalid
>   * Description: Test to check if heartbeat parameter rejects any unrepresentable intervals.
> - * Test category: SysMan
>   *
>   * SUBTEST: long
>   *
>   * SUBTEST: mixed
>   * Description: Run a mixed workload with non-preemptable hogs that exceed the heartbeat, and quicker innocents. Inspect the fence status of each to verify that only the hogs are reset.
> - * Test category: SysMan
>   *
>   * SUBTEST: nopreempt
>   * Description: Test heartbeats with forced preemption disabled.
> - * Test category: SysMan
>   *
>   * SUBTEST: off
>   *
>   * SUBTEST: precise
>   * Description: Tests the heartbeats with preemption and heartbeat parameter enabled.
> - * Test category: SysMan
>   */
>  
>  #define ATTR "heartbeat_interval_ms"
> diff --git a/tests/intel/sysfs_preempt_timeout.c b/tests/intel/sysfs_preempt_timeout.c
> index 964b78ae8..606491c34 100644
> --- a/tests/intel/sysfs_preempt_timeout.c
> +++ b/tests/intel/sysfs_preempt_timeout.c
> @@ -43,21 +43,24 @@
>  /**
>   * TEST: sysfs preempt timeout
>   * Feature: SMI, context
> + * Test category: SysMan
>   * Run type: FULL
>   *
>   * SUBTEST: idempotent
> - * Description: Test to check whether the preempt_timeout parameter reports the values set.
> - * Test category: SysMan
> + * Description: Test to check whether the preempt_timeout parameter reports the
> + *		values set.
>   *
>   * SUBTEST: invalid
> - * Description: Test to check if preempt_timeout parameter rejects any unrepresentable intervals.
> - * Test category: SysMan
> + * Description: Test to check if preempt_timeout parameter rejects any
> + *		unrepresentable intervals.
>   *
>   * SUBTEST: off
>   *
>   * SUBTEST: timeout
> - * Description: Test to measure the delay from requestion the preemption to its completion. Send down some non-preemptable workloads and then request a switch to a higher priority context. The HW will not be able to respond, so the kernel will be forced to reset the hog.
> - * Test category: SysMan
> + * Description: Test to measure the delay from requestion the preemption to its
> + *		completion. Send down some non-preemptable workloads and then
> + *		request a switch to a higher priority context. The HW will not
> + *		be able to respond, so the kernel will be forced to reset the hog.
>   */
>  
>  #define ATTR "preempt_timeout_ms"
> diff --git a/tests/intel/sysfs_timeslice_duration.c b/tests/intel/sysfs_timeslice_duration.c
> index fc2b14e16..cceac94f2 100644
> --- a/tests/intel/sysfs_timeslice_duration.c
> +++ b/tests/intel/sysfs_timeslice_duration.c
> @@ -46,25 +46,28 @@
>  /**
>   * TEST: sysfs timeslice duration
>   * Feature: SMI, cmd_submission
> + * Test category: SysMan
>   * Run type: FULL
>   *
>   * SUBTEST: duration
> - * Description: Test to measure the timeslice duration by watching the xCS_TIMESTAMP and recording its value every time we switch into the context, using a couple of semaphores to busyspin for the timeslice.
> - * Test category: SysMan
> + * Description: Test to measure the timeslice duration by watching the
> + *		xCS_TIMESTAMP and recording its value every time we switch
> + *		into the context, using a couple of semaphores to busyspin for
> + *		the timeslice.
>   *
>   * SUBTEST: idempotent
>   * Description: Test to check whether timeslice parameter reports the values set.
> - * Test category: SysMan
>   *
>   * SUBTEST: invalid
> - * Description: Test to check if timeslice parameter rejects any unrepresentable intervals.
> - * Test category: SysMan
> + * Description: Test to check if timeslice parameter rejects any unrepresentable
> + *		intervals.
>   *
>   * SUBTEST: off
>   *
>   * SUBTEST: timeout
> - * Description: Couple a unpreemptable hog with a fast forced reset and measure the timeslice by how long it takes for the hog to be reset and the high priority context to complete.
> - * Test category: SysMan
> + * Description: Couple a unpreemptable hog with a fast forced reset and measure
> + *		the timeslice by how long it takes for the hog to be reset and
> + *		the high priority context to complete.
>   */
>  
>  #define ATTR "timeslice_duration_ms"
> diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
> index 551a731f5..e21bedc94 100644
> --- a/tests/prime_vgem.c
> +++ b/tests/prime_vgem.c
> @@ -32,29 +32,22 @@
>  #include "intel_batchbuffer.h"	/* igt_blitter_copy() */
>  /**
>   * TEST: prime vgem
> - * Description: Basic check of polling for prime/vgem fences.
> - *
> - * SUBTEST: basic-blt
>   * Category: Infrastructure
> - * Description: Examine blitter access path.
> + * Description: Basic check of polling for prime/vgem fences.
>   * Feature: prime
>   * Functionality: mock device
> - * Run type: FULL
>   * Sub-category: DRM
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic-blt
> + * Description: Examine blitter access path.
>   *
>   * SUBTEST: basic-fence-blt
> - * Category: Infrastructure
>   * Description: Examine blitter access path fencing.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic-fence-flip
>   * Description: Examine vgem bo front/back flip fencing.
> - * Feature: prime
>   * Run type: BAT
>   *
>   * SUBTEST: basic-fence-mmap
> @@ -83,78 +76,38 @@
>   * Run type: BAT
>   *
>   * SUBTEST: busy
> - * Category: Infrastructure
>   * Description: Examine busy check of polling for vgem fence.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: coherency-blt
> - * Category: Infrastructure
>   * Description: Examine blitter access path WC coherency.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: coherency-gtt
>   * Description: Examine concurrent access of vgem bo.
>   * Feature: gtt, prime
> - * Run type: FULL
>   *
>   * SUBTEST: fence-flip-hang
>   * Description: Examine vgem bo front/back flip fencing with a pending gpu hang.
>   * Feature: blacklist, prime, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: fence-read-hang
>   * Description: Examine read access path fencing with a pending gpu hang.
>   * Feature: blacklist, prime, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: fence-wait
> - * Category: Infrastructure
>   * Description: Examine basic dma-buf fence interop.
> - * Feature: prime, synchronization
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: fence-write-hang
>   * Description: Examine write access path fencing with a pending gpu hang.
>   * Feature: blacklist, prime, synchronization
> - * Run type: FULL
>   *
>   * SUBTEST: shrink
> - * Category: Infrastructure
>   * Description: Examine link establishment between shrinker and vgem bo.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: sync
> - * Category: Infrastructure
>   * Description: Examine sync on vgem fence.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: wait
> - * Category: Infrastructure
>   * Description: Examine wait on vgem fence.
> - * Feature: prime
> - * Functionality: mock device
> - * Run type: FULL
> - * Sub-category: DRM
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic check of polling for prime/vgem fences.");
> diff --git a/tests/vgem_basic.c b/tests/vgem_basic.c
> index 63c5c0971..6cfb02e82 100644
> --- a/tests/vgem_basic.c
> +++ b/tests/vgem_basic.c
> @@ -37,97 +37,71 @@
>   * Description: Basic sanity check of Virtual GEM module (vGEM).
>   * Functionality: mock device
>   * Test category: GEM_Legacy
> + * Feature: vgem
> + * Run type: FULL
>   *
>   * SUBTEST: bad-fence
>   * Description: Make sure a non-existent fence cannot be signaled.
> - * Feature: vgem
> - * Run type: FULL
>   *
>   * SUBTEST: bad-flag
>   * Description: Make sure a fence cannot be attached and signaled with invalid flags.
> - * Feature: vgem
> - * Run type: FULL
>   *
>   * SUBTEST: bad-handle
>   * Description: Make sure a fence cannot be attached to a invalid handle.
> - * Feature: vgem
> - * Run type: FULL
>   *
>   * SUBTEST: bad-pad
>   * Description: Make sure a non-zero pad is rejected.
> - * Feature: vgem
> - * Run type: FULL
>   *
>   * SUBTEST: busy-fence
>   * Description: Make sure a conflicting fence cannot be attached.
> - * Feature: vgem
> - * Run type: FULL
>   *
>   * SUBTEST: create
>   * Description: Check the basic working of vgem_create ioctl.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: debugfs
>   * Description: Check the basic access to debugfs and also try to read entries in the directory.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: dmabuf-export
>   * Description: Check whether it can export/import the vgem handle using prime.
>   * Feature: prime, vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: dmabuf-fence
>   * Description: Check the working of dma-buf fence interop.
>   * Feature: prime, vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: dmabuf-fence-before
>   * Description: Attach a fence before exporting a vgem handle and check the working of fence.
>   * Feature: prime, vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: dmabuf-mmap
>   * Description: Export the vgem handle along with RDWR capabilities using prime and check if it can be mmaped.
>   * Feature: prime, vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: mmap
>   * Description: Create a vgem handle and check if it can be mmaped.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: second-client
>   * Description: Check whether it can open multiple clients.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: setversion
>   * Description: Check the working of SET_VERSION ioctl.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: sysfs
>   * Description: Check the basic access to sysfs and also try to read entries in the directory.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   *
>   * SUBTEST: unload
>   * Description: Basic test for handling of module unload.
> - * Feature: vgem
>   * Run type: BAT
> - * Sub-category: DRM
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic sanity check of Virtual GEM module (vGEM).");
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH i-g-t 1/5] Documentation refactoring part 1
  2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
  2024-02-29 15:25   ` Kamil Konieczny
@ 2024-02-29 18:18   ` Kamil Konieczny
  1 sibling, 0 replies; 13+ messages in thread
From: Kamil Konieczny @ 2024-02-29 18:18 UTC (permalink / raw)
  To: igt-dev; +Cc: Katarzyna Piecielska, Mauro Carvalho Chehab

Hi Katarzyna,
On 2024-02-29 at 11:19:05 +0000, Katarzyna Piecielska wrote:
> Unify documentation for Intel i915 tests that we have by  moving
> common parts to be available for all tests.
> 
> This is part 1 to make review easier.

Please look into git report, first patch do not apply.

Regards,
Kamil

> 
> Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska@intel.com>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  tests/core_hotunplug.c       |  57 +++++--------
>  tests/device_reset.c         |  17 ++--
>  tests/dmabuf.c               |  13 ++-
>  tests/drm_mm.c               |  84 +------------------
>  tests/intel/api_intel_bb.c   | 152 ++---------------------------------
>  tests/intel/debugfs_test.c   |  32 +++-----
>  tests/intel/gem_basic.c      |  22 ++---
>  tests/intel/gem_blits.c      |   2 +-
>  tests/intel/gem_ccs.c        |   9 +--
>  tests/intel/gem_close_race.c |  39 +++------
>  tests/intel/gem_create.c     |  87 ++++++--------------
>  11 files changed, 94 insertions(+), 420 deletions(-)
> 
> diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
> index be80d479f..f578afa4a 100644
> --- a/tests/core_hotunplug.c
> +++ b/tests/core_hotunplug.c
> @@ -44,64 +44,43 @@
>   * Description: Examine behavior of a driver on device hot unplug
>   * Feature: SMI, core
>   * Test category: functionality test
> - *
> - * SUBTEST: hotrebind
>   * Category: Software building block
>   * Sub-category: driver
>   * Functionality: device hotplug
> - * Description:
> - *   Check if the driver can be cleanly rebound to a device with a still open hot unbound driver
> - *   instance
>   * Run type: FULL
>   *
> + * SUBTEST: hotrebind
> + * Description: Check if the driver can be cleanly rebound to a device with a
> + *		still open hot unbound driver instance
> + *
>   * SUBTEST: hotrebind-lateclose
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a hot unbound driver instance still open after hot rebind can be cleanly released
> - * Run type: FULL
> + * Description: Check if a hot unbound driver instance still open after hot
> + *		rebind can be cleanly released
>   *
>   * SUBTEST: hotreplug
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a hot unplugged and still open device can be cleanly restored
> - * Run type: FULL
> + * Description: Check if a hot unplugged and still open device can be cleanly
> + *		restored
>   *
>   * SUBTEST: hotreplug-lateclose
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if an instance of a still open while hot replugged device can be cleanly released
> - * Run type: FULL
> + * Description: Check if an instance of a still open while hot replugged device
> + *		can be cleanly released
>   *
>   * SUBTEST: hotunbind-rebind
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if the driver can be cleanly unbound from an open device, then released and rebound
> - * Run type: FULL
> + * Description: Check if the driver can be cleanly unbound from an open device,
> + *		then released and rebound
>   *
>   * SUBTEST: hotunplug-rescan
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if an open device can be cleanly unplugged, then released and restored
> - * Run type: FULL
> + * Description: Check if an open device can be cleanly unplugged, then released
> + *		and restored
>   *
>   * SUBTEST: unbind-rebind
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if the driver can be cleanly unbound from a device believed to be closed, then rebound
> + * Description: Check if the driver can be cleanly unbound from a device
> + *		believed to be closed, then rebound
>   * Run type: BAT
>   *
>   * SUBTEST: unplug-rescan
> - * Category: Software building block
> - * Sub-category: driver
> - * Functionality: device hotplug
> - * Description: Check if a device believed to be closed can be cleanly unplugged, then restored
> - * Run type: FULL
> + * Description: Check if a device believed to be closed can be cleanly
> + *		unplugged, then restored
>   */
>  
>  IGT_TEST_DESCRIPTION("Examine behavior of a driver on device hot unplug");
> diff --git a/tests/device_reset.c b/tests/device_reset.c
> index ef08164aa..e1e3ac78d 100644
> --- a/tests/device_reset.c
> +++ b/tests/device_reset.c
> @@ -17,29 +17,26 @@
>  /**
>   * TEST: device reset
>   * Description: Examine behavior of a driver on device sysfs reset
> + * Category: Server
> + * Feature: reset
> + * Functionality: reset
> + * Sub-category: Reset
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: cold-reset-bound
>   * Description: Cold Resets device with bound driver
> - * Feature: reset
>   *
>   * SUBTEST: reset-bound
>   * Description: Resets device with bound driver
> - * Feature: reset
>   *
>   * SUBTEST: unbind-cold-reset-rebind
>   * Description: Unbinds driver from device, initiates cold reset then rebinds driver to device
> - * Feature: reset
>   *
>   * SUBTEST: unbind-reset-rebind
> - * Category: Server
> - * Description:
> - *   Unbinds driver from device, initiates reset then rebinds driver to device
> - *   validating device resets
> + * Description: Unbinds driver from device, initiates reset then rebinds driver
> + *		to device validating device resets
>   * Feature: reset, sriov-reset
> - * Functionality: reset
> - * Sub-category: sysman
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Examine behavior of a driver on device sysfs reset");
> diff --git a/tests/dmabuf.c b/tests/dmabuf.c
> index 2ac105423..977b04043 100644
> --- a/tests/dmabuf.c
> +++ b/tests/dmabuf.c
> @@ -27,21 +27,18 @@
>   * TEST: dmabuf
>   * Description: Kernel selftests for the dmabuf API
>   * Feature: mapping, prime
> + * Category: Infrastructure
> + * Description: drm_mm range manager SW validation
> + * Functionality: DRM
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
>   * Run type: BAT
>   *
>   * SUBTEST: all-tests
>   *
>   * SUBTEST: all-tests@dma_fence
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: all-tests@sanitycheck
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Kernel selftests for the dmabuf API");
> diff --git a/tests/drm_mm.c b/tests/drm_mm.c
> index e6ba22474..f2e6c6cd1 100644
> --- a/tests/drm_mm.c
> +++ b/tests/drm_mm.c
> @@ -27,129 +27,53 @@
>   * TEST: drm mm
>   * Description: Basic sanity check of DRM's range manager (struct drm_mm)
>   * Feature: mapping
> + * Category: Infrastructure
> + * Functionality: DRM memory mangemnt
> + * Sub-category: Memory management
> + * Test category: GEM_Legacy
>   * Run type: FULL
>   *
>   * SUBTEST: drm_mm
>   *
>   * SUBTEST: drm_mm@align
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@align32
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@align64
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@bottomup
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color_evict
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@color_evict_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@debug
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@evict
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@evict_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@frag
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@highest
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@init
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@insert
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@insert_range
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@lowest
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@replace
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@reserve
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@sanitycheck
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: drm_mm@topdown
> - * Category: Infrastructure
> - * Description: drm_mm range manager SW validation
> - * Functionality: DRM memory mangemnt
> - * Test category: GEM_Legacy
>   */
>  
>  IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)");
> diff --git a/tests/intel/api_intel_bb.c b/tests/intel/api_intel_bb.c
> index 59ed244f0..24f96fcf5 100644
> --- a/tests/intel/api_intel_bb.c
> +++ b/tests/intel/api_intel_bb.c
> @@ -43,210 +43,72 @@
>  #include "intel_blt.h"
>  /**
>   * TEST: api intel bb
> - * Description: intel_bb API check.
> - * Run type: FULL
> - *
> - * SUBTEST: add-remove-objects
>   * Category: Infrastructure
>   * Description: checking dummy buffer creation & submission
>   * Feature: igt_core
>   * Functionality: dummy buffer creation & submission
>   * Sub-category: IGT Lib
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: add-remove-objects
>   *
>   * SUBTEST: bb-with-allocator
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-noreloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-noreloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-reloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: blit-reloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: crc32
>   * Description: Compare cpu and gpu crc32 sums on input object
> - * Feature: igt_core
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: delta-check
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: destroy-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: full-batch
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: intel-bb-blit-none
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: intel-bb-blit-x
> - * Feature: igt_core
>   *
>   * SUBTEST: intel-bb-blit-y
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: lot-of-buffers
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: misplaced-blitter
> - * Category: Infrastructure
> - * Description:
> - *   Execute intel_bb with set of engines provided by userspace
> - *   checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
> + * Description: Execute intel_bb with set of engines provided by userspace
> + *		checking dummy buffer creation & submission
>   *
>   * SUBTEST: object-noreloc-keep-cache-simple
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-noreloc-purge-cache-simple
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-reloc-keep-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: object-reloc-purge-cache
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: offset-control
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: purge-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: render
> - * Feature: igt_core
>   *
>   * SUBTEST: render-ccs
> - * Feature: igt_core
>   *
>   * SUBTEST: reset-bb
> - * Category: Infrastructure
> - * Description:
> - *   Ensure reset is possible on fresh bb
> - *   checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
> + * Description: Ensure reset is possible on fresh bb checking dummy buffer
> + *		creation & submission
>   *
>   * SUBTEST: reset-flags
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: simple-bb
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: simple-bb-ctx
> - * Category: Infrastructure
> - * Description: checking dummy buffer creation & submission
> - * Feature: igt_core
> - * Functionality: dummy buffer creation & submission
> - * Sub-category: IGT Lib
> - * Test category: GEM_Legacy
>   */
>  
>  #define PAGE_SIZE 4096
> diff --git a/tests/intel/debugfs_test.c b/tests/intel/debugfs_test.c
> index b67bfabac..9706b81e1 100644
> --- a/tests/intel/debugfs_test.c
> +++ b/tests/intel/debugfs_test.c
> @@ -33,43 +33,29 @@
>   * TEST: debugfs test
>   * Description: Read entries from debugfs, hwmon and sysfs paths.
>   * Feature: core
> + * Category: Infrastructure
> + * Functionality: debugfs
> + * Sub-category: uapi
> + * Test category: uapi
> + * Run type: FULL
>   *
>   * SUBTEST: basic-hwmon
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from hwmon path
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> + * Description: Read all entries from hwmon path validating debugfs entries
>   * Run type: BAT
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: read_all_entries
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from debugfs path.
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> + * Description: Read all entries from debugfs path validating debugfs entries
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: read_all_entries_display_off
>   * Description: Read all debugfs entries with display on/off.
> - * Run type: FULL
>   *
>   * SUBTEST: read_all_entries_display_on
>   * Description: Read all debugfs entries with display on/off.
> - * Run type: FULL
>   *
>   * SUBTEST: sysfs
> - * Category: Infrastructure
> - * Description:
> - *   Read all entries from sysfs path.
> - *   validating debugfs entries
> - * Functionality: debugfs entries
> - * Run type: FULL
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Read all entries from sysfs path validating debugfs entries
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Read entries from debugfs, hwmon and sysfs paths.");
> diff --git a/tests/intel/gem_basic.c b/tests/intel/gem_basic.c
> index 3485f92c8..513113cd1 100644
> --- a/tests/intel/gem_basic.c
> +++ b/tests/intel/gem_basic.c
> @@ -44,33 +44,21 @@
>  /**
>   * TEST: gem basic
>   * Description: Tests basic gem_create and gem_close IOCTLs
> - *
> - * SUBTEST: bad-close
>   * Category: Infrastructure
> - * Description: Verify that gem_close fails with bad params.
>   * Feature: gem_core
>   * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> + * Sub-category: uapi
>   * Test category: GEM_Legacy
> + * Run type: BAT
> + *
> + * SUBTEST: bad-close
> + * Description: Verify that gem_close fails with bad params.
>   *
>   * SUBTEST: create-close
> - * Category: Infrastructure
>   * Description: Verify basic functionality of gem_create and gem_close.
> - * Feature: gem_core
> - * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-fd-close
> - * Category: Infrastructure
>   * Description: Verify that closing drm driver is possible with opened gem object.
> - * Feature: gem_core
> - * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: multigpu-create-close
>   * Description: Verify basic functionality of gem_create and gem_close on multi-GPU.
> diff --git a/tests/intel/gem_blits.c b/tests/intel/gem_blits.c
> index e567cdf33..b9d0b5f87 100644
> --- a/tests/intel/gem_blits.c
> +++ b/tests/intel/gem_blits.c
> @@ -34,7 +34,7 @@
>   * Feature: blitter
>   * Functionality: command streamer
>   * Run type: FULL
> - * Sub-category: HW
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
>   *
>   * SUBTEST: basic
> diff --git a/tests/intel/gem_ccs.c b/tests/intel/gem_ccs.c
> index e8f16d7d8..3442ecfd3 100644
> --- a/tests/intel/gem_ccs.c
> +++ b/tests/intel/gem_ccs.c
> @@ -19,11 +19,11 @@
>  /**
>   * TEST: gem ccs
>   * Description: Exercise gen12 blitter with and without flatccs compression
> + * Feature: flat_ccs_mapping
>   * Run type: FULL
>   *
>   * SUBTEST: block-copy-compressed
>   * Description: Check block-copy flatccs compressed blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: block-copy-uncompressed
>   * Description: Check block-copy uncompressed blit
> @@ -31,19 +31,16 @@
>   *
>   * SUBTEST: block-multicopy-compressed
>   * Description: Check block-multicopy flatccs compressed blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: block-multicopy-inplace
>   * Description: Check block-multicopy flatccs inplace decompression blit
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: ctrl-surf-copy
>   * Description: Check flatccs data can be copied from/to surface
> - * Feature: flat_ccs_mapping
>   *
>   * SUBTEST: ctrl-surf-copy-new-ctx
> - * Description: Check flatccs data are physically tagged and visible in different contexts
> - * Feature: flat_ccs_mapping
> + * Description: Check flatccs data are physically tagged and visible i
> + *		different contexts
>   *
>   * SUBTEST: suspend-resume
>   * Description: Check flatccs data persists after suspend / resume (S0)
> diff --git a/tests/intel/gem_close_race.c b/tests/intel/gem_close_race.c
> index cef0ff025..9c2034ad3 100644
> --- a/tests/intel/gem_close_race.c
> +++ b/tests/intel/gem_close_race.c
> @@ -51,57 +51,42 @@
>  /**
>   * TEST: gem close race
>   * Description: Test try to race gem_close against workload submission.
> - *
> - * SUBTEST: basic-process
>   * Category: Infrastructure
> - * Description: Basic workload submission.
>   * Feature: synchronization
>   * Functionality: driver handler
> - * Run type: BAT
> - * Sub-category: i915
> + * Sub-category: CMD submission
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: basic-process
> + * Description: Basic workload submission.
> + * Run type: BAT
>   *
>   * SUBTEST: basic-threads
> - * Category: Infrastructure
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race gem_close against
> - *   continuous workload with minimum timeout.
> - * Feature: synchronization
> - * Functionality: driver handler
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race gem_close against continuous workload with minimum timeout.
>   * Run type: BAT
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: contexts
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race gem_close against
> - *   continuous workload in other contexts.
> - * Feature: synchronization
> - * Run type: FULL
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race gem_close against continuous workload in other contexts.
>   *
>   * SUBTEST: gem-close-race
> - * Description:
> - *   Share buffer handle across different drm fd's and trying to race of gem_close against
> - *   continuous workload.
> - * Feature: synchronization
> - * Run type: FULL
> + * Description: Share buffer handle across different drm fd's and trying to
> + *		race of gem_close against continuous workload.
>   *
>   * SUBTEST: multigpu-basic-process
>   * Description: Basic workload submission on multi-GPU machine.
>   * Feature: multigpu, synchronization
> - * Run type: FULL
>   * Test category: MultiGPU
>   *
>   * SUBTEST: multigpu-basic-threads
>   * Description: Run basic-threads race on multi-GPU machine.
>   * Feature: multigpu, synchronization
> - * Run type: FULL
>   * Test category: MultiGPU
>   *
>   * SUBTEST: process-exit
>   * Description: Test try to race gem_close against submission of continuous workload.
> - * Feature: synchronization
> - * Run type: FULL
>   */
>  
>  #define OBJECT_SIZE (256 * 1024)
> diff --git a/tests/intel/gem_create.c b/tests/intel/gem_create.c
> index 87fde2963..77ffceda4 100644
> --- a/tests/intel/gem_create.c
> +++ b/tests/intel/gem_create.c
> @@ -64,101 +64,60 @@
>  #include "i915_drm.h"
>  /**
>   * TEST: gem create
> - * Description:
> - *   Ensure that basic gem_create and gem_create_ext works and that invalid input combinations
> - *   are rejected.
> - * Run type: FULL
> - *
> - * SUBTEST: busy-create
> + * Description: Ensure that basic gem_create and gem_create_ext works and that
> + *		invalid input combinations are rejected.
>   * Category: Infrastructure
> - * Description: Create buffer objects while GPU is busy.
>   * Feature: mapping
>   * Functionality: buffer management
> - * Sub-category: i915
> + * Sub-category: uapi
>   * Test category: GEM_Legacy
> + * Run type: FULL
> + *
> + * SUBTEST: busy-create
> + * Description: Create buffer objects while GPU is busy.
>   *
>   * SUBTEST: create-clear
> - * Category: Infrastructure
>   * Description: Verify that all new objects are clear.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-ext-cpu-access-big
> - * Description:
> - *   Verify the extreme cases with very large objects and.
> - *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
> - * Feature: mapping
> + * Description: Verify the extreme cases with very large objects and
> + *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
>   *
>   * SUBTEST: create-ext-cpu-access-sanity-check
> - * Description:
> - *   Verify the basic functionally and expected ABI contract around.
> - *   I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
> - * Feature: mapping
> + * Description: Verify the basic functionally and expected ABI contract around
> + *		I915_GEM_CREATE_EXT_FLAG_NEEDS_CPU_ACCESS
>   *
>   * SUBTEST: create-ext-placement-all
>   * Category: Infrastructure
>   * Description: Create objects in every memory region using create_ext.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-ext-placement-each
> - * Category: Infrastructure
> - * Description: Create one object with memory pieces in each memory region using create_ext.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Create one object with memory pieces in each memory region
> + *		using create_ext.
>   *
>   * SUBTEST: create-ext-placement-sanity-check
> - * Category: Infrastructure
>   * Description: Exercise create_ext placements extension.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
>   *
>   * SUBTEST: create-invalid-size
> - * Category: Infrastructure
> - * Description: Try to create a gem object of invalid size 0 and check if ioctl returns error.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create a gem object of invalid size 0 and check if
> + *		ioctl returns error.
>   *
>   * SUBTEST: create-massive
> - * Category: Infrastructure
> - * Description: Exercise creation of buffer object with impossible size and check for the expected error.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Exercise creation of buffer object with impossible size and
> + *		check for the expected error.
>   *
>   * SUBTEST: create-size-update
> - * Category: Infrastructure
> - * Description: Try to create a gem object with size 15 and check actual created size.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create a gem object with size 15 and check actual
> + *		created size.
>   *
>   * SUBTEST: create-valid-nonaligned
> - * Category: Infrastructure
> - * Description:
> - *   Try to create an object with non-aligned size, check we got one with size aligned up to page
> - *   size and test we can write into the padded extra memory.
> - * Feature: mapping
> - * Functionality: buffer management
> - * Sub-category: i915
> - * Test category: GEM_Legacy
> + * Description: Try to create an object with non-aligned size, check we got one
> + *		with size aligned up to page size and test we can write into
> + *		the padded extra memory.
>   *
>   * SUBTEST: hog-create
>   * Description: Create buffer objects while GPU is busy.
> - * Feature: mapping
> - * Test category: GEM_Legacy
> + *
>   */
>  
>  IGT_TEST_DESCRIPTION("Ensure that basic gem_create and gem_create_ext works"
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-02-29 18:19 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-29 11:19 [PATCH i-g-t 0/5] IGT documentation refactoring Katarzyna Piecielska
2024-02-29 11:19 ` [PATCH i-g-t 1/5] Documentation refactoring part 1 Katarzyna Piecielska
2024-02-29 15:25   ` Kamil Konieczny
2024-02-29 18:18   ` Kamil Konieczny
2024-02-29 11:19 ` [PATCH i-g-t 2/5] Documentation refactoring part 2 Katarzyna Piecielska
2024-02-29 15:35   ` Kamil Konieczny
2024-02-29 11:19 ` [PATCH i-g-t 3/5] Documentation refactoring part 3 Katarzyna Piecielska
2024-02-29 15:57   ` Kamil Konieczny
2024-02-29 11:19 ` [PATCH i-g-t 4/5] Documentation refactoring part 4 Katarzyna Piecielska
2024-02-29 16:05   ` Kamil Konieczny
2024-02-29 11:19 ` [PATCH i-g-t 5/5] Documentation refactoring part 5 Katarzyna Piecielska
2024-02-29 17:07   ` Kamil Konieczny
2024-02-29 16:34 ` ✗ Fi.CI.BUILD: failure for IGT documentation refactoring Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.