From c6a6c79b1070c9536d42b8407d98b1d6f8e3e512 Mon Sep 17 00:00:00 2001 From: Roland Schulz Date: Sat, 30 May 2015 03:46:07 -0400 Subject: [PATCH] Reenable lincs/bonded SIMD for ICC on Windows It was accidentally disabled when disabling MSVC because ICC also has _MSC_VER defined. Change-Id: I7733b4af74a12dd0997ed22e86f2cdf459f08aba --- src/gromacs/listed-forces/listed-forces.cpp | 2 +- src/gromacs/mdlib/clincs.cpp | 2 +- src/gromacs/pbcutil/pbc-simd.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gromacs/listed-forces/listed-forces.cpp b/src/gromacs/listed-forces/listed-forces.cpp index f95db0b9c5..3f68624add 100644 --- a/src/gromacs/listed-forces/listed-forces.cpp +++ b/src/gromacs/listed-forces/listed-forces.cpp @@ -262,7 +262,7 @@ calc_one_bond(int thread, #ifdef GMX_SIMD_HAVE_REAL gmx_bool bUseSIMD; /* MSVC 2010 produces buggy SIMD PBC code, disable SIMD for MSVC <= 2010 */ -#if defined _MSC_VER && _MSC_VER < 1700 +#if defined _MSC_VER && _MSC_VER < 1700 && !defined(__ICL) bUseSIMD = FALSE; #else bUseSIMD = fr->use_simd_kernels; diff --git a/src/gromacs/mdlib/clincs.cpp b/src/gromacs/mdlib/clincs.cpp index 7be3cef649..11bdfd81b5 100644 --- a/src/gromacs/mdlib/clincs.cpp +++ b/src/gromacs/mdlib/clincs.cpp @@ -68,7 +68,7 @@ #include "gromacs/utility/smalloc.h" /* MSVC 2010 produces buggy SIMD PBC code, disable SIMD for MSVC <= 2010 */ -#if defined GMX_SIMD_HAVE_REAL && !(defined _MSC_VER && _MSC_VER < 1700) +#if defined GMX_SIMD_HAVE_REAL && !(defined _MSC_VER && _MSC_VER < 1700) && !defined(__ICL) #define LINCS_SIMD #endif diff --git a/src/gromacs/pbcutil/pbc-simd.h b/src/gromacs/pbcutil/pbc-simd.h index 6e1348a554..fc7b29a968 100644 --- a/src/gromacs/pbcutil/pbc-simd.h +++ b/src/gromacs/pbcutil/pbc-simd.h @@ -108,7 +108,7 @@ pbc_correct_dx_simd(gmx_simd_real_t *dx, { gmx_simd_real_t shz, shy, shx; -#if defined _MSC_VER && _MSC_VER < 1700 +#if defined _MSC_VER && _MSC_VER < 1700 && !defined(__ICL) /* The caller side should make sure we never end up here. * TODO Black-list _MSC_VER < 1700 when it's old enough, so we can rid * of this code complication. -- 2.22.0