Re: [PATCH i-g-t 7/7] tests/intel/xe_exec_threads: Extend multi queue testing

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

On Fri, Dec 19, 2025 at 05:31:54PM +0530, priyanka.dandamudi@intel.com wrote:
>From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
>
>Extend multi queue testing to different scenarios.
>
>Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>

Same here. Remove.

>Signed-off-by: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
>---
> tests/intel/xe_exec_threads.c | 163 +++++++++++++++++++++++++++++++++-
> 1 file changed, 160 insertions(+), 3 deletions(-)
>
>diff --git a/tests/intel/xe_exec_threads.c b/tests/intel/xe_exec_threads.c
>index 4bf1cd1b1..0545c7ab6 100644
>--- a/tests/intel/xe_exec_threads.c
>+++ b/tests/intel/xe_exec_threads.c
>@@ -312,9 +312,21 @@ test_compute_mode(int fd, uint32_t vm, uint64_t addr, uint64_t userptr,
> 	igt_assert(exec_sync != MAP_FAILED);
> 	memset(exec_sync, 0, sync_size);
>
>-	for (i = 0; i < n_exec_queues; i++)
>-		exec_queues[i] = xe_exec_queue_create(fd, vm, eci, 0);
>+	for (i = 0; i < n_exec_queues; i++) {
>+		if (flags & MULTI_QUEUE) {
>+			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(&multi_queue);
>
>+			multi_queue.value = i ? exec_queues[0] : DRM_XE_MULTI_GROUP_CREATE;
>+			exec_queues[i] = xe_exec_queue_create(fd, vm, eci, ext);
>+		} else {
>+			exec_queues[i] = xe_exec_queue_create(fd, vm, eci, 0);
>+		}
>+	}
> 	pthread_barrier_wait(&barrier);
>
> 	sync[0].addr = to_user_pointer(&data[0].vm_sync);
>@@ -994,8 +1006,95 @@ static void *thread(void *data)
>  *	balancer mixed fd userptr invalidate
>  * @bal-mixed-fd-userptr-invalidate-race:
>  *	balancer mixed fd userptr invalidate race
>+ */
>+/**
>+ * SUBTEST: threads-%s
>+ * Mega feature: MultiQ
>+ * Sub-category: MultiQ tests

Same comments as in patch#1 applies here also
regarding SUBTEST name and MultiQ naming.

>+ * Description: Run threads %arg[1] test with multi threads
>+ * arg[1]:
>+ * @multi-queue-basic:
>+ *	multi-queue basic
>+ * @multi-queue-userptr:
>+ *	multi-queue userptr
>+ * @multi-queue-rebind:
>+ *	multi-queue rebind
>+ * @multi-queue-userptr-rebind:
>+ *	multi-queue userptr rebind
>+ * @multi-queue-userptr-invalidate:
>+ *	multi-queue userptr invalidate
>+ * @multi-queue-userptr-invalidate-race:
>+ *	multi-queue userptr invalidate race
>  * @multi-queue-shared-vm-basic:
>- *	multi-queue shared vm basic test
>+ *	multi-queue shared vm basic

Ah I see, the rest of tests are added in this patch.
It is bit confusing though as compute mode variant
support is added in this patch along with other
legacy mode test extensions.

It is probably better to move the above changes in
test_compute_mode also to previous patch with a
compute mode test variant added? Or simply merge
both patches together. It will also remove the
above multi-queue-shared-vm-basic description
change here which is unnecessary.

Also, I don't see cm* test variants being added.
Why not?

Niranjana

>+ * @multi-queue-shared-vm-userptr:
>+ *	multi-queue shared vm userptr
>+ * @multi-queue-shared-vm-rebind:
>+ *	multi-queue shared vm rebind
>+ * @multi-queue-shared-vm-userptr-rebind:
>+ *	multi-queue shared vm userptr rebind
>+ * @multi-queue-rebind-err:
>+ *	multi-queue rebind err
>+ * @multi-queue-userptr-rebind-err:
>+ *	multi-queue userptr rebind err
>+ * @multi-queue-shared-vm-userptr-invalidate:
>+ *	multi-queue shared vm userptr invalidate
>+ * @multi-queue-shared-vm-userptr-invalidate-race:
>+ *	multi-queue shared vm userptr invalidate race
>+ * @multi-queue-fd-basic:
>+ *	multi-queue fd basic
>+ * @multi-queue-fd-userptr:
>+ *	multi-queue fd userptr
>+ * @multi-queue-fd-rebind:
>+ *	multi-queue fd rebind
>+ * @multi-queue-fd-userptr-rebind:
>+ *	multi-queue fd userptr rebind
>+ * @multi-queue-fd-userptr-invalidate:
>+ *	multi-queue fd userptr invalidate
>+ * @multi-queue-fd-userptr-invalidate-race:
>+ *	multi-queue fd userptr invalidate race
>+ * @multi-queue-hang-basic:
>+ *     multi-queue hang basic
>+ * @multi-queue-hang-fd-userptr-invalidate-race:
>+ *	multi-queue hang fd userptr invalidate race
>+ * @multi-queue-cm-fd-userptr-invalidate-race:
>+ *	multi-queue compute mode fd userptr invalidate race
>+ * @multi-queue-mixed-basic:
>+ *	multi-queue mixed basic
>+ * @multi-queue-mixed-userptr:
>+ *	multi-queue-mixed userptr
>+ * @multi-queue-mixed-rebind:
>+ *	multi-queue-mixed rebind
>+ * @multi-queue-mixed-userptr-rebind:
>+ *	multi-queue-mixed userptr rebind
>+ * @multi-queue-mixed-userptr-invalidate:
>+ *	multi-queue-mixed userptr invalidate
>+ * @multi-queue-mixed-userptr-invalidate-race:
>+ *	multi-queue-mixed userptr invalidate race
>+ * @multi-queue-mixed-shared-vm-basic:
>+ *	multi-queue mixed shared vm basic
>+ * @multi-queue-mixed-shared-vm-userptr:
>+ *	multi-queue-mixed shared vm userptr
>+ * @multi-queue-mixed-shared-vm-rebind:
>+ *	multi-queue-mixed shared vm rebind
>+ * @multi-queue-mixed-shared-vm-userptr-rebind:
>+ *	multi-queue-mixed shared vm userptr rebind
>+ * @multi-queue-mixed-shared-vm-userptr-invalidate:
>+ *	multi-queue-mixed shared vm userptr invalidate
>+ * @multi-queue-mixed-shared-vm-userptr-invalidate-race:
>+ *	multi-queue-mixed shared vm userptr invalidate race
>+ * @multi-queue-mixed-fd-basic:
>+ *	multi-queue mixed fd basic
>+ * @multi-queue-mixed-fd-userptr:
>+ *	multi-queue-mixed fd userptr
>+ * @multi-queue-mixed-fd-rebind:
>+ *	multi-queue-mixed fd rebind
>+ * @multi-queue-mixed-fd-userptr-rebind:
>+ *	multi-queue-mixed fd userptr rebind
>+ * @multi-queue-mixed-fd-userptr-invalidate:
>+ *	multi-queue-mixed fd userptr invalidate
>+ * @multi-queue-mixed-fd-userptr-invalidate-race:
>+ *	multi-queue-mixed fd userptr invalidate race
>  */
>
> static void threads(int fd, int flags)
>@@ -1299,7 +1398,65 @@ int igt_main()
> 			FD | USERPTR | INVALIDATE },
> 		{ "bal-mixed-fd-userptr-invalidate-race", BALANCER |
> 			MIXED_MODE | FD | USERPTR | INVALIDATE | RACE },
>+		{ "multi-queue-basic", MULTI_QUEUE | 0 },
>+		{ "multi-queue-userptr", MULTI_QUEUE | USERPTR },
>+		{ "multi-queue-rebind", MULTI_QUEUE | REBIND },
>+		{ "multi-queue-userptr-rebind", MULTI_QUEUE | USERPTR | REBIND },
>+		{ "multi-queue-userptr-invalidate", MULTI_QUEUE | USERPTR | INVALIDATE },
>+		{ "multi-queue-userptr-invalidate-race", MULTI_QUEUE | USERPTR | INVALIDATE |
>+			RACE },
> 		{ "multi-queue-shared-vm-basic", MULTI_QUEUE | SHARED_VM },
>+		{ "multi-queue-shared-vm-userptr", MULTI_QUEUE | SHARED_VM | USERPTR },
>+		{ "multi-queue-shared-vm-rebind", MULTI_QUEUE | SHARED_VM | REBIND },
>+		{ "multi-queue-shared-vm-userptr-rebind", MULTI_QUEUE | SHARED_VM | USERPTR |
>+			REBIND },
>+		{ "multi-queue-rebind-err", MULTI_QUEUE | REBIND | REBIND_ERROR },
>+		{ "multi-queue-userptr-rebind-err", MULTI_QUEUE | USERPTR | REBIND |
>+			REBIND_ERROR },
>+		{ "multi-queue-shared-vm-userptr-invalidate", MULTI_QUEUE | SHARED_VM |
>+			USERPTR | INVALIDATE },
>+		{ "multi-queue-shared-vm-userptr-invalidate-race", MULTI_QUEUE | SHARED_VM |
>+			USERPTR | INVALIDATE | RACE },
>+		{ "multi-queue-fd-basic", MULTI_QUEUE | FD },
>+		{ "multi-queue-fd-userptr", MULTI_QUEUE | FD | USERPTR },
>+		{ "multi-queue-fd-rebind", MULTI_QUEUE | FD | REBIND },
>+		{ "multi-queue-fd-userptr-rebind", MULTI_QUEUE | FD | USERPTR | REBIND },
>+		{ "multi-queue-fd-userptr-invalidate", MULTI_QUEUE | FD | USERPTR |
>+			INVALIDATE },
>+		{ "multi-queue-fd-userptr-invalidate-race", MULTI_QUEUE | FD | USERPTR |
>+			INVALIDATE | RACE },
>+		{ "multi-queue-hang-basic", MULTI_QUEUE | HANG },
>+		{ "multi-queue-hang-fd-userptr-invalidate-race", MULTI_QUEUE | HANG | FD | USERPTR |
>+			INVALIDATE | RACE },
>+		{ "multi-queue-cm-fd-userptr-invalidate-race", MULTI_QUEUE | COMPUTE_MODE | FD |
>+			USERPTR | INVALIDATE | RACE },
>+		{ "multi-queue-mixed-basic", MULTI_QUEUE | MIXED_MODE },
>+		{ "multi-queue-mixed-userptr", MULTI_QUEUE | MIXED_MODE | USERPTR },
>+		{ "multi-queue-mixed-rebind", MULTI_QUEUE | MIXED_MODE | REBIND },
>+		{ "multi-queue-mixed-userptr-rebind", MULTI_QUEUE | MIXED_MODE | USERPTR | REBIND },
>+		{ "multi-queue-mixed-userptr-invalidate", MULTI_QUEUE | MIXED_MODE | USERPTR |
>+			INVALIDATE },
>+		{ "multi-queue-mixed-userptr-invalidate-race", MULTI_QUEUE | MIXED_MODE | USERPTR |
>+			INVALIDATE | RACE },
>+		{ "multi-queue-mixed-shared-vm-basic", MULTI_QUEUE | MIXED_MODE | SHARED_VM },
>+		{ "multi-queue-mixed-shared-vm-userptr", MULTI_QUEUE | MIXED_MODE | SHARED_VM |
>+			USERPTR },
>+		{ "multi-queue-mixed-shared-vm-rebind", MULTI_QUEUE | MIXED_MODE | SHARED_VM | REBIND },
>+		{ "multi-queue-mixed-shared-vm-userptr-rebind", MULTI_QUEUE | MIXED_MODE | SHARED_VM |
>+			USERPTR | REBIND },
>+		{ "multi-queue-mixed-shared-vm-userptr-invalidate", MULTI_QUEUE | MIXED_MODE |
>+			SHARED_VM | USERPTR | INVALIDATE },
>+		{ "multi-queue-mixed-shared-vm-userptr-invalidate-race", MULTI_QUEUE | MIXED_MODE |
>+			SHARED_VM | USERPTR | INVALIDATE | RACE },
>+		{ "multi-queue-mixed-fd-basic", MULTI_QUEUE | MIXED_MODE | FD },
>+		{ "multi-queue-mixed-fd-userptr", MULTI_QUEUE | MIXED_MODE | FD | USERPTR },
>+		{ "multi-queue-mixed-fd-rebind", MULTI_QUEUE | MIXED_MODE | FD | REBIND },
>+		{ "multi-queue-mixed-fd-userptr-rebind", MULTI_QUEUE | MIXED_MODE | FD | USERPTR |
>+			REBIND },
>+		{ "multi-queue-mixed-fd-userptr-invalidate", MULTI_QUEUE | MIXED_MODE | FD |
>+			USERPTR | INVALIDATE },
>+		{ "multi-queue-mixed-fd-userptr-invalidate-race", MULTI_QUEUE | MIXED_MODE | FD |
>+			USERPTR | INVALIDATE | RACE },
> 		{ NULL },
> 	};
> 	int fd;
>-- 
>2.43.0
>