diff options
| author | James Almer <jamrial@gmail.com> | 2014-02-22 04:54:00 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-02-23 15:29:36 +0100 |
| commit | 10b0161d78148f46eaffb29ea022378947eaef2c (patch) | |
| tree | 5058fb19fb253812f6b83d1d10c5122c33c8b389 | |
| parent | 5800ba0db667630e6ff81d30f03961ea10726aa6 (diff) | |
| download | ffmpeg-10b0161d78148f46eaffb29ea022378947eaef2c.tar.gz | |
x86: add missing XOP checks and macros
Signed-off-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavutil/x86/cpu.h | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -270,6 +270,7 @@ Optimization options (experts only): --disable-sse4 disable SSE4 optimizations --disable-sse42 disable SSE4.2 optimizations --disable-avx disable AVX optimizations + --disable-xop disable XOP optimizations --disable-fma4 disable FMA4 optimizations --disable-avx2 disable AVX2 optimizations --disable-armv5te disable armv5te optimizations @@ -1252,6 +1253,7 @@ ARCH_EXT_LIST_X86=' avx avx2 cpunop + xop fma4 i686 mmx @@ -1575,6 +1577,7 @@ ssse3_deps="sse3" sse4_deps="ssse3" sse42_deps="sse4" avx_deps="sse42" +xop_deps="avx" fma4_deps="avx" avx2_deps="avx" @@ -3757,6 +3760,7 @@ EOF check_yasm "movbe ecx, [5]" && enable yasm || die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build." + check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external check_yasm "CPU amdnop" || disable cpunop fi @@ -4289,6 +4293,7 @@ if enabled x86; then echo "SSE enabled ${sse-no}" echo "SSSE3 enabled ${ssse3-no}" echo "AVX enabled ${avx-no}" + echo "XOP enabled ${xop-no}" echo "FMA4 enabled ${fma4-no}" echo "i686 features enabled ${i686-no}" echo "CMOV is fast ${fast_cmov-no}" diff --git a/libavutil/x86/cpu.h b/libavutil/x86/cpu.h index 5303c5ae02..40daf445c7 100644 --- a/libavutil/x86/cpu.h +++ b/libavutil/x86/cpu.h @@ -37,6 +37,7 @@ #define X86_SSE4(flags) CPUEXT(flags, SSE4) #define X86_SSE42(flags) CPUEXT(flags, SSE42) #define X86_AVX(flags) CPUEXT(flags, AVX) +#define X86_XOP(flags) CPUEXT(flags, XOP) #define X86_FMA4(flags) CPUEXT(flags, FMA4) #define X86_AVX2(flags) CPUEXT(flags, AVX2) @@ -51,6 +52,7 @@ #define EXTERNAL_SSE4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4) #define EXTERNAL_SSE42(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42) #define EXTERNAL_AVX(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX) +#define EXTERNAL_XOP(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, XOP) #define EXTERNAL_FMA4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4) #define EXTERNAL_AVX2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2) @@ -65,6 +67,7 @@ #define INLINE_SSE4(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE4) #define INLINE_SSE42(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE42) #define INLINE_AVX(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX) +#define INLINE_XOP(flags) CPUEXT_SUFFIX(flags, _INLINE, XOP) #define INLINE_FMA4(flags) CPUEXT_SUFFIX(flags, _INLINE, FMA4) #define INLINE_AVX2(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX2) |