Re: [PATCH i-g-t 4/7] tests/intel/xe_evict: Enhance testing of multi queue functionality

[Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>]

On Fri, Dec 19, 2025 at 05:31:51PM +0530, priyanka.dandamudi@intel.com wrote:
>From: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
>
>Extend testing of multi queue functionality with flags
>like EXTERNAL_OBJ, THREADED, MIXED_THREADS and COMPUTE_THREAD.
>Rename multiq to multi queue across for better readability.
>
>Signed-off-by: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
>---
> tests/intel/xe_evict.c | 159 ++++++++++++++++++++++++++++++-----------
> 1 file changed, 119 insertions(+), 40 deletions(-)
>
>diff --git a/tests/intel/xe_evict.c b/tests/intel/xe_evict.c
>index 35192aad0..26b6091a9 100644
>--- a/tests/intel/xe_evict.c
>+++ b/tests/intel/xe_evict.c
>@@ -7,8 +7,7 @@
>  * TEST: Check VMA eviction
>  * Category: Core
>  * Mega feature: General Core features
>- * Sub-category: VMA
>- * Functionality: eviction
>+ * Sub-category: Memory management tests
>  * GPU requirements: GPU needs to have dedicated VRAM
>  */
>
>@@ -84,12 +83,12 @@ test_evict(int fd, struct drm_xe_engine_class_instance *eci,
> 			exec_queues[i] = xe_exec_queue_create(fd, i & 1 ? vm2 : vm ,
> 						      eci, 0);
> 		else if (flags & MULTI_QUEUE) {
>-			struct drm_xe_ext_set_property multiq = {
>+			struct drm_xe_ext_set_property multi_queue = {
> 				.base.next_extension = 0,
> 				.base.name = DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY,
> 				.property = DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_GROUP,
> 			};
>-			uint64_t ext = to_user_pointer(&multiq);
>+			uint64_t ext = to_user_pointer(&multi_queue);

Please don't make such name changes in a separate patch like this when it can be
done in the first patch that introduced this.

>
> 			if (flags & PRIORITY) {
> 				struct drm_xe_ext_set_property mq_priority = {
>@@ -97,10 +96,10 @@ test_evict(int fd, struct drm_xe_engine_class_instance *eci,
> 					.base.name = DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY,
> 					.property = DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_QUEUE_PRIORITY,
> 				};
>-				multiq.base.next_extension = to_user_pointer(&mq_priority);
>+				multi_queue.base.next_extension = to_user_pointer(&mq_priority);
> 				mq_priority.value = XE_EXEC_QUEUE_PRIORITY_NORMAL + (rand() % 2);
> 			}
>-			multiq.value = i ? exec_queues[0] : DRM_XE_MULTI_GROUP_CREATE;
>+			multi_queue.value = i ? exec_queues[0] : DRM_XE_MULTI_GROUP_CREATE;
> 			igt_assert_eq(__xe_exec_queue_create(fd, vm, 1, 1, eci,
> 							     ext, &exec_queues[i]), 0);
> 		} else
>@@ -553,14 +552,13 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
>
> /**
>  * SUBTEST: evict-%s
>+ * Functionality: eviction

I see many such changes in this patch that are not multi-queue specific.
They should not be here. If you really want these changes, put them in
a separate patch.

>  * Description:  %arg[1] evict test.
>  * Test category: functionality test
>  *
>  * arg[1]:
>  *
>  * @small:			small
>- * @small-multiqueue:		small multi queue
>- * @small-multiqueue-priority:	small multi queue priority
>  * @small-external:		small external
>  * @small-multi-vm:		small multi VM
>  * @beng-small:			small bind exec_queue
>@@ -569,6 +567,7 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
>  */
> /**
>  * SUBTEST: evict-%s
>+ * Functionality: eviction
>  * Description:  %arg[1] evict test.
>  * Test category: stress test
>  *
>@@ -584,15 +583,13 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: compute VM eviction
>  * Description:  %arg[1] evict test.
>- * Feature: compute machine
>  * Test category: functionality test
>  *
>  * arg[1]:
>  *
>  * @small-cm:			small compute machine
>- * @small-multiqueue-cm:	small multi queue compute machine
>- * @small-multiqueue-priority-cm:	small multi queue priority compute machine
>  * @small-external-cm:		small external compute machine
>  * @small-multi-vm-cm:		small multi VM compute machine
>  * @beng-small-cm:		small bind exec_queue compute machine
>@@ -601,8 +598,8 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
>  */
> /**
>  * SUBTEST: evict-%s
>+ * Functionality: compute VM eviction
>  * Description:  %arg[1] evict test.
>- * Feature: compute machine
>  * Test category: stress test
>  *
>  * arg[1]:
>@@ -617,27 +614,8 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: mixed threads eviction
>  * Description:  %arg[1] evict test.
>- * Feature: mixted threads
>- * Test category: functionality test
>- *
>- * arg[1]:
>- *
>- * @mixed-threads-small:	mixed threads small
>- * @mixed-many-threads-small:	mixed many threads small
>- * @mixed-threads-small-multi-vm:
>- * 				mixed threads small multi vm
>- * @beng-mixed-threads-small:	bind exec_queue mixed threads small
>- * @beng-mixed-many-threads-small:
>- *				bind exec_queue mixed many threads small
>- * @beng-mixed-threads-small-multi-vm:
>- *				bind exec_queue mixed threads small multi vm
>- */
>-/**
>- *
>- * SUBTEST: evict-%s
>- * Description:  %arg[1] evict test.
>- * Feature: mixted threads
>  * Test category: stress test
>  *
>  * arg[1]:
>@@ -655,8 +633,8 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: compute mode threads eviction
>  * Description:  %arg[1] evict test.
>- * Feature: compute mode threads
>  * Test category: functionality test
>  *
>  * arg[1]:
>@@ -669,8 +647,8 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: compute mode threads eviction
>  * Description:  %arg[1] evict test.
>- * Feature: compute mode threads
>  * Test category: stress test
>  *
>  * arg[1]:
>@@ -680,11 +658,31 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
>  * @beng-cm-threads-large-multi-vm:
>  *				bind exec_queue compute mode threads large multi vm
>  */
>+
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: mixted threads eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ *
>+ * @mixed-threads-small:       mixed threads small
>+ * @mixed-many-threads-small:  mixed many threads small
>+ * @mixed-threads-small-multi-vm:
>+ *                             mixed threads small multi vm
>+ * @beng-mixed-threads-small:  bind exec_queue mixed threads small
>+ * @beng-mixed-many-threads-small:
>+ *                             bind exec_queue mixed many threads small
>+ * @beng-mixed-threads-small-multi-vm:
>+ *                             bind exec_queue mixed threads small multi vm
>+*/
>+/**
>+ *
>+ * SUBTEST: evict-%s
>+ * Functionality: threads eviction
>  * Description:  %arg[1] evict test.
>- * Feature: threads
>  * Test category: functionality test
>  *
>  * arg[1]:
>@@ -699,8 +697,8 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
> /**
>  *
>  * SUBTEST: evict-%s
>+ * Functionality: threads eviction
>  * Description:  %arg[1] evict test.
>- * Feature: threads
>  * Test category: stress test
>  *
>  * arg[1]:
>@@ -712,6 +710,79 @@ static unsigned int working_set(uint64_t vram_size, uint64_t system_size,
>  * @beng-threads-large:		bind exec_queue threads large
>  *
>  */
>+/**
>+ *
>+ * SUBTEST: evict-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests
>+ * Functionality: threads eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ *
>+ * @threads-small-multi-queue:	threads small multi queue
>+ *
>+ */
>+/**
>+ *
>+ * SUBTEST: evict-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests
>+ * Functionality: compute mode threads eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ * @cm-threads-small-multi-queue:
>+ * 				compute mode threads small multi queue
>+ */
>+/**
>+ * SUBTEST: evict-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests
>+ * Functionality: eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ *
>+ * @small-multi-queue:		small multi queue
>+ * @small-multi-queue-priority:
>+ * 				small multi queue priority
>+ * @small-external-multi-queue: small external multi queue
>+ */
>+/**
>+ *
>+ * SUBTEST: evict-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests
>+ * Functionality: mixed threads eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ *
>+ * @mixed-threads-small-multi-queue:
>+ * 				mixed threads small multi queue
>+ */
>+/**
>+ *
>+ * SUBTEST: evict-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests
>+ * Functionality: compute VM eviction
>+ * Description:  %arg[1] evict test.
>+ * Test category: functionality test
>+ *
>+ * arg[1]:
>+ *
>+ * @small-multi-queue-cm:	small multi queue compute machine
>+ * @small-multi-queue-priority-cm:
>+ * 				small multi queue priority compute machine
>+ * @small-external-multi-queue-cm:
>+ * 				small external compute machine multi queue
>+ */

Can we have one header for all these tests like 'SUBTEST: evict-%s-multi-queue'?
Or something similar?

Niranjana

>
> /*
>  * Table driven test that attempts to cover all possible scenarios of eviction
>@@ -735,9 +806,10 @@ int igt_main()
> 		unsigned int flags;
> 	} sections[] = {
> 		{ "small", 16, 448, 1, 128, 0 },
>-		{ "small-multiqueue", 16, 448, 1, 128, MULTI_QUEUE },
>-		{ "small-multiqueue-priority", 16, 448, 1, 128, MULTI_QUEUE | PRIORITY},
>+		{ "small-multi-queue", 16, 448, 1, 128, MULTI_QUEUE },
>+		{ "small-multi-queue-priority", 16, 448, 1, 128, MULTI_QUEUE | PRIORITY },
> 		{ "small-external", 16, 448, 1, 128, EXTERNAL_OBJ },
>+		{ "small-external-multi-queue", 16, 448, 1, 128, EXTERNAL_OBJ | MULTI_QUEUE },
> 		{ "small-multi-vm", 16, 256, 1, 128, MULTI_VM },
> 		{ "large", 4, 16, 1, 4, 0 },
> 		{ "large-external", 4, 16, 1, 4, EXTERNAL_OBJ },
>@@ -762,9 +834,10 @@ int igt_main()
> 		unsigned int flags;
> 	} sections_cm[] = {
> 		{ "small-cm", 16, 448, 1, 128, 0 },
>-		{ "small-multiqueue-cm", 16, 448, 1, 128, MULTI_QUEUE },
>-		{ "small-multiqueue-priority-cm", 16, 448, 1, 128, MULTI_QUEUE | PRIORITY},
>+		{ "small-multi-queue-cm", 16, 448, 1, 128, MULTI_QUEUE },
>+		{ "small-multi-queue-priority-cm", 16, 448, 1, 128, MULTI_QUEUE | PRIORITY },
> 		{ "small-external-cm", 16, 448, 1, 128, EXTERNAL_OBJ },
>+		{ "small-external-multi-queue-cm", 16, 448, 1, 128, EXTERNAL_OBJ | MULTI_QUEUE },
> 		{ "small-multi-vm-cm", 16, 256, 1, 128, MULTI_VM },
> 		{ "large-cm", 4, 16, 1, 4, 0 },
> 		{ "large-external-cm", 4, 16, 1, 4, EXTERNAL_OBJ },
>@@ -792,10 +865,16 @@ int igt_main()
> 	} sections_threads[] = {
> 		{ "threads-small", 2, 16, 128, 1, 128,
> 			THREADED },
>+		{ "threads-small-multi-queue", 2, 16, 128, 1, 128,
>+			THREADED | MULTI_QUEUE },
> 		{ "cm-threads-small", 2, 16, 128, 1, 128,
> 			COMPUTE_THREAD | THREADED },
>+		{ "cm-threads-small-multi-queue", 2, 16, 128, 1, 128,
>+			COMPUTE_THREAD | THREADED | MULTI_QUEUE },
> 		{ "mixed-threads-small", 2, 16, 128, 1, 128,
> 			MIXED_THREADS | THREADED },
>+		{ "mixed-threads-small-multi-queue", 2, 16, 128, 1, 128,
>+			MIXED_THREADS | THREADED | MULTI_QUEUE },
> 		{ "mixed-many-threads-small", 3, 16, 128, 1, 128,
> 			THREADED },
> 		{ "threads-large", 2, 2, 16, 3, 32,
>-- 
>2.43.0
>