[FFmpeg-cvslog] swresample: Add arm&x86 clobber tests

Martin Storsjö git at videolan.org
Sat Jan 18 19:38:24 CET 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sat Jan 18 18:17:54 2014 +0100| [3dd04cbcf76b2fe07726c350a5c52270fb9da327] | committer: Michael Niedermayer

swresample: Add arm&x86 clobber tests

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure                      |    2 ++
 libswresample/arm/Makefile     |    3 +++
 libswresample/arm/neontest.c   |   29 +++++++++++++++++++++++++++++
 libswresample/x86/Makefile     |    2 ++
 libswresample/x86/w64xmmtest.c |   29 +++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+)

diff --git a/configure b/configure
index 642f31b..7c479b2 100755
--- a/configure
+++ b/configure
@@ -4648,6 +4648,7 @@ enabled neon_clobber_test &&
                   -Wl,--wrap,avcodec_encode_audio2      \
                   -Wl,--wrap,avcodec_encode_video2      \
                   -Wl,--wrap,avcodec_encode_subtitle    \
+                  -Wl,--wrap,swr_convert                \
                   -Wl,--wrap,avresample_convert ||
     disable neon_clobber_test
 
@@ -4660,6 +4661,7 @@ enabled xmm_clobber_test &&
                   -Wl,--wrap,avcodec_encode_video       \
                   -Wl,--wrap,avcodec_encode_video2      \
                   -Wl,--wrap,avcodec_encode_subtitle    \
+                  -Wl,--wrap,swr_convert                \
                   -Wl,--wrap,avresample_convert         \
                   -Wl,--wrap,sws_scale ||
     disable xmm_clobber_test
diff --git a/libswresample/arm/Makefile b/libswresample/arm/Makefile
index 55683cb..60f3f6d 100644
--- a/libswresample/arm/Makefile
+++ b/libswresample/arm/Makefile
@@ -1,2 +1,5 @@
 OBJS      += arm/audio_convert_init.o
+
+OBJS-$(CONFIG_NEON_CLOBBER_TEST) += arm/neontest.o
+
 NEON-OBJS += arm/audio_convert_neon.o
diff --git a/libswresample/arm/neontest.c b/libswresample/arm/neontest.c
new file mode 100644
index 0000000..2abbbc2
--- /dev/null
+++ b/libswresample/arm/neontest.c
@@ -0,0 +1,29 @@
+/*
+ * check NEON registers for clobbers
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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 "libswresample/swresample.h"
+#include "libavutil/arm/neontest.h"
+
+wrap(swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
+                 const uint8_t **in , int in_count))
+{
+    testneonclobbers(swr_convert, s, out, out_count, in, in_count);
+}
diff --git a/libswresample/x86/Makefile b/libswresample/x86/Makefile
index e8feede..1d1ab6e 100644
--- a/libswresample/x86/Makefile
+++ b/libswresample/x86/Makefile
@@ -1,3 +1,5 @@
 YASM-OBJS                       += x86/swresample_x86.o\
                                    x86/audio_convert.o\
                                    x86/rematrix.o\
+
+OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
diff --git a/libswresample/x86/w64xmmtest.c b/libswresample/x86/w64xmmtest.c
new file mode 100644
index 0000000..9cddb4a
--- /dev/null
+++ b/libswresample/x86/w64xmmtest.c
@@ -0,0 +1,29 @@
+/*
+ * check XMM registers for clobbers on Win64
+ * Copyright (c) 2013 Martin Storsjo
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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 "libswresample/swresample.h"
+#include "libavutil/x86/w64xmmtest.h"
+
+wrap(swr_convert(struct SwrContext *s, uint8_t **out, int out_count,
+                 const uint8_t **in , int in_count))
+{
+    testxmmclobbers(swr_convert, s, out, out_count, in, in_count);
+}



More information about the ffmpeg-cvslog mailing list