[Intel-gfx] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Intel-gfx] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

With the introduction of dynamic subtests we got one step closer towards
eliminating the duality of static and dynamic engine enumeration.

This patch makes one more step in that direction by removing the
dependency on the static list when generating probed engine names.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
 lib/igt_gt.h                   |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index 790d455ff2ad..eff231800b77 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
 	gem_context_set_param(fd, param);
 }
 
+static const char *class_names[] = {
+	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
+	[I915_ENGINE_CLASS_COPY]	  = "bcs",
+	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
+	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
+};
+
 static void init_engine(struct intel_execution_engine2 *e2,
 			int class, int instance, uint64_t flags)
 {
-	const struct intel_execution_engine2 *__e2;
-	static const char *unknown_name = "unknown",
-			  *virtual_name = "virtual";
+	int ret;
 
 	e2->class    = class;
 	e2->instance = instance;
-	e2->flags    = flags;
 
 	/* engine is a virtual engine */
 	if (class == I915_ENGINE_CLASS_INVALID &&
 	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
-		e2->name = virtual_name;
+		strcpy(e2->name, "virtual");
 		e2->is_virtual = true;
 		return;
+	} else {
+		e2->is_virtual = false;
 	}
 
-	__for_each_static_engine(__e2)
-		if (__e2->class == class && __e2->instance == instance)
-			break;
-
-	if (__e2->name) {
-		e2->name = __e2->name;
+	if (class < ARRAY_SIZE(class_names)) {
+		e2->flags = flags;
+		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
+			       class_names[class], instance);
 	} else {
 		igt_warn("found unknown engine (%d, %d)\n", class, instance);
-		e2->name = unknown_name;
 		e2->flags = -1;
+		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
+			       class, instance);
 	}
 
-	/* just to remark it */
-	e2->is_virtual = false;
+	igt_assert(ret < sizeof(e2->name));
 }
 
 static void query_engine_list(int fd, struct intel_engine_data *ed)
@@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
 			struct intel_execution_engine2 *__e2 =
 				&engine_data.engines[engine_data.nengines];
 
-			__e2->name       = e2->name;
+			strcpy(__e2->name, e2->name);
 			__e2->instance   = e2->instance;
 			__e2->class      = e2->class;
 			__e2->flags      = e2->flags;
@@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 		.class = -1,
 		.instance = -1,
 		.flags = -1,
-		.name = "invalid"
 	};
 
 	if (ring == I915_EXEC_DEFAULT) {
 		e2__.flags = I915_EXEC_DEFAULT;
-		e2__.name = "default";
+		strcpy(e2__.name, "default");
 	} else {
 		const struct intel_execution_engine2 *e2;
 
@@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 			if (e2->flags == ring)
 				return *e2;
 		}
+
+		strcpy(e2__.name, "invalid");
 	}
 
 	return e2__;
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 66088d39176a..6a8eceb68817 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
 bool gem_class_can_store_dword(int fd, int class);
 
 extern const struct intel_execution_engine2 {
-	const char *name;
+	char name[16];
 	int class;
 	int instance;
 	uint64_t flags;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[igt-dev] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

With the introduction of dynamic subtests we got one step closer towards
eliminating the duality of static and dynamic engine enumeration.

This patch makes one more step in that direction by removing the
dependency on the static list when generating probed engine names.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
 lib/igt_gt.h                   |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index 790d455ff2ad..eff231800b77 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
 	gem_context_set_param(fd, param);
 }
 
+static const char *class_names[] = {
+	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
+	[I915_ENGINE_CLASS_COPY]	  = "bcs",
+	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
+	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
+};
+
 static void init_engine(struct intel_execution_engine2 *e2,
 			int class, int instance, uint64_t flags)
 {
-	const struct intel_execution_engine2 *__e2;
-	static const char *unknown_name = "unknown",
-			  *virtual_name = "virtual";
+	int ret;
 
 	e2->class    = class;
 	e2->instance = instance;
-	e2->flags    = flags;
 
 	/* engine is a virtual engine */
 	if (class == I915_ENGINE_CLASS_INVALID &&
 	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
-		e2->name = virtual_name;
+		strcpy(e2->name, "virtual");
 		e2->is_virtual = true;
 		return;
+	} else {
+		e2->is_virtual = false;
 	}
 
-	__for_each_static_engine(__e2)
-		if (__e2->class == class && __e2->instance == instance)
-			break;
-
-	if (__e2->name) {
-		e2->name = __e2->name;
+	if (class < ARRAY_SIZE(class_names)) {
+		e2->flags = flags;
+		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
+			       class_names[class], instance);
 	} else {
 		igt_warn("found unknown engine (%d, %d)\n", class, instance);
-		e2->name = unknown_name;
 		e2->flags = -1;
+		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
+			       class, instance);
 	}
 
-	/* just to remark it */
-	e2->is_virtual = false;
+	igt_assert(ret < sizeof(e2->name));
 }
 
 static void query_engine_list(int fd, struct intel_engine_data *ed)
@@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
 			struct intel_execution_engine2 *__e2 =
 				&engine_data.engines[engine_data.nengines];
 
-			__e2->name       = e2->name;
+			strcpy(__e2->name, e2->name);
 			__e2->instance   = e2->instance;
 			__e2->class      = e2->class;
 			__e2->flags      = e2->flags;
@@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 		.class = -1,
 		.instance = -1,
 		.flags = -1,
