diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-09 08:54:59 -0400 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-14 12:39:29 +0100 |
| commit | 206895708ea2b464755d340e44501daf9a07c310 (patch) | |
| tree | adef04fec470970a6e01ed4752c44d9159b56ab3 /libavutil/x86 | |
| parent | c108ba0175d4fc3a3253a8b0f782fbfb96ba5098 (diff) | |
| download | ffmpeg-206895708ea2b464755d340e44501daf9a07c310.tar.gz | |
x86inc: Remove our FMA4 support
This is so we can sync to x264's version of FMA4 support.
This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 16 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 11 |
2 files changed, 16 insertions, 11 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index b2b67c5a12..051ac58295 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1400,22 +1400,16 @@ AVX_INSTR pfmul, 1, 0, 1 %undef j %macro FMA_INSTR 3 - %macro %1 5-8 %1, %2, %3 - %if cpuflag(xop) || cpuflag(fma4) - v%6 %1, %2, %3, %4 + %macro %1 4-7 %1, %2, %3 + %if cpuflag(xop) + v%5 %1, %2, %3, %4 %else - %ifidn %1, %4 - %7 %5, %2, %3 - %8 %1, %4, %5 - %else - %7 %1, %2, %3 - %8 %1, %4 - %endif + %6 %1, %2, %3 + %7 %1, %4 %endif %endmacro %endmacro -FMA_INSTR fmaddps, mulps, addps FMA_INSTR pmacsdd, pmulld, paddd FMA_INSTR pmacsww, pmullw, paddw FMA_INSTR pmadcswd, pmaddwd, paddd diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 79a023fc52..bfe7a23202 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -665,3 +665,14 @@ psrad %1, 16 %endif %endmacro + +; Wrapper for non-FMA version of fmaddps +%macro FMULADD_PS 5 + %ifidn %1, %4 + mulps %5, %2, %3 + addps %1, %4, %5 + %else + mulps %1, %2, %3 + addps %1, %4 + %endif +%endmacro |