[PATCH i-g-t 0/4] eudebug: drop support for exec queue placements

[PATCH i-g-t 0/4] eudebug: drop support for exec queue placements

[Mika Kuoppala]

Exec queue placements are not utilized so drop them as unused.

Further, adapt to the exec queue property numbering changed
due to eudebug-dev being out-of-tree and rebased on top of
PXP property.

Mika Kuoppala (4):
  Revert "tests/xe_eudebug: Validate exec queue placements"
  Revert "lib/xe_eudebug: Add support for exec queue placements events"
  Revert "drm-uapi-experimental/xe_drm_eudebug: Sync after exec_queue
    placement event addition"
  lib/eudebug: Adjust to upstream uapi rebase

 .../drm-uapi-experimental/xe_drm_eudebug.h    |  33 ++---
 lib/xe/xe_eudebug.c                           |  89 +-----------
 tests/intel/xe_eudebug.c                      | 129 +-----------------
 3 files changed, 15 insertions(+), 236 deletions(-)

-- 
2.43.0

[PATCH i-g-t 1/4] Revert "tests/xe_eudebug: Validate exec queue placements"

[Mika Kuoppala]

Exec queue placements support was dropped as unused.

This reverts commit 05659c7f2840938c4977668143e6c60a46ca509d.

Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 tests/intel/xe_eudebug.c | 129 ++-------------------------------------
 1 file changed, 4 insertions(+), 125 deletions(-)

diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
index da53aa881..76870805c 100644
--- a/tests/intel/xe_eudebug.c
+++ b/tests/intel/xe_eudebug.c
@@ -20,7 +20,6 @@
 #include <sys/prctl.h>
 
 #include "igt.h"
-#include "igt_sysfs.h"
 #include "intel_pat.h"
 #include "lib/igt_syncobj.h"
 #include "xe/xe_eudebug.h"
@@ -62,10 +61,9 @@ static void test_sysfs_toggle(int fd)
 #define VM_METADATA			(1 << 5)
 #define VM_BIND_METADATA		(1 << 6)
 #define VM_BIND_OP_MAP_USERPTR		(1 << 7)
-#define EXEC_QUEUES_PLACEMENTS		(1 << 8)
-#define VM_BIND_DELAY_UFENCE_ACK	(1 << 9)
-#define VM_BIND_UFENCE_RECONNECT	(1 << 10)
-#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 11)
+#define VM_BIND_DELAY_UFENCE_ACK	(1 << 8)
+#define VM_BIND_UFENCE_RECONNECT	(1 << 9)
+#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 10)
 #define TEST_DISCOVERY			(1 << 31)
 
 #define PAGE_SIZE SZ_4K
@@ -426,80 +424,6 @@ static void vm_bind_client(int fd, struct xe_eudebug_client *c)
 	xe_eudebug_client_vm_destroy(c, fd, vm);
 }
 
-static void placements_client(int fd, struct xe_eudebug_client *c)
-{
-	struct drm_xe_ext_set_property eq_ext = {
-		.base.name = DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY,
-		.property = DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG,
-		.value = DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE,
-	};
-	struct drm_xe_exec_queue_create create = {
-		.extensions = to_user_pointer(&eq_ext),
-	};
-	struct drm_xe_engine_class_instance *eci;
-	bool at_least_4_ccs = false;
-	uint32_t vm;
-	int i, gt;
-
-	xe_for_each_gt(fd, gt) {
-		int count = 0;
-
-		xe_for_each_engine(fd, eci)
-			if (eci->engine_class == DRM_XE_ENGINE_CLASS_COMPUTE &&
-			    eci->gt_id == gt)
-				count++;
-
-		if (count < 4)
-			continue;
-
-		at_least_4_ccs = true;
-
-		vm = xe_eudebug_client_vm_create(c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
-
-		eci = calloc(count * count - 2, sizeof(*eci));
-
-		for (i = 0; i < count * count - 2; i++) {
-			eci[i].engine_class = DRM_XE_ENGINE_CLASS_COMPUTE;
-			eci[i].gt_id = gt;
-		}
-
-		for (i = 0; i < count; i++)
-			eci[i].engine_instance = i;
-
-		create.instances = to_user_pointer(eci);
-		create.vm_id = vm;
-		create.width = 1;
-		create.num_placements = count;
-		xe_eudebug_client_exec_queue_create(c, fd, &create);
-		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
-
-		create.width = count;
-		create.num_placements = 1;
-		xe_eudebug_client_exec_queue_create(c, fd, &create);
-		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
-
-		/* every other instance (logical_mask ~ 1010, 0101) */
-		create.width = 2;
-		create.num_placements = count/2;
-		xe_eudebug_client_exec_queue_create(c, fd, &create);
-		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
-
-		/* logically contigous placement (logical_mask ~ 1100, 0110, 0011) */
-		for (i = 0; i < count * count - 2; i++)
-			eci[i].engine_instance = i / 2 + i % 2;
-
-		create.width = 2;
-		create.num_placements = count - 1;
-		xe_eudebug_client_exec_queue_create(c, fd, &create);
-		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
-
-		xe_eudebug_client_vm_destroy(c, fd, vm);
-		free(eci);
-	}
-
-	igt_require(at_least_4_ccs);
-}
-
 static void run_basic_client(struct xe_eudebug_client *c)
 {
 	int fd, i;
@@ -550,9 +474,6 @@ static void run_basic_client(struct xe_eudebug_client *c)
 		xe_eudebug_client_vm_destroy(c, fd, vm);
 	}
 
-	if (c->flags & EXEC_QUEUES_PLACEMENTS)
-		placements_client(fd, c);
-
 	if (c->flags & VM_BIND || c->flags & VM_BIND_METADATA)
 		basic_vm_bind_client(fd, c);
 
@@ -991,11 +912,6 @@ static void test_read_event(int fd)
  *	Attach the debugger to a process that performs bind, bind array, rebind,
  *	partial unbind, unbind and unbind all operations.
  *
- * SUBTEST: exec-queue-placements
- * Description:
- *	Create compute exec_queues with various placements and compare them against
- *	event sent to the debugger.
- *
  * SUBTEST: multigpu-basic-client
  * Description:
  *	Attach the debugger to process which opens and closes xe drm client on all Xe devices.
@@ -2794,40 +2710,14 @@ static void test_basic_exec_queues_enable(int fd)
 	xe_vm_destroy(fd, vm_non_lr);
 }
 