-		.name = "invalid"
 	};
 
 	if (ring == I915_EXEC_DEFAULT) {
 		e2__.flags = I915_EXEC_DEFAULT;
-		e2__.name = "default";
+		strcpy(e2__.name, "default");
 	} else {
 		const struct intel_execution_engine2 *e2;
 
@@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 			if (e2->flags == ring)
 				return *e2;
 		}
+
+		strcpy(e2__.name, "invalid");
 	}
 
 	return e2__;
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 66088d39176a..6a8eceb68817 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
 bool gem_class_can_store_dword(int fd, int class);
 
 extern const struct intel_execution_engine2 {
-	const char *name;
+	char name[16];
 	int class;
 	int instance;
 	uint64_t flags;
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 10:10, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> With the introduction of dynamic subtests we got one step closer towards
> eliminating the duality of static and dynamic engine enumeration.
> 
> This patch makes one more step in that direction by removing the
> dependency on the static list when generating probed engine names.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Petri Latvala <petri.latvala@intel.com>
> ---
>   lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
>   lib/igt_gt.h                   |  2 +-
>   2 files changed, 23 insertions(+), 18 deletions(-)
> 
> diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> index 790d455ff2ad..eff231800b77 100644
> --- a/lib/i915/gem_engine_topology.c
> +++ b/lib/i915/gem_engine_topology.c
> @@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
>   	gem_context_set_param(fd, param);
>   }
>   
> +static const char *class_names[] = {
> +	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
> +	[I915_ENGINE_CLASS_COPY]	  = "bcs",
> +	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
> +	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
> +};
> +
>   static void init_engine(struct intel_execution_engine2 *e2,
>   			int class, int instance, uint64_t flags)
>   {
> -	const struct intel_execution_engine2 *__e2;
> -	static const char *unknown_name = "unknown",
> -			  *virtual_name = "virtual";
> +	int ret;
>   
>   	e2->class    = class;
>   	e2->instance = instance;
> -	e2->flags    = flags;
>   
>   	/* engine is a virtual engine */
>   	if (class == I915_ENGINE_CLASS_INVALID &&
>   	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> -		e2->name = virtual_name;
> +		strcpy(e2->name, "virtual");
>   		e2->is_virtual = true;
>   		return;
> +	} else {
> +		e2->is_virtual = false;
>   	}
>   
> -	__for_each_static_engine(__e2)
> -		if (__e2->class == class && __e2->instance == instance)
> -			break;
> -
> -	if (__e2->name) {
> -		e2->name = __e2->name;
> +	if (class < ARRAY_SIZE(class_names)) {
> +		e2->flags = flags;
> +		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
> +			       class_names[class], instance);
>   	} else {
>   		igt_warn("found unknown engine (%d, %d)\n", class, instance);
> -		e2->name = unknown_name;
>   		e2->flags = -1;
> +		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
> +			       class, instance);
>   	}
>   
> -	/* just to remark it */
> -	e2->is_virtual = false;
> +	igt_assert(ret < sizeof(e2->name));
>   }
>   
>   static void query_engine_list(int fd, struct intel_engine_data *ed)
> @@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
>   			struct intel_execution_engine2 *__e2 =
>   				&engine_data.engines[engine_data.nengines];
>   
> -			__e2->name       = e2->name;
> +			strcpy(__e2->name, e2->name);
>   			__e2->instance   = e2->instance;
>   			__e2->class      = e2->class;
>   			__e2->flags      = e2->flags;
> @@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
>   		.class = -1,
>   		.instance = -1,
>   		.flags = -1,
> -		.name = "invalid"
>   	};
>   
>   	if (ring == I915_EXEC_DEFAULT) {
>   		e2__.flags = I915_EXEC_DEFAULT;
> -		e2__.name = "default";
> +		strcpy(e2__.name, "default");
>   	} else {
>   		const struct intel_execution_engine2 *e2;
>   
> @@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
>   			if (e2->flags == ring)
>   				return *e2;
>   		}
> +
> +		strcpy(e2__.name, "invalid");
>   	}
>   
>   	return e2__;
> diff --git a/lib/igt_gt.h b/lib/igt_gt.h
> index 66088d39176a..6a8eceb68817 100644
> --- a/lib/igt_gt.h
> +++ b/lib/igt_gt.h
> @@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
>   bool gem_class_can_store_dword(int fd, int class);
>   
>   extern const struct intel_execution_engine2 {
> -	const char *name;
> +	char name[16];

I forgot that with this approach I'd need to apply default names 
somewhere during IGT framework startup. :I As I forgot Petri you already 
had a patch which solves the overall problem. Will re-read your 
solution. Where did it get stuck btw?

Regards,

Tvrtko

>   	int class;
>   	int instance;
>   	uint64_t flags;
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 10:10, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> With the introduction of dynamic subtests we got one step closer towards
> eliminating the duality of static and dynamic engine enumeration.
> 
> This patch makes one more step in that direction by removing the
> dependency on the static list when generating probed engine names.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Andi Shyti <andi.shyti@intel.com>
> Cc: Petri Latvala <petri.latvala@intel.com>
> ---
>   lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
>   lib/igt_gt.h                   |  2 +-
>   2 files changed, 23 insertions(+), 18 deletions(-)
> 
> diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> index 790d455ff2ad..eff231800b77 100644
> --- a/lib/i915/gem_engine_topology.c
> +++ b/lib/i915/gem_engine_topology.c
> @@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
>   	gem_context_set_param(fd, param);
>   }
>   
> +static const char *class_names[] = {
> +	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
> +	[I915_ENGINE_CLASS_COPY]	  = "bcs",
> +	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
> +	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
> +};
> +
>   static void init_engine(struct intel_execution_engine2 *e2,
>   			int class, int instance, uint64_t flags)
>   {
> -	const struct intel_execution_engine2 *__e2;
> -	static const char *unknown_name = "unknown",
> -			  *virtual_name = "virtual";
> +	int ret;
>   
>   	e2->class    = class;
>   	e2->instance = instance;
> -	e2->flags    = flags;
>   
>   	/* engine is a virtual engine */
>   	if (class == I915_ENGINE_CLASS_INVALID &&
>   	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> -		e2->name = virtual_name;
> +		strcpy(e2->name, "virtual");
>   		e2->is_virtual = true;
>   		return;
> +	} else {
> +		e2->is_virtual = false;
>   	}
>   
> -	__for_each_static_engine(__e2)
> -		if (__e2->class == class && __e2->instance == instance)
> -			break;
> -
> -	if (__e2->name) {
> -		e2->name = __e2->name;
> +	if (class < ARRAY_SIZE(class_names)) {
> +		e2->flags = flags;
> +		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
> +			       class_names[class], instance);
>   	} else {
>   		igt_warn("found unknown engine (%d, %d)\n", class, instance);
> -		e2->name = unknown_name;
>   		e2->flags = -1;
> +		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
> +			       class, instance);
>   	}
>   
> -	/* just to remark it */
> -	e2->is_virtual = false;
> +	igt_assert(ret < sizeof(e2->name));
>   }
>   
>   static void query_engine_list(int fd, struct intel_engine_data *ed)
> @@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
>   			struct intel_execution_engine2 *__e2 =
>   				&engine_data.engines[engine_data.nengines];
>   
> -			__e2->name       = e2->name;
> +			strcpy(__e2->name, e2->name);
>   			__e2->instance   = e2->instance;
>   			__e2->class      = e2->class;
>   			__e2->flags      = e2->flags;
> @@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
>   		.class = -1,
>   		.instance = -1,
>   		.flags = -1,
> -		.name = "invalid"
>   	};
>   
>   	if (ring == I915_EXEC_DEFAULT) {
>   		e2__.flags = I915_EXEC_DEFAULT;
> -		e2__.name = "default";
> +		strcpy(e2__.name, "default");
>   	} else {
>   		const struct intel_execution_engine2 *e2;
>   
> @@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
>   			if (e2->flags == ring)
>   				return *e2;
>   		}
> +
> +		strcpy(e2__.name, "invalid");
>   	}
>   
>   	return e2__;
> diff --git a/lib/igt_gt.h b/lib/igt_gt.h
> index 66088d39176a..6a8eceb68817 100644
> --- a/lib/igt_gt.h
> +++ b/lib/igt_gt.h
> @@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
>   bool gem_class_can_store_dword(int fd, int class);
>   
>   extern const struct intel_execution_engine2 {
> -	const char *name;
> +	char name[16];

I forgot that with this approach I'd need to apply default names 
somewhere during IGT framework startup. :I As I forgot Petri you already 
had a patch which solves the overall problem. Will re-read your 
solution. Where did it get stuck btw?

Regards,

Tvrtko

>   	int class;
>   	int instance;
>   	uint64_t flags;
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Petri Latvala]

