[igt-dev] [RFC PATCH v8 3/5] lib/igt_gt: use for_each_engine2 to loop through engines

[Chris Wilson]

Quoting Andi Shyti (2019-02-12 23:54:34)
> 'for_each_engine2()' defines a loop through the gpu engines.
> 
> It can work with both active and pre-defined engines.
> 
> In case we are looping through active engines (i.e. the running
> kernel has the query and get/setparam ioctls), the
> intel_active_engines2 points to an array that contains only the
> list engines dynamically allocated after having interrogated the
> driver.
> 
> While, if we are looping through pre-defined engines,
> intel_active_engines2 points to the 'intel_execution_engines2'
> array and works exactly as for_each_engine() but using the
> new 'struct intel_execution_engine2' data type.
> 
> Signed-off-by: Andi Shyti <andi.shyti at intel.com>
> ---
>  lib/igt_gt.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/lib/igt_gt.h b/lib/igt_gt.h
> index f4bd6c22a81a..7aba4b4e37f1 100644
> --- a/lib/igt_gt.h
> +++ b/lib/igt_gt.h
> @@ -30,6 +30,8 @@
>  
>  #include "i915_drm.h"
>  
> +#include "i915/gem_query.h"
> +
>  void igt_require_hang_ring(int fd, int ring);
>  
>  typedef struct igt_hang {
> @@ -86,6 +88,12 @@ extern const struct intel_execution_engine {
>              e__++) \
>                 for_if (gem_ring_has_physical_engine(fd__, flags__ = e__->exec_id | e__->flags))
>  
> +#define for_each_engine2(fd, ctx, e) \
> +               for (__set_ctx_engine_map(fd, ctx_id), \
> +                    e = intel_active_engines2; e->name; e++) \
> +                       for_if (gem_has_get_set_param() || \
> +                               gem_has_engine(fd, e->class, e->instance))

intel_active_engines2 can define e->flags, and then you can just use
gem_has_ring(fd, e->flags) for both ctx->engines[] and legacy.

That's one for test/gem_query.c, making sure that set_ctx_engine_map()
is fully iterable by gem_has_ring(fd, id).
-Chris