From: Teemu Murtola Date: Thu, 4 Sep 2014 18:45:56 +0000 (+0300) Subject: Another batch of added config.h X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=e8b8107c93c32c1ec4c6b6921ed2f8d46f5b2dc7 Another batch of added config.h Include config.h explicitly in most places where it is used instead of relying on getting the definitions from "somewhere". Change-Id: I3c6702cea59fca10226a13714c8ffddc482c224a --- 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 f2b4a4e0fd..5b931327a5 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 @@ -43,6 +43,8 @@ # include #endif +#include "config.h" + #define gmx_mm_castsi128_pd _mm_castsi128_pd #define gmx_mm_extract_epi32 _mm_extract_epi32 diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h index e77e39c1d3..6e37231046 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/kernelutil_x86_avx_256_double.h @@ -35,6 +35,8 @@ #ifndef _kernelutil_x86_avx_256_double_h_ #define _kernelutil_x86_avx_256_double_h_ +#include "config.h" + #define gmx_mm_castsi128_ps(a) _mm_castsi128_ps(a) #define _GMX_MM_BLEND256D(b3, b2, b1, b0) (((b3) << 3) | ((b2) << 2) | ((b1) << 1) | ((b0))) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h index 35c2f1e9a9..415fee6de3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/kernelutil_x86_sse2_double.h @@ -36,10 +36,10 @@ #define _kernelutil_x86_sse2_double_h_ #include - - #include +#include "config.h" + /* Normal sum of four ymm registers */ #define gmx_mm_sum4_pd(t0, t1, t2, t3) _mm_add_pd(_mm_add_pd(t0, t1), _mm_add_pd(t2, t3)) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h index 820a37031a..31f1230c80 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/kernelutil_x86_sse2_single.h @@ -39,6 +39,8 @@ #include +#include "config.h" + #define gmx_mm_castsi128_ps _mm_castsi128_ps #define gmx_mm_extract_epi32(x, imm) _mm_cvtsi128_si32(_mm_srli_si128((x), 4 * (imm))) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h index ccbb62750f..a235cd48bc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/kernelutil_x86_sse4_1_double.h @@ -36,9 +36,10 @@ #define _kernelutil_x86_sse4_1_double_h_ #include - #include +#include "config.h" + #define gmx_mm_extract_epi32(x, imm) _mm_extract_epi32((x), (imm)) #define gmx_mm_castsi128_pd(a) _mm_castsi128_pd(a) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h index 45f2a7b5f2..2d83de317a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/kernelutil_x86_sse4_1_single.h @@ -37,6 +37,8 @@ #include +#include "config.h" + #undef gmx_restrict #define gmx_restrict diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h index c90e4bb803..17d1186c48 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_128s.h @@ -37,6 +37,8 @@ #include "gromacs/legacyheaders/types/simple.h" +#include "config.h" + /* This files contains all functions/macros for the SIMD kernels * which have explicit dependencies on the j-cluster size and/or SIMD-width. * The functionality which depends on the j-cluster size is: diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h index 51dd883ed2..5caee76a48 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils_x86_256s.h @@ -35,6 +35,8 @@ #ifndef _nbnxn_kernel_simd_utils_x86_256s_h_ #define _nbnxn_kernel_simd_utils_x86_256s_h_ +#include "config.h" + /* This files contains all functions/macros for the SIMD kernels * which have explicit dependencies on the j-cluster size and/or SIMD-width. * The functionality which depends on the j-cluster size is: diff --git a/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h index 63bce3c895..ebbf77aec7 100644 --- a/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h +++ b/src/gromacs/simd/impl_ibm_qpx/impl_ibm_qpx.h @@ -41,6 +41,8 @@ #include #endif +#include "config.h" + /* IBM QPX SIMD instruction wrappers * * Please see documentation in gromacs/simd/simd.h for the available diff --git a/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h b/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h index e3d49126f0..49a0df77e0 100644 --- a/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h +++ b/src/gromacs/simd/impl_intel_mic/impl_intel_mic.h @@ -39,6 +39,8 @@ #include #include +#include "config.h" + /* Intel Xeon Phi, or * the-artist-formerly-known-as-Knight's-corner, or * the-artist-formerly-formerly-known-as-MIC, or diff --git a/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h b/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h index a05e12ebbb..195fdbc295 100644 --- a/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h +++ b/src/gromacs/simd/impl_x86_avx2_256/impl_x86_avx2_256.h @@ -39,6 +39,8 @@ #include #include +#include "config.h" + /* x86 256-bit AVX2 SIMD instruction wrappers * * Please see documentation in gromacs/simd/simd.h for details diff --git a/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h b/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h index 5b3096bee3..7c946d10d2 100644 --- a/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h +++ b/src/gromacs/simd/impl_x86_avx_128_fma/impl_x86_avx_128_fma.h @@ -40,6 +40,8 @@ #include #include +#include "config.h" + /* x86 128-bit AVX with FMA SIMD instruction wrappers * * Please see documentation in gromacs/simd/simd.h for details diff --git a/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h index cff1a7e2cb..f6d5402aaa 100644 --- a/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h +++ b/src/gromacs/simd/impl_x86_avx_256/impl_x86_avx_256.h @@ -39,6 +39,8 @@ #include #include +#include "config.h" + /* It is cleaner to start the AVX implementation from scratch rather than * first inheriting from SSE4.1, which in turn inherits from SSE2. However, * the capabilities still form a superset. diff --git a/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h index 7aab27ae21..c16d3d4d57 100644 --- a/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h +++ b/src/gromacs/simd/impl_x86_sse2/impl_x86_sse2.h @@ -39,6 +39,8 @@ #include #include +#include "config.h" + /* Set capabilities that can be inherited */ #define GMX_SIMD_X86_SSE2_OR_HIGHER diff --git a/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h b/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h index 946ae1e866..91bef05ac6 100644 --- a/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h +++ b/src/gromacs/simd/impl_x86_sse4_1/impl_x86_sse4_1.h @@ -39,6 +39,7 @@ #include #include +#include "config.h" /* x86 SSE4.1 SIMD instruction wrappers * diff --git a/src/gromacs/simd/simd_math.h b/src/gromacs/simd/simd_math.h index 68ab6774ef..7601aba820 100644 --- a/src/gromacs/simd/simd_math.h +++ b/src/gromacs/simd/simd_math.h @@ -60,6 +60,8 @@ #include "gromacs/math/utilities.h" #include "gromacs/simd/simd.h" +#include "config.h" + /*! \cond libapi */ /*! \addtogroup module_simd */ /*! \{ */ diff --git a/src/gromacs/simd/vector_operations.h b/src/gromacs/simd/vector_operations.h index d2ccfde0e2..d24c25f4db 100644 --- a/src/gromacs/simd/vector_operations.h +++ b/src/gromacs/simd/vector_operations.h @@ -48,6 +48,8 @@ #include "gromacs/simd/simd.h" +#include "config.h" + /*! \cond libapi */ /*! \addtogroup module_simd */ /*! \{ */