[igt-dev] [PATCH i-g-t v4 33/56] tests/gem_request_retire: Add allocator support

[Zbigniew Kempczyński]

On Fri, Aug 06, 2021 at 03:41:22PM +0200, Zbigniew Kempczyński wrote:
> From: Ch Sai Gowtham <sai.gowtham.ch at intel.com>
> 
> When relocations are not available tests must assign addresses to objects
> by themselves instead of relying on the driver. We use allocator for
> that purpose.
> 
> Signed-off-by: Ch Sai Gowtham <sai.gowtham.ch at intel.com>
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> Cc: Petri Latvala <petri.latvala at intel.com>
> Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
> ---
>  tests/i915/gem_request_retire.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/i915/gem_request_retire.c b/tests/i915/gem_request_retire.c
> index 3df54f2a5..da9d405ed 100644
> --- a/tests/i915/gem_request_retire.c
> +++ b/tests/i915/gem_request_retire.c
> @@ -63,21 +63,29 @@ test_retire_vma_not_inactive(int fd)
>  {
>  	struct intel_execution_engine2 *e;
>  	const intel_ctx_t *ctx;
> +	uint64_t ahnd, ahndN;
>  	igt_spin_t *bg = NULL;
>  
>  	ctx = intel_ctx_create_all_physical(fd);
> +	ahnd = get_reloc_ahnd(fd, ctx->id);
>  
>  	for_each_ctx_engine(fd, ctx, e) {
>  		igt_spin_t *spin;
>  		const intel_ctx_t *spin_ctx;
>  
>  		if (!bg) {
> -			bg = igt_spin_new(fd, .ctx = ctx, .engine = e->flags);
> +			bg = igt_spin_new(fd,
> +					  .ahnd = ahnd,
> +					  .ctx = ctx,
> +					  .engine = e->flags);
>  			continue;
>  		}
>  
>  		spin_ctx = intel_ctx_create(fd, &ctx->cfg);
> -		spin = igt_spin_new(fd, .ctx = spin_ctx,
> +		ahndN = get_reloc_ahnd(fd, spin_ctx->id);
> +		spin = igt_spin_new(fd,
> +				    .ahnd = ahndN,
> +				    .ctx = spin_ctx,
>  				    .engine = e->flags,
>  				    .dependency = bg->handle,
>  				    .flags = IGT_SPIN_SOFTDEP);

Ok, we're running this on separate contexts so .dependency
can have different vma. 

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

> @@ -86,11 +94,13 @@ test_retire_vma_not_inactive(int fd)
>  
>  		gem_sync(fd, spin->handle);
>  		igt_spin_free(fd, spin);
> +		put_ahnd(ahndN);
>  	}
>  
>  	igt_drop_caches_set(fd, DROP_RETIRE);
>  	igt_spin_free(fd, bg);
>  	intel_ctx_destroy(fd, ctx);
> +	put_ahnd(ahnd);
>  }
>  
>  int fd;
> -- 
> 2.26.0
>