[FFmpeg-cvslog] avcodec/mips: loongson fix bugs in mathops optimization

周晓勇 git at videolan.org
Thu May 21 17:47:12 CEST 2015


ffmpeg | branch: master | 周晓勇 <zhouxiaoyong at loongson.cn> | Thu May 21 16:31:58 2015 +0800| [33e9473366074ee92eecec5f5719734e4a6b4b79] | committer: Michael Niedermayer

avcodec/mips: loongson fix bugs in mathops optimization

the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now.

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

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

 libavcodec/mips/mathops.h |   51 ---------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/libavcodec/mips/mathops.h b/libavcodec/mips/mathops.h
index cdc7705..bb9dc83 100644
--- a/libavcodec/mips/mathops.h
+++ b/libavcodec/mips/mathops.h
@@ -43,19 +43,6 @@ static inline av_const int MULH(int a, int b)
     return c;
 }
 
-#define UMULH UMULH
-static inline av_const unsigned UMULH(unsigned a, unsigned b)
-{
-    unsigned c;
-    __asm__ ("dmultu %1, %2     \n\t"
-             "mflo %0           \n\t"
-             "dsrl %0, %0, 32   \n\t"
-             : "=r"(c)
-             : "r"(a),"r"(b)
-             : "hi", "lo");
-    return c;
-}
-
 #define mid_pred mid_pred
 static inline av_const int mid_pred(int a, int b, int c)
 {
@@ -73,44 +60,6 @@ static inline av_const int mid_pred(int a, int b, int c)
     return t;
 }
 
-#define ff_sqrt ff_sqrt
-static inline av_const unsigned int ff_sqrt(unsigned int a)
-{
-    unsigned int b;
-
-    __asm__ ("ctc1 %1, $f0      \n\t"
-             "sqrt.s $f2, $f0   \n\t"
-             "cvt.w.s $f0, $f2  \n\t"
-             "cfc1 %0, $f0      \n\t"
-             : "=r"(b)
-             : "r"(a));
-    return b;
-}
-
-static inline av_const int64_t MAC64(int64_t d, int a, int b)
-{
-    int64_t m;
-    __asm__ ("dmult %2, %3     \n\t"
-             "mflo  %1         \n\t"
-             "daddu %0, %0, %1 \n\t"
-             : "+r"(d), "=&r"(m) : "r"(a), "r"(b)
-             : "hi", "lo");
-    return d;
-}
-#define MAC64(d, a, b) ((d) = MAC64(d, a, b))
-
-static inline av_const int64_t MLS64(int64_t d, int a, int b)
-{
-    int64_t m;
-    __asm__ ("dmult %2, %3     \n\t"
-             "mflo  %1         \n\t"
-             "dsubu %0, %0, %1 \n\t"
-             : "+r"(d), "=&r"(m) : "r"(a), "r"(b)
-             : "hi", "lo");
-    return d;
-}
-#define MLS64(d, a, b) ((d) = MLS64(d, a, b))
-
 #endif /* HAVE_LOONGSON3 */
 
 #endif /* HAVE_INLINE_ASM */



More information about the ffmpeg-cvslog mailing list