-static void ccs_mode_all_engines(int num_gt)
-{
-	int fd, gt, gt_fd, num_slices, ccs_mode;
-	int num_gts_with_ccs_mode = 0;
-
-	for (gt = 0; gt < num_gt; gt++) {
-		fd = drm_open_driver(DRIVER_XE);
-		gt_fd = xe_sysfs_gt_open(fd, gt);
-		close(fd);
-
-		if (igt_sysfs_scanf(gt_fd, "num_cslices", "%u", &num_slices) <= 0)
-			continue;
-
-		num_gts_with_ccs_mode++;
-
-		igt_assert(igt_sysfs_printf(gt_fd, "ccs_mode", "%u", num_slices) > 0);
-		igt_assert(igt_sysfs_scanf(gt_fd, "ccs_mode", "%u", &ccs_mode) > 0);
-		igt_assert(num_slices == ccs_mode);
-		close(gt_fd);
-	}
-
-	errno = 0;
-	igt_require(num_gts_with_ccs_mode > 0);
-}
-
 igt_main
 {
 	bool was_enabled;
 	bool *multigpu_was_enabled;
-	int fd, gpu_count, gt_count;
+	int fd, gpu_count;
 
 	igt_fixture {
 		fd = drm_open_driver(DRIVER_XE);
-		gt_count = xe_number_gt(fd);
 		was_enabled = xe_eudebug_enable(fd, true);
 	}
 
@@ -2936,17 +2826,6 @@ igt_main
 	igt_subtest("discovery-empty-clients")
 		test_empty_discovery(fd, DISCOVERY_DESTROY_RESOURCES, 16);
 
-	igt_subtest_group {
-		igt_fixture {
-			drm_close_driver(fd);
-			ccs_mode_all_engines(gt_count);
-			fd = drm_open_driver(DRIVER_XE);
-		}
-
-		igt_subtest("exec-queue-placements")
-			test_basic_sessions(fd, EXEC_QUEUES_PLACEMENTS, 1, true);
-	}
-
 	igt_fixture {
 		xe_eudebug_enable(fd, was_enabled);
 		drm_close_driver(fd);
-- 
2.43.0

[PATCH i-g-t 2/4] Revert "lib/xe_eudebug: Add support for exec queue placements events"

[Mika Kuoppala]

Exec queue placements support was dropped as unused.

This reverts commit 8c550873064f46ccc17661572f1aeec70a533213.

Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 lib/xe/xe_eudebug.c | 89 ++-------------------------------------------
 1 file changed, 3 insertions(+), 86 deletions(-)

diff --git a/lib/xe/xe_eudebug.c b/lib/xe/xe_eudebug.c
index 19bec2d25..1205d945b 100644
--- a/lib/xe/xe_eudebug.c
+++ b/lib/xe/xe_eudebug.c
@@ -78,8 +78,6 @@ static const char *type_to_str(unsigned int type)
 		return "vm";
 	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE:
 		return "exec_queue";
-	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS:
-		return "exec_queue_placements";
 	case DRM_XE_EUDEBUG_EVENT_EU_ATTENTION:
 		return "attention";
 	case DRM_XE_EUDEBUG_EVENT_VM_BIND:
@@ -150,27 +148,6 @@ static const char *event_members_to_str(struct drm_xe_eudebug_event *e, char *bu
 			ee->exec_queue_handle, ee->engine_class, ee->width);
 		break;
 	}
-	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
-		struct drm_xe_eudebug_event_exec_queue_placements *ee = igt_container_of(e, ee,
-											 base);
-		struct drm_xe_engine_class_instance *instances = (void *)(ee->instances);
-		int i, l;
-
-		l = sprintf(buf, "client_handle=%llu, vm_handle=%llu, "
-			    "exec_queue_handle=%llu, lrc_handle=%llu, "
-			    "num_placements=%d, gt_id=%d, mask=[",
-			    ee->client_handle, ee->vm_handle,
-			    ee->exec_queue_handle, ee->lrc_handle,
-			    ee->num_placements, instances[0].gt_id);
-
-		for (i = 0; i < ee->num_placements; i++)
-			l += sprintf(buf + l, "%s%d pad%d, ",
-				     xe_engine_class_short_string(instances[i].engine_class),
-				     instances[i].engine_instance, instances[i].pad);
-		buf[l - 2] = ']';
-
-		break;
-	}
 	case DRM_XE_EUDEBUG_EVENT_EU_ATTENTION: {
 		struct drm_xe_eudebug_event_eu_attention *ea = igt_container_of(e, ea, base);
 
@@ -458,19 +435,6 @@ static int match_fields(struct drm_xe_eudebug_event *a, void *data)
 			ret = 1;
 		break;
 	}
