[igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_spin_batch: Removing context persistence

Dixit, Ashutosh ashutosh.dixit at intel.com
Sat Feb 19 00:20:42 UTC 2022


On Fri, 18 Feb 2022 16:10:13 -0800, Jasmine Newsome wrote:
>
> diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c
> index 653812c7..0835a122 100644
> --- a/tests/i915/gem_spin_batch.c
> +++ b/tests/i915/gem_spin_batch.c
> @@ -143,6 +143,7 @@ static void spin_all(int i915, const intel_ctx_t *ctx, unsigned int flags)
>	const struct intel_execution_engine2 *e;
>	intel_ctx_cfg_t cfg = ctx->cfg;
>	struct igt_spin *spin, *n;
> +	const intel_ctx_t *local_ctx;

Don't need local_ctx, let's overwrite ctx as before.

>	uint64_t ahnd;
>	IGT_LIST_HEAD(list);
>
> @@ -151,18 +152,16 @@ static void spin_all(int i915, const intel_ctx_t *ctx, unsigned int flags)
>			continue;
>
>		if (flags & PARALLEL_SPIN_NEW_CTX)
> -			ctx = intel_ctx_create(i915, &cfg);
> +			local_ctx = intel_ctx_create(i915, &cfg);

Don't need this change.

>		ahnd = get_reloc_ahnd(i915, ctx->id);
>
>		/* Prevent preemption so only one is allowed on each engine */
>		spin = igt_spin_new(i915,
>				    .ahnd = ahnd,
> -				    .ctx = ctx,
> +				    .ctx = (flags & PARALLEL_SPIN_NEW_CTX) ? local_ctx : ctx,

Don't need this change.

>				    .engine = e->flags,
>				    .flags = (IGT_SPIN_POLL_RUN |
>					      IGT_SPIN_NO_PREEMPTION));
> -		if (flags & PARALLEL_SPIN_NEW_CTX)
> -			intel_ctx_destroy(i915, ctx);
>
>		igt_spin_busywait_until_started(spin);
>		igt_list_move(&spin->link, &list);
> @@ -172,7 +171,9 @@ static void spin_all(int i915, const intel_ctx_t *ctx, unsigned int flags)
>		igt_assert(gem_bo_busy(i915, spin->handle));
>		ahnd = spin->ahnd;
>		igt_spin_end(spin);
> -		gem_sync(i915, spin->handle);
> +		if (flags & PARALLEL_SPIN_NEW_CTX)
> +			intel_ctx_destroy(i915, spin->opts.ctx);
> +                gem_sync(i915, spin->handle);

This line still has spaces not tabs. Rest of the patch is great!

>		igt_spin_free(i915, spin);
>		put_ahnd(ahnd);
>	}
> --
> 2.25.1
>


More information about the igt-dev mailing list