From 014e34a8552525597a2dc9b3b87046c3a55431a1 Mon Sep 17 00:00:00 2001 From: Erik Lindahl Date: Tue, 2 Sep 2014 18:58:12 +0200 Subject: [PATCH] Fixed preprocessor error for AVX_128_FMA simd Some endifs appear to have been left when we removed the MSVC-specific macros. Change-Id: If5dcb9269348f2a34f2c37efb0856925bb473940 --- .../kernelutil_x86_avx_128_fma_double.h | 2 -- .../kernelutil_x86_avx_128_fma_single.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h index bc4b3a6e78..f2b4a4e0fd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/kernelutil_x86_avx_128_fma_double.h @@ -634,7 +634,6 @@ gmx_mm_decrement_4rvec_2ptr_swizzle_pd(double * gmx_restrict ptrA, double * gmx_ _mm_storeu_pd(ptrB+8, t11); _mm_storeu_pd(ptrB+10, t12); } -#endif static gmx_inline void gmx_simdcall @@ -724,7 +723,6 @@ gmx_mm_update_iforce_4atom_swizzle_pd(__m128d fix1, __m128d fiy1, __m128d fiz1, _mm_storeu_pd( fshiftptr, _mm_add_pd( _mm_loadu_pd(fshiftptr), fix1 )); _mm_store_sd( fshiftptr+2, _mm_add_sd( _mm_load_sd(fshiftptr+2), fiz1 )); } -#endif static gmx_inline void gmx_simdcall diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/kernelutil_x86_avx_128_fma_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/kernelutil_x86_avx_128_fma_single.h index 9af5bb410a..319ad63efa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/kernelutil_x86_avx_128_fma_single.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/kernelutil_x86_avx_128_fma_single.h @@ -625,7 +625,6 @@ gmx_mm_update_iforce_4atom_swizzle_ps(__m128 fix1, __m128 fiy1, __m128 fiz1, _mm_store_ss(fshiftptr+2, t5); _mm_storeh_pi((__m64 *)(fshiftptr), t5); } -#endif static gmx_inline void gmx_simdcall -- 2.22.0