-	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
-		struct drm_xe_eudebug_event_exec_queue_placements *ae = igt_container_of(a, ae,
-											 base);
-		struct drm_xe_eudebug_event_exec_queue_placements *be = igt_container_of(b, be,
-											 base);
-
-		if (ae->num_placements == be->num_placements &&
-		    memcmp(ae->instances, be->instances,
-			   sizeof(uint64_t) * ae->num_placements) == 0)
-			ret = 1;
-
-		break;
-	}
 	case DRM_XE_EUDEBUG_EVENT_VM_BIND: {
 		struct drm_xe_eudebug_event_vm_bind *ea = igt_container_of(a, ea, base);
 		struct drm_xe_eudebug_event_vm_bind *eb = igt_container_of(b, eb, base);
@@ -538,14 +502,6 @@ static int match_client_handle(struct drm_xe_eudebug_event *e, void *data)
 			return 1;
 		break;
 	}
-	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
-		struct drm_xe_eudebug_event_exec_queue_placements *ee = igt_container_of(e, ee,
-											 base);
-
-		if (ee->client_handle == h)
-			return 1;
-		break;
-	}
 	case DRM_XE_EUDEBUG_EVENT_VM_BIND: {
 		struct drm_xe_eudebug_event_vm_bind *evmb = igt_container_of(e, evmb, base);
 
@@ -1044,11 +1000,10 @@ xe_eudebug_event_log_match_opposite(struct xe_eudebug_event_log *l, uint32_t fil
 			if (XE_EUDEBUG_EVENT_IS_FILTERED(ev1->type, filter))
 				continue;
 
-			/* No opposite matching for some events */
+			/* No opposite matching for binds */
 			if ((ev1->type >= DRM_XE_EUDEBUG_EVENT_VM_BIND &&
 			     ev1->type <= DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE) ||
-			    ev1->type == DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA ||
-			    ev1->type == DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS)
+			    ev1->type == DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA)
 				continue;
 
 			ev2 = opposite_event_match(l, ev1, ev1);
@@ -1739,36 +1694,6 @@ static void exec_queue_event(struct xe_eudebug_client *c, uint32_t flags,
 	xe_eudebug_event_log_write(c->log, (void *)&ee);
 }
 
-static void exec_queue_placements_event(struct xe_eudebug_client *c,
-					int client_fd, uint32_t vm_id,
-					uint32_t exec_queue_handle,
-					uint16_t width, uint16_t lrc_no,
-					uint16_t num_placements,
-					struct drm_xe_engine_class_instance *eci)
-{
-	struct drm_xe_eudebug_event_exec_queue_placements *ee;
-	struct drm_xe_engine_class_instance *instances;
-	size_t sz = sizeof(*ee) + num_placements * sizeof(uint64_t);
-
-	ee = calloc(1, sz);
-	igt_assert(ee);
-
-	base_event(c, to_base(*ee), DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS,
-		   DRM_XE_EUDEBUG_EVENT_CREATE, sz);
-
-	ee->client_handle = client_fd;
-	ee->vm_handle = vm_id;
-	ee->exec_queue_handle = exec_queue_handle;
-	ee->num_placements = num_placements;
-
-	instances = (struct drm_xe_engine_class_instance *)(ee->instances);
-	for (int j = 0; j < num_placements; j++)
-		instances[j] = eci[j * width + lrc_no];
-
-	xe_eudebug_event_log_write(c->log, (void *)ee);
-	free(ee);
-}
-
 static void metadata_event(struct xe_eudebug_client *c, uint32_t flags,
 			   int client_fd, uint32_t id, uint64_t type, uint64_t len)
 {
@@ -1963,18 +1888,10 @@ uint32_t xe_eudebug_client_exec_queue_create(struct xe_eudebug_client *c, int fd
 		    ext->value & DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE)
 			send = true;
 
-	if (send) {
+	if (send)
 		exec_queue_event(c, DRM_XE_EUDEBUG_EVENT_CREATE, fd, create->vm_id,
 				 create->exec_queue_id, class, create->width);
 
-		for (int i = 0; i < create->width; i++) {
-			exec_queue_placements_event(c, fd, create->vm_id, create->exec_queue_id,
-						    create->width, i,
-						    create->num_placements,
-						    instances);
-		}
-	}
-
 	return create->exec_queue_id;
 }
 
-- 
2.43.0

[PATCH i-g-t 3/4] Revert "drm-uapi-experimental/xe_drm_eudebug: Sync after exec_queue placement event addition"

[Mika Kuoppala]

Exec queue placements support was dropped as unused.

This reverts commit 722494e73a3117c0de1708a2ff2a326446b043b6.

Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 .../drm-uapi-experimental/xe_drm_eudebug.h    | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/include/drm-uapi-experimental/xe_drm_eudebug.h b/include/drm-uapi-experimental/xe_drm_eudebug.h
index ed2e728c2..714bb93c7 100644
--- a/include/drm-uapi-experimental/xe_drm_eudebug.h
+++ b/include/drm-uapi-experimental/xe_drm_eudebug.h
@@ -147,14 +147,13 @@ struct drm_xe_eudebug_event {
 #define DRM_XE_EUDEBUG_EVENT_OPEN		2
 #define DRM_XE_EUDEBUG_EVENT_VM			3
 #define DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE		4
-#define DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS 5
-#define DRM_XE_EUDEBUG_EVENT_EU_ATTENTION	6
-#define DRM_XE_EUDEBUG_EVENT_VM_BIND		7
-#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP		8
-#define DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE	9
-#define DRM_XE_EUDEBUG_EVENT_METADATA		10
-#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA 11
-#define DRM_XE_EUDEBUG_EVENT_PAGEFAULT		12
+#define DRM_XE_EUDEBUG_EVENT_EU_ATTENTION	5
+#define DRM_XE_EUDEBUG_EVENT_VM_BIND		6
+#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP		7
+#define DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE	8
+#define DRM_XE_EUDEBUG_EVENT_METADATA		9
+#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA 10
+#define DRM_XE_EUDEBUG_EVENT_PAGEFAULT		11
 
 	__u16 flags;
 #define DRM_XE_EUDEBUG_EVENT_CREATE		(1 << 0)
@@ -190,22 +189,6 @@ struct drm_xe_eudebug_event_exec_queue {
 	__u64 lrc_handle[];
 };
 
-struct drm_xe_eudebug_event_exec_queue_placements {
-	struct drm_xe_eudebug_event base;
-
-	__u64 client_handle;
-	__u64 vm_handle;
-	__u64 exec_queue_handle;
-	__u64 lrc_handle;
-	__u32 num_placements;
-	__u32 pad;
-	/**
-	 * @instances: user pointer to num_placements sized array of struct
-	 * drm_xe_engine_class_instance
-	 */
-	__u64 instances[];
-};
-
 struct drm_xe_eudebug_event_eu_attention {
 	struct drm_xe_eudebug_event base;
 
-- 
2.43.0

[PATCH i-g-t 4/4] lib/eudebug: Adjust to upstream uapi rebase

[Mika Kuoppala]

As eudebug-dev is not merged, it consumes the upstream changes
as a base. Exec queues got new property of PXP which causes
PROPERTY_EUDEBUG to jump from 2 to 3.

Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 include/drm-uapi-experimental/xe_drm_eudebug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm-uapi-experimental/xe_drm_eudebug.h b/include/drm-uapi-experimental/xe_drm_eudebug.h
index 714bb93c7..f66de2ff5 100644
--- a/include/drm-uapi-experimental/xe_drm_eudebug.h
+++ b/include/drm-uapi-experimental/xe_drm_eudebug.h
@@ -54,7 +54,7 @@ struct drm_xe_vm_bind_op_ext_attach_debug {
 
 /* ... */
 
-#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG		2
+#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG		3
 #define     DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE		(1 << 0)
 
 /* ... */
-- 
2.43.0

Re: [PATCH i-g-t 1/4] Revert "tests/xe_eudebug: Validate exec queue placements"

[Manszewski, Christoph]

Hi Mika,

On 7.02.2025 12:49, Mika Kuoppala wrote:
> Exec queue placements support was dropped as unused.
> 
> This reverts commit 05659c7f2840938c4977668143e6c60a46ca509d.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Reviewed-by: Christoph Manszewski <christoph.manszewski@intel.com>

Thanks,
Christoph
> ---
>   tests/intel/xe_eudebug.c | 129 ++-------------------------------------
>   1 file changed, 4 insertions(+), 125 deletions(-)
> 
> diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
> index da53aa881..76870805c 100644
> --- a/tests/intel/xe_eudebug.c
> +++ b/tests/intel/xe_eudebug.c
> @@ -20,7 +20,6 @@
>   #include <sys/prctl.h>
>   
>   #include "igt.h"
> -#include "igt_sysfs.h"
>   #include "intel_pat.h"
>   #include "lib/igt_syncobj.h"
>   #include "xe/xe_eudebug.h"
> @@ -62,10 +61,9 @@ static void test_sysfs_toggle(int fd)
>   #define VM_METADATA			(1 << 5)
>   #define VM_BIND_METADATA		(1 << 6)
>   #define VM_BIND_OP_MAP_USERPTR		(1 << 7)
> -#define EXEC_QUEUES_PLACEMENTS		(1 << 8)
> -#define VM_BIND_DELAY_UFENCE_ACK	(1 << 9)
> -#define VM_BIND_UFENCE_RECONNECT	(1 << 10)
> -#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 11)
> +#define VM_BIND_DELAY_UFENCE_ACK	(1 << 8)
> +#define VM_BIND_UFENCE_RECONNECT	(1 << 9)
> +#define VM_BIND_UFENCE_SIGINT_CLIENT	(1 << 10)
>   #define TEST_DISCOVERY			(1 << 31)
>   
>   #define PAGE_SIZE SZ_4K
> @@ -426,80 +424,6 @@ static void vm_bind_client(int fd, struct xe_eudebug_client *c)
>   	xe_eudebug_client_vm_destroy(c, fd, vm);
>   }
>   
> -static void placements_client(int fd, struct xe_eudebug_client *c)
> -{
> -	struct drm_xe_ext_set_property eq_ext = {
> -		.base.name = DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY,
> -		.property = DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG,
> -		.value = DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE,
> -	};
> -	struct drm_xe_exec_queue_create create = {
> -		.extensions = to_user_pointer(&eq_ext),
> -	};
> -	struct drm_xe_engine_class_instance *eci;
> -	bool at_least_4_ccs = false;
> -	uint32_t vm;
> -	int i, gt;
> -
> -	xe_for_each_gt(fd, gt) {
> -		int count = 0;
> -
> -		xe_for_each_engine(fd, eci)
> -			if (eci->engine_class == DRM_XE_ENGINE_CLASS_COMPUTE &&
> -			    eci->gt_id == gt)
> -				count++;
> -
> -		if (count < 4)
> -			continue;
> -
> -		at_least_4_ccs = true;
> -
> -		vm = xe_eudebug_client_vm_create(c, fd, DRM_XE_VM_CREATE_FLAG_LR_MODE, 0);
> -
> -		eci = calloc(count * count - 2, sizeof(*eci));
> -
> -		for (i = 0; i < count * count - 2; i++) {
> -			eci[i].engine_class = DRM_XE_ENGINE_CLASS_COMPUTE;
> -			eci[i].gt_id = gt;
> -		}
> -
> -		for (i = 0; i < count; i++)
> -			eci[i].engine_instance = i;
> -
> -		create.instances = to_user_pointer(eci);
> -		create.vm_id = vm;
> -		create.width = 1;
> -		create.num_placements = count;
> -		xe_eudebug_client_exec_queue_create(c, fd, &create);
> -		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
> -
> -		create.width = count;
> -		create.num_placements = 1;
> -		xe_eudebug_client_exec_queue_create(c, fd, &create);
> -		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
> -
> -		/* every other instance (logical_mask ~ 1010, 0101) */
> -		create.width = 2;
> -		create.num_placements = count/2;
> -		xe_eudebug_client_exec_queue_create(c, fd, &create);
> -		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
> -
> -		/* logically contigous placement (logical_mask ~ 1100, 0110, 0011) */
> -		for (i = 0; i < count * count - 2; i++)
> -			eci[i].engine_instance = i / 2 + i % 2;
> -
> -		create.width = 2;
> -		create.num_placements = count - 1;
> -		xe_eudebug_client_exec_queue_create(c, fd, &create);
> -		xe_eudebug_client_exec_queue_destroy(c, fd, &create);
> -
> -		xe_eudebug_client_vm_destroy(c, fd, vm);
> -		free(eci);
> -	}
> -
> -	igt_require(at_least_4_ccs);
> -}
> -
>   static void run_basic_client(struct xe_eudebug_client *c)
>   {
>   	int fd, i;
> @@ -550,9 +474,6 @@ static void run_basic_client(struct xe_eudebug_client *c)
>   		xe_eudebug_client_vm_destroy(c, fd, vm);
>   	}
>   
> -	if (c->flags & EXEC_QUEUES_PLACEMENTS)
> -		placements_client(fd, c);
> -
>   	if (c->flags & VM_BIND || c->flags & VM_BIND_METADATA)
>   		basic_vm_bind_client(fd, c);
>   
> @@ -991,11 +912,6 @@ static void test_read_event(int fd)
>    *	Attach the debugger to a process that performs bind, bind array, rebind,
>    *	partial unbind, unbind and unbind all operations.
>    *
> - * SUBTEST: exec-queue-placements
> - * Description:
> - *	Create compute exec_queues with various placements and compare them against
> - *	event sent to the debugger.
> - *
>    * SUBTEST: multigpu-basic-client
>    * Description:
>    *	Attach the debugger to process which opens and closes xe drm client on all Xe devices.
> @@ -2794,40 +2710,14 @@ static void test_basic_exec_queues_enable(int fd)
>   	xe_vm_destroy(fd, vm_non_lr);
>   }
>   
> -static void ccs_mode_all_engines(int num_gt)
> -{
> -	int fd, gt, gt_fd, num_slices, ccs_mode;
> -	int num_gts_with_ccs_mode = 0;
> -
> -	for (gt = 0; gt < num_gt; gt++) {
> -		fd = drm_open_driver(DRIVER_XE);
> -		gt_fd = xe_sysfs_gt_open(fd, gt);
> -		close(fd);
> -
> -		if (igt_sysfs_scanf(gt_fd, "num_cslices", "%u", &num_slices) <= 0)
> -			continue;
> -
> -		num_gts_with_ccs_mode++;
> -
> -		igt_assert(igt_sysfs_printf(gt_fd, "ccs_mode", "%u", num_slices) > 0);
> -		igt_assert(igt_sysfs_scanf(gt_fd, "ccs_mode", "%u", &ccs_mode) > 0);
> -		igt_assert(num_slices == ccs_mode);
> -		close(gt_fd);
> -	}
> -
> -	errno = 0;
> -	igt_require(num_gts_with_ccs_mode > 0);
> -}
> -
>   igt_main
>   {
>   	bool was_enabled;
>   	bool *multigpu_was_enabled;
> -	int fd, gpu_count, gt_count;
> +	int fd, gpu_count;
>   
>   	igt_fixture {
>   		fd = drm_open_driver(DRIVER_XE);
> -		gt_count = xe_number_gt(fd);
>   		was_enabled = xe_eudebug_enable(fd, true);
>   	}
>   
> @@ -2936,17 +2826,6 @@ igt_main
>   	igt_subtest("discovery-empty-clients")
>   		test_empty_discovery(fd, DISCOVERY_DESTROY_RESOURCES, 16);
>   
> -	igt_subtest_group {
> -		igt_fixture {
> -			drm_close_driver(fd);
> -			ccs_mode_all_engines(gt_count);
> -			fd = drm_open_driver(DRIVER_XE);
> -		}
> -
> -		igt_subtest("exec-queue-placements")
> -			test_basic_sessions(fd, EXEC_QUEUES_PLACEMENTS, 1, true);
> -	}
> -
>   	igt_fixture {
>   		xe_eudebug_enable(fd, was_enabled);
>   		drm_close_driver(fd);

Re: [PATCH i-g-t 2/4] Revert "lib/xe_eudebug: Add support for exec queue placements events"

[Manszewski, Christoph]

Hi Mika,

On 7.02.2025 12:49, Mika Kuoppala wrote:
> Exec queue placements support was dropped as unused.
> 
> This reverts commit 8c550873064f46ccc17661572f1aeec70a533213.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Reviewed-by: Christoph Manszewski <christoph.manszewski@intel.com>

Thanks,
Christoph

> ---
>   lib/xe/xe_eudebug.c | 89 ++-------------------------------------------
>   1 file changed, 3 insertions(+), 86 deletions(-)
> 
> diff --git a/lib/xe/xe_eudebug.c b/lib/xe/xe_eudebug.c
> index 19bec2d25..1205d945b 100644
> --- a/lib/xe/xe_eudebug.c
> +++ b/lib/xe/xe_eudebug.c
> @@ -78,8 +78,6 @@ static const char *type_to_str(unsigned int type)
>   		return "vm";
>   	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE:
>   		return "exec_queue";
> -	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS:
> -		return "exec_queue_placements";
>   	case DRM_XE_EUDEBUG_EVENT_EU_ATTENTION:
>   		return "attention";
>   	case DRM_XE_EUDEBUG_EVENT_VM_BIND:
> @@ -150,27 +148,6 @@ static const char *event_members_to_str(struct drm_xe_eudebug_event *e, char *bu
>   			ee->exec_queue_handle, ee->engine_class, ee->width);
>   		break;
>   	}
> -	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
> -		struct drm_xe_eudebug_event_exec_queue_placements *ee = igt_container_of(e, ee,
> -											 base);
> -		struct drm_xe_engine_class_instance *instances = (void *)(ee->instances);
> -		int i, l;
> -
> -		l = sprintf(buf, "client_handle=%llu, vm_handle=%llu, "
> -			    "exec_queue_handle=%llu, lrc_handle=%llu, "
> -			    "num_placements=%d, gt_id=%d, mask=[",
> -			    ee->client_handle, ee->vm_handle,
> -			    ee->exec_queue_handle, ee->lrc_handle,
> -			    ee->num_placements, instances[0].gt_id);
> -
> -		for (i = 0; i < ee->num_placements; i++)
> -			l += sprintf(buf + l, "%s%d pad%d, ",
> -				     xe_engine_class_short_string(instances[i].engine_class),
> -				     instances[i].engine_instance, instances[i].pad);
> -		buf[l - 2] = ']';
> -
> -		break;
> -	}
>   	case DRM_XE_EUDEBUG_EVENT_EU_ATTENTION: {
>   		struct drm_xe_eudebug_event_eu_attention *ea = igt_container_of(e, ea, base);
>   
> @@ -458,19 +435,6 @@ static int match_fields(struct drm_xe_eudebug_event *a, void *data)
>   			ret = 1;
>   		break;
>   	}
> -	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
> -		struct drm_xe_eudebug_event_exec_queue_placements *ae = igt_container_of(a, ae,
> -											 base);
> -		struct drm_xe_eudebug_event_exec_queue_placements *be = igt_container_of(b, be,
> -											 base);
> -
> -		if (ae->num_placements == be->num_placements &&
> -		    memcmp(ae->instances, be->instances,
> -			   sizeof(uint64_t) * ae->num_placements) == 0)
> -			ret = 1;
> -
> -		break;
> -	}
>   	case DRM_XE_EUDEBUG_EVENT_VM_BIND: {
>   		struct drm_xe_eudebug_event_vm_bind *ea = igt_container_of(a, ea, base);
>   		struct drm_xe_eudebug_event_vm_bind *eb = igt_container_of(b, eb, base);
> @@ -538,14 +502,6 @@ static int match_client_handle(struct drm_xe_eudebug_event *e, void *data)
>   			return 1;
>   		break;
>   	}
> -	case DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS: {
> -		struct drm_xe_eudebug_event_exec_queue_placements *ee = igt_container_of(e, ee,
> -											 base);
> -
> -		if (ee->client_handle == h)
> -			return 1;
> -		break;
> -	}
>   	case DRM_XE_EUDEBUG_EVENT_VM_BIND: {
>   		struct drm_xe_eudebug_event_vm_bind *evmb = igt_container_of(e, evmb, base);
>   
> @@ -1044,11 +1000,10 @@ xe_eudebug_event_log_match_opposite(struct xe_eudebug_event_log *l, uint32_t fil
>   			if (XE_EUDEBUG_EVENT_IS_FILTERED(ev1->type, filter))
>   				continue;
>   
> -			/* No opposite matching for some events */
> +			/* No opposite matching for binds */
>   			if ((ev1->type >= DRM_XE_EUDEBUG_EVENT_VM_BIND &&
>   			     ev1->type <= DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE) ||
> -			    ev1->type == DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA ||
> -			    ev1->type == DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS)
> +			    ev1->type == DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA)
>   				continue;
>   
>   			ev2 = opposite_event_match(l, ev1, ev1);
> @@ -1739,36 +1694,6 @@ static void exec_queue_event(struct xe_eudebug_client *c, uint32_t flags,
>   	xe_eudebug_event_log_write(c->log, (void *)&ee);
>   }
>   
> -static void exec_queue_placements_event(struct xe_eudebug_client *c,
> -					int client_fd, uint32_t vm_id,
> -					uint32_t exec_queue_handle,
> -					uint16_t width, uint16_t lrc_no,
> -					uint16_t num_placements,
> -					struct drm_xe_engine_class_instance *eci)
> -{
> -	struct drm_xe_eudebug_event_exec_queue_placements *ee;
> -	struct drm_xe_engine_class_instance *instances;
> -	size_t sz = sizeof(*ee) + num_placements * sizeof(uint64_t);
> -
> -	ee = calloc(1, sz);
> -	igt_assert(ee);
> -
> -	base_event(c, to_base(*ee), DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS,
> -		   DRM_XE_EUDEBUG_EVENT_CREATE, sz);
> -
> -	ee->client_handle = client_fd;
> -	ee->vm_handle = vm_id;
> -	ee->exec_queue_handle = exec_queue_handle;
> -	ee->num_placements = num_placements;
> -
> -	instances = (struct drm_xe_engine_class_instance *)(ee->instances);
> -	for (int j = 0; j < num_placements; j++)
> -		instances[j] = eci[j * width + lrc_no];
> -
> -	xe_eudebug_event_log_write(c->log, (void *)ee);
> -	free(ee);
> -}
> -
>   static void metadata_event(struct xe_eudebug_client *c, uint32_t flags,
>   			   int client_fd, uint32_t id, uint64_t type, uint64_t len)
>   {
> @@ -1963,18 +1888,10 @@ uint32_t xe_eudebug_client_exec_queue_create(struct xe_eudebug_client *c, int fd
>   		    ext->value & DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE)
>   			send = true;
>   
> -	if (send) {
> +	if (send)
>   		exec_queue_event(c, DRM_XE_EUDEBUG_EVENT_CREATE, fd, create->vm_id,
>   				 create->exec_queue_id, class, create->width);
>   
> -		for (int i = 0; i < create->width; i++) {
> -			exec_queue_placements_event(c, fd, create->vm_id, create->exec_queue_id,
> -						    create->width, i,
> -						    create->num_placements,
> -						    instances);
> -		}
> -	}
> -
>   	return create->exec_queue_id;
>   }
>   

Re: [PATCH i-g-t 3/4] Revert "drm-uapi-experimental/xe_drm_eudebug: Sync after exec_queue placement event addition"

[Manszewski, Christoph]

Hi Mika,

On 7.02.2025 12:49, Mika Kuoppala wrote:
> Exec queue placements support was dropped as unused.
> 
> This reverts commit 722494e73a3117c0de1708a2ff2a326446b043b6.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Reviewed-by: Christoph Manszewski <christoph.manszewski@intel.com>

Thanks,
Christoph
> ---
>   .../drm-uapi-experimental/xe_drm_eudebug.h    | 31 +++++--------------
>   1 file changed, 7 insertions(+), 24 deletions(-)
> 
> diff --git a/include/drm-uapi-experimental/xe_drm_eudebug.h b/include/drm-uapi-experimental/xe_drm_eudebug.h
> index ed2e728c2..714bb93c7 100644
> --- a/include/drm-uapi-experimental/xe_drm_eudebug.h
> +++ b/include/drm-uapi-experimental/xe_drm_eudebug.h
> @@ -147,14 +147,13 @@ struct drm_xe_eudebug_event {
>   #define DRM_XE_EUDEBUG_EVENT_OPEN		2
>   #define DRM_XE_EUDEBUG_EVENT_VM			3
>   #define DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE		4
> -#define DRM_XE_EUDEBUG_EVENT_EXEC_QUEUE_PLACEMENTS 5
> -#define DRM_XE_EUDEBUG_EVENT_EU_ATTENTION	6
> -#define DRM_XE_EUDEBUG_EVENT_VM_BIND		7
> -#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP		8
> -#define DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE	9
> -#define DRM_XE_EUDEBUG_EVENT_METADATA		10
> -#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA 11
> -#define DRM_XE_EUDEBUG_EVENT_PAGEFAULT		12
> +#define DRM_XE_EUDEBUG_EVENT_EU_ATTENTION	5
> +#define DRM_XE_EUDEBUG_EVENT_VM_BIND		6
> +#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP		7
> +#define DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE	8
> +#define DRM_XE_EUDEBUG_EVENT_METADATA		9
> +#define DRM_XE_EUDEBUG_EVENT_VM_BIND_OP_METADATA 10
> +#define DRM_XE_EUDEBUG_EVENT_PAGEFAULT		11
>   
>   	__u16 flags;
>   #define DRM_XE_EUDEBUG_EVENT_CREATE		(1 << 0)
> @@ -190,22 +189,6 @@ struct drm_xe_eudebug_event_exec_queue {
>   	__u64 lrc_handle[];
>   };
>   
> -struct drm_xe_eudebug_event_exec_queue_placements {
> -	struct drm_xe_eudebug_event base;
> -
> -	__u64 client_handle;
> -	__u64 vm_handle;
> -	__u64 exec_queue_handle;
> -	__u64 lrc_handle;
> -	__u32 num_placements;
> -	__u32 pad;
> -	/**
> -	 * @instances: user pointer to num_placements sized array of struct
> -	 * drm_xe_engine_class_instance
> -	 */
> -	__u64 instances[];
> -};
> -
>   struct drm_xe_eudebug_event_eu_attention {
>   	struct drm_xe_eudebug_event base;
>   

Re: [PATCH i-g-t 4/4] lib/eudebug: Adjust to upstream uapi rebase

[Manszewski, Christoph]

Hi Mika,

On 7.02.2025 12:49, Mika Kuoppala wrote:
> As eudebug-dev is not merged, it consumes the upstream changes
> as a base. Exec queues got new property of PXP which causes
> PROPERTY_EUDEBUG to jump from 2 to 3.
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>

Reviewed-by: Christoph Manszewski <christoph.manszewski@intel.com>

Thanks,
Christoph

> ---
>   include/drm-uapi-experimental/xe_drm_eudebug.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/drm-uapi-experimental/xe_drm_eudebug.h b/include/drm-uapi-experimental/xe_drm_eudebug.h
> index 714bb93c7..f66de2ff5 100644
> --- a/include/drm-uapi-experimental/xe_drm_eudebug.h
> +++ b/include/drm-uapi-experimental/xe_drm_eudebug.h
> @@ -54,7 +54,7 @@ struct drm_xe_vm_bind_op_ext_attach_debug {
>   
>   /* ... */
>   
> -#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG		2
> +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_EUDEBUG		3
>   #define     DRM_XE_EXEC_QUEUE_EUDEBUG_FLAG_ENABLE		(1 << 0)
>   
>   /* ... */

✗ Fi.CI.BAT: failure for eudebug: drop support for exec queue placements

[Patchwork]

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

== Series Details ==

Series: eudebug: drop support for exec queue placements
URL   : https://patchwork.freedesktop.org/series/144501/
State : failure

== Summary ==

Series 144501 revision 1 was fully merged or fully failed: no git log



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