[FFmpeg-cvslog] checkasm: add fixed_dsp tests

James Almer git at videolan.org
Wed Apr 12 00:05:33 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr 11 17:12:21 2017 -0300| [7b3cb953f7d790c1ca26dd3da17ba6aea38918fd] | committer: James Almer

checkasm: add fixed_dsp tests

Tested-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b3cb953f7d790c1ca26dd3da17ba6aea38918fd
---

 tests/checkasm/Makefile    |   3 +
 tests/checkasm/checkasm.c  |   3 +
 tests/checkasm/checkasm.h  |   1 +
 tests/checkasm/fixed_dsp.c | 159 +++++++++++++++++++++++++++++++++++++++++++++
 tests/fate/checkasm.mak    |   1 +
 5 files changed, 167 insertions(+)

diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 4e103f43ed..cbe614b1fd 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -29,6 +29,9 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
 
 CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
 
+AVUTILOBJS                              += fixed_dsp.o
+
+CHECKASMOBJS-$(CONFIG_AVUTIL)  += $(AVUTILOBJS)
 
 CHECKASMOBJS-$(ARCH_AARCH64)            += aarch64/checkasm.o
 CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL)   += arm/checkasm.o
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index ad897b9001..0cb4ed199a 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -129,6 +129,9 @@ static const struct {
         { "vf_colorspace", checkasm_check_colorspace },
     #endif
 #endif
+#if CONFIG_AVUTIL
+        { "fixed_dsp", checkasm_check_fixed_dsp },
+#endif
     { NULL }
 };
 
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index f1d1f71d4f..695d871220 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -37,6 +37,7 @@ void checkasm_check_blend(void);
 void checkasm_check_blockdsp(void);
 void checkasm_check_bswapdsp(void);
 void checkasm_check_colorspace(void);
+void checkasm_check_fixed_dsp(void);
 void checkasm_check_flacdsp(void);
 void checkasm_check_fmtconvert(void);
 void checkasm_check_h264dsp(void);
