>From d0ad6c2fbb57fb16e5507149a7378022329820f8 Mon Sep 17 00:00:00 2001
From: ZhouXiaoyong <zhouxiaoy...@loongson.cn>
Date: Tue, 19 May 2015 15:43:09 +0800
Subject: [PATCH 2/3] avcodec/mips: loongson fix bugs in mathops optimization
The mathops bugs impact passing fate test.
Signed-off-by: ZhouXiaoyong <zhouxiaoy...@loongson.cn>
---
libavcodec/mips/mathops.h | 41 +++++++----------------------------------
1 file changed, 7 insertions(+), 34 deletions(-)
diff --git a/libavcodec/mips/mathops.h b/libavcodec/mips/mathops.h
index cdc7705..d6b0706 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)
{
@@ -77,40 +64,26 @@ static inline av_const int mid_pred(int a, int b, int c)
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"
+ __asm__ ("sqrt.s $f0, %1 \n\t"
+ "trunc.w.s $f0, $f0 \n\t"
+ "mfc1 %0, $f0 \n\t"
: "=r"(b)
- : "r"(a));
+ : "f"((float)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"
+ __asm__ ("dmult %2, %3 \n\t"
+ "mflo %1 \n\t"
+ "dadd %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 */
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