On Wed, Jan 22, 2020 at 10:15:56AM +0000, Tvrtko Ursulin wrote:
> 
> On 22/01/2020 10:10, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > 
> > With the introduction of dynamic subtests we got one step closer towards
> > eliminating the duality of static and dynamic engine enumeration.
> > 
> > This patch makes one more step in that direction by removing the
> > dependency on the static list when generating probed engine names.
> > 
> > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Andi Shyti <andi.shyti@intel.com>
> > Cc: Petri Latvala <petri.latvala@intel.com>
> > ---
> >   lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
> >   lib/igt_gt.h                   |  2 +-
> >   2 files changed, 23 insertions(+), 18 deletions(-)
> > 
> > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> > index 790d455ff2ad..eff231800b77 100644
> > --- a/lib/i915/gem_engine_topology.c
> > +++ b/lib/i915/gem_engine_topology.c
> > @@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
> >   	gem_context_set_param(fd, param);
> >   }
> > +static const char *class_names[] = {
> > +	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
> > +	[I915_ENGINE_CLASS_COPY]	  = "bcs",
> > +	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
> > +	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
> > +};
> > +
> >   static void init_engine(struct intel_execution_engine2 *e2,
> >   			int class, int instance, uint64_t flags)
> >   {
> > -	const struct intel_execution_engine2 *__e2;
> > -	static const char *unknown_name = "unknown",
> > -			  *virtual_name = "virtual";
> > +	int ret;
> >   	e2->class    = class;
> >   	e2->instance = instance;
> > -	e2->flags    = flags;
> >   	/* engine is a virtual engine */
> >   	if (class == I915_ENGINE_CLASS_INVALID &&
> >   	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> > -		e2->name = virtual_name;
> > +		strcpy(e2->name, "virtual");
> >   		e2->is_virtual = true;
> >   		return;
> > +	} else {
> > +		e2->is_virtual = false;
> >   	}
> > -	__for_each_static_engine(__e2)
> > -		if (__e2->class == class && __e2->instance == instance)
> > -			break;
> > -
> > -	if (__e2->name) {
> > -		e2->name = __e2->name;
> > +	if (class < ARRAY_SIZE(class_names)) {
> > +		e2->flags = flags;
> > +		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
> > +			       class_names[class], instance);
> >   	} else {
> >   		igt_warn("found unknown engine (%d, %d)\n", class, instance);
> > -		e2->name = unknown_name;
> >   		e2->flags = -1;
> > +		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
> > +			       class, instance);
> >   	}
> > -	/* just to remark it */
> > -	e2->is_virtual = false;
> > +	igt_assert(ret < sizeof(e2->name));
> >   }
> >   static void query_engine_list(int fd, struct intel_engine_data *ed)
> > @@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
> >   			struct intel_execution_engine2 *__e2 =
> >   				&engine_data.engines[engine_data.nengines];
> > -			__e2->name       = e2->name;
> > +			strcpy(__e2->name, e2->name);
> >   			__e2->instance   = e2->instance;
> >   			__e2->class      = e2->class;
> >   			__e2->flags      = e2->flags;
> > @@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
> >   		.class = -1,
> >   		.instance = -1,
> >   		.flags = -1,
> > -		.name = "invalid"
> >   	};
> >   	if (ring == I915_EXEC_DEFAULT) {
> >   		e2__.flags = I915_EXEC_DEFAULT;
> > -		e2__.name = "default";
> > +		strcpy(e2__.name, "default");
> >   	} else {
> >   		const struct intel_execution_engine2 *e2;
> > @@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
> >   			if (e2->flags == ring)
> >   				return *e2;
> >   		}
> > +
> > +		strcpy(e2__.name, "invalid");
> >   	}
> >   	return e2__;
> > diff --git a/lib/igt_gt.h b/lib/igt_gt.h
> > index 66088d39176a..6a8eceb68817 100644
> > --- a/lib/igt_gt.h
> > +++ b/lib/igt_gt.h
> > @@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
> >   bool gem_class_can_store_dword(int fd, int class);
> >   extern const struct intel_execution_engine2 {
> > -	const char *name;
> > +	char name[16];
> 
> I forgot that with this approach I'd need to apply default names somewhere
> during IGT framework startup. :I As I forgot Petri you already had a patch
> which solves the overall problem. Will re-read your solution. Where did it
> get stuck btw?


To the feedback from Andi that a third table for kind of the same
thing is getting a bit much. And me being completely clueless about
GEM so couldn't quite get myself to push this further. If you can
convince Andi that the code will get cleaner now, we should be good :P


-- 
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH i-g-t] i915/gem_engine_topology: Generate engine names based on class

