Re: [igt-dev] [PATCH i-g-t v2 6/8] tests/kms_writeback: Dump the frames if the don't match

[Pekka Paalanen <ppaalanen@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2802 bytes --]

On Mon, 28 Mar 2022 16:55:07 +0200
Maxime Ripard <maxime@cerno.tech> wrote:

> The writeback tests will make sure the reference and captured frames
> match. If they don't however, we don't get anything but their hash which
> isn't really helpful.
> 
> Add a function similar to chamelium_assert_crc_eq_or_dump() to dump the
> PNG and raw buffers of those two frames if they don't match and frame
> dumping has been enabled.
> 
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Hi,

FWIW, in Weston we write out also the error visualization image with the
mismatching areas highlighted:
https://gitlab.freedesktop.org/wayland/weston/-/blob/69a59359fa8590074717e211d332c1077d8f277f/tests/weston-test-client-helper.c#L1405-1433


Thanks,
pq

> ---
>  tests/kms_writeback.c | 36 +++++++++++++++++++++++++++++++++++-
>  1 file changed, 35 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
> index faa790cc0f72..2366692865b7 100644
> --- a/tests/kms_writeback.c
> +++ b/tests/kms_writeback.c
> @@ -256,6 +256,39 @@ static void get_and_wait_out_fence(igt_output_t *output)
>  	output->writeback_out_fence_fd = -1;
>  }
>  
> +static void writeback_assert_crtc_eq_or_dump(igt_crc_t *reference_crc,
> +					     igt_fb_t *reference_fb,
> +					     igt_crc_t *capture_crc,
> +					     igt_fb_t *capture_fb)
> +{
> +	bool eq;
> +
> +	eq = igt_check_crc_equal(reference_crc, capture_crc);
> +	if (!eq) {
> +		cairo_surface_t *reference, *capture;
> +		char *reference_suffix, *capture_suffix;
> +
> +		reference = igt_get_cairo_surface(reference_fb->fd, reference_fb);
> +		igt_assert(reference);
> +
> +		capture = igt_get_cairo_surface(capture_fb->fd, capture_fb);
> +		igt_assert(capture);
> +
> +		reference_suffix = igt_crc_to_string_extended(reference_crc, '-', 2);
> +		capture_suffix = igt_crc_to_string_extended(capture_crc, '-', 2);
> +
> +		/* Write reference and capture frames to png. */
> +		igt_write_compared_frames(reference, capture,
> +					  reference_suffix,
> +					  capture_suffix);
> +
> +		free(reference_suffix);
> +		free(capture_suffix);
> +	}
> +
> +	igt_assert(eq);
> +}
> +
>  static void writeback_sequence(igt_output_t *output, igt_plane_t *plane,
>  				igt_fb_t *in_fb, igt_fb_t *out_fbs[], int n_commits)
>  {
> @@ -303,7 +336,8 @@ static void writeback_sequence(igt_output_t *output, igt_plane_t *plane,
>  		if (out_fbs[i]) {
>  			igt_crc_t out_after;
>  			igt_fb_get_fnv1a_crc(out_fbs[i], &out_after);
> -			igt_assert_crc_equal(&out_expected, &out_after);
> +			writeback_assert_crtc_eq_or_dump(&out_expected, in_fb,
> +							 &out_after, out_fbs[i]);
>  
>  			/* And clear it, for the next time */
>  			fill_fb(out_fbs[i], clear_color);


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]