[igt-dev] [PATCH i-g-t 31/77] tests/i915/gem_exec_parallel: Convert to intel_ctx_t

[Zbigniew Kempczyński]

On Mon, Jun 14, 2021 at 11:36:46AM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  tests/i915/gem_exec_parallel.c | 29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
> index 11cea5d7d..60356f0bd 100644
> --- a/tests/i915/gem_exec_parallel.c
> +++ b/tests/i915/gem_exec_parallel.c
> @@ -57,6 +57,7 @@ struct thread {
>  	unsigned flags;
>  	uint32_t *scratch;
>  	unsigned id;
> +	const intel_ctx_t *ctx;
>  	unsigned engine;
>  	uint32_t used;
>  	int fd, gen, *go;
> @@ -68,6 +69,7 @@ static void *thread(void *data)
>  	struct drm_i915_gem_exec_object2 obj[2];
>  	struct drm_i915_gem_relocation_entry reloc;
>  	struct drm_i915_gem_execbuffer2 execbuf;
> +	const intel_ctx_t *tmp_ctx = NULL;
>  	uint32_t batch[16];
>  	uint16_t used;
>  	int fd, i;
> @@ -79,7 +81,6 @@ static void *thread(void *data)
>  
>  	if (t->flags & FDS) {
>  		fd = gem_reopen_driver(t->fd);
> -		gem_context_copy_engines(t->fd, 0, fd, 0);
>  	} else {
>  		fd = t->fd;
>  	}
> @@ -122,8 +123,11 @@ static void *thread(void *data)
>  	execbuf.flags |= I915_EXEC_NO_RELOC;
>  	if (t->gen < 6)
>  		execbuf.flags |= I915_EXEC_SECURE;
> -	if (t->flags & CONTEXTS) {
> -		execbuf.rsvd1 = gem_context_clone_with_engines(fd, 0);
> +	if (t->flags & (CONTEXTS | FDS)) {
> +		tmp_ctx = intel_ctx_create(fd, &t->ctx->cfg);

I got some doubts regarding why we need creating the context for FDS
too but it is caused by driver reopen and lack of possibility to work
on ctx0 so we got to create a new one and configure the engines there.

> +		execbuf.rsvd1 = tmp_ctx->id;
> +	} else {
> +		execbuf.rsvd1 = t->ctx->id;
>  	}
>  
>  	used = 0;
> @@ -142,8 +146,8 @@ static void *thread(void *data)
>  			gem_close(fd, obj[0].handle);
>  	}
>  
> -	if (t->flags & CONTEXTS)
> -		gem_context_destroy(fd, execbuf.rsvd1);
> +	if (t->flags & (CONTEXTS | FDS))
> +		intel_ctx_destroy(fd, tmp_ctx);
>  	gem_close(fd, obj[1].handle);
>  	if (t->flags & FDS)
>  		close(fd);
> @@ -197,7 +201,8 @@ static void handle_close(int fd, unsigned int flags, uint32_t handle, void *data
>  	gem_close(fd, handle);
>  }
>  
> -static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
> +static void all(int fd, const intel_ctx_t *ctx,
> +		struct intel_execution_engine2 *engine, unsigned flags)
>  {
>  	const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
>  	unsigned engines[I915_EXEC_RING_MASK + 1], nengine;
> @@ -220,7 +225,7 @@ static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
>  	nengine = 0;
>  	if (!engine) {
>  		struct intel_execution_engine2 *e;
> -		__for_each_physical_engine(fd, e) {
> +		for_each_ctx_engine(fd, ctx, e) {
>  			if (gem_class_can_store_dword(fd, e->class))
>  				engines[nengine++] = e->flags;
>  		}
> @@ -247,6 +252,7 @@ static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
>  		threads[i].id = i;
>  		threads[i].fd = fd;
>  		threads[i].gen = gen;
> +		threads[i].ctx = ctx;
>  		threads[i].engine = engines[i % nengine];
>  		threads[i].flags = flags;
>  		threads[i].scratch = scratch;
> @@ -288,11 +294,13 @@ igt_main
>  		{ "userptr", USERPTR },
>  		{ NULL }
>  	};
> +	const intel_ctx_t *ctx = NULL;

Null not necessary here, regardless above:

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

>  	int fd;
>  
>  	igt_fixture {
>  		fd = drm_open_driver_master(DRIVER_INTEL);
>  		igt_require_gem(fd);
> +		ctx = intel_ctx_create_all_physical(fd);
>  
>  		igt_fork_hang_detector(fd);
>  	}
> @@ -301,21 +309,22 @@ igt_main
>  		for (const struct mode *m = modes; m->name; m++)
>  			igt_dynamic(m->name)
>  				/* NULL value means all engines */
> -				all(fd, NULL, m->flags);
> +				all(fd, ctx, NULL, m->flags);
>  	}
>  
>  	for (const struct mode *m = modes; m->name; m++) {
>  		igt_subtest_with_dynamic(m->name) {
> -			__for_each_physical_engine(fd, e) {
> +			for_each_ctx_engine(fd, ctx, e) {
>  				if (gem_class_can_store_dword(fd, e->class))
>  					igt_dynamic(e->name)
> -						all(fd, e, m->flags);
> +						all(fd, ctx, e, m->flags);
>  			}
>  		}
>  	}
>  
>  	igt_fixture {
>  		igt_stop_hang_detector();
> +		intel_ctx_destroy(fd, ctx);
>  		close(fd);
>  	}
>  }
> -- 
> 2.31.1
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev