[FFmpeg-devel] [PATCH 1/9] checkasm/vc1dsp: Use declare_func_emms only when needed

[FFmpeg-devel] [PATCH 1/9] checkasm/vc1dsp: Use declare_func_emms only when needed

[Andreas Rheinhardt]

There is no MMX code for vc1_inv_trans_8x8 or
vc1_unescape_buffer, so use declare_func instead of
declare_func_emms() to also test that we are not in MMX
mode after return.

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

diff --git a/tests/checkasm/vc1dsp.c b/tests/checkasm/vc1dsp.c
index 52628d15e4..570785776f 100644
--- a/tests/checkasm/vc1dsp.c
+++ b/tests/checkasm/vc1dsp.c
@@ -261,7 +261,7 @@ static void check_inv_trans_inplace(void)
 
     if (check_func(h.vc1_inv_trans_8x8, "vc1dsp.vc1_inv_trans_8x8")) {
         matrix *coeffs;
-        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *);
+        declare_func(void, int16_t *);
         RANDOMIZE_BUFFER16(inv_trans_in, 10 * 8);
         coeffs = generate_inverse_quantized_transform_coefficients(8, 8);
         for (int j = 0; j < 8; ++j)
@@ -404,7 +404,7 @@ static void check_unescape(void)
 
     if (check_func(h.vc1_unescape_buffer, "vc1dsp.vc1_unescape_buffer")) {
         int len0, len1, escaped_offset, unescaped_offset, escaped_len;
-        declare_func_emms(AV_CPU_FLAG_MMX, int, const uint8_t *, int, uint8_t *);
+        declare_func(int, const uint8_t *, int, uint8_t *);
 
         /* Test data which consists of escapes sequences packed as tightly as possible */
         for (int x = 0; x < UNESCAPE_BUF_SIZE; ++x)
-- 
2.34.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".

[FFmpeg-devel] [PATCH 2/9] checkasm/blockdsp: Be strict about MMX

[Andreas Rheinhardt]

There is no MMX code for blockdsp after commit
ee551a21ddcbf81afe183d9489c534ee80f263a0, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c
index 99d79209e4..22a2f79455 100644
--- a/tests/checkasm/blockdsp.c
+++ b/tests/checkasm/blockdsp.c
@@ -42,7 +42,7 @@
 #define check_clear(func, size)                                     \
 do {                                                                \
     if (check_func(h.func, "blockdsp." #func)) {                    \
-        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block);   \
+        declare_func(void, int16_t *block);                         \
         randomize_buffers(size);                                    \
         call_ref(buf0);                                             \
         call_new(buf1);                                             \
-- 
2.34.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".

[FFmpeg-devel] [PATCH 3/9] checkasm/audiodsp: Be strict about MMX

[Andreas Rheinhardt]

There is no MMX code for audiodsp after commit
3d716d38abdae1982e84e30becb57458244656bd, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/audiodsp.c b/tests/checkasm/audiodsp.c
index d3a5604299..7980b550d2 100644
--- a/tests/checkasm/audiodsp.c
+++ b/tests/checkasm/audiodsp.c
@@ -61,7 +61,7 @@ void checkasm_check_audiodsp(void)
         unsigned int len_bits_minus4, v1_bits, v2_bits, len;
         int32_t res0, res1;
 
-        declare_func_emms(AV_CPU_FLAG_MMX, int32_t, const int16_t *v1, const int16_t *v2, int len);
+        declare_func(int32_t, const int16_t *v1, const int16_t *v2, int len);
 
         // generate random 5-12bit vector length
         len_bits_minus4 = rnd() % 8;
@@ -90,8 +90,8 @@ void checkasm_check_audiodsp(void)
         int32_t val1, val2, min, max;
         int len;
 
-        declare_func_emms(AV_CPU_FLAG_MMX, void, int32_t *dst, const int32_t *src,
-                          int32_t min, int32_t max, unsigned int len);
+        declare_func(void, int32_t *dst, const int32_t *src,
+                     int32_t min, int32_t max, unsigned int len);
 
         val1 = ((int32_t)rnd());
         val1 = FFSIGN(val1) * (val1 & ((1 << 24) - 1));
@@ -120,8 +120,8 @@ void checkasm_check_audiodsp(void)
         float val1, val2, min, max;
         int i, len;
 
-        declare_func_emms(AV_CPU_FLAG_MMX, void, float *dst, const float *src,
-                          int len, float min, float max);
+        declare_func(void, float *dst, const float *src,
+                     int len, float min, float max);
 
         val1 = (float)rnd() / (UINT_MAX >> 1) - 1.0f;
         val2 = (float)rnd() / (UINT_MAX >> 1) - 1.0f;
-- 
2.34.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".

[FFmpeg-devel] [PATCH 4/9] checkasm/pixblockdsp: Be strict about MMX

[Andreas Rheinhardt]

There is no MMX code for pixblockdsp after commit
92b58002776edd3a3df03c90e8a3ab24b8f987de, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/pixblockdsp.c b/tests/checkasm/pixblockdsp.c
index 9a7865aa5f..3c8599db36 100644
--- a/tests/checkasm/pixblockdsp.c
+++ b/tests/checkasm/pixblockdsp.c
@@ -48,7 +48,7 @@
 #define check_get_pixels(type, aligned)                                                    \
     do {                                                                                   \
         int i;                                                                             \
-        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);    \
+        declare_func(void, int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);    \
                                                                                            \
         for (i = 0; i < BUF_UNITS; i++) {                                              \
             int src_offset = i * 64 * sizeof(type) + (aligned ? 8 : 1) * i;                \
@@ -65,7 +65,7 @@
 #define check_diff_pixels(type, aligned)                                                   \
     do {                                                                                   \
         int i;                                                                             \
-        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); \
+        declare_func(void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); \
                                                                                            \
         for (i = 0; i < BUF_UNITS; i++) {                                              \
             int src_offset = i * 64 * sizeof(type) + (aligned ? 8 : 1) * i;                \
-- 
2.34.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".

[FFmpeg-devel] [PATCH 5/9] checkasm/llviddsp: Be strict about MMX

[Andreas Rheinhardt]

There is no MMX code for llviddsp after commit
fed07efcde72824ac1ada80d4af4e91ac4fcfc14, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/llviddsp.c b/tests/checkasm/llviddsp.c
index 66e08c8099..d948a9832d 100644
--- a/tests/checkasm/llviddsp.c
+++ b/tests/checkasm/llviddsp.c
@@ -48,7 +48,7 @@ static void check_add_bytes(LLVidDSPContext c, int width)
     uint8_t *dst1 = av_mallocz(width);
     uint8_t *src0 = av_calloc(width, sizeof(*src0));
     uint8_t *src1 = av_calloc(width, sizeof(*src1));
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t w);
+    declare_func(void, uint8_t *dst, uint8_t *src, ptrdiff_t w);
 
     init_buffer(src0, src1, uint8_t, width);
 
@@ -78,9 +78,9 @@ static void check_add_median_pred(LLVidDSPContext c, int width) {
     uint8_t *src1  = av_calloc(width, sizeof(*src1));
     uint8_t *diff0 = av_calloc(width, sizeof(*diff0));
     uint8_t *diff1 = av_calloc(width, sizeof(*diff1));
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, const uint8_t *src1,
-                      const uint8_t *diff, ptrdiff_t w,
-                      int *left, int *left_top);
+    declare_func(void, uint8_t *dst, const uint8_t *src1,
+                 const uint8_t *diff, ptrdiff_t w,
+                 int *left, int *left_top);
 
     init_buffer(src0, src1, uint8_t, width);
     init_buffer(diff0, diff1, uint8_t, width);
@@ -114,7 +114,7 @@ static void check_add_left_pred(LLVidDSPContext c, int width, int acc, const cha
     uint8_t *dst1 = av_mallocz(width);
     uint8_t *src0 = av_calloc(width, sizeof(*src0));
     uint8_t *src1 = av_calloc(width, sizeof(*src1));
-    declare_func_emms(AV_CPU_FLAG_MMX, int, uint8_t *dst, uint8_t *src, ptrdiff_t w, int acc);
+    declare_func(int, uint8_t *dst, uint8_t *src, ptrdiff_t w, int acc);
 
     init_buffer(src0, src1, uint8_t, width);
 
@@ -143,7 +143,7 @@ static void check_add_left_pred_16(LLVidDSPContext c, unsigned mask, int width,
     uint16_t *dst1 = av_calloc(width, sizeof(*dst1));
     uint16_t *src0 = av_calloc(width, sizeof(*src0));
     uint16_t *src1 = av_calloc(width, sizeof(*src1));
-    declare_func_emms(AV_CPU_FLAG_MMX, int, uint16_t *dst, uint16_t *src, unsigned mask, ptrdiff_t w, unsigned acc);
+    declare_func(int, uint16_t *dst, uint16_t *src, unsigned mask, ptrdiff_t w, unsigned acc);
 
     init_buffer(src0, src1, uint16_t, width);
 
@@ -168,8 +168,8 @@ static void check_add_left_pred_16(LLVidDSPContext c, unsigned mask, int width,
 static void check_add_gradient_pred(LLVidDSPContext c, int w) {
     int src_size, stride;
     uint8_t *src0, *src1;
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *src, const ptrdiff_t stride,
-                      const ptrdiff_t width);
+    declare_func(void, uint8_t *src, const ptrdiff_t stride,
+                 const ptrdiff_t width);
 
     stride = w + 32;
     src_size = (stride + 32) * 2; /* dsp need previous line, and ignore the start of the line */
-- 
2.34.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".

[FFmpeg-devel] [PATCH 6/9] checkasm/huffyuvdsp: Use declare_func_emms only when needed

[Andreas Rheinhardt]

There is no MMX code for add_int16 since commit
4b6ffc2880e33d05ed1ab6bbc38e5a795f14b504, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/huffyuvdsp.c b/tests/checkasm/huffyuvdsp.c
index 8392022c04..16e6bfb808 100644
--- a/tests/checkasm/huffyuvdsp.c
+++ b/tests/checkasm/huffyuvdsp.c
@@ -42,7 +42,7 @@ static void check_add_int16(HuffYUVDSPContext c, unsigned mask, int width, const
     uint16_t *dst0 = av_mallocz(width * sizeof(uint16_t));
     uint16_t *dst1 = av_mallocz(width * sizeof(uint16_t));
 
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint16_t *dst, uint16_t *src, unsigned mask, int w);
+    declare_func(void, uint16_t *dst, uint16_t *src, unsigned mask, int w);
 
     if (!src0 || !src1 || !dst0 || !dst1)
         fail();
-- 
2.34.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".

[FFmpeg-devel] [PATCH 7/9] checkasm/llviddspenc: Use declare_func_emms only when needed

[Andreas Rheinhardt]

There is no MMX code for diff_bytes since commit
230ea38de143368729ee1cce47b3a87fbafad8e4, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/llviddspenc.c b/tests/checkasm/llviddspenc.c
index 4ec46c96bd..e12003aeeb 100644
--- a/tests/checkasm/llviddspenc.c
+++ b/tests/checkasm/llviddspenc.c
@@ -52,8 +52,8 @@ static void check_diff_bytes(LLVidEncDSPContext *c)
     LOCAL_ALIGNED_32(uint8_t, src2, [MAX_STRIDE]);
     LOCAL_ALIGNED_32(uint8_t, src3, [MAX_STRIDE]);
 
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, const uint8_t *src1,
-                      const uint8_t *src2, intptr_t w);
+    declare_func(void, uint8_t *dst, const uint8_t *src1,
+                 const uint8_t *src2, intptr_t w);
 
     memset(dst0, 0, MAX_STRIDE);
     memset(dst1, 0, MAX_STRIDE);
-- 
2.34.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".

[FFmpeg-devel] [PATCH 8/9] checkasm/vp8dsp: Use declare_func_emms only when needed

[Andreas Rheinhardt]

There is no MMX code for loop filters since commit
6a551f14050674fb685920eb1b0640810cacccf9, so use declare_func
instead of declare_func_emms() to also test that we are not
in MMX mode after return.

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

diff --git a/tests/checkasm/vp8dsp.c b/tests/checkasm/vp8dsp.c
index c3af54fbfd..87b03d71d5 100644
--- a/tests/checkasm/vp8dsp.c
+++ b/tests/checkasm/vp8dsp.c
@@ -384,7 +384,7 @@ static void check_loopfilter_16y(void)
     VP8DSPContext d;
     int dir, edge, force_hev;
     int flim_E = 20, flim_I = 10, hev_thresh = 7;
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, ptrdiff_t, int, int, int);
+    declare_func(void, uint8_t *, ptrdiff_t, int, int, int);
 
     ff_vp8dsp_init(&d);
 
@@ -430,7 +430,7 @@ static void check_loopfilter_8uv(void)
     VP8DSPContext d;
     int dir, edge, force_hev;
     int flim_E = 20, flim_I = 10, hev_thresh = 7;
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, uint8_t *, ptrdiff_t, int, int, int);
+    declare_func(void, uint8_t *, uint8_t *, ptrdiff_t, int, int, int);
 
     ff_vp8dsp_init(&d);
 
@@ -481,7 +481,7 @@ static void check_loopfilter_simple(void)
     VP8DSPContext d;
     int dir;
     int flim_E = 20, flim_I = 30, hev_thresh = 0;
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, ptrdiff_t, int);
+    declare_func(void, uint8_t *, ptrdiff_t, int);
 
     ff_vp8dsp_init(&d);
 
-- 
2.34.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 8/9] checkasm/vp8dsp: Use declare_func_emms only when needed

[Ronald S. Bultje]

Hi,

On Fri, Oct 7, 2022 at 9:25 PM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> There is no MMX code for loop filters since commit
> 6a551f14050674fb685920eb1b0640810cacccf9, so use declare_func
> instead of declare_func_emms() to also test that we are not
> in MMX mode after return.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  tests/checkasm/vp8dsp.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>

LGTM.

Ronald
_______________________________________________
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".

[FFmpeg-devel] [PATCH 9/9] checkasm/idctdsp: Use declare_func_emms only when needed

[Andreas Rheinhardt]

There is no MMX code for (add|put|put_signed)_pixels_clamped
since commit bfb28b5ce89f3e950214b67ea95b45e3355c2caf, so use
declare_func instead of declare_func_emms() to also test that
we are not in MMX mode after return.

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

diff --git a/tests/checkasm/idctdsp.c b/tests/checkasm/idctdsp.c
index 02724536a7..c06e607d99 100644
--- a/tests/checkasm/idctdsp.c
+++ b/tests/checkasm/idctdsp.c
@@ -79,7 +79,7 @@ static void check_add_put_clamped(void)
     for (size_t t = 0; t < FF_ARRAY_ELEMS(tests); ++t) {
         void (*func)(const int16_t *, uint8_t * ptrdiff_t) = *(void **)((intptr_t) &h + tests[t].offset);
         if (check_func(func, "idctdsp.%s", tests[t].name)) {
-            declare_func_emms(AV_CPU_FLAG_MMX, void, const int16_t *, uint8_t *, ptrdiff_t);
+            declare_func(void, const int16_t *, uint8_t *, ptrdiff_t);
             RANDOMIZE_BUFFER16(src, 64);
             RANDOMIZE_BUFFER8(dst, 10 * 24);
             call_ref(src0, dst0 + 24 + 8, 24);
-- 
2.34.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 1/9] checkasm/vc1dsp: Use declare_func_emms only when needed

[Andreas Rheinhardt]

Andreas Rheinhardt:
> There is no MMX code for vc1_inv_trans_8x8 or
> vc1_unescape_buffer, so use declare_func instead of
> declare_func_emms() to also test that we are not in MMX
> mode after return.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  tests/checkasm/vc1dsp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/checkasm/vc1dsp.c b/tests/checkasm/vc1dsp.c
> index 52628d15e4..570785776f 100644
> --- a/tests/checkasm/vc1dsp.c
> +++ b/tests/checkasm/vc1dsp.c
> @@ -261,7 +261,7 @@ static void check_inv_trans_inplace(void)
>  
>      if (check_func(h.vc1_inv_trans_8x8, "vc1dsp.vc1_inv_trans_8x8")) {
>          matrix *coeffs;
> -        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *);
> +        declare_func(void, int16_t *);
>          RANDOMIZE_BUFFER16(inv_trans_in, 10 * 8);
>          coeffs = generate_inverse_quantized_transform_coefficients(8, 8);
>          for (int j = 0; j < 8; ++j)
> @@ -404,7 +404,7 @@ static void check_unescape(void)
>  
>      if (check_func(h.vc1_unescape_buffer, "vc1dsp.vc1_unescape_buffer")) {
>          int len0, len1, escaped_offset, unescaped_offset, escaped_len;
> -        declare_func_emms(AV_CPU_FLAG_MMX, int, const uint8_t *, int, uint8_t *);
> +        declare_func(int, const uint8_t *, int, uint8_t *);
>  
>          /* Test data which consists of escapes sequences packed as tightly as possible */
>          for (int x = 0; x < UNESCAPE_BUF_SIZE; ++x)

Will apply this patchset 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".