From 0969a30057dc4bae631a5d59a3a9088b4e5e23b4 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Fri, 15 Apr 2016 11:43:09 -0700 Subject: [PATCH] Fix AVX512 suggestion Change-Id: Id8a9d4b9c9886e4a023f3d8a9a035dc324029683 --- cmake/gmxDetectSimd.cmake | 4 ++-- src/gromacs/simd/support.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake/gmxDetectSimd.cmake b/cmake/gmxDetectSimd.cmake index aa9c24fdaa..fe7a2ca190 100644 --- a/cmake/gmxDetectSimd.cmake +++ b/cmake/gmxDetectSimd.cmake @@ -93,9 +93,9 @@ function(gmx_suggest_simd _suggested_simd) if(GMX_TARGET_X86) if(OUTPUT_TMP MATCHES " avx512er ") - set(OUTPUT_SIMD "AVX_512ER") + set(OUTPUT_SIMD "AVX_512_KNL") elseif(OUTPUT_TMP MATCHES " avx512f ") - set(OUTPUT_SIMD "AVX_512F") + set(OUTPUT_SIMD "AVX_512") elseif(OUTPUT_TMP MATCHES " avx2 ") set(OUTPUT_SIMD "AVX2_256") elseif(OUTPUT_TMP MATCHES " avx ") diff --git a/src/gromacs/simd/support.cpp b/src/gromacs/simd/support.cpp index decccbad20..40f85c4b22 100644 --- a/src/gromacs/simd/support.cpp +++ b/src/gromacs/simd/support.cpp @@ -98,7 +98,15 @@ simdSuggested(const CpuInfo &c) switch (c.vendor()) { case CpuInfo::Vendor::Intel: - if (c.feature(CpuInfo::Feature::X86_Avx2)) + if (c.feature(CpuInfo::Feature::X86_Avx512ER)) + { + suggested = SimdType::X86_Avx512Knl; + } + else if (c.feature(CpuInfo::Feature::X86_Avx512F)) + { + suggested = SimdType::X86_Avx512; + } + else if (c.feature(CpuInfo::Feature::X86_Avx2)) { suggested = SimdType::X86_Avx2; } -- 2.11.4.GIT