[igt-dev] [PATCH i-g-t 25/31] i915/perf: Make sanity check failures descriptive

Kamil Konieczny kamil.konieczny at linux.intel.com
Wed Mar 15 16:47:54 UTC 2023


On 2023-02-14 at 16:46:42 -0800, Umesh Nerlige Ramappa wrote:
> Make the asserts in the sanity check descriptive.
> 
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>

Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

> ---
>  tests/i915/perf.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/i915/perf.c b/tests/i915/perf.c
> index 2e902d74..b50c86d1 100644
> --- a/tests/i915/perf.c
> +++ b/tests/i915/perf.c
> @@ -1030,7 +1030,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,
>  			continue;
>  
>  		igt_debug("A40_%d: delta = %"PRIu64"\n", j, delta);
> -		igt_assert(delta <= max_delta);
> +		igt_assert_f(delta <= max_delta,
> +			     "A40_%d: delta = %"PRIu64", max_delta = %"PRIu64"\n",
> +			     j, delta, max_delta);
>  	}
>  
>  	for (int j = 0; j < format.n_a64; j++) {
> @@ -1042,7 +1044,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,
>  			continue;
>  
>  		igt_debug("A64_%d: delta = %"PRIu64"\n", format.first_a + j, delta);
> -		igt_assert(delta <= max_delta);
> +		igt_assert_f(delta <= max_delta,
> +			     "A64_%d: delta = %"PRIu64", max_delta = %"PRIu64"\n",
> +			     format.first_a + j, delta, max_delta);
>  	}
>  
>  	for (int j = 0; j < format.n_a; j++) {
> @@ -1057,7 +1061,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,
>  			continue;
>  
>  		igt_debug("A%d: delta = %"PRIu32"\n", a_id, delta);
> -		igt_assert(delta <= max_delta);
> +		igt_assert_f(delta <= max_delta,
> +			     "A%d: delta = %"PRIu32", max_delta = %"PRIu64"\n",
> +			     a_id, delta, max_delta);
>  	}
>  
>  	/* The TestOa metric set defines all B counters to be a
> @@ -1119,7 +1125,9 @@ gen8_sanity_check_test_oa_reports(const uint32_t *oa_report0,
>  
>  		igt_debug("C%d: delta = %"PRIu32", max_delta=%"PRIu64"\n",
>  			  j, delta, max_delta);
> -		igt_assert(delta <= max_delta);
> +		igt_assert_f(delta <= max_delta,
> +			     "C%d: delta = %"PRIu32", max_delta = %"PRIu64"\n",
> +			     j, delta, max_delta);
>  	}
>  }
>  
> -- 
> 2.36.1
> 


More information about the igt-dev mailing list