[Petri Latvala]

On Wed, Jan 22, 2020 at 10:15:56AM +0000, Tvrtko Ursulin wrote:
> 
> On 22/01/2020 10:10, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > 
> > With the introduction of dynamic subtests we got one step closer towards
> > eliminating the duality of static and dynamic engine enumeration.
> > 
> > This patch makes one more step in that direction by removing the
> > dependency on the static list when generating probed engine names.
> > 
> > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Andi Shyti <andi.shyti@intel.com>
> > Cc: Petri Latvala <petri.latvala@intel.com>
> > ---
> >   lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
> >   lib/igt_gt.h                   |  2 +-
> >   2 files changed, 23 insertions(+), 18 deletions(-)
> > 
> > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> > index 790d455ff2ad..eff231800b77 100644
> > --- a/lib/i915/gem_engine_topology.c
> > +++ b/lib/i915/gem_engine_topology.c
> > @@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
> >   	gem_context_set_param(fd, param);
> >   }
> > +static const char *class_names[] = {
> > +	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
> > +	[I915_ENGINE_CLASS_COPY]	  = "bcs",
> > +	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
> > +	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
> > +};
> > +
> >   static void init_engine(struct intel_execution_engine2 *e2,
> >   			int class, int instance, uint64_t flags)
> >   {
> > -	const struct intel_execution_engine2 *__e2;
> > -	static const char *unknown_name = "unknown",
> > -			  *virtual_name = "virtual";
> > +	int ret;
> >   	e2->class    = class;
> >   	e2->instance = instance;
> > -	e2->flags    = flags;
> >   	/* engine is a virtual engine */
> >   	if (class == I915_ENGINE_CLASS_INVALID &&
> >   	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> > -		e2->name = virtual_name;
> > +		strcpy(e2->name, "virtual");
> >   		e2->is_virtual = true;
> >   		return;
> > +	} else {
> > +		e2->is_virtual = false;
> >   	}
> > -	__for_each_static_engine(__e2)
> > -		if (__e2->class == class && __e2->instance == instance)
> > -			break;
> > -
> > -	if (__e2->name) {
> > -		e2->name = __e2->name;
> > +	if (class < ARRAY_SIZE(class_names)) {
> > +		e2->flags = flags;
> > +		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
> > +			       class_names[class], instance);
> >   	} else {
> >   		igt_warn("found unknown engine (%d, %d)\n", class, instance);
> > -		e2->name = unknown_name;
> >   		e2->flags = -1;
> > +		ret = snprintf(e2->name, sizeof(e2->name), "%u-%u",
> > +			       class, instance);
> >   	}
> > -	/* just to remark it */
> > -	e2->is_virtual = false;
> > +	igt_assert(ret < sizeof(e2->name));
> >   }
> >   static void query_engine_list(int fd, struct intel_engine_data *ed)
> > @@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
> >   			struct intel_execution_engine2 *__e2 =
> >   				&engine_data.engines[engine_data.nengines];
> > -			__e2->name       = e2->name;
> > +			strcpy(__e2->name, e2->name);
> >   			__e2->instance   = e2->instance;
> >   			__e2->class      = e2->class;
> >   			__e2->flags      = e2->flags;
> > @@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
> >   		.class = -1,
> >   		.instance = -1,
> >   		.flags = -1,
> > -		.name = "invalid"
> >   	};
> >   	if (ring == I915_EXEC_DEFAULT) {
> >   		e2__.flags = I915_EXEC_DEFAULT;
> > -		e2__.name = "default";
> > +		strcpy(e2__.name, "default");
> >   	} else {
> >   		const struct intel_execution_engine2 *e2;
> > @@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
> >   			if (e2->flags == ring)
> >   				return *e2;
> >   		}
> > +
> > +		strcpy(e2__.name, "invalid");
> >   	}
> >   	return e2__;
> > diff --git a/lib/igt_gt.h b/lib/igt_gt.h
> > index 66088d39176a..6a8eceb68817 100644
> > --- a/lib/igt_gt.h
> > +++ b/lib/igt_gt.h
> > @@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
> >   bool gem_class_can_store_dword(int fd, int class);
> >   extern const struct intel_execution_engine2 {
> > -	const char *name;
> > +	char name[16];
> 
> I forgot that with this approach I'd need to apply default names somewhere
> during IGT framework startup. :I As I forgot Petri you already had a patch
> which solves the overall problem. Will re-read your solution. Where did it
> get stuck btw?


To the feedback from Andi that a third table for kind of the same
thing is getting a bit much. And me being completely clueless about
GEM so couldn't quite get myself to push this further. If you can
convince Andi that the code will get cleaner now, we should be good :P


-- 
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[Intel-gfx] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

With the introduction of dynamic subtests we got one step closer towards
eliminating the duality of static and dynamic engine enumeration.

This patch makes one more step in that direction by removing the
dependency on the static list when generating probed engine names.

v2:
 * Fix __for_each_static_engine iterator.
 * Prefix unknown engines with 'unknown'.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
 lib/i915/gem_engine_topology.h |  2 +-
 lib/igt_gt.h                   |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index 790d455ff2ad..c3645eab8538 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
 	gem_context_set_param(fd, param);
 }
 