diff --git a/tests/checkasm/fixed_dsp.c b/tests/checkasm/fixed_dsp.c
new file mode 100644
index 0000000000..546858a600
--- /dev/null
+++ b/tests/checkasm/fixed_dsp.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "checkasm.h"
+#include "libavutil/common.h"
+#include "libavutil/fixed_dsp.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
+
+#define BUF_SIZE 256
+
+#define randomize_buffers()                   \
+    do {                                      \
+        int i;                                \
+        for (i = 0; i < BUF_SIZE; i++) {      \
+            src0[i] = sign_extend(rnd(), 24); \
+            src1[i] = sign_extend(rnd(), 24); \
+            src2[i] = sign_extend(rnd(), 24); \
+        }                                     \
+    } while (0)
+
+static void check_vector_fmul(const int *src0, const int *src1)
+{
+    LOCAL_ALIGNED_32(int, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int, new, [BUF_SIZE]);
+
+    declare_func(void, int *dst, const int *src0, const int *src1, int len);
+
+    call_ref(ref, src0, src1, BUF_SIZE);
+    call_new(new, src0, src1, BUF_SIZE);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int)))
+        fail();
+    bench_new(new, src0, src1, BUF_SIZE);
+}
+
+static void check_vector_fmul_add(const int *src0, const int *src1, const int *src2)
+{
+    LOCAL_ALIGNED_32(int, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int, new, [BUF_SIZE]);
+
+    declare_func(void, int *dst, const int *src0, const int *src1, const int *src2, int len);
+
+    call_ref(ref, src0, src1, src2, BUF_SIZE);
+    call_new(new, src0, src1, src2, BUF_SIZE);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int)))
+        fail();
+    bench_new(new, src0, src1, src2, BUF_SIZE);
+}
+
+static void check_vector_fmul_window(const int32_t *src0, const int32_t *src1, const int32_t *win)
+{
+    LOCAL_ALIGNED_32(int32_t, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, new, [BUF_SIZE]);
+
+    declare_func(void, int32_t *dst, const int32_t *src0, const int32_t *src1, const int32_t *win, int len);
+
+    call_ref(ref, src0, src1, win, BUF_SIZE / 2);
+    call_new(new, src0, src1, win, BUF_SIZE / 2);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int32_t)))
+        fail();
+    bench_new(new, src0, src1, win, BUF_SIZE / 2);
+}
+
+static void check_vector_fmul_window_scaled(const int32_t *src0, const int32_t *src1, const int32_t *win)
+{
+    LOCAL_ALIGNED_16(int16_t, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int16_t, new, [BUF_SIZE]);
+
+    declare_func(void, int16_t *dst, const int32_t *src0, const int32_t *src1, const int32_t *win, int len, uint8_t bits);
+
+    call_ref(ref, src0, src1, win, BUF_SIZE / 2, 2);
+    call_new(new, src0, src1, win, BUF_SIZE / 2, 2);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int16_t)))
+        fail();
+    bench_new(new, src0, src1, win, BUF_SIZE / 2, 2);
+}
+
+static void check_butterflies(const int *src0, const int *src1)
+{
+    LOCAL_ALIGNED_16(int, ref0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, ref1, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, new0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, new1, [BUF_SIZE]);
+
+    declare_func(void, int *av_restrict src0, int *av_restrict src1, int len);
+
+    memcpy(ref0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(ref1, src1, BUF_SIZE * sizeof(*src1));
+    memcpy(new0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(new1, src1, BUF_SIZE * sizeof(*src1));
+
+    call_ref(ref0, ref1, BUF_SIZE);
+    call_new(new0, new1, BUF_SIZE);
+    if (memcmp(ref0, new0, BUF_SIZE * sizeof(*ref0)) ||
+        memcmp(ref1, new1, BUF_SIZE * sizeof(*ref1)))
+        fail();
+    memcpy(new0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(new1, src1, BUF_SIZE * sizeof(*src1));
+    bench_new(new0, new1, BUF_SIZE);
+}
+
+static void check_scalarproduct_fixed(const int *src0, const int *src1)
+{
+    int ref, new;
+
+    declare_func(int, const int *src0, const int *src1, int len);
+
+    ref = call_ref(src0, src1, BUF_SIZE);
+    new = call_new(src0, src1, BUF_SIZE);
+    if (ref != new)
+        fail();
+    bench_new(src0, src1, BUF_SIZE);
+}
+
+void checkasm_check_fixed_dsp(void)
+{
+    LOCAL_ALIGNED_32(int32_t, src0, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, src1, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, src2, [BUF_SIZE]);
+    AVFixedDSPContext *fdsp = avpriv_alloc_fixed_dsp(1);
+
+    randomize_buffers();
+    if (check_func(fdsp->vector_fmul, "vector_fmul"))
+        check_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_add, "vector_fmul_add"))
+        check_vector_fmul_add(src0, src1, src2);
+    if (check_func(fdsp->vector_fmul_reverse, "vector_fmul_reverse"))
+        check_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_window, "vector_fmul_window"))
+        check_vector_fmul_window(src0, src1, src2);
+    if (check_func(fdsp->vector_fmul_window_scaled, "vector_fmul_window_scaled"))
+        check_vector_fmul_window_scaled(src0, src1, src2);
+    report("vector_fmul");
+    if (check_func(fdsp->butterflies_fixed, "butterflies_fixed"))
+        check_butterflies(src0, src1);
+    report("butterflies_fixed");
+    if (check_func(fdsp->scalarproduct_fixed, "scalarproduct_fixed"))
+        check_scalarproduct_fixed(src0, src1);
+    report("scalarproduct_fixed");
+
+    av_freep(&fdsp);
+}
diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index aa37b961a1..c7b6b36ebb 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -2,6 +2,7 @@ FATE_CHECKASM = fate-checkasm-alacdsp                                   \
                 fate-checkasm-audiodsp                                  \
                 fate-checkasm-blockdsp                                  \
                 fate-checkasm-bswapdsp                                  \
+                fate-checkasm-fixed_dsp                                 \
                 fate-checkasm-flacdsp                                   \
                 fate-checkasm-fmtconvert                                \
                 fate-checkasm-h264dsp                                   \



More information about the ffmpeg-cvslog mailing list