diff options
| author | Anton Mitrofanov <BugMaster@narod.ru> | 2016-04-20 19:35:34 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-05-16 10:31:24 +0200 |
| commit | 2fb1d17a5a6b6ff8da2434cde0fda821f06f608c (patch) | |
| tree | 070fab5646901464b5dea9a02abc53a2481181bb /libavutil | |
| parent | 300fb0df84e9a563ed3b8a9b3d365abb6cf34600 (diff) | |
| download | ffmpeg-2fb1d17a5a6b6ff8da2434cde0fda821f06f608c.tar.gz | |
x86inc: Enable AVX emulation in additional cases
Allows emulation to work when dst is equal to src2 as long as the
instruction is commutative, e.g. `addps m0, m1, m0`.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index b79cc19fe3..dca1f78409 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1129,14 +1129,12 @@ INIT_XMM %if __emulate_avx %xdefine __src1 %7 %xdefine __src2 %8 - %ifnidn %6, %7 - %if %0 >= 9 - CHECK_AVX_INSTR_EMU {%1 %6, %7, %8, %9}, %6, %8, %9 - %else - CHECK_AVX_INSTR_EMU {%1 %6, %7, %8}, %6, %8 - %endif - %if %5 && %4 == 0 - %ifnnum sizeof%8 + %if %5 && %4 == 0 + %ifnidn %6, %7 + %ifidn %6, %8 + %xdefine __src1 %8 + %xdefine __src2 %7 + %elifnnum sizeof%8 ; 3-operand AVX instructions with a memory arg can only have it in src2, ; whereas SSE emulation prefers to have it in src1 (i.e. the mov). ; So, if the instruction is commutative with a memory arg, swap them. @@ -1144,6 +1142,13 @@ INIT_XMM %xdefine __src2 %7 %endif %endif + %endif + %ifnidn %6, __src1 + %if %0 >= 9 + CHECK_AVX_INSTR_EMU {%1 %6, %7, %8, %9}, %6, __src2, %9 + %else + CHECK_AVX_INSTR_EMU {%1 %6, %7, %8}, %6, __src2 + %endif %if __sizeofreg == 8 MOVQ %6, __src1 %elif %3 |