+static const char *class_names[] = {
+	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
+	[I915_ENGINE_CLASS_COPY]	  = "bcs",
+	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
+	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
+};
+
 static void init_engine(struct intel_execution_engine2 *e2,
 			int class, int instance, uint64_t flags)
 {
-	const struct intel_execution_engine2 *__e2;
-	static const char *unknown_name = "unknown",
-			  *virtual_name = "virtual";
+	int ret;
 
 	e2->class    = class;
 	e2->instance = instance;
-	e2->flags    = flags;
 
 	/* engine is a virtual engine */
 	if (class == I915_ENGINE_CLASS_INVALID &&
 	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
-		e2->name = virtual_name;
+		strcpy(e2->name, "virtual");
 		e2->is_virtual = true;
 		return;
+	} else {
+		e2->is_virtual = false;
 	}
 
-	__for_each_static_engine(__e2)
-		if (__e2->class == class && __e2->instance == instance)
-			break;
-
-	if (__e2->name) {
-		e2->name = __e2->name;
+	if (class < ARRAY_SIZE(class_names)) {
+		e2->flags = flags;
+		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
+			       class_names[class], instance);
 	} else {
 		igt_warn("found unknown engine (%d, %d)\n", class, instance);
-		e2->name = unknown_name;
 		e2->flags = -1;
+		ret = snprintf(e2->name, sizeof(e2->name), "unknown%u-%u",
+			       class, instance);
 	}
 
-	/* just to remark it */
-	e2->is_virtual = false;
+	igt_assert(ret < sizeof(e2->name));
 }
 
 static void query_engine_list(int fd, struct intel_engine_data *ed)
@@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
 			struct intel_execution_engine2 *__e2 =
 				&engine_data.engines[engine_data.nengines];
 
-			__e2->name       = e2->name;
+			strcpy(__e2->name, e2->name);
 			__e2->instance   = e2->instance;
 			__e2->class      = e2->class;
 			__e2->flags      = e2->flags;
@@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 		.class = -1,
 		.instance = -1,
 		.flags = -1,
-		.name = "invalid"
 	};
 
 	if (ring == I915_EXEC_DEFAULT) {
 		e2__.flags = I915_EXEC_DEFAULT;
-		e2__.name = "default";
+		strcpy(e2__.name, "default");
 	} else {
 		const struct intel_execution_engine2 *e2;
 
@@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 			if (e2->flags == ring)
 				return *e2;
 		}
+
+		strcpy(e2__.name, "invalid");
 	}
 
 	return e2__;
diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h
index d98773e06783..525741cc8a08 100644
--- a/lib/i915/gem_engine_topology.h
+++ b/lib/i915/gem_engine_topology.h
@@ -61,7 +61,7 @@ bool gem_engine_is_equal(const struct intel_execution_engine2 *e1,
 struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags);
 
 #define __for_each_static_engine(e__) \
