[FFmpeg-devel] [PATCH] tests/checkasm/vvc_alf: Don't use declare_func_emms

[FFmpeg-devel] [PATCH] tests/checkasm/vvc_alf: Don't use declare_func_emms

[Andreas Rheinhardt]

VVC does not have MMX code at all, so one can use the stricter
declare_func to also check that the MMX state has not been clobbered
with (which would be an ABI violation).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/checkasm/vvc_alf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c
index 6dd89bfafc..f35fd2cd3e 100644
--- a/tests/checkasm/vvc_alf.c
+++ b/tests/checkasm/vvc_alf.c
@@ -83,7 +83,7 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth)
     ptrdiff_t dst_stride = DST_PIXEL_STRIDE * SIZEOF_PIXEL;
     int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
 
-    declare_func_emms(AV_CPU_FLAG_AVX2, void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
+    declare_func(void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
         int width, int height, const int16_t *filter, const int16_t *clip, const int vb_pos);
 
     randomize_buffers(src0, src1, SRC_BUF_SIZE);
@@ -137,7 +137,7 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth)
     ptrdiff_t stride = SRC_PIXEL_STRIDE * SIZEOF_PIXEL;
     int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
 
-    declare_func_emms(AV_CPU_FLAG_AVX2, void, int *class_idx, int *transpose_idx,
+    declare_func(void, int *class_idx, int *transpose_idx,
         const uint8_t *src, ptrdiff_t src_stride, int width, int height, int vb_pos, int *gradient_tmp);
 
     randomize_buffers(src0, src1, SRC_BUF_SIZE);
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] tests/checkasm/vvc_alf: Don't use declare_func_emms

[Martin Storsjö]

On Wed, 22 May 2024, Andreas Rheinhardt wrote:

> VVC does not have MMX code at all, so one can use the stricter
> declare_func to also check that the MMX state has not been clobbered
> with (which would be an ABI violation).
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/checkasm/vvc_alf.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c
> index 6dd89bfafc..f35fd2cd3e 100644
> --- a/tests/checkasm/vvc_alf.c
> +++ b/tests/checkasm/vvc_alf.c
> @@ -83,7 +83,7 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth)
>     ptrdiff_t dst_stride = DST_PIXEL_STRIDE * SIZEOF_PIXEL;
>     int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
>
> -    declare_func_emms(AV_CPU_FLAG_AVX2, void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
> +    declare_func(void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
>         int width, int height, const int16_t *filter, const int16_t *clip, const int vb_pos);
>
>     randomize_buffers(src0, src1, SRC_BUF_SIZE);
> @@ -137,7 +137,7 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth)
>     ptrdiff_t stride = SRC_PIXEL_STRIDE * SIZEOF_PIXEL;
>     int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
>
> -    declare_func_emms(AV_CPU_FLAG_AVX2, void, int *class_idx, int *transpose_idx,
> +    declare_func(void, int *class_idx, int *transpose_idx,
>         const uint8_t *src, ptrdiff_t src_stride, int width, int height, int vb_pos, int *gradient_tmp);
>
>     randomize_buffers(src0, src1, SRC_BUF_SIZE);
> -- 
> 2.40.1

LGTM

// Martin

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] tests/checkasm/vvc_alf: Don't use declare_func_emms

[Andreas Rheinhardt]

Andreas Rheinhardt:
> VVC does not have MMX code at all, so one can use the stricter
> declare_func to also check that the MMX state has not been clobbered
> with (which would be an ABI violation).
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  tests/checkasm/vvc_alf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c
> index 6dd89bfafc..f35fd2cd3e 100644
> --- a/tests/checkasm/vvc_alf.c
> +++ b/tests/checkasm/vvc_alf.c
> @@ -83,7 +83,7 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth)
>      ptrdiff_t dst_stride = DST_PIXEL_STRIDE * SIZEOF_PIXEL;
>      int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
>  
> -    declare_func_emms(AV_CPU_FLAG_AVX2, void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
> +    declare_func(void, uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride,
>          int width, int height, const int16_t *filter, const int16_t *clip, const int vb_pos);
>  
>      randomize_buffers(src0, src1, SRC_BUF_SIZE);
> @@ -137,7 +137,7 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth)
>      ptrdiff_t stride = SRC_PIXEL_STRIDE * SIZEOF_PIXEL;
>      int offset = (3 * SRC_PIXEL_STRIDE + 3) * SIZEOF_PIXEL;
>  
> -    declare_func_emms(AV_CPU_FLAG_AVX2, void, int *class_idx, int *transpose_idx,
> +    declare_func(void, int *class_idx, int *transpose_idx,
>          const uint8_t *src, ptrdiff_t src_stride, int width, int height, int vb_pos, int *gradient_tmp);
>  
>      randomize_buffers(src0, src1, SRC_BUF_SIZE);

Will apply this patch tomorrow unless there are objections.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".