[PATCH v2 2/2] xe_exec_reset: Add timeslice preempt test

[Kamil Konieczny]

Hi Matthew,
On 2024-06-07 at 17:12:11 -0700, Matthew Brost wrote:

you did Cc to intel-xe list, in that case please add i-g-t
after PATCH:

[PATCH i-g-t v2 2/2] xe_exec_reset: Add timeslice preempt test

> Add tests in which submit multiple preemptable spinners to same hardware
> engine ensuring a cumulative longer timeout and validating the restart
> paths in the TDR.

Please explain what TDR means, like: in the TDR (T... D... R...).

Regards,
Kamil

> 
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> ---
>  tests/intel/xe_exec_reset.c | 23 +++++++++++++++++++++--
>  1 file changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/intel/xe_exec_reset.c b/tests/intel/xe_exec_reset.c
> index 5e9e48adda..144e3b3884 100644
> --- a/tests/intel/xe_exec_reset.c
> +++ b/tests/intel/xe_exec_reset.c
> @@ -100,6 +100,7 @@ static void test_spin(int fd, struct drm_xe_engine_class_instance *eci)
>  #define PARALLEL			(0x1 << 4)
>  #define CAT_ERROR			(0x1 << 5)
>  #define PREEMPT				(0x1 << 6)
> +#define CANCEL				(0x1 << 7)
>  
>  /**
>   * SUBTEST: %s-cat-error
> @@ -287,6 +288,12 @@ test_balancer(int fd, int gt, int class, int n_exec_queues, int n_execs,
>   * SUBTEST: cancel-preempt
>   * Description: Test job cancel with a preemptable job
>   *
> + * SUBTEST: cancel-timeslice-preempt
> + * Description: Test job cancel with 2 preemptable jobs
> + *
> + * SUBTEST: cancel-timeslice-many-preempt
> + * Description: Test job cancel with many preemptable jobs
> + *
>   * SUBTEST: gt-reset
>   * Description: Test GT reset
>   *
> @@ -361,7 +368,7 @@ test_legacy_mode(int fd, struct drm_xe_engine_class_instance *eci,
>  		uint64_t exec_addr;
>  		int e = i % n_exec_queues;
>  
> -		if (!i) {
> +		if (!i || flags & CANCEL) {
>  			spin_opts.addr = base_addr + spin_offset;
>  			xe_spin_init(&data[i].spin, &spin_opts);
>  			exec_addr = spin_opts.addr;
> @@ -411,7 +418,7 @@ test_legacy_mode(int fd, struct drm_xe_engine_class_instance *eci,
>  	xe_vm_unbind_async(fd, vm, 0, 0, addr, bo_size, sync, 1);
>  	igt_assert(syncobj_wait(fd, &sync[0].handle, 1, INT64_MAX, 0, NULL));
>  
> -	if (!(flags & GT_RESET)) {
> +	if (!(flags & (GT_RESET | CANCEL))) {
>  		for (i = 1; i < n_execs; i++)
>  			igt_assert_eq(data[i].data, 0xc0ffee);
>  	}
> @@ -746,6 +753,18 @@ igt_main
>  			break;
>  		}
>  
> +	igt_subtest("cancel-timeslice-preempt")
> +		xe_for_each_engine(fd, hwe) {
> +			test_legacy_mode(fd, hwe, 2, 2, CANCEL | PREEMPT);
> +			break;
> +		}
> +
> +	igt_subtest("cancel-timeslice-many-preempt")
> +		xe_for_each_engine(fd, hwe) {
> +			test_legacy_mode(fd, hwe, 4, 4, CANCEL | PREEMPT);
> +			break;
> +		}
> +
>  	igt_subtest("gt-reset")
>  		xe_for_each_engine(fd, hwe)
>  			test_legacy_mode(fd, hwe, 2, 2, GT_RESET);
> -- 
> 2.34.1
>