-	for ((e__) = intel_execution_engines2; (e__)->name; (e__)++)
+	for ((e__) = intel_execution_engines2; (e__)->name[0]; (e__)++)
 
 #define for_each_context_engine(fd__, ctx__, e__) \
 	for (struct intel_engine_data i__ = intel_init_engine_list(fd__, ctx__); \
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 66088d39176a..6a8eceb68817 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
 bool gem_class_can_store_dword(int fd, int class);
 
 extern const struct intel_execution_engine2 {
-	const char *name;
+	char name[16];
 	int class;
 	int instance;
 	uint64_t flags;
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

With the introduction of dynamic subtests we got one step closer towards
eliminating the duality of static and dynamic engine enumeration.

This patch makes one more step in that direction by removing the
dependency on the static list when generating probed engine names.

v2:
 * Fix __for_each_static_engine iterator.
 * Prefix unknown engines with 'unknown'.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 lib/i915/gem_engine_topology.c | 39 +++++++++++++++++++---------------
 lib/i915/gem_engine_topology.h |  2 +-
 lib/igt_gt.h                   |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index 790d455ff2ad..c3645eab8538 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -97,39 +97,43 @@ static void ctx_map_engines(int fd, struct intel_engine_data *ed,
 	gem_context_set_param(fd, param);
 }
 
+static const char *class_names[] = {
+	[I915_ENGINE_CLASS_RENDER]	  = "rcs",
+	[I915_ENGINE_CLASS_COPY]	  = "bcs",
+	[I915_ENGINE_CLASS_VIDEO]	  = "vcs",
+	[I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
+};
+
 static void init_engine(struct intel_execution_engine2 *e2,
 			int class, int instance, uint64_t flags)
 {
-	const struct intel_execution_engine2 *__e2;
-	static const char *unknown_name = "unknown",
-			  *virtual_name = "virtual";
+	int ret;
 
 	e2->class    = class;
 	e2->instance = instance;
-	e2->flags    = flags;
 
 	/* engine is a virtual engine */
 	if (class == I915_ENGINE_CLASS_INVALID &&
 	    instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
-		e2->name = virtual_name;
+		strcpy(e2->name, "virtual");
 		e2->is_virtual = true;
 		return;
+	} else {
+		e2->is_virtual = false;
 	}
 
-	__for_each_static_engine(__e2)
-		if (__e2->class == class && __e2->instance == instance)
-			break;
-
-	if (__e2->name) {
-		e2->name = __e2->name;
+	if (class < ARRAY_SIZE(class_names)) {
+		e2->flags = flags;
+		ret = snprintf(e2->name, sizeof(e2->name), "%s%u",
+			       class_names[class], instance);
 	} else {
 		igt_warn("found unknown engine (%d, %d)\n", class, instance);
-		e2->name = unknown_name;
 		e2->flags = -1;
+		ret = snprintf(e2->name, sizeof(e2->name), "unknown%u-%u",
+			       class, instance);
 	}
 
-	/* just to remark it */
-	e2->is_virtual = false;
+	igt_assert(ret < sizeof(e2->name));
 }
 
 static void query_engine_list(int fd, struct intel_engine_data *ed)
@@ -223,7 +227,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)
 			struct intel_execution_engine2 *__e2 =
 				&engine_data.engines[engine_data.nengines];
 
-			__e2->name       = e2->name;
+			strcpy(__e2->name, e2->name);
 			__e2->instance   = e2->instance;
 			__e2->class      = e2->class;
 			__e2->flags      = e2->flags;
@@ -297,12 +301,11 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 		.class = -1,
 		.instance = -1,
 		.flags = -1,
-		.name = "invalid"
 	};
 
 	if (ring == I915_EXEC_DEFAULT) {
 		e2__.flags = I915_EXEC_DEFAULT;
-		e2__.name = "default";
+		strcpy(e2__.name, "default");
 	} else {
 		const struct intel_execution_engine2 *e2;
 
@@ -310,6 +313,8 @@ struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags)
 			if (e2->flags == ring)
 				return *e2;
 		}
+
+		strcpy(e2__.name, "invalid");
 	}
 
 	return e2__;
diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h
index d98773e06783..525741cc8a08 100644
--- a/lib/i915/gem_engine_topology.h
+++ b/lib/i915/gem_engine_topology.h
@@ -61,7 +61,7 @@ bool gem_engine_is_equal(const struct intel_execution_engine2 *e1,
 struct intel_execution_engine2 gem_eb_flags_to_engine(unsigned int flags);
 
 #define __for_each_static_engine(e__) \
-	for ((e__) = intel_execution_engines2; (e__)->name; (e__)++)
+	for ((e__) = intel_execution_engines2; (e__)->name[0]; (e__)++)
 
 #define for_each_context_engine(fd__, ctx__, e__) \
 	for (struct intel_engine_data i__ = intel_init_engine_list(fd__, ctx__); \
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 66088d39176a..6a8eceb68817 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -95,7 +95,7 @@ bool gem_can_store_dword(int fd, unsigned int engine);
 bool gem_class_can_store_dword(int fd, int class);
 
 extern const struct intel_execution_engine2 {
-	const char *name;
+	char name[16];
 	int class;
 	int instance;
 	uint64_t flags;
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Chris Wilson]

Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>  static void init_engine(struct intel_execution_engine2 *e2,
>                         int class, int instance, uint64_t flags)
>  {
> -       const struct intel_execution_engine2 *__e2;
> -       static const char *unknown_name = "unknown",
> -                         *virtual_name = "virtual";
> +       int ret;
>  
>         e2->class    = class;
>         e2->instance = instance;
> -       e2->flags    = flags;
>  
>         /* engine is a virtual engine */
>         if (class == I915_ENGINE_CLASS_INVALID &&
>             instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {

Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
int class/instance should be u16?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Chris Wilson]

Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>  static void init_engine(struct intel_execution_engine2 *e2,
>                         int class, int instance, uint64_t flags)
>  {
> -       const struct intel_execution_engine2 *__e2;
> -       static const char *unknown_name = "unknown",
> -                         *virtual_name = "virtual";
> +       int ret;
>  
>         e2->class    = class;
>         e2->instance = instance;
> -       e2->flags    = flags;
>  
>         /* engine is a virtual engine */
>         if (class == I915_ENGINE_CLASS_INVALID &&
>             instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {

Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
int class/instance should be u16?
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 14:46, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>>   static void init_engine(struct intel_execution_engine2 *e2,
>>                          int class, int instance, uint64_t flags)
>>   {
>> -       const struct intel_execution_engine2 *__e2;
>> -       static const char *unknown_name = "unknown",
>> -                         *virtual_name = "virtual";
>> +       int ret;
>>   
>>          e2->class    = class;
>>          e2->instance = instance;
>> -       e2->flags    = flags;
>>   
>>          /* engine is a virtual engine */
>>          if (class == I915_ENGINE_CLASS_INVALID &&
>>              instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> 
> Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
> int class/instance should be u16?

Yeah, no it can't ever match. I'll have a look how easy to change it all 
to struct i915_engine_class_instance.

Regards,

Tvrtko


_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 14:46, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>>   static void init_engine(struct intel_execution_engine2 *e2,
>>                          int class, int instance, uint64_t flags)
>>   {
>> -       const struct intel_execution_engine2 *__e2;
>> -       static const char *unknown_name = "unknown",
>> -                         *virtual_name = "virtual";
>> +       int ret;
>>   
>>          e2->class    = class;
>>          e2->instance = instance;
>> -       e2->flags    = flags;
>>   
>>          /* engine is a virtual engine */
>>          if (class == I915_ENGINE_CLASS_INVALID &&
>>              instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
> 
> Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
> int class/instance should be u16?

Yeah, no it can't ever match. I'll have a look how easy to change it all 
to struct i915_engine_class_instance.

Regards,

Tvrtko


_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 14:53, Tvrtko Ursulin wrote:
> 
> On 22/01/2020 14:46, Chris Wilson wrote:
>> Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>>>   static void init_engine(struct intel_execution_engine2 *e2,
>>>                          int class, int instance, uint64_t flags)
>>>   {
>>> -       const struct intel_execution_engine2 *__e2;
>>> -       static const char *unknown_name = "unknown",
>>> -                         *virtual_name = "virtual";
>>> +       int ret;
>>>          e2->class    = class;
>>>          e2->instance = instance;
>>> -       e2->flags    = flags;
>>>          /* engine is a virtual engine */
>>>          if (class == I915_ENGINE_CLASS_INVALID &&
>>>              instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
>>
>> Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
>> int class/instance should be u16?
> 
> Yeah, no it can't ever match. I'll have a look how easy to change it all 
> to struct i915_engine_class_instance.

Too much churn. I did simple uint16_t here and in struct 
intel_execution_engine2 as a follow up patch to this one.

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH i-g-t v2] i915/gem_engine_topology: Generate engine names based on class

[Tvrtko Ursulin]

On 22/01/2020 14:53, Tvrtko Ursulin wrote:
> 
> On 22/01/2020 14:46, Chris Wilson wrote:
>> Quoting Tvrtko Ursulin (2020-01-22 14:40:28)
>>>   static void init_engine(struct intel_execution_engine2 *e2,
>>>                          int class, int instance, uint64_t flags)
>>>   {
>>> -       const struct intel_execution_engine2 *__e2;
>>> -       static const char *unknown_name = "unknown",
>>> -                         *virtual_name = "virtual";
>>> +       int ret;
>>>          e2->class    = class;
>>>          e2->instance = instance;
>>> -       e2->flags    = flags;
>>>          /* engine is a virtual engine */
>>>          if (class == I915_ENGINE_CLASS_INVALID &&
>>>              instance == I915_ENGINE_CLASS_INVALID_VIRTUAL) {
>>
>> Can this ever match?  instance is 65534 and INVALID_VIRTUAL is -2.
>> int class/instance should be u16?
> 
> Yeah, no it can't ever match. I'll have a look how easy to change it all 
> to struct i915_engine_class_instance.

Too much churn. I did simple uint16_t here and in struct 
intel_execution_engine2 as a follow up patch to this one.

Regards,

Tvrtko
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for i915/gem_engine_topology: Generate engine names based on class (rev2)

[Patchwork]

== Series Details ==

Series: i915/gem_engine_topology: Generate engine names based on class (rev2)
URL   : https://patchwork.freedesktop.org/series/72384/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7792 -> IGTPW_3967
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_3967 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_3967, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/index.html

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@gem_exec_parallel@fds:
    - fi-hsw-peppy:       NOTRUN -> [INCOMPLETE][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-hsw-peppy/igt@gem_exec_parallel@fds.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live_execlists:
    - fi-kbl-soraka:      [PASS][2] -> [DMESG-FAIL][3] ([i915#656])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-kbl-soraka/igt@i915_selftest@live_execlists.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-icl-u2:          [PASS][4] -> [FAIL][5] ([i915#217])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
    - fi-kbl-7500u:       [PASS][6] -> [FAIL][7] ([fdo#111096] / [i915#323])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html

  
#### Possible fixes ####

  * igt@i915_selftest@live_coherency:
    - fi-cfl-guc:         [DMESG-FAIL][8] ([i915#889]) -> [PASS][9] +7 similar issues
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-cfl-guc/igt@i915_selftest@live_coherency.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-cfl-guc/igt@i915_selftest@live_coherency.html

  * igt@i915_selftest@live_gt_timelines:
    - fi-cfl-guc:         [DMESG-WARN][10] ([i915#889]) -> [PASS][11] +23 similar issues
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-cfl-guc/igt@i915_selftest@live_gt_timelines.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-cfl-guc/igt@i915_selftest@live_gt_timelines.html

  
#### Warnings ####

  * igt@gem_close_race@basic-threads:
    - fi-byt-j1900:       [INCOMPLETE][12] ([i915#45]) -> [TIMEOUT][13] ([fdo#112271] / [i915#816])
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-byt-j1900/igt@gem_close_race@basic-threads.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-byt-j1900/igt@gem_close_race@basic-threads.html

  * igt@i915_selftest@live_blt:
    - fi-hsw-4770:        [DMESG-FAIL][14] ([i915#725]) -> [DMESG-FAIL][15] ([i915#553] / [i915#725])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@kms_chamelium@vga-edid-read:
    - fi-icl-u2:          [SKIP][16] ([fdo#109309]) -> [FAIL][17] ([i915#217])
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7792/fi-icl-u2/igt@kms_chamelium@vga-edid-read.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/fi-icl-u2/igt@kms_chamelium@vga-edid-read.html

  
  [fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
  [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
  [fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
  [i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
  [i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
  [i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
  [i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
  [i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
  [i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889


Participating hosts (40 -> 42)
------------------------------

  Additional (5): fi-bdw-5557u fi-hsw-peppy fi-gdg-551 fi-blb-e6850 fi-skl-6600u 
  Missing    (3): fi-byt-clapper fi-whl-u fi-bsw-cyan 


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

  * CI: CI-20190529 -> None
  * IGT: IGT_5377 -> IGTPW_3967

  CI-20190529: 20190529
  CI_DRM_7792: 1eaee9143cc2e9d5a03dc8243cc0fcfac894dc94 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3967: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/index.html
  IGT_5377: 1e6cb3e75925cf623df04f78430ae9299632ec3f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools



== Testlist changes ==

+igt@gem_ctx_isolation@-clean
+igt@gem_ctx_isolation@-dirty-create
+igt@gem_ctx_isolation@-dirty-switch
+igt@gem_ctx_isolation@-none
+igt@gem_ctx_isolation@-nonpriv
+igt@gem_ctx_isolation@-nonpriv-switch
+igt@gem_ctx_isolation@-reset
+igt@gem_ctx_isolation@-s3
+igt@gem_ctx_isolation@-s4

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3967/index.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ GitLab.Pipeline: warning for i915/gem_engine_topology: Generate engine names based on class

[Patchwork]

== Series Details ==

Series: i915/gem_engine_topology: Generate engine names based on class
URL   : https://patchwork.freedesktop.org/series/72384/
State : warning

== Summary ==

Did not get list of undocumented tests for this run, something is wrong!

Other than that, pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/99786 for the overview.

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/1420618):
  [1/639] Generating version.h with a custom command.
  [2/492] Linking target tests/gem_concurrent_blit.
  [3/492] Linking target tests/gem_ctx_create.
  [4/492] Linking target tests/gem_ctx_engines.
  [5/492] Linking target tests/gem_ctx_exec.
  [6/492] Compiling C object 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o'.
  FAILED: tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o 
  clang -Itests/59830eb@@gem_ctx_isolation@exe -Itests -I../tests -I../include/drm-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/valgrind -I/usr/include/libdrm/nouveau -Xclang -fcolor-diagnostics -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=i
 mplicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o' -MF 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o.d' -o 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o' -c ../tests/i915/gem_ctx_isolation.c
  ../tests/i915/gem_ctx_isolation.c:880:10: error: address of array 'e->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
               e->name; e++) {
               ~~~^~~~
  1 error generated.
  ninja: build stopped: subcommand failed.
  section_end:1579689434:build_script
  ^[[0Ksection_start:1579689434:after_script
  ^[[0Ksection_end:1579689435:after_script
  ^[[0Ksection_start:1579689435:upload_artifacts_on_failure
  ^[[0Ksection_end:1579689437:upload_artifacts_on_failure
  ^[[0K^[[31;1mERROR: Job failed: exit code 1
  ^[[0;m

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/99786
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ GitLab.Pipeline: warning for i915/gem_engine_topology: Generate engine names based on class (rev2)

[Patchwork]

== Series Details ==

Series: i915/gem_engine_topology: Generate engine names based on class (rev2)
URL   : https://patchwork.freedesktop.org/series/72384/
State : warning

== Summary ==

Did not get list of undocumented tests for this run, something is wrong!

Other than that, pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/99903 for the overview.

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/1423548):
  [140/623] Linking target tests/gem_ctx_bad_destroy.
  [141/623] Linking target tests/gem_ctx_clone.
  [142/623] Linking target tests/gem_ctx_create.
  [143/623] Linking target tests/gem_ctx_engines.
  [144/623] Linking target tests/gem_ctx_exec.
  [145/623] Compiling C object 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o'.
  FAILED: tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o 
  clang -Itests/59830eb@@gem_ctx_isolation@exe -Itests -I../tests -I../include/drm-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/valgrind -I/usr/include/libdrm/nouveau -Xclang -fcolor-diagnostics -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=i
 mplicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o' -MF 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o.d' -o 'tests/59830eb@@gem_ctx_isolation@exe/i915_gem_ctx_isolation.c.o' -c ../tests/i915/gem_ctx_isolation.c
  ../tests/i915/gem_ctx_isolation.c:880:10: error: address of array 'e->name' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion]
               e->name; e++) {
               ~~~^~~~
  1 error generated.
  ninja: build stopped: subcommand failed.
  section_end:1579704764:build_script
  ^[[0Ksection_start:1579704764:after_script
  ^[[0Ksection_end:1579704766:after_script
  ^[[0Ksection_start:1579704766:upload_artifacts_on_failure
  ^[[0Ksection_end:1579704768:upload_artifacts_on_failure
  ^[[0K^[[31;1mERROR: Job failed: exit code 1
  ^[[0;m

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/99903
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev