[igt-dev] [PATCH i-g-t] i915/gem_ctx_persistence: skip heartbeat tests with GuC

[Kamil Konieczny]

Hi Andrzej,

On 2023-05-26 at 12:18:03 +0200, Andrzej Hajda wrote:
> GuC does not support fully updating of persisting contexts, especially
> heartbeat related parameters.
> 
> Signed-off-by: Andrzej Hajda <andrzej.hajda at intel.com>
> ---
>  tests/i915/gem_ctx_persistence.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c
> index 584137db454..00fdc19e76c 100644
> --- a/tests/i915/gem_ctx_persistence.c
> +++ b/tests/i915/gem_ctx_persistence.c
> @@ -1481,16 +1481,21 @@ igt_main
>  	igt_subtest("hang")
>  		test_nohangcheck_hang(i915, &empty_cfg);
>  
> -	igt_subtest("heartbeat-stop")
> -		test_noheartbeat_many(i915, 1, 0);
> -	igt_subtest("heartbeat-hang")
> -		test_noheartbeat_many(i915, 1, IGT_SPIN_NO_PREEMPTION);
> -	igt_subtest("heartbeat-many")
> -		test_noheartbeat_many(i915, 16, 0);
> -	igt_subtest("heartbeat-close")
> -		test_noheartbeat_close(i915, 0);
> -	igt_subtest("heartbeat-hostile")
> -		test_noheartbeat_close(i915, IGT_SPIN_NO_PREEMPTION);
> +	igt_subtest_group {
> +		igt_fixture
> +			igt_require(!gem_using_guc_submission(i915));

Do not place igt_require until you want to skip all subtests.

> +
> +		igt_subtest("heartbeat-stop")
> +			test_noheartbeat_many(i915, 1, 0);
> +		igt_subtest("heartbeat-hang")
> +			test_noheartbeat_many(i915, 1, IGT_SPIN_NO_PREEMPTION);
> +		igt_subtest("heartbeat-many")
> +			test_noheartbeat_many(i915, 16, 0);
----------------------- ^
Place that igt_require at begin of function.

> +		igt_subtest("heartbeat-close")
> +			test_noheartbeat_close(i915, 0);
----------------------- ^
Same here.

Regards,
Kamil

> +		igt_subtest("heartbeat-hostile")
> +			test_noheartbeat_close(i915, IGT_SPIN_NO_PREEMPTION);
> +	}
>  
>  	igt_subtest_group {
>  		igt_fixture
> -- 
> 2.34.1
>