[FFmpeg-devel] [PATCH v3 04/17] tests/checkasm: generalize DEF_CHECKASM_CHECK_FUNC to floats

[Martin Storsjö]

On Tue, 27 May 2025, Niklas Haas wrote:

> From: Niklas Haas <git at haasn.dev>
>
> We split the standard macro into its body (implementation) and declaration,
> and use a macro argument in place of the raw `memcmp` call, with the major
> difference that we now take the number of pixels to compare instead of the
> number of bytes (to match the signature of float_near_ulp_array).
> ---
> tests/checkasm/checkasm.c | 52 ++++++++++++++++++++++++++-------------
> tests/checkasm/checkasm.h |  7 ++++++
> 2 files changed, 42 insertions(+), 17 deletions(-)
>
> diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
> index 71d1e5766c..f393a0cb96 100644
> --- a/tests/checkasm/checkasm.c
> +++ b/tests/checkasm/checkasm.c
> @@ -1187,14 +1187,8 @@ static int check_err(const char *file, int line,
>     return 0;
> }
>
> -#define DEF_CHECKASM_CHECK_FUNC(type, fmt) \
> -int checkasm_check_##type(const char *file, int line, \
> -                          const type *buf1, ptrdiff_t stride1, \
> -                          const type *buf2, ptrdiff_t stride2, \
> -                          int w, int h, const char *name, \
> -                          int align_w, int align_h, \
> -                          int padding) \
> -{ \
> +#define DEF_CHECKASM_CHECK_BODY(compare, type, fmt) \
> +do { \
>     int64_t aligned_w = (w - 1LL + align_w) & ~(align_w - 1); \
>     int64_t aligned_h = (h - 1LL + align_h) & ~(align_h - 1); \
>     int err = 0; \
> @@ -1204,7 +1198,7 @@ int checkasm_check_##type(const char *file, int line, \
>     stride1 /= sizeof(*buf1); \
>     stride2 /= sizeof(*buf2); \
>     for (y = 0; y < h; y++) \
> -        if (memcmp(&buf1[y*stride1], &buf2[y*stride2], w*sizeof(*buf1))) \
> +        if (!compare(&buf1[y*stride1], &buf2[y*stride2], w)) \
>             break; \
>     if (y != h) { \
>         if (check_err(file, line, name, w, h, &err)) \
> @@ -1226,38 +1220,50 @@ int checkasm_check_##type(const char *file, int line, \
>         buf2 -= h*stride2; \
>     } \
>     for (y = -padding; y < 0; y++) \
> -        if (memcmp(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> -                   (w + 2*padding)*sizeof(*buf1))) { \
> +        if (!compare(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> +                     w + 2*padding)) { \
>             if (check_err(file, line, name, w, h, &err)) \
>                 return 1; \
>             fprintf(stderr, " overwrite above\n"); \
>             break; \
>         } \
>     for (y = aligned_h; y < aligned_h + padding; y++) \
> -        if (memcmp(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> -                   (w + 2*padding)*sizeof(*buf1))) { \
> +        if (!compare(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> +                     w + 2*padding)) { \
>             if (check_err(file, line, name, w, h, &err)) \
>                 return 1; \
>             fprintf(stderr, " overwrite below\n"); \
>             break; \
>         } \
>     for (y = 0; y < h; y++) \
> -        if (memcmp(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> -                   padding*sizeof(*buf1))) { \
> +        if (!compare(&buf1[y*stride1 - padding], &buf2[y*stride2 - padding], \
> +                     padding)) { \
>             if (check_err(file, line, name, w, h, &err)) \
>                 return 1; \
>             fprintf(stderr, " overwrite left\n"); \
>             break; \
>         } \
>     for (y = 0; y < h; y++) \
> -        if (memcmp(&buf1[y*stride1 + aligned_w], &buf2[y*stride2 + aligned_w], \
> -                   padding*sizeof(*buf1))) { \
> +        if (!compare(&buf1[y*stride1 + aligned_w], &buf2[y*stride2 + aligned_w], \
> +                     padding)) { \
>             if (check_err(file, line, name, w, h, &err)) \
>                 return 1; \
>             fprintf(stderr, " overwrite right\n"); \
>             break; \
>         } \
>     return err; \
> +} while (0)
> +
> +#define cmp_int(a, b, len) (!memcmp(a, b, (len) * sizeof(*(a))))
> +#define DEF_CHECKASM_CHECK_FUNC(type, fmt) \
> +int checkasm_check_##type(const char *file, int line, \
> +                          const type *buf1, ptrdiff_t stride1, \
> +                          const type *buf2, ptrdiff_t stride2, \
> +                          int w, int h, const char *name, \
> +                          int align_w, int align_h, \
> +                          int padding) \
> +{ \
> +    DEF_CHECKASM_CHECK_BODY(cmp_int, type, fmt); \
> }
>
> DEF_CHECKASM_CHECK_FUNC(uint8_t,  "%02x")
> @@ -1265,3 +1271,15 @@ DEF_CHECKASM_CHECK_FUNC(uint16_t, "%04x")
> DEF_CHECKASM_CHECK_FUNC(uint32_t, "%08x")
> DEF_CHECKASM_CHECK_FUNC(int16_t,  "%6d")
> DEF_CHECKASM_CHECK_FUNC(int32_t,  "%9d")
> +
> +int checkasm_check_float_ulp(const char *file, int line,
> +                             const float *buf1, ptrdiff_t stride1,
> +                             const float *buf2, ptrdiff_t stride2,
> +                             int w, int h, const char *name,
> +                             unsigned max_ulp, int align_w, int align_h,
> +                             int padding)
> +{
> +    #define cmp_float(a, b, len) float_near_ulp_array(a, b, max_ulp, len)
> +    DEF_CHECKASM_CHECK_BODY(cmp_float, float, "%g");
> +    #undef cmp_float
> +}
> diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
> index ad7ed10613..ec01bd6207 100644
> --- a/tests/checkasm/checkasm.h
> +++ b/tests/checkasm/checkasm.h
> @@ -423,6 +423,13 @@ DECL_CHECKASM_CHECK_FUNC(uint32_t);
> DECL_CHECKASM_CHECK_FUNC(int16_t);
> DECL_CHECKASM_CHECK_FUNC(int32_t);
>
> +int checkasm_check_float_ulp(const char *file, int line,
> +                             const float *buf1, ptrdiff_t stride1,
> +                             const float *buf2, ptrdiff_t stride2,
> +                             int w, int h, const char *name,
> +                             unsigned max_elp, int align_w, int align_h,

Typo - max_ulp?


Other than that, thanks, this looks reasonable!

// Martin