From 5ea2f20dc72fafedd018cea406dded84320a51d8 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 16 Jul 2015 11:57:10 +0200 Subject: [PATCH] Make every SIMD predefs zero valued --- include/boost/predef/hardware/simd/arm/neon.h | 4 +++- include/boost/predef/hardware/simd/ppc/qpx.h | 4 +++- include/boost/predef/hardware/simd/ppc/vmx.h | 4 +++- include/boost/predef/hardware/simd/ppc/vsx.h | 4 +++- include/boost/predef/hardware/simd/x86/fma3.h | 4 +++- include/boost/predef/hardware/simd/x86/fma4.h | 4 +++- include/boost/predef/hardware/simd/x86/mic.h | 4 +++- include/boost/predef/hardware/simd/x86/sse.h | 4 +++- include/boost/predef/hardware/simd/x86/sse2.h | 4 +++- include/boost/predef/hardware/simd/x86/sse3.h | 4 +++- include/boost/predef/hardware/simd/x86/sse4_1.h | 4 +++- include/boost/predef/hardware/simd/x86/sse4_2.h | 4 +++- include/boost/predef/hardware/simd/x86/sse4a.h | 4 +++- include/boost/predef/hardware/simd/x86/ssse3.h | 4 +++- include/boost/predef/hardware/simd/x86/xop.h | 4 +++- 15 files changed, 45 insertions(+), 15 deletions(-) diff --git a/include/boost/predef/hardware/simd/arm/neon.h b/include/boost/predef/hardware/simd/arm/neon.h index 1a9e173..4c96482 100644 --- a/include/boost/predef/hardware/simd/arm/neon.h +++ b/include/boost/predef/hardware/simd/arm/neon.h @@ -26,9 +26,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_ARM_NEON BOOST_VERSION_NUMBER(1, 0, 0) +#define BOOST_HW_SIMD_ARM_NEON BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM) +# undef BOOST_HW_SIMD_ARM_NEON +# define BOOST_HW_SIMD_ARM_NEON BOOST_VERSION_NUMBER(1, 0, 0) # define BOOST_HW_SIMD_ARM_NEON_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/ppc/qpx.h b/include/boost/predef/hardware/simd/ppc/qpx.h index d65b74f..ff65141 100644 --- a/include/boost/predef/hardware/simd/ppc/qpx.h +++ b/include/boost/predef/hardware/simd/ppc/qpx.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_PPC_QPX BOOST_VERSION_NUMBER(2, 0, 0) +#define BOOST_HW_SIMD_PPC_QPX BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__VECTOR4DOUBLE__) +# undef BOOST_HW_SIMD_PPC_QPX +# define BOOST_HW_SIMD_PPC_QPX BOOST_VERSION_NUMBER(2, 0, 0) # define BOOST_HW_SIMD_PPC_QPX_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/ppc/vmx.h b/include/boost/predef/hardware/simd/ppc/vmx.h index 6569444..176cc24 100644 --- a/include/boost/predef/hardware/simd/ppc/vmx.h +++ b/include/boost/predef/hardware/simd/ppc/vmx.h @@ -25,9 +25,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_PPC_VMX BOOST_VERSION_NUMBER(1, 0, 0) +#define BOOST_HW_SIMD_PPC_VMX BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__ALTIVEC__) || defined(__VEC__) +# undef BOOST_HW_SIMD_PPC_VMX +# define BOOST_HW_SIMD_PPC_VMX BOOST_VERSION_NUMBER(1, 0, 0) # define BOOST_HW_SIMD_PPC_VMX_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/ppc/vsx.h b/include/boost/predef/hardware/simd/ppc/vsx.h index 69b0f3d..c708ab5 100644 --- a/include/boost/predef/hardware/simd/ppc/vsx.h +++ b/include/boost/predef/hardware/simd/ppc/vsx.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_PPC_VSX BOOST_VERSION_NUMBER(1, 1, 0) +#define BOOST_HW_SIMD_PPC_VSX BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__VSX__) +# undef BOOST_HW_SIMD_PPC_VSX +# define BOOST_HW_SIMD_PPC_VSX BOOST_VERSION_NUMBER(1, 1, 0) # define BOOST_HW_SIMD_PPC_VSX_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/fma3.h b/include/boost/predef/hardware/simd/x86/fma3.h index 1e20e46..d069280 100644 --- a/include/boost/predef/hardware/simd/x86/fma3.h +++ b/include/boost/predef/hardware/simd/x86/fma3.h @@ -25,11 +25,13 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER(5, 2, 0) +#define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__FMA__) # if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC < BOOST_VERSION_NUMBER(17, 0, 0)\ || !defined(BOOST_COMP_MSVC_AVAILABLE) +# undef BOOST_HW_SIMD_X86_FMA3 +# define BOOST_HW_SIMD_X86_FMA3 BOOST_VERSION_NUMBER(5, 2, 0) # define BOOST_HW_SIMD_X86_FMA3_AVAILABLE # endif #endif diff --git a/include/boost/predef/hardware/simd/x86/fma4.h b/include/boost/predef/hardware/simd/x86/fma4.h index 5f383a4..a886de0 100644 --- a/include/boost/predef/hardware/simd/x86/fma4.h +++ b/include/boost/predef/hardware/simd/x86/fma4.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER(5, 1, 0) +#define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__FMA4__) +# undef BOOST_HW_SIMD_X86_FMA4 +# define BOOST_HW_SIMD_X86_FMA4 BOOST_VERSION_NUMBER(5, 1, 0) # define BOOST_HW_SIMD_X86_FMA4_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/mic.h b/include/boost/predef/hardware/simd/x86/mic.h index 6604063..87de8ed 100644 --- a/include/boost/predef/hardware/simd/x86/mic.h +++ b/include/boost/predef/hardware/simd/x86/mic.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER(6, 0, 0) +#define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__MIC__) +# undef BOOST_HW_SIMD_X86_MIC +# define BOOST_HW_SIMD_X86_MIC BOOST_VERSION_NUMBER(6, 0, 0) # define BOOST_HW_SIMD_X86_MIC_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse.h b/include/boost/predef/hardware/simd/x86/sse.h index f12b1ef..17e823b 100644 --- a/include/boost/predef/hardware/simd/x86/sse.h +++ b/include/boost/predef/hardware/simd/x86/sse.h @@ -26,9 +26,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER(1, 0, 0) +#define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1 +# undef BOOST_HW_SIMD_X86_SSE +# define BOOST_HW_SIMD_X86_SSE BOOST_VERSION_NUMBER(1, 0, 0) # define BOOST_HW_SIMD_X86_SSE_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse2.h b/include/boost/predef/hardware/simd/x86/sse2.h index b47d398..35fec9d 100644 --- a/include/boost/predef/hardware/simd/x86/sse2.h +++ b/include/boost/predef/hardware/simd/x86/sse2.h @@ -26,9 +26,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER(2, 0, 0) +#define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2 +# undef BOOST_HW_SIMD_X86_SSE2 +# define BOOST_HW_SIMD_X86_SSE2 BOOST_VERSION_NUMBER(2, 0, 0) # define BOOST_HW_SIMD_X86_SSE2_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse3.h b/include/boost/predef/hardware/simd/x86/sse3.h index cef43bc..cd9b96f 100644 --- a/include/boost/predef/hardware/simd/x86/sse3.h +++ b/include/boost/predef/hardware/simd/x86/sse3.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER(3, 0, 0) +#define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE3__) +# undef BOOST_HW_SIMD_X86_SSE3 +# define BOOST_HW_SIMD_X86_SSE3 BOOST_VERSION_NUMBER(3, 0, 0) # define BOOST_HW_SIMD_X86_SSE3_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse4_1.h b/include/boost/predef/hardware/simd/x86/sse4_1.h index 50b1ae5..667eff9 100644 --- a/include/boost/predef/hardware/simd/x86/sse4_1.h +++ b/include/boost/predef/hardware/simd/x86/sse4_1.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER(4, 1, 0) +#define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE4_1__) +# undef BOOST_HW_SIMD_X86_SSE4_1 +# define BOOST_HW_SIMD_X86_SSE4_1 BOOST_VERSION_NUMBER(4, 1, 0) # define BOOST_HW_SIMD_X86_SSE4_1_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse4_2.h b/include/boost/predef/hardware/simd/x86/sse4_2.h index 80a944e..5da5a37 100644 --- a/include/boost/predef/hardware/simd/x86/sse4_2.h +++ b/include/boost/predef/hardware/simd/x86/sse4_2.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER(4, 2, 0) +#define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE4_2__) +# undef BOOST_HW_SIMD_X86_SSE4_2 +# define BOOST_HW_SIMD_X86_SSE4_2 BOOST_VERSION_NUMBER(4, 2, 0) # define BOOST_HW_SIMD_X86_SSE4_2_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/sse4a.h b/include/boost/predef/hardware/simd/x86/sse4a.h index cbffba2..b0eed86 100644 --- a/include/boost/predef/hardware/simd/x86/sse4a.h +++ b/include/boost/predef/hardware/simd/x86/sse4a.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER(4, 0, 0) +#define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSE4A__) +# undef BOOST_HW_SIMD_X86_SSE4A +# define BOOST_HW_SIMD_X86_SSE4A BOOST_VERSION_NUMBER(4, 0, 0) # define BOOST_HW_SIMD_X86_SSE4A_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/ssse3.h b/include/boost/predef/hardware/simd/x86/ssse3.h index ace2396..9b395ac 100644 --- a/include/boost/predef/hardware/simd/x86/ssse3.h +++ b/include/boost/predef/hardware/simd/x86/ssse3.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER(3, 1, 0) +#define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__SSSE3__) +# undef BOOST_HW_SIMD_X86_SSSE3 +# define BOOST_HW_SIMD_X86_SSSE3 BOOST_VERSION_NUMBER(3, 1, 0) # define BOOST_HW_SIMD_X86_SSSE3_AVAILABLE #endif diff --git a/include/boost/predef/hardware/simd/x86/xop.h b/include/boost/predef/hardware/simd/x86/xop.h index e1a9d02..3139fc9 100644 --- a/include/boost/predef/hardware/simd/x86/xop.h +++ b/include/boost/predef/hardware/simd/x86/xop.h @@ -24,9 +24,11 @@ http://www.boost.org/LICENSE_1_0.txt) ] */ -#define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER(5, 1, 1) +#define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER_NOT_AVAILABLE #if defined(__XOP__) +# undef BOOST_HW_SIMD_X86_XOP +# define BOOST_HW_SIMD_X86_XOP BOOST_VERSION_NUMBER(5, 1, 1) # define BOOST_HW_SIMD_X86_XOP_AVAILABLE #endif