Commit 10b0161d authored by James Almer's avatar James Almer Committed by Janne Grunau

x86: add missing XOP checks and macros

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 5800ba0d
...@@ -270,6 +270,7 @@ Optimization options (experts only): ...@@ -270,6 +270,7 @@ Optimization options (experts only):
--disable-sse4 disable SSE4 optimizations --disable-sse4 disable SSE4 optimizations
--disable-sse42 disable SSE4.2 optimizations --disable-sse42 disable SSE4.2 optimizations
--disable-avx disable AVX optimizations --disable-avx disable AVX optimizations
--disable-xop disable XOP optimizations
--disable-fma4 disable FMA4 optimizations --disable-fma4 disable FMA4 optimizations
--disable-avx2 disable AVX2 optimizations --disable-avx2 disable AVX2 optimizations
--disable-armv5te disable armv5te optimizations --disable-armv5te disable armv5te optimizations
...@@ -1252,6 +1253,7 @@ ARCH_EXT_LIST_X86=' ...@@ -1252,6 +1253,7 @@ ARCH_EXT_LIST_X86='
avx avx
avx2 avx2
cpunop cpunop
xop
fma4 fma4
i686 i686
mmx mmx
...@@ -1575,6 +1577,7 @@ ssse3_deps="sse3" ...@@ -1575,6 +1577,7 @@ ssse3_deps="sse3"
sse4_deps="ssse3" sse4_deps="ssse3"
sse42_deps="sse4" sse42_deps="sse4"
avx_deps="sse42" avx_deps="sse42"
xop_deps="avx"
fma4_deps="avx" fma4_deps="avx"
avx2_deps="avx" avx2_deps="avx"
...@@ -3757,6 +3760,7 @@ EOF ...@@ -3757,6 +3760,7 @@ EOF
check_yasm "movbe ecx, [5]" && enable yasm || check_yasm "movbe ecx, [5]" && enable yasm ||
die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build." 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 "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
check_yasm "CPU amdnop" || disable cpunop check_yasm "CPU amdnop" || disable cpunop
fi fi
...@@ -4289,6 +4293,7 @@ if enabled x86; then ...@@ -4289,6 +4293,7 @@ if enabled x86; then
echo "SSE enabled ${sse-no}" echo "SSE enabled ${sse-no}"
echo "SSSE3 enabled ${ssse3-no}" echo "SSSE3 enabled ${ssse3-no}"
echo "AVX enabled ${avx-no}" echo "AVX enabled ${avx-no}"
echo "XOP enabled ${xop-no}"
echo "FMA4 enabled ${fma4-no}" echo "FMA4 enabled ${fma4-no}"
echo "i686 features enabled ${i686-no}" echo "i686 features enabled ${i686-no}"
echo "CMOV is fast ${fast_cmov-no}" echo "CMOV is fast ${fast_cmov-no}"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#define X86_SSE4(flags) CPUEXT(flags, SSE4) #define X86_SSE4(flags) CPUEXT(flags, SSE4)
#define X86_SSE42(flags) CPUEXT(flags, SSE42) #define X86_SSE42(flags) CPUEXT(flags, SSE42)
#define X86_AVX(flags) CPUEXT(flags, AVX) #define X86_AVX(flags) CPUEXT(flags, AVX)
#define X86_XOP(flags) CPUEXT(flags, XOP)
#define X86_FMA4(flags) CPUEXT(flags, FMA4) #define X86_FMA4(flags) CPUEXT(flags, FMA4)
#define X86_AVX2(flags) CPUEXT(flags, AVX2) #define X86_AVX2(flags) CPUEXT(flags, AVX2)
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
#define EXTERNAL_SSE4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4) #define EXTERNAL_SSE4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4)
#define EXTERNAL_SSE42(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42) #define EXTERNAL_SSE42(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42)
#define EXTERNAL_AVX(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX) #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_FMA4(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, FMA4)
#define EXTERNAL_AVX2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2) #define EXTERNAL_AVX2(flags) CPUEXT_SUFFIX(flags, _EXTERNAL, AVX2)
...@@ -65,6 +67,7 @@ ...@@ -65,6 +67,7 @@
#define INLINE_SSE4(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE4) #define INLINE_SSE4(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE4)
#define INLINE_SSE42(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE42) #define INLINE_SSE42(flags) CPUEXT_SUFFIX(flags, _INLINE, SSE42)
#define INLINE_AVX(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX) #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_FMA4(flags) CPUEXT_SUFFIX(flags, _INLINE, FMA4)
#define INLINE_AVX2(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX2) #define INLINE_AVX2(flags) CPUEXT_SUFFIX(flags, _INLINE, AVX2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment