[igt-dev] [PATCH i-g-t 26/93] tests/i915/gem_exec_async: Convert to intel_ctx_t

[Zbigniew Kempczyński]

On Wed, Jun 09, 2021 at 12:36:09PM -0500, Jason Ekstrand wrote:
> Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
> ---
>  tests/i915/gem_exec_async.c | 32 ++++++++++++++++++++------------
>  1 file changed, 20 insertions(+), 12 deletions(-)
> 
> diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
> index bf8a856a..1824b73c 100644
> --- a/tests/i915/gem_exec_async.c
> +++ b/tests/i915/gem_exec_async.c
> @@ -27,7 +27,7 @@
>  
>  IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engines.");
>  
> -static void store_dword(int fd, unsigned ring,
> +static void store_dword(int fd, const intel_ctx_t *ctx, unsigned ring,
>  			uint32_t target, uint32_t offset, uint32_t value)
>  {
>  	const unsigned int gen = intel_gen(intel_get_drm_devid(fd));
> @@ -43,6 +43,7 @@ static void store_dword(int fd, unsigned ring,
>  	execbuf.flags = ring;
>  	if (gen < 6)
>  		execbuf.flags |= I915_EXEC_SECURE;
> +	execbuf.rsvd1 = ctx->id;
>  
>  	memset(obj, 0, sizeof(obj));
>  	obj[0].handle = target;
> @@ -80,7 +81,8 @@ static void store_dword(int fd, unsigned ring,
>  	gem_close(fd, obj[1].handle);
>  }
>  
> -static void one(int fd, unsigned engine, unsigned int flags)
> +static void one(int fd, const intel_ctx_t *ctx,
> +		unsigned engine, unsigned int flags)
>  #define FORKED (1 << 0)
>  {
>  	const struct intel_execution_engine2 *e;
> @@ -94,10 +96,11 @@ static void one(int fd, unsigned engine, unsigned int flags)
>  	 * the scratch for write. Then on the other rings try and
>  	 * write into that target. If it blocks we hang the GPU...
>  	 */
> -	spin = igt_spin_new(fd, .engine = engine, .dependency = scratch);
> +	spin = igt_spin_new(fd, .ctx = ctx, .engine = engine,
> +			    .dependency = scratch);
>  
>  	i = 0;
> -	__for_each_physical_engine(fd, e) {
> +	for_each_ctx_engine(fd, ctx, e) {
>  		if (e->flags == engine)
>  			continue;
>  
> @@ -106,9 +109,9 @@ static void one(int fd, unsigned engine, unsigned int flags)
>  
>  		if (flags & FORKED) {
>  			igt_fork(child, 1)
> -				store_dword(fd, e->flags, scratch, 4*i, ~i);
> +				store_dword(fd, ctx, e->flags, scratch, 4*i, ~i);
>  		} else {
> -			store_dword(fd, e->flags, scratch, 4*i, ~i);
> +			store_dword(fd, ctx, e->flags, scratch, 4*i, ~i);
>  		}
>  		i++;
>  	}
> @@ -135,13 +138,14 @@ static bool has_async_execbuf(int fd)
>  	return async > 0;
>  }
>  
> -#define test_each_engine(T, i915, e) \
> -	igt_subtest_with_dynamic(T) __for_each_physical_engine(i915, e) \
> +#define test_each_engine(T, i915, ctx, e) \
> +	igt_subtest_with_dynamic(T) for_each_ctx_engine(i915, ctx, e) \
>  		igt_dynamic_f("%s", (e)->name)
>  
>  igt_main
>  {
>  	const struct intel_execution_engine2 *e;
> +	const intel_ctx_t *ctx = NULL;

Initialization not necessary, regardless this:

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

--
Zbigniew

>  	int fd = -1;
>  
>  	igt_fixture {
> @@ -149,17 +153,21 @@ igt_main
>  		igt_require_gem(fd);
>  		gem_require_mmap_wc(fd);
>  		igt_require(has_async_execbuf(fd));
> +
> +		ctx = intel_ctx_create_all_physical(fd);
> +
>  		igt_fork_hang_detector(fd);
>  	}
>  
> -	test_each_engine("concurrent-writes", fd, e)
> -		one(fd, e->flags, 0);
> +	test_each_engine("concurrent-writes", fd, ctx, e)
> +		one(fd, ctx, e->flags, 0);
>  
> -	test_each_engine("forked-writes", fd, e)
> -		one(fd, e->flags, FORKED);
> +	test_each_engine("forked-writes", fd, ctx, e)
> +		one(fd, ctx, e->flags, FORKED);
>  
>  	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