From 3dc66cd71f4eb932be39337237336f572f729a1e Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Tue, 4 Aug 2015 11:57:06 +0200 Subject: [PATCH] Remove extra check (of MSVC version) for FMA/AVX/AVX2 for now --- include/boost/predef/hardware/simd/x86.h | 16 +++------------- .../boost/predef/hardware/simd/x86/versions.h | 6 ------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/boost/predef/hardware/simd/x86.h b/include/boost/predef/hardware/simd/x86.h index 2c8db0f..0874bc4 100644 --- a/include/boost/predef/hardware/simd/x86.h +++ b/include/boost/predef/hardware/simd/x86.h @@ -11,7 +11,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include -#include /*` [heading `BOOST_HW_SIMD_X86`] @@ -80,22 +79,13 @@ http://www.boost.org/LICENSE_1_0.txt) # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_MIC_VERSION #endif #if !defined(BOOST_HW_SIMD_X86) && defined(__AVX2__) -# if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC > BOOST_VERSION_NUMBER(17, 0, 0) ||\ - !defined(BOOST_COMP_MSVC_AVAILABLE) -# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_AVX2_VERSION -# endif +# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_AVX2_VERSION #endif #if !defined(BOOST_HW_SIMD_X86) && defined(__AVX__) -# if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC > BOOST_VERSION_NUMBER(16, 0, 40219) ||\ - !defined(BOOST_COMP_MSVC_AVAILABLE) -# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_AVX_VERSION -# endif +# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_AVX_VERSION #endif #if !defined(BOOST_HW_SIMD_X86) && defined(__FMA__) -# if defined(BOOST_COMP_MSVC_AVAILABLE) && BOOST_COMP_MSVC > BOOST_VERSION_NUMBER(17, 0, 0) ||\ - !defined(BOOST_COMP_MSVC_AVAILABLE) -# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_FMA_VERSION -# endif +# define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_FMA_VERSION #endif #if !defined(BOOST_HW_SIMD_X86) && defined(__SSE4_2__) # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE4_2_VERSION diff --git a/include/boost/predef/hardware/simd/x86/versions.h b/include/boost/predef/hardware/simd/x86/versions.h index 3c64ea5..0c7a4d3 100644 --- a/include/boost/predef/hardware/simd/x86/versions.h +++ b/include/boost/predef/hardware/simd/x86/versions.h @@ -93,8 +93,6 @@ http://www.boost.org/LICENSE_1_0.txt) extension version number. Version number is: *5.0.0*. - - [note Not available for versions of MSVC below 16.00.40219.] */ #define BOOST_HW_SIMD_X86_AVX_VERSION BOOST_VERSION_NUMBER(5, 0, 0) @@ -105,8 +103,6 @@ http://www.boost.org/LICENSE_1_0.txt) version number. Version number is: *5.2.0*. - - [note Not available for versions of MSVC below 17.00.] */ #define BOOST_HW_SIMD_X86_FMA3_VERSION BOOST_VERSION_NUMBER(5, 2, 0) @@ -117,8 +113,6 @@ http://www.boost.org/LICENSE_1_0.txt) x86 extension version number. Version number is: *5.3.0*. - - [note Not available for versions of MSVC below 17.00.] */ #define BOOST_HW_SIMD_X86_AVX2_VERSION BOOST_VERSION_NUMBER(5, 3, 0)