From: Berk Hess Date: Fri, 12 Apr 2013 17:11:09 +0000 (+0200) Subject: Created SIMD module X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=43cb80ae2f567c11b3dcef0012e219e2c9612ed6;p=alexxy%2Fgromacs.git Created SIMD module Moved header files to new module, renamed their #include guards appropriately. Removed two unused headers (content mostly duplicated) Refs #1173 Change-Id: Ieda78cc3bcb499e8c17ef8ef539c49cbc2d6d74d --- diff --git a/src/gromacs/gmxlib/bondfree.c b/src/gromacs/gmxlib/bondfree.c index 56c3505d03..43776abb70 100644 --- a/src/gromacs/gmxlib/bondfree.c +++ b/src/gromacs/gmxlib/bondfree.c @@ -58,10 +58,10 @@ #include "nonbonded.h" /* Include the SIMD macro file and then check for support */ -#include "gmx_simd_macros.h" +#include "gromacs/simd/macros.h" #if defined GMX_HAVE_SIMD_MACROS && defined GMX_SIMD_HAVE_TRIGONOMETRIC #define SIMD_BONDEDS -#include "gmx_simd_vec.h" +#include "gromacs/simd/vector_operations.h" #endif /* Find a better place for this? */ 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 fa7036795d..c841834edd 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 @@ -35,7 +35,7 @@ #ifndef _kernelutil_x86_avx_128_fma_double_h_ #define _kernelutil_x86_avx_128_fma_double_h_ -#include "gmx_x86_avx_128_fma.h" +#include "gromacs/simd/general_x86_avx_128_fma.h" static int diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c index 85a681bc7c..bf022067c6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c index c29f2fe3ff..f698b34c4f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c index 84bfbf84d5..d2eb26cf93 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c index f43648f2aa..22c36051ba 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c index 5740b16d7d..8531689917 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c index ac1ce38992..f3686bc72b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c index fdebc7e3e6..eb036d8d2f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c index 90cb0e0089..5b93375537 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c index d328878926..b5c0aa95d1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c index 4f4693eaee..86b1d4dcb1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c index 5fde9d50b0..d853c4943b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c index 7fd685d094..95b08e36a0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c index f7cbf3f026..362adfe5b9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c index 71104457f3..e529ae361a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c index 88a0d66e7b..196ccdb980 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c index 4cc3a92f25..61cb77b514 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c index f268953e41..5885a4e5bd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c index 2567d5ed41..6475f6fa33 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c index f75c9c3d85..1718384142 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c index 833ed43a3d..7c0815aebd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c index b33a4f0bed..9d16d7c6f5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c index 822626f820..5913aeed7e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c index e8d5e849d5..26ad7e39c1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c index 7a0a5ab0d1..e1976eca49 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c index 3bea3c9b09..bff7086d04 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c index affc387d0f..822018c652 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c index 9e660744ef..dff9b6f2a6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c index b2c1b5866e..ef55d239e7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c index d2f904ff5a..5e3bf0be39 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c index 4181d81101..cfaada4b66 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c index e838b778cf..b6aecfb318 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c index a57dd5ce40..83318fbf0a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c index 9990bd4429..a91e64d59e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c index 6c85ddcf83..01a4a3051a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c index a8951c7b4d..95b8dbebf0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c index c121eb7ed8..b2f5e69ee9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c index 2200a09334..47b4f88784 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c index 1b645b8f2d..23e9c23251 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c index 10f4b082e2..4e4459f3c7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c index aa255e7a28..28360b4520 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c index 7ea4b8994f..f30ebd6954 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c index 151f235327..70c364afd2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c index 4b8eeeb020..f34fb96728 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c index 1da1b45969..645a6e06c0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c index 2d5c8dcb91..1782e8e47d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c index 570824e97d..ced7a6838d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c index 97207f2d50..b9d08db8ce 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c index 55556c6734..bfe1fde402 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c index c75da6eefa..7d1049f0e0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c index b977ccd72d..1a2993fbf0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c index 72e5490c68..87578cf700 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c index 654399bed4..01c3782b92 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c index a00ba6d7e8..8f34d4f732 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c index fc673815ad..48e1c06b94 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c index f65a9c557c..b7c78af992 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c index d4bab4ae2e..26774a478a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c index 231b63a4b3..cd96fcadcc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c index e794a7f805..dd6379b448 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c index 7ba8efadad..dd4ef28fcd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c index 68e694d19c..7c76786e0e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c index 87d036fc1d..19c228c954 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c index 255206fe18..ab0958de6d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c index 19c9eb8d58..e76ae0d121 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c index e6c78a4d01..1d8d003ed3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c index 25393d93f6..22279514b4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c index f93d97517d..6a1230f05d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c index 18f7265812..7500fd8fec 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c index 47a2b232ea..2584c4efbe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c index 6e1f5c3693..7507b94471 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c index 5db7b4cf66..121474ad19 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c index 7d1e4e2ce2..a033b9b39e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c index 7e7d485c42..8c1564e05f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c index 951cca52b2..f29e649ba5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c index 618bbaa45e..f202a8d345 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c index 9fed59c8c0..256d739c8b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c index 98338f2159..b563d2ad01 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c index 8693e65a0a..c78c3925c8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c index 8fe4748b5a..c193c40950 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c index 6a26f8dc95..75b1cbeb52 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c index 56c2d0df05..81532182c3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c index 4854a6a387..e44b38bcd3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c index b6df7a0a1f..22ece2860e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c index 5323cc3553..25a342709b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c index 776dc60c26..7d18c98d03 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c index dc428f33c0..9c5c32c065 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c index d7af4379b8..ee62b01d9f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c index 54d82ad24d..b4e8bd36f1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c index 135d57ae72..8400742fcf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c index f76960dc5d..46aa8a7dbd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c index 231e63c66b..6a7be3e614 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c index 25177d140d..538c5f518a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c index e8500e258b..9cd38b549b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c index a61807cb89..0b322c4b74 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c index 042e815570..c1d31608b4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c index eeb160fe65..0849d7d0c2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c index 125eba55de..7b46c68aad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c index 52fcb46d1a..7863ea8fa9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c index 6c8cd12956..f60d0a0651 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c index 7a3a550365..a1ae161c26 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c index ca4dd145cb..5bf635fa4b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c index b7778023e4..47e44d03ef 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c index d04de5096c..e0ea14ce34 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c index 23498dfb40..f7132eb8a7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c index 22d46a80c3..f9c8e92cfb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c index bca27fe505..5332a35599 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c index 94ca42666e..9234c00319 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c index b07167ba6f..d4aabaf553 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre index 6faac17ca5..134d134346 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_double.h" +#include "gromacs/simd/math_x86_avx_128_fma_double.h" #include "kernelutil_x86_avx_128_fma_double.h" /* #endif */ 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 842f7d11ee..273bf1a003 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 @@ -38,7 +38,7 @@ #include -#include "gmx_x86_avx_128_fma.h" +#include "gromacs/simd/general_x86_avx_128_fma.h" /* Normal sum of four xmm registers */ #define gmx_mm_sum4_ps(t0, t1, t2, t3) _mm_add_ps(_mm_add_ps(t0, t1), _mm_add_ps(t2, t3)) diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c index 7ebebb008c..7936369a7e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c index 9a3fb0aff2..56b8e0317c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c index d991585901..4577d81b1c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c index 141f1af017..727393eba3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c index 4de8eb7dad..2a3a5254d1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c index c62f44eecc..b734789b82 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c index 291f523cdf..b92dacc663 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c index 7d62483b59..0909a3368e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c index f4ed4484d1..e8dd492910 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c index b1bf670068..df97c46a98 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c index 996d3431cc..bc1b5acbed 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c index 930ec677f0..d5f8c084b2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c index 653ee87576..e60b6f9333 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c index 2351714d07..c2fbc84f09 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c index 2e340b68f1..cf026b56fc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c index b44bda9fd4..32a3fe5155 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c index 906ff06114..a1d246fbdf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c index 049cffd7a5..26160b863d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c index 01318a49a7..5551b67ada 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c index f9d3821565..fe7be790e0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c index 03c459d8f4..b67807906c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c index 52ba7ac140..d93bb9ac18 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c index 34d80cdfbd..34d8fb7262 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c index 67ce18da8e..7dc3fb10ae 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c index 36da6b4bb1..5c4778e81f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c index 5c05f95e38..9f4c3c72b3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c index 912d7dd361..180708d083 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c index 288b55e91d..1f99542da4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c index 31c705c785..af140ef843 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c index b98145b066..4aaec9eb0a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c index 3cc9cd1c9d..0fdee560c7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c index 49ea662e58..60184f281e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c index 3845b55766..02426ca747 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c index 5667ffb6ad..dc84e67e37 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c index 5fc6230d44..62d1836b44 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c index dddc36193e..f82a45703d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c index 0fab5d22c2..ecac29a9c3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c index eccb8c6850..4bc686910e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c index 56c9918e34..caa97c778c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c index 94f9653835..bde7c8dd02 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c index b2ce6c3d28..7b02509f43 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c index 1ff4877c37..b250f662a4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c index 9f9ee96a7a..c6b5edb135 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c index 9270b74d93..8189ea21f9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c index a5b7ec3ecd..eb1b64b7c8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c index 7e4085ff22..468fe17b9e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c index 89591835ff..dc77db78de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c index 8f63b53626..84f7a90c18 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c index 40d478c74d..d1163e5568 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c index 698294e236..4d523c6cdf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c index 8a13a7d76a..830d4b0109 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c index 6884136af0..2bb6e48404 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c index ba2df76cf8..a8863dad0a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c index 86008e4af3..6210c4af28 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c index 7010ba6b95..37b004dd9e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c index 542722eade..336a4df7be 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c index 8b681414b9..c009d45088 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c index eb3eb4e9e9..a1e3a658ce 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c index 0451a70617..9a36de0599 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c index 5967de3c33..4d01b1699d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c index 568a9d03f6..7cf5c021f9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c index d2ecf1e5ef..3c978e7361 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c index dc14bf29b1..6921397471 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c index ae013bd1f5..39b250912f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c index 95c084eb37..5e9fa74dad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c index 5f764b7528..b189dd5db9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c index 813a631377..37d60b40d5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c index 246e03df8b..5fb11907b2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c index f16a4a8f34..c40a1961b6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c index 1fb09b0448..b71b05a7c8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c index fbca6bb5e2..e3e216e167 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c index d5c8fb0a7c..3863582a74 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c index 0388e77997..94a018d582 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c index e131f69773..21f1f24ec3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c index 9b91b40d51..8d566a3910 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c index a7615d998b..86673ebd91 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c index f866c9ee94..964f851f45 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c index 38371a2f64..5f7eae8718 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c index 4c9855b137..adad55ef83 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c index c8f1405e0f..9f6890dcdf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c index 758b45eda5..d0d8c317e8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c index 06f26fdb2c..f4f5739cc4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c index 7352d319ee..10916f57e4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c index 7f9a54fdd2..b8e71a88b8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c index 0b25d1c8b2..56396bd3f7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c index 34696d423c..8d4f5df832 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c index 8399545fd7..28f1ba9301 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c index 64392114fd..6bbf310e96 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c index ef8ac9f2af..af6dd21bcd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c index aa2129e9c6..d984e85576 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c index dbfae3bfd3..eafc5604c6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c index 24ca4f225a..693c9834aa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c index 6ec2985fb3..15735f48fb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c index 9cec7f517a..b38e9d1909 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c index 9438086c85..65220a606c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c index 0987d6d21f..07792c61c2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c index f99321ba69..d05265d343 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c index ddc6913c0c..634b8d71dc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c index 847b18bd98..a0f7938233 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c index b8e79e5bf4..5b2229037e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c index b0a61b05bf..383f0b001e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c index 8cde3b8dec..f657b9ab9f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c index 8e605fab18..253d0433d5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c index 1b9b95d7b9..59bb55e859 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c index 6267455a32..1ec202e3dd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c index 825600a0e9..cb55c27b99 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c index 3333125d8b..5b99471998 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre index d71ef9c781..32eff105c3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_128_fma_single.h" +#include "gromacs/simd/math_x86_avx_128_fma_single.h" #include "kernelutil_x86_avx_128_fma_single.h" /* #endif */ 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 d5470c0bdb..0f86d54a5a 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 @@ -36,7 +36,7 @@ #define _kernelutil_x86_avx_256_double_h_ -#include "gmx_x86_avx_256.h" +#include "gromacs/simd/general_x86_avx_256.h" static int diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c index a30ec1b8a0..340aeb68e6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c index 62964b0a4e..de8ed6af08 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c index d303f0d939..c25b6199a7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c index d927bc1782..37be66d8f3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c index f4e598d227..c7fe531f73 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c index 03341f8da1..711e1013a8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c index 8abf2e678b..65233ccfed 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c index 38a90e5f49..96fed27847 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c index 300f43b1b7..84d469dcc9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c index ae22dde5df..1bab3887bc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c index ff420d6a08..84604d3199 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c index 5c1fec331b..1dc2ade34a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c index 8db7e48323..6efa635230 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c index 7001f8cb92..f91fc46f41 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c index e015fef258..5632ae3c1d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c index 81c684d2b7..8e3906a52f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c index a9647549f6..5be24bf676 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c index 323c2118dc..5546082d08 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c index 5057003d30..0d3edf4a63 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c index 3164cec143..416bb3e3c2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c index 9ff0844115..180008dc93 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c index ccff4e431e..64b2edf6db 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c index 65229779be..4778fca550 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c index c12cdc17f1..502051438d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c index 251e6e9e11..95834d17b0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c index a649cb8028..00fca60439 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c index aaaafc6d08..aa3d3bb339 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c index 97b1fb7444..875649df7b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c index 6367117476..116958b86d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c index 358052074a..4b693b3b16 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c index d2d38d4c04..ee5f2cf418 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c index eb21d21869..2882774b8c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c index 2fca59de7f..0e71578672 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c index d8089f9aa4..2aaed88c1d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c index eea2a9a56e..680e174940 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c index 3b99d09fad..30cd2fc696 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c index 31a5702763..2617ed1fee 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c index 79cc6135e8..7cf13ab7e4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c index aee9ded203..a4d7a7a7fd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c index 4f5dfc6e8f..b78ab49b0a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c index 173af64afe..4a607472ab 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c index c6be368c82..1d5cea1d3c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c index 393d3c2950..4aef522cbf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c index 6d0c7c63f7..2a294c5550 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c index 08c304f8a5..5a85ccaf3e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c index 9d49f558a3..8278c3e8cf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c index aa3120f7d8..5ef30f1d42 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c index b6e7ba947b..2315a49f73 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c index 7c0696777b..cefb0598e2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c index a510626acf..c6291d080f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c index b8d845b094..b79c7f2f2e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c index ff6a770810..7082e8323c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c index 2db6b49502..a3f970428c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c index 134c7d438e..d33ee31af3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c index b0f1bdb407..e08273a4f3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c index b76a8b92bd..51c4b0edda 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c index c7ecbc603d..9492240ed0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c index 8df794d5da..97ebbfc649 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c index a6038be43a..a3e402b626 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c index 9227d8cbf4..4579613944 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c index 31482fea5c..14bb514eea 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c index 4f162f39ec..88896aadc8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c index a0932e7def..885a2a06f6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c index 90fc1ba99f..0bb578598f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c index 24223f0a1e..72cee46131 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c index 90503c4aa7..118fcf0fa0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c index 4001bda2fb..09d93dc9cf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c index ed61c5cf0c..b384621186 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c index 469c0a9c7c..2709c6a2d5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c index 75d818e336..9086637bc2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c index ad28b76477..ee98ebd2d4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c index 7f0f921a9b..bb765da84c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c index 1a5448b305..39ae14575d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c index 88cadc586a..c8024d273f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c index 2f67637c56..7610b1cdf9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c index edd9ff8417..2ab6ab4b4b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c index 68529ffa95..dfcd6bf391 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c index 4ad7e7a797..e2bda1b267 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c index 2f64a2f77d..84ec51fa01 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c index 93108c06b3..2d51d5943f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c index b77840d877..400c63c4ad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c index 1a50086186..c172fe9b0b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c index f71861d1b6..4eca4fe1de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c index 7b715a02d0..bc014001de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c index 0c0d373331..aa69f8b8bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c index b6688fc43b..1d13db7eb8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c index dcbdbf4205..3f5365c459 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c index 0574a0413a..73bca302e2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c index 03ac1c0438..3a271fbf7c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c index 4d5d808304..4a3649f3b2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c index 4b6c38b9da..0ca7e447d1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c index 733723fa5b..39f49cbc86 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c index 3dbe7a53e8..aaeb6638a4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c index cd7b96b204..6e3e6d7e47 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c index 3127b50971..1d25d6f4b5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c index 1411574b1f..b982a05498 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c index dec60e7308..7eb04311a5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c index ae40acb5de..7ffccf4695 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c index 66633ad6cb..bdc230ae10 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c index 1a685035de..45ab560a4c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c index d1aadf08d5..2697f5cffa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c index 9789f2433f..ddd634ca11 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c index b042f0029e..9fb428f761 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c index 55911ed9cf..9c4c73f4ee 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c index afc2f43bd7..b903000660 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c index 8827e5f0c1..07d3e83999 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c index 8ca6bc6785..106ef8c8de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre index 4b061bf032..9535d2cad9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_double.h" +#include "gromacs/simd/math_x86_avx_256_double.h" #include "kernelutil_x86_avx_256_double.h" /* #endif */ diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/kernelutil_x86_avx_256_single.h b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/kernelutil_x86_avx_256_single.h index a862536079..59c9e053b7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/kernelutil_x86_avx_256_single.h +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/kernelutil_x86_avx_256_single.h @@ -35,7 +35,7 @@ #ifndef _kernelutil_x86_avx_256_single_h_ #define _kernelutil_x86_avx_256_single_h_ -#include "gmx_x86_avx_256.h" +#include "gromacs/simd/general_x86_avx_256.h" /* Transpose lower/upper half of 256-bit registers separately */ #define GMX_MM256_HALFTRANSPOSE4_PS(ymm0, ymm1, ymm2, ymm3) { \ diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c index 550e76c414..a31eda8097 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c index ac1706ce40..6e13e32406 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c index 9a56daa104..85b0b34323 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c index 40c9f52c86..571bd3b305 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c index c109995cf4..8ffc459f5c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c index bd58855db0..bd02d38a6d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c index 221ebf5d94..b3061c5a07 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c index bea23dfd51..f58e48ae27 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c index 7cacc3f7c8..90f8e86e11 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c index 9c20b2a3d4..0bbd2fed8e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c index 9c71357078..1acfb96283 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c index 55d472c439..d7c1c50033 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c index 52c346c161..a8c810fac5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c index 64309bde8f..a9b004b404 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c index 0c68010933..6abe07efed 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c index 84f4a3107a..4139080c8d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c index 5787180f91..c89383bb4f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c index 3c76e5b206..4ab736cbe4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c index c4d8ebd375..1e2b2750ea 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c index 9c3dd4fc64..724bfc6a80 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c index a99c8312d5..8e33b71472 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c index b498f1e428..e015d71523 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c index b8e146d9a6..58592a4b2e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c index 0d7bb3a25c..a5142edd1d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c index d6ae248bbb..74e8807fe4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c index a2bb6a2bf0..72a9e404a1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c index 2b88b4ea57..5e142007e8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c index 545c290036..886363fb6b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c index 3a482e4dbc..8549fda531 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c index a6551cdf33..8c37dff5f7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c index 0d0e26cdf7..18a7df2846 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c index 1d3b078e72..4f3ee651e7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c index a8964cc510..2656289f17 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c index 5443d841a0..6c729c5fe9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c index 60df7ec57b..c34e8f4eb1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c index d358240678..c3d787327f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c index c98b29c8d0..8e2e64d361 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c index 470b010380..d31574ca36 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c index 6d1740425f..c72568a3fd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c index df4b1093bd..12ac8ca754 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c index e543cfa616..625d9cff38 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c index 5af01616de..cdb5a5bf1a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c index 48a7e8138c..75276bed4b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c index ca5426407f..e4494e96dc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c index ee38dd4b3e..944e6d0129 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c index 0198a64a53..bdea49357b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c index c5660f4620..a55cc8c17e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c index 408cd4ca06..57aa5e41d2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c index f193d9b056..c02df43390 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c index f29954a52c..d631c49dc0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c index 7dc81b5a6a..b2cd949972 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c index ee5a05e35b..7a19dd880f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c index 551b95d5fd..9e97185933 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c index 737d1dd227..cb979758f7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c index 8a3e63a1fd..3302732fed 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c index 9d0b81186c..89f3ee40bd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c index 2ef4833697..9742a77b5b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c index c0b37f23d6..b0cad93a22 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c index 92f75496c3..ab3d56d51f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c index 22087bf5df..9ca351ddb0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c index 88a3954218..ae69f3e8e9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c index d24772cec0..c255fc9e23 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c index bb7cd6658d..843a84f897 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c index b5fd8066fd..eb2a01573b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c index b7cafcdf43..2139c49f40 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c index 38165d1438..846ec020ab 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c index a7861597f6..839a2fe7a8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c index 2f783bf90f..05568fa271 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c index d6e9544101..42fd0f4c52 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c index 4eb7bbf027..2a799a92ab 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c index 5ba8a15f32..4dae0d8591 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c index cf2fc4e0d1..e90999a54e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c index 60946ab649..d6c3d6802b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c index 0049d02b6a..783a23e44c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c index 630015ac2d..4821b27034 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c index f7535195b4..a8ac42a539 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c index 26db2e68d0..438e38fb22 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c index bd2fdf333c..7055594fe1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c index 5709281fd6..122eb43bd8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c index 96d5323978..0709eca87e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c index ada987eaba..8c2073d185 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c index e246da6426..d274860cb2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c index f547059de9..bba56c9125 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c index 475bd346b9..391c66e035 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c index d7a8c9f371..bec0c9281f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c index 5914849a0e..c02b483d73 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c index 81c34e0355..812961b457 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c index 436fddab9f..66609cad15 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c index 77f29f19fe..77789306e5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c index ec5d90e300..06226933cb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c index bf414ccc68..6d26141a39 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c index bc090e8c5c..9cc53dc324 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c index 7541e2695a..be29237f7c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c index be3a6707f4..60f5e40e51 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c index 82253b0cec..95a2616b38 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c index a2b81ead07..ed2118b7a4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c index 296b84d18a..45fb543596 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c index e8e646e9e9..26127febae 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c index 179141a8d0..9bef5e60e8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c index 2dcb688e5a..2ac9309257 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c index 2f50ff1acf..6b7fe1cfef 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c index 104b1d759a..714e5ef5c3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c index 876b10dcdb..b70518f004 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c index a18a87d3b2..6eeefa77d0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c index 7475ac6010..d3e9fa1d65 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c index 4a447fd9c8..58e2262036 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c index 0a97f51afb..14ea9d2f5c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre index 446c20ec05..9a1ddd43ce 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_avx_256_single.h" +#include "gromacs/simd/math_x86_avx_256_single.h" #include "kernelutil_x86_avx_256_single.h" /* #endif */ 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 24f22182a9..05ed35d17c 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 @@ -37,7 +37,7 @@ #include -#include "gmx_x86_sse2.h" +#include "gromacs/simd/general_x86_sse2.h" #include diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c index 598d1c4ff5..8812dbb18f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c index bdc2160e67..c4604ff1ac 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c index add70baa5e..9060d4332f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c index 1943b86392..518aa69f58 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c index ba75aaf4a4..14a8fed7b8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c index 52524a365f..46a5a5dca5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c index 33c68b6145..0810dced56 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c index 097202f80c..ef6a63ef9d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c index 376a42c4f5..c33d96bc6a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c index 70c00f9df7..db5fae621a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c index 193bfe5ad9..674ce0af3b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c index 02904c2a33..ca74086c09 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c index f0581ca1e0..e6e86fce2d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c index 169621ae71..2a912db4dd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c index 84c8bb9501..9842b3da93 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c index 99e5b5f703..7ed18dc6c2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c index 09cedaa123..62f3caf4ef 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c index 6d25a73258..9ca81f960c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c index d97a941ea0..7ada0d0df5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c index 31d79d1394..752c5e8eb6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c index fbbb5df7cc..fe1f2fafd2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c index bfed207648..aa57a7322f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c index be03135834..02d110f516 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c index aff4b27bc6..423c3ee39b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c index 442be0e624..457fcfd409 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c index 6cd25fa3c8..eda2975ed3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c index 4d7069e3c4..e76d6333cf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c index c7c1c396b4..c6e46d9b08 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c index 04d7774f6a..9eefcd3cc0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c index 5eb01dda24..27016b8096 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c index 2a5000be74..dfd1df2b01 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c index 292f4015a4..6c51e1c94a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c index 2a74810406..607e82f009 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c index 5530970851..a78d4c61fe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c index d7fd610a93..7ebb37f721 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c index 5370efc045..b05b026adb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c index 5cc57cf5c4..21ca776880 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c index de8dfa8c8b..9504e11283 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c index ad6da9e819..0494150c7e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c index 76c3a6676c..cfa8f4006a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c index 85a9c9c8e4..c2a89e1f94 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c index 1096828dd5..e081e211c7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c index 8f4f434c39..f61fcc38db 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c index 6bedd00845..914b77ab03 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c index f8cd420b52..c7040fd843 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c index 2c4e0936e7..4969a4a242 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c index 034a660122..0fba7a1ccf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c index 606dc119cb..99408aba46 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c index 214c9e909f..601cb2e9e4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c index 20098c3879..d2da77794e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c index b8d95ae77d..431a57bf4f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c index 888f81b334..698aa03506 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c index aaf82dca32..aa695c79df 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c index f38a9312c4..68e85aa367 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c index 161cf47256..2850954b31 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c index 57a5ef5822..c096180cf7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c index 1178772225..68f1f9d7d2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c index 40c744993e..daa666ce4c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c index 9049dcbd45..db19156659 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c index f67e253fe1..70d7c287b1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c index 0f062946e7..75ef13cca3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c index 79ea50d843..5f37b0a5d0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c index befee4298f..1289d9d972 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c index ba3c64d4c0..ae1a0f7e6e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c index 15defb1a02..47ef9a1e79 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c index 414e3bde55..9a2b797587 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c index 301dc020b9..54c5ef2f9e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c index e036bb49da..222313e4a7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c index eddbe30767..27e5c525f0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c index 948b1fbee3..d1142948cc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c index 2174b50575..9888e8087f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c index 6b9076e2c4..6e8d1bc702 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c index c91a13961c..6d3a35019e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c index d723587112..562c79fc43 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c index fbf7af288c..33705c8cdb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c index 6b673e0c93..32c90b2950 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c index c834192fe6..1ff8586e86 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c index 36017688cc..91b0201e1e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c index 51b7a5a5bb..85f3041766 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c index 0ee96a0b5c..810625993b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c index 2915e0e380..e370f0564e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c index 81525c95f9..54424803d0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c index 488c5c9f01..efca2149d0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c index f7a1c33aa8..71222b0aff 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c index 9e2fa83413..eb3aebadad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c index e8dbaa608f..251486d765 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c index 96a66fb048..8d08235351 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c index 02d99917db..f1acafed8f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c index df29ddbb47..c0883d976d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c index 56bfca4e93..1a5e4682bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c index 7b14ab5517..382467dce2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c index 57152337db..580376252c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c index 8a3e3cc132..696d541e98 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c index f8bcd411e1..534f260ce3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c index c3ed21c643..e092b553dc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c index 73704c58e3..80f282b9da 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c index 6eba731e28..e8a739d97b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c index 5aa8c7456a..4710f11b85 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c index 13bd1e4bff..464e690925 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c index e9c7cb8ff7..dbf0fea073 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c index 84ceaaad96..8f9d31ee3b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c index e779e8aa3e..e8cefe8a8d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c index 2541b94897..9f0091bc12 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c index ef8f1e29b3..eeb517bf13 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c index ed06ab1abf..37d656078f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c index 3390f7367d..dd1b9608f4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c index aa8b977fe6..19e8a07516 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre index ed85164e4f..928844b5d6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_double.h" +#include "gromacs/simd/math_x86_sse2_double.h" #include "kernelutil_x86_sse2_double.h" /* #endif */ 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 72bb83a4ae..3d8b723808 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,7 +39,7 @@ #include -#include "gmx_x86_sse2.h" +#include "gromacs/simd/general_x86_sse2.h" /* Normal sum of four xmm registers */ diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c index fef46ca655..853206e224 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c index 92f4b63a03..b149aa2fa4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c index 5658eb803a..5d32452902 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c index 22a65dda95..b1f235427c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c index e658cbe8be..12dfa40c1b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c index bf205304ac..bf2fdde1a1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c index 9dd23eca0b..a954a738fe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c index ccb5071322..786fe7d97b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c index 11f4f80bca..c049711823 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c index 89256dc788..5e496064cc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c index 5069f29f5f..25c99b4144 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c index f7a4ff0325..47d0b6c7b7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c index 1b43a540c1..32b6d8f9de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c index ca0d320707..f899aa0001 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c index df4ff0f9a3..21327db303 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c index 8342dd84d9..5e2ef2430c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c index 7cac6b1fc3..78f743c034 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c index f6e105efa1..3d74ff63a8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c index 0dd8203405..d0686bf46e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c index cf48c43b69..d30e9ee57e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c index 618002d8dc..b6e78dab0b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c index 977c151f54..9cb9e56c79 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c index 333b7dd486..28f093be42 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c index 8c8f333175..8a45cbe104 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c index b31fe673be..20af76d96a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c index 503cc6a9bb..f9be33ad09 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c index c57f543ec5..404eaede4c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c index 7b9db7b3f3..7931f62221 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c index b5e5e3131b..047fb9bdec 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c index b6a5cb2726..b7035c4bfe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c index fc5104476f..89302e686a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c index 5f1e292b00..8286e490db 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c index c08ee5fea7..02f6dc6103 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c index 0bc4e3a46e..d97553b603 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c index ec74f5ce7c..5a90b63c14 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c index c02e5ff900..e372eb0b0b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c index 7d8a091a38..7f81f331c7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c index 8f2c29fde3..4bf397d644 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c index 0009cff442..521fb75880 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c index 07da0719f2..67140cad9a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c index 487a5d3aed..9cc5a8dc16 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c index c6cc8a9031..8000a51d0f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c index 3ae0c83424..5fdd54de15 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c index 3849cace2a..9c8238521e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c index 21e34a4051..4e4aab3dc7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c index 2b99e2c2e5..25f30ba465 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c index be54749c5b..ffc3c2548f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c index e25fc7c0a1..9b800e8263 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c index bba7604d42..010ec545de 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c index 668895dbf8..191b040aaf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c index f141d3796f..bfa897a7e0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c index 53fa4b4229..1d185854a6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c index 8e03a4c099..a69f4f295f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c index e575a0a008..14849c317e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c index de1c00abd9..91e0f8711b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c index b7dc967a65..72d1955ee3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c index 66abd3ba2c..e9bbca794c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c index c672c95b16..8b5cfaff03 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c index 80c5fbbc0f..bcd18da360 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c index 5d02ce0b5d..e78d38eebd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c index 26839c3d28..d567138f0c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c index e8a3baa516..083aefee08 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c index 2f070a2da0..e4c4e08cc3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c index df60ee2856..cd301e9c5c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c index cc1d7598c6..6b01187f32 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c index 2fd317ae41..0717da1773 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c index 0b3a58088f..3130ba44e2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c index 949813c5b7..451f96a511 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c index 42938cb2c9..3c80b4e2c5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c index 7dc5e72dfe..956e883125 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c index b283973a2e..9b1c31f7d0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c index f11d7ca930..7aa5c6afac 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c index 742b593432..fe3f10de29 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c index ae6c327188..33cd05b198 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c index 50dfb0c233..1e46beb6e1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c index ebe4652e27..d2214aae85 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c index 54564eb27e..f4d5549fa6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c index 57a6dd1c5e..466b808ca3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c index 741b19baca..0c18418edd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c index de5c6411b0..c2e86560f5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c index c451930705..9e61af8102 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c index bbd0c5ea47..a3e3b4cc9a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c index 52371175a6..b063a244c4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c index 015c100f54..07e22ad09d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c index de0847f957..7af182f100 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c index 1c831c41d5..2ed4fb7881 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c index 5ee27c4c0c..91c7efaa43 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c index ed4c6f0c77..180806d27b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c index eef8d3f66e..8dd087a7f4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c index 5d378ed3d5..f36e788e0b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c index a4a3fd5f03..d18752f4bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c index ed51d4e6e7..5d85e946bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c index 107fc2e0d3..39b37aee6d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c index bd587485fc..06fa5e62da 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c index f258c76d78..fcc35f9a71 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c index ad9bcf668d..a9e5dad425 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c index 6468d1e542..c8f2f1f79a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c index 799c060d55..7c4af96763 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c index ea4d498650..830fec7c71 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c index e735bc504b..dabe5ac417 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c index 8250fb6a08..5956e258ff 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c index ef43804436..03ddc09b7e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c index 112af31def..2bd86b5bf0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c index 34e7d6fbb6..4faaa04749 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c index fb68ded929..ca604e40bc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c index 569f1d51a0..263f1238ed 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c index c5dd20ae8f..dd3720089a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre index b3cce9513b..0cc9cb0390 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse2_single.h" +#include "gromacs/simd/math_x86_sse2_single.h" #include "kernelutil_x86_sse2_single.h" /* #endif */ 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 6588de26a5..282dfc0ea4 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 @@ -37,7 +37,7 @@ #include -#include "gmx_x86_sse4_1.h" +#include "gromacs/simd/general_x86_sse4_1.h" #include diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c index ca287c2d9f..fda6370b64 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c index d62a5aa2d0..a8a9e26dac 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c index 8684e98c0f..8313e952ad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c index 532d57d01c..a255bbf293 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c index 98528f352d..4f9ab91c8c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c index a40fd062ef..b04fa0ff4c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c index 428fd3715f..49e61fb996 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c index 8f60943455..c58caf11f0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c index c97dd637d5..bf18f815fb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c index 8a12d5af9e..a59611c51d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c index 758609f104..0e9d40a732 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c index a80a4f3a82..87090da789 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c index 840638ce5e..3e3204b427 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c index c34e766b76..0bb5f44459 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c index 58bd54a891..45a4e2523d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c index ee21de94b6..dacd64d9ef 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c index 14a41b893a..82efcff86d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c index 4932376e57..ad4867d0e9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c index 8c5de6b8cd..e962313380 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c index 19fd4c73f8..322d2baf26 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c index 3d3e5ac22b..f412487749 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c index f3eb1947f3..a641ec2d02 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c index 114f4843eb..70827217a2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c index 44625c0817..13a9bc6c7f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c index 4cbc6400f4..b52a4624e7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c index 30bbb93fdd..d76b1f08bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c index 80b51f38d8..5fb922f20b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c index 3d6ee18e21..bda6401f04 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c index 6b897eae84..e9b0aec44a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c index f33c2f3c7f..de03eeb756 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c index d3519ca91c..a6464d6412 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c index ba68439ad5..a194b53626 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c index 6e3b237ffd..3143ae9a3a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c index bef9e66ad7..cdce932aa5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c index e73dbbb166..760fb1b7e3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c index 84b78856d3..f59c181c0c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c index 7bf666da74..31c91c6164 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c index 5bd5ccb7e4..34176bcf0e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c index 866c3f8ac1..af96896e80 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c index 3682271902..deb7c926a7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c index c0af1d6464..5f5d67fc68 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c index c90b36bf88..f0434fac76 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c index 9410bd2e13..e180367e98 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c index 9f95d99323..4a54ed85cb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c index 6bb96b3fe4..b2ee59cbee 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c index 670e9d31dd..8129d23377 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c index b9118e726b..75f1bbaaf9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c index e9c4cc1754..df0e9635c6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c index 2c90ef2226..608cc809ba 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c index 600bfeeb08..ec382b412d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c index 91e88a9eb3..ca48ca5787 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c index 66881fcf88..f1a75923d1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c index 350f22485a..5ffd304773 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c index ecfddcdfad..0c995eb6fa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c index f859598334..3d7c067fc8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c index 9a585d736c..ca5d7eece1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c index 5f6f5e91e9..5cd1ce8d05 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c index 4b786368ca..3cfcee40c3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c index 866f1ab48e..90776521fd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c index 6d5878585c..79250959c5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c index 9f0723e132..26c0aaa209 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c index a421b9cdcf..e111e60cd7 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c index c9c3bed891..d3f5e05824 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c index 38ac9c18e8..36217ae9dd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c index 9e949ae71a..3b5c2e79ff 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c index 31c39f7b1c..2716bcedf2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c index 763ceac7fa..5ec61fb7cb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c index d5eaf553d9..72685887f1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c index be90377109..053a05c317 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c index 09c0a21490..c53a93f68c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c index ed83600c71..44742f1220 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c index 3810220e4a..d7023fd33a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c index 78713a9f42..0b93847e88 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c index 2b34793522..7ac6e0dfad 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c index e6e724a0bb..0fa9ce94b5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c index 81d6138771..239991cf5c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c index 1ba6e3314d..7aeb8dcf53 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c index 8cd3615676..08bf8b37cb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c index 00926647d3..d349dbcd90 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c index 9cb9647093..ec2cd4d461 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c index 8e50da9de0..b93a124589 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c index d0a8530a25..643aed1e9d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c index 5880bcf072..617ca31edb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c index 4814d88fb5..59f6c93c02 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c index 13f3ece180..2b4ec8e28b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c index 4005f49c9b..bf7513ac61 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c index 3eb406d15a..474e757525 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c index 3e4c76ae38..cf5e4fd1e8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c index d23f0dceba..b3f25d9d2e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c index 0abfc4d6c1..8b0a6dd93b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c index 03a0edfe57..4a4d75ef49 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c index adbd092ae0..be8860d142 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c index e58771e496..276776e004 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c index 83a9da693c..9b9152eee9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c index 1a69415c6d..e8b17350e2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c index 6b2a21d81e..25038631fa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c index 44baf8e166..12882917da 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c index e816032b41..bf5000880f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c index 5306ddc836..60004363ce 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c index c94e0cec3a..7e8ac3c540 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c index adb9422dbc..a607175033 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c index a0fb64bf45..2a0bde3aff 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c index 99419052d3..7f96966076 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c index d60a0f0240..50b9124cae 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c index accfd54e80..6229414620 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c index f6fe2ae5c5..f9a3cfda2d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c index 8f37f9c6e2..eb28094a97 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre index 252162d8cf..359850660e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_double.h" +#include "gromacs/simd/math_x86_sse4_1_double.h" #include "kernelutil_x86_sse4_1_double.h" /* #endif */ 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 0db398ed72..4aee8a2764 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,7 +37,7 @@ #include -#include "gmx_x86_sse4_1.h" +#include "gromacs/simd/general_x86_sse4_1.h" #undef gmx_restrict #define gmx_restrict diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c index 8187f78908..0dde894006 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c index 27d37b0b8e..9f05188548 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c index 796179f015..50b4b59710 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c index d9fc37c99d..5f135877fe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c index a6aef3f50f..08114a675f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c index d60e4b1242..f62a1ea167 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c index eb61399d04..d5b89f9efe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c index 10652b59d8..3b0f1465aa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c index 353a145910..34e25c2a4f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c index aff923d453..995467b6a2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c index c07980fa63..015bbf03eb 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c index 09259fa12b..d5d81656a5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c index 6fa2f5fe9f..769c16b42e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c index 4707a60c88..2786360113 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c index 156047696d..ba96babbf5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c index 5aeab3e128..d8c401dc51 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c index d649810968..d37127e7fe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c index 2cda81228f..cce787ac64 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c index 3cb4cd3a1b..cfa9c23cc3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c index 69cdddfc56..7fbfd65bff 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c index f33f528448..b947708b59 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c index 5d4b3ab98f..a2882b798f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c index b4b58cfab4..385ae34ed6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c index f3f6d9bc1b..c9035c010d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c index 42ce0b94bd..5f8b4b6ad5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c index 910acaea1b..ca8227218a 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c index fccbf88df6..b49dc64faa 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c index 410fc6f7f3..dbf099afe6 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c index 12034d12da..d423577635 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c index f63e7efe3a..329319b26d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c index 7564b9eeae..801879aba9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c index 14b4eeb616..ac1f8e4927 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c index de35892d84..1d6fb501a4 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c index 482ca96218..a37706ccf0 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c index b5fffa42d7..a9ab3eb4db 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c index ceded8debf..0e3e1c0568 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c index dd93551ecf..b1b4be7255 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c index f1b8496b53..b7ff2dbe40 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c index 59d950cbe7..d2a5248769 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c index cc0b3b8e28..8f998843a9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c index 373e48dabe..c88b7ece24 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c index c5904b1bca..744845b606 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c index cb78506f92..866d10ec17 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c index 077be74cd4..5c16ed677d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c index de15d4c875..02be6a2d11 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c index 7c385b2e34..784e401238 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c index 59a536c8ff..3ffa38a33e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c index bae866a172..b94c40468b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c index 981ae16f5e..ecc4fa986d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c index 42a483a769..c095e1f523 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c index ef6cf514d5..d48932a960 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c index 3cd662d6d4..469cb62ada 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c index df636508d0..4c721af444 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c index 92953c146c..f2553a88bf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c index de0e6183df..66ae09b204 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c index c398e3a618..17715797e9 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c index 907d0c57e0..e7358692f3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c index 0ee73fa2ec..0b711d1812 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c index c989945d4a..9d3bf4bbda 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c index 03d6af0ad1..126227ec07 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c index 716f07e4d3..09b2c8a189 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c index 3b559cdbf3..1080c7293b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c index 7d85e6e677..5792169ef2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c index ab4b79c2e7..72aed21c73 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c index c7cece31e2..484b96077f 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c index c414d6270c..e1d94c6e3d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c index 3a6b49c27b..e561c4030c 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c index e28e6db4be..6728516156 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c index 212f31da2d..b8e6ed800d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c index ba3fd53843..399a19a394 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c index 6dcaa54a9c..d9679e6edf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c index 152b06da29..2eb4848df2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c index 1ecb187d47..1afebfa039 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c index 23e2a17b30..c2cc9e790e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c index adbebc339d..f2279e4635 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c index 9d5dec71f8..2b69fbdc05 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c index 55c9937efa..209e44ba34 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c index 6ea6a7abf7..5691ea3e90 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c index 978b1d5246..da4566ac2b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c index 633274e3d9..bc8e2cd684 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c index 3e40a5f851..d13e71f27d 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c index d5ab40b7b6..826a2f7af3 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c index 17fdf03734..fdd483a74b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c index bf5c5d96ba..1da9228cbc 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c index 728d9796d5..4766c85485 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c index bd4b84a7b8..c1fed33908 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c index 122c6096d5..b074dbbf26 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c index 8a32e560ca..6a48bd4057 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c index 856a0175eb..bb2af8fa65 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c index faa1974bc5..bb5881f784 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c index 65f8fa09b7..36b90fc188 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c index 3982256659..be4854fdb5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c index 710eb9bdc0..d1c8726f04 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c index ad5155fdbf..d420c1bbbe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c index c1749db0cf..5291a56ecf 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c index 635a3b30f3..c39998025b 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c index 39d200d87d..6797d52fc8 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c index 0b2157fe68..5f9bf92fc2 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c index 7fde5d6659..b423463176 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c index 635010f76b..4e196decd5 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c index 882e112e86..d1618c5506 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c index a4b879421d..8fd701195e 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c index 2db54d3158..31b42d4e67 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c index 17f8202ace..ec8d44bd68 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c index 89311d89c4..8b45d77ddd 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c index e165220bb1..9d629b5e09 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c index af9c80628b..232ec1debe 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c @@ -46,7 +46,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre index 1962300971..e3beb992b1 100644 --- a/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre +++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre @@ -47,7 +47,7 @@ #include "vec.h" #include "nrnb.h" -#include "gmx_math_x86_sse4_1_single.h" +#include "gromacs/simd/math_x86_sse4_1_single.h" #include "kernelutil_x86_sse4_1_single.h" /* #endif */ diff --git a/src/gromacs/gmxpreprocess/calc_verletbuf.c b/src/gromacs/gmxpreprocess/calc_verletbuf.c index 398e8d3f6b..fb0641ed4c 100644 --- a/src/gromacs/gmxpreprocess/calc_verletbuf.c +++ b/src/gromacs/gmxpreprocess/calc_verletbuf.c @@ -58,7 +58,7 @@ #ifdef GMX_NBNXN_HALF_WIDTH_SIMD #define GMX_USE_HALF_WIDTH_SIMD_HERE #endif -#include "gmx_simd_macros.h" +#include "gromacs/simd/macros.h" #endif diff --git a/src/gromacs/legacyheaders/gmx_avx_double.h b/src/gromacs/legacyheaders/gmx_avx_double.h deleted file mode 100644 index cbf6bc5f9b..0000000000 --- a/src/gromacs/legacyheaders/gmx_avx_double.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This source code is part of - * - * G R O M A C S - * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team - * - * Gromacs is a library for molecular simulation and trajectory analysis, - * written by Erik Lindahl, David van der Spoel, Berk Hess, and others - for - * a full list of developers and information, check out http://www.gromacs.org - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) any - * later version. - * As a special exception, you may use this file as part of a free software - * library without restriction. Specifically, if other files instantiate - * templates or use macros or inline functions from this file, or you compile - * this file and link it with other files to produce an executable, this - * file does not by itself cause the resulting executable to be covered by - * the GNU Lesser General Public License. - * - * In plain-speak: do not worry about classes/macros/templates either - only - * changes to the library have to be LGPL, not an application linking with it. - * - * To help fund GROMACS development, we humbly ask that you cite - * the papers people have written on it - you can find them on the website! - */ -#ifndef _gmx_avx_double_h_ -#define _gmx_avx_double_h_ - -/* We require AVX now! */ - -#include /* AVX */ - -static inline __m256d -gmx_mm256_invsqrt_pd(__m256d x) -{ - /* There is no double precision AVX rsqrt instruction. - * But using a single precision rsqrt still gives the full precision. - */ - const __m256d half = _mm256_set_pd(0.5, 0.5, 0.5, 0.5); - const __m256d three = _mm256_set_pd(3.0, 3.0, 3.0, 3.0); - - __m256d lu = _mm256_cvtps_pd(_mm_rsqrt_ps(_mm256_cvtpd_ps(x))); - - lu = _mm256_mul_pd(half, _mm256_mul_pd(_mm256_sub_pd(three, _mm256_mul_pd(_mm256_mul_pd(lu, lu), x)), lu)); - return _mm256_mul_pd(half, _mm256_mul_pd(_mm256_sub_pd(three, _mm256_mul_pd(_mm256_mul_pd(lu, lu), x)), lu)); -} - -static inline __m256d -gmx_mm256_calc_rsq_pd(__m256d dx, __m256d dy, __m256d dz) -{ - return _mm256_add_pd( _mm256_add_pd( _mm256_mul_pd(dx, dx), _mm256_mul_pd(dy, dy) ), _mm256_mul_pd(dz, dz) ); -} - -/* Normal sum of four xmm registers */ -#define gmx_mm256_sum4_pd(t0, t1, t2, t3) _mm256_add_pd(_mm256_add_pd(t0, t1), _mm256_add_pd(t2, t3)) - -#endif /* gmx_avx_double_h_ */ diff --git a/src/gromacs/legacyheaders/gmx_avx_single.h b/src/gromacs/legacyheaders/gmx_avx_single.h deleted file mode 100644 index 2434bc3a9b..0000000000 --- a/src/gromacs/legacyheaders/gmx_avx_single.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This source code is part of - * - * G R O M A C S - * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team - * - * Gromacs is a library for molecular simulation and trajectory analysis, - * written by Erik Lindahl, David van der Spoel, Berk Hess, and others - for - * a full list of developers and information, check out http://www.gromacs.org - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) any - * later version. - * As a special exception, you may use this file as part of a free software - * library without restriction. Specifically, if other files instantiate - * templates or use macros or inline functions from this file, or you compile - * this file and link it with other files to produce an executable, this - * file does not by itself cause the resulting executable to be covered by - * the GNU Lesser General Public License. - * - * In plain-speak: do not worry about classes/macros/templates either - only - * changes to the library have to be LGPL, not an application linking with it. - * - * To help fund GROMACS development, we humbly ask that you cite - * the papers people have written on it - you can find them on the website! - */ -#ifndef _gmx_avx_single_h_ -#define _gmx_avx_single_h_ - -/* We require AVX now! */ - -#include /* AVX */ - -static inline __m256 -gmx_mm256_invsqrt_ps(__m256 x) -{ - const __m256 half = _mm256_set_ps(0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5); - const __m256 three = _mm256_set_ps(3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0, 3.0); - - __m256 lu = _mm256_rsqrt_ps(x); - - return _mm256_mul_ps(half, _mm256_mul_ps(_mm256_sub_ps(three, _mm256_mul_ps(_mm256_mul_ps(lu, lu), x)), lu)); -} - -static inline __m256 -gmx_mm256_calc_rsq_ps(__m256 dx, __m256 dy, __m256 dz) -{ - return _mm256_add_ps( _mm256_add_ps( _mm256_mul_ps(dx, dx), _mm256_mul_ps(dy, dy) ), _mm256_mul_ps(dz, dz) ); -} - -/* Normal sum of four xmm registers */ -#define gmx_mm256_sum4_ps(t0, t1, t2, t3) _mm256_add_ps(_mm256_add_ps(t0, t1), _mm256_add_ps(t2, t3)) - -#endif /* gmx_avx_single_h_ */ diff --git a/src/gromacs/legacyheaders/types/nb_verlet.h b/src/gromacs/legacyheaders/types/nb_verlet.h index c547ffab36..67a213fceb 100644 --- a/src/gromacs/legacyheaders/types/nb_verlet.h +++ b/src/gromacs/legacyheaders/types/nb_verlet.h @@ -45,8 +45,8 @@ extern "C" { /* For testing the reference plain-C SIMD kernels, uncomment the next lines, - * as well as the GMX_SIMD_REFERENCE_PLAIN_C define in gmx_simd_macros.h - * The actual SIMD width is set in gmx_simd_macros.h + * as well as the GMX_SIMD_REFERENCE_PLAIN_C define in gromacs/simd/macros.h + * The actual SIMD width is set in gromacs/simd/macros.h * The 4xN reference kernels support 2-, 4- and 8-way SIMD. * The 2x(N+N) reference kernels support 8- and 16-way SIMD. */ diff --git a/src/gromacs/mdlib/nbnxn_internal.h b/src/gromacs/mdlib/nbnxn_internal.h index 6d4a328b15..cbb0ddcc48 100644 --- a/src/gromacs/mdlib/nbnxn_internal.h +++ b/src/gromacs/mdlib/nbnxn_internal.h @@ -47,7 +47,7 @@ #ifdef GMX_NBNXN_HALF_WIDTH_SIMD #define GMX_USE_HALF_WIDTH_SIMD_HERE #endif -#include "gmx_simd_macros.h" +#include "gromacs/simd/macros.h" #endif @@ -56,7 +56,7 @@ */ #define GMX_SIMD4_SINGLE /* Include the 4-wide SIMD macro file */ -#include "gmx_simd4_macros.h" +#include "gromacs/simd/four_wide_macros.h" /* Check if we have 4-wide SIMD macro support */ #ifdef GMX_HAVE_SIMD4_MACROS #define NBNXN_SEARCH_BB_SIMD4 diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h index c9d3ca86c5..9fa385e04c 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h +++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_simd_utils.h @@ -97,17 +97,6 @@ prepare_table_load_buffer(const int *array) #define TAB_FDV0 #endif -/* -Berk, 2xnn.c had the following code, but I think it is safe to remove now, given the code immediately above. - -#if defined GMX_X86_AVX_256 && !defined GMX_DOUBLE -/ * AVX-256 single precision 2x(4+4) kernel, - * we can do half SIMD-width aligned FDV0 table loads. - * / -#define TAB_FDV0 -#endif -*/ - #ifdef GMX_DOUBLE #include "nbnxn_kernel_simd_utils_x86_256d.h" #else /* GMX_DOUBLE */ diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c index 795963c2a4..0f5190a50b 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn.c @@ -46,9 +46,9 @@ #ifdef GMX_NBNXN_SIMD_2XNN /* Include the full-width SIMD macros */ +#include "gromacs/simd/macros.h" +#include "gromacs/simd/vector_operations.h" -#include "gmx_simd_macros.h" -#include "gmx_simd_vec.h" #if !(GMX_SIMD_WIDTH_HERE == 8 || GMX_SIMD_WIDTH_HERE == 16) #error "unsupported SIMD width" #endif diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h index 68dba5a2ca..5b31957375 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_2xnn/nbnxn_kernel_simd_2xnn_common.h @@ -32,8 +32,8 @@ * To help us fund GROMACS development, we humbly ask that you cite * the research papers on the package. Check out http://www.gromacs.org. */ -#include "gmx_simd_macros.h" -#include "gmx_simd_vec.h" +#include "gromacs/simd/macros.h" +#include "gromacs/simd/vector_operations.h" #include "../../nbnxn_consts.h" #ifdef CALC_COUL_EWALD #include "maths.h" diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c index 7d33142df2..3e9245a426 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c @@ -48,9 +48,9 @@ #ifdef GMX_NBNXN_HALF_WIDTH_SIMD #define GMX_USE_HALF_WIDTH_SIMD_HERE #endif +#include "gromacs/simd/macros.h" +#include "gromacs/simd/vector_operations.h" -#include "gmx_simd_macros.h" -#include "gmx_simd_vec.h" #if !(GMX_SIMD_WIDTH_HERE == 2 || GMX_SIMD_WIDTH_HERE == 4 || GMX_SIMD_WIDTH_HERE == 8) #error "unsupported SIMD width" #endif diff --git a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h index 11a4e7685f..2310153702 100644 --- a/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h +++ b/src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn_common.h @@ -32,8 +32,8 @@ * To help us fund GROMACS development, we humbly ask that you cite * the research papers on the package. Check out http://www.gromacs.org. */ -#include "gmx_simd_macros.h" -#include "gmx_simd_vec.h" +#include "gromacs/simd/macros.h" +#include "gromacs/simd/vector_operations.h" #include "../../nbnxn_consts.h" #ifdef CALC_COUL_EWALD #include "maths.h" diff --git a/src/gromacs/mdlib/nbnxn_search.c b/src/gromacs/mdlib/nbnxn_search.c index 3e2001d0e7..ca7bafa287 100644 --- a/src/gromacs/mdlib/nbnxn_search.c +++ b/src/gromacs/mdlib/nbnxn_search.c @@ -43,10 +43,10 @@ #include "vec.h" #include "pbc.h" #include "nbnxn_consts.h" -/* nbnxn_internal.h included gmx_simd_macros.h */ +/* nbnxn_internal.h included gromacs/simd/macros.h */ #include "nbnxn_internal.h" #ifdef GMX_NBNXN_SIMD -#include "gmx_simd_vec.h" +#include "gromacs/simd/vector_operations.h" #endif #include "nbnxn_atomdata.h" #include "nbnxn_search.h" diff --git a/src/gromacs/mdlib/pme.c b/src/gromacs/mdlib/pme.c index bc2f8580b5..8683ca687a 100644 --- a/src/gromacs/mdlib/pme.c +++ b/src/gromacs/mdlib/pme.c @@ -86,14 +86,14 @@ #include "gromacs/utility/gmxomp.h" /* Include the SIMD macro file and then check for support */ -#include "gmx_simd_macros.h" +#include "gromacs/simd/macros.h" #if defined GMX_HAVE_SIMD_MACROS && defined GMX_SIMD_HAVE_EXP /* Turn on arbitrary width SIMD intrinsics for PME solve */ #define PME_SIMD #endif /* Include the 4-wide SIMD macro file */ -#include "gmx_simd4_macros.h" +#include "gromacs/simd/four_wide_macros.h" /* Check if we have 4-wide SIMD macro support */ #ifdef GMX_HAVE_SIMD4_MACROS /* Do PME spread and gather with 4-wide SIMD. diff --git a/src/gromacs/mdlib/tpi.c b/src/gromacs/mdlib/tpi.c index 7b4926955b..c8a33a992f 100644 --- a/src/gromacs/mdlib/tpi.c +++ b/src/gromacs/mdlib/tpi.c @@ -82,7 +82,7 @@ #include "gromacs/timing/walltime_accounting.h" #ifdef GMX_X86_SSE2 -#include "gmx_x86_sse2.h" +#include "gromacs/simd/general_x86_sse2.h" #endif diff --git a/src/gromacs/legacyheaders/gmx_simd4_macros.h b/src/gromacs/simd/four_wide_macros.h similarity index 98% rename from src/gromacs/legacyheaders/gmx_simd4_macros.h rename to src/gromacs/simd/four_wide_macros.h index 5cef56757f..8f6f08cc49 100644 --- a/src/gromacs/legacyheaders/gmx_simd4_macros.h +++ b/src/gromacs/simd/four_wide_macros.h @@ -1,8 +1,6 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team. * Copyright (c) 2012,2013, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the @@ -46,10 +44,10 @@ * not necessarily equal to 4. */ -#ifdef _gmx_simd4_macros_h_ -#error "gmx_simd4_macros.h included twice" +#ifdef GMX_SIMD_FOUR_WIDE_MACROS_H +#error "four_wide_macros.h included twice" #else -#define _gmx_simd4_macros_h_ +#define GMX_SIMD_FOUR_WIDE_MACROS_H /* The SIMD width here is always 4, since that is the whole point */ @@ -81,7 +79,7 @@ typedef float gmx_simd4_real; #define GMX_HAVE_SIMD4_MACROS /* Include plain-C reference implementation, also serves as documentation */ -#include "gmx_simd4_ref.h" +#include "four_wide_macros_ref.h" /* float/double SIMD register type */ #define gmx_simd4_pr gmx_simd4_ref_pr @@ -468,4 +466,4 @@ gmx_simd4_align_real(const gmx_simd4_real *x) #endif -#endif /* _gmx_simd4_macros_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd4_ref.h b/src/gromacs/simd/four_wide_macros_ref.h similarity index 95% rename from src/gromacs/legacyheaders/gmx_simd4_ref.h rename to src/gromacs/simd/four_wide_macros_ref.h index 39a19945d1..002f3a96f9 100644 --- a/src/gromacs/legacyheaders/gmx_simd4_ref.h +++ b/src/gromacs/simd/four_wide_macros_ref.h @@ -1,9 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team. - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Copyright (c) 2013, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -35,8 +33,8 @@ * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_simd4_ref_h_ -#define _gmx_simd4_ref_h_ +#ifndef GMX_SIMD_FOUR_WIDE_MACROS_REF_H +#define GMX_SIMD_FOUR_WIDE_MACROS_REF_H /* This file contains a reference plain-C implementation of 4-wide SIMD. * This code is only useful for testing and documentation. @@ -174,7 +172,7 @@ static gmx_inline gmx_simd4_ref_pr gmx_simd4_ref_nmsub_pr(gmx_simd4_ref_pr a, gmx_simd4_ref_pr b, gmx_simd4_ref_pr c) { gmx_simd4_ref_pr d; - int i; + int i; for (i = 0; i < GMX_SIMD4_WIDTH; i++) { @@ -305,4 +303,4 @@ gmx_simd4_ref_anytrue_pb(gmx_simd4_ref_pb a) return anytrue; } -#endif /* _gmx_simd4_ref_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_x86_avx_128_fma.h b/src/gromacs/simd/general_x86_avx_128_fma.h similarity index 77% rename from src/gromacs/legacyheaders/gmx_x86_avx_128_fma.h rename to src/gromacs/simd/general_x86_avx_128_fma.h index 3dbd7a48ba..5314d1c4a2 100644 --- a/src/gromacs/legacyheaders/gmx_x86_avx_128_fma.h +++ b/src/gromacs/simd/general_x86_avx_128_fma.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- +/* + * This file is part of the GROMACS molecular simulation package. * + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This file is part of GROMACS. - * Copyright (c) 2012- - * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. - * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_x86_avx_128_fma_h_ -#define _gmx_x86_avx_128_fma_h_ +#ifndef GMX_SIMD_GENERAL_AVX_128_FMA_H +#define GMX_SIMD_GENERAL_AVX_128_FMA_H #include @@ -211,4 +225,4 @@ static int gmx_mm_check_and_reset_overflow(void) -#endif /* _gmx_x86_avx_128_fma_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_x86_avx_256.h b/src/gromacs/simd/general_x86_avx_256.h similarity index 83% rename from src/gromacs/legacyheaders/gmx_x86_avx_256.h rename to src/gromacs/simd/general_x86_avx_256.h index bd5bea1dac..d13bdeec8c 100644 --- a/src/gromacs/legacyheaders/gmx_x86_avx_256.h +++ b/src/gromacs/simd/general_x86_avx_256.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- +/* + * This file is part of the GROMACS molecular simulation package. * + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This file is part of GROMACS. - * Copyright (c) 2012- - * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. - * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_x86_avx_256_h_ -#define _gmx_x86_avx_256_h_ +#ifndef GMX_SIMD_GENERAL_AVX_256_H +#define GMX_SIMD_GENERAL_AVX_256_H #include @@ -286,4 +300,4 @@ static int gmx_mm_check_and_reset_overflow(void) #endif -#endif /* _gmx_x86_avx_256_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_x86_sse2.h b/src/gromacs/simd/general_x86_sse2.h similarity index 69% rename from src/gromacs/legacyheaders/gmx_x86_sse2.h rename to src/gromacs/simd/general_x86_sse2.h index ea5273cafe..c6c8b4d3ae 100644 --- a/src/gromacs/legacyheaders/gmx_x86_sse2.h +++ b/src/gromacs/simd/general_x86_sse2.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- +/* + * This file is part of the GROMACS molecular simulation package. * + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This file is part of GROMACS. - * Copyright (c) 2012- - * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. - * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_x86_sse2_h_ -#define _gmx_x86_sse2_h_ +#ifndef GMX_SIMD_GENERAL_SSE2_H +#define GMX_SIMD_GENERAL_SSE2_H #include @@ -152,4 +166,4 @@ static int gmx_mm_check_and_reset_overflow(void) } -#endif /* _gmx_x86_sse2_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_x86_sse4_1.h b/src/gromacs/simd/general_x86_sse4_1.h similarity index 69% rename from src/gromacs/legacyheaders/gmx_x86_sse4_1.h rename to src/gromacs/simd/general_x86_sse4_1.h index 297dac57e8..be0eaa7fa2 100644 --- a/src/gromacs/legacyheaders/gmx_x86_sse4_1.h +++ b/src/gromacs/simd/general_x86_sse4_1.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- +/* + * This file is part of the GROMACS molecular simulation package. * + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This file is part of GROMACS. - * Copyright (c) 2012- - * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. - * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_x86_sse4_1_h_ -#define _gmx_x86_sse4_1_h_ +#ifndef GMX_SIMD_GENERAL_SSE4_1_H +#define GMX_SIMD_GENERAL_SSE4_1_H #include @@ -152,4 +166,4 @@ static int gmx_mm_check_and_reset_overflow(void) } -#endif /* _gmx_x86_sse4_1_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd_macros.h b/src/gromacs/simd/macros.h similarity index 97% rename from src/gromacs/legacyheaders/gmx_simd_macros.h rename to src/gromacs/simd/macros.h index d15b49c912..797fc1e442 100644 --- a/src/gromacs/legacyheaders/gmx_simd_macros.h +++ b/src/gromacs/simd/macros.h @@ -39,10 +39,10 @@ * all that is needed. */ -#ifdef _gmx_simd_macros_h_ -#error "gmx_simd_macros.h included twice" +#ifdef GMX_SIMD_MACROS_H +#error "gromacs/simd/macros.h included twice" #else -#define _gmx_simd_macros_h_ +#define GMX_SIMD_MACROS_H /* NOTE: SSE2 acceleration does not include floor or blendv */ @@ -59,7 +59,7 @@ #define GMX_SIMD_REF_WIDTH 4 /* Include plain-C reference implementation, also serves as documentation */ -#include "gmx_simd_ref.h" +#include "gromacs/simd/macros_ref.h" #define GMX_SIMD_WIDTH_HERE GMX_SIMD_REF_WIDTH @@ -173,35 +173,35 @@ /* Include the highest supported x86 SIMD intrisics + math functions */ #ifdef GMX_X86_AVX_256 -#include "gmx_x86_avx_256.h" +#include "general_x86_avx_256.h" #ifdef GMX_DOUBLE -#include "gmx_math_x86_avx_256_double.h" +#include "math_x86_avx_256_double.h" #else /* GMX_DOUBLE */ -#include "gmx_math_x86_avx_256_single.h" +#include "math_x86_avx_256_single.h" #endif /* GMX_DOUBLE */ #else /* GMX_X86_AVX_256 */ #ifdef GMX_X86_AVX_128_FMA -#include "gmx_x86_avx_128_fma.h" +#include "general_x86_avx_128_fma.h" #ifdef GMX_DOUBLE -#include "gmx_math_x86_avx_128_fma_double.h" +#include "math_x86_avx_128_fma_double.h" #else /* GMX_DOUBLE */ -#include "gmx_math_x86_avx_128_fma_single.h" +#include "math_x86_avx_128_fma_single.h" #endif /* GMX_DOUBLE */ #else /* GMX_X86_AVX_128_FMA */ #ifdef GMX_X86_SSE4_1 -#include "gmx_x86_sse4_1.h" +#include "general_x86_sse4_1.h" #ifdef GMX_DOUBLE -#include "gmx_math_x86_sse4_1_double.h" +#include "math_x86_sse4_1_double.h" #else /* GMX_DOUBLE */ -#include "gmx_math_x86_sse4_1_single.h" +#include "math_x86_sse4_1_single.h" #endif /* GMX_DOUBLE */ #else /* GMX_X86_SSE4_1 */ #ifdef GMX_X86_SSE2 -#include "gmx_x86_sse2.h" +#include "general_x86_sse2.h" #ifdef GMX_DOUBLE -#include "gmx_math_x86_sse2_double.h" +#include "math_x86_sse2_double.h" #else /* GMX_DOUBLE */ -#include "gmx_math_x86_sse2_single.h" +#include "math_x86_sse2_single.h" #endif /* GMX_DOUBLE */ #else /* GMX_X86_SSE2 */ #error No x86 acceleration defined @@ -805,12 +805,12 @@ gmx_simd_align_int(const int *x) * generally these are the ones that don't need masking operations. */ #ifdef GMX_DOUBLE -#include "gmx_simd_math_double.h" +#include "math_double.h" #else -#include "gmx_simd_math_single.h" +#include "math_single.h" #endif #endif /* GMX_HAVE_SIMD_MACROS */ -#endif /* _gmx_simd_macros_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd_ref.h b/src/gromacs/simd/macros_ref.h similarity index 96% rename from src/gromacs/legacyheaders/gmx_simd_ref.h rename to src/gromacs/simd/macros_ref.h index 3c4ee171d5..80021d0bb3 100644 --- a/src/gromacs/legacyheaders/gmx_simd_ref.h +++ b/src/gromacs/simd/macros_ref.h @@ -1,9 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team - * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Copyright (c) 2013, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -35,8 +33,8 @@ * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_simd_ref_h_ -#define _gmx_simd_ref_h_ +#ifndef GMX_SIMD_MACROS_REF_H +#define GMX_SIMD_MACROS_REF_H /* This file contains a reference plain-C implementation of arbitrary width. * This code is only useful for testing and documentation. @@ -45,7 +43,7 @@ #ifndef GMX_SIMD_REF_WIDTH -#error "GMX_SIMD_REF_WIDTH should be defined before including gmx_simd_ref.h" +#error "GMX_SIMD_REF_WIDTH should be defined before including gromacs/simd/macros_ref.h" #endif #include @@ -525,4 +523,4 @@ gmx_simd_ref_atan2_pr(gmx_simd_ref_pr a, gmx_simd_ref_pr b) return c; } -#endif /* _gmx_simd_ref_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd_math_double.h b/src/gromacs/simd/math_double.h similarity index 99% rename from src/gromacs/legacyheaders/gmx_simd_math_double.h rename to src/gromacs/simd/math_double.h index 30a2c79dc6..76dcc95a12 100644 --- a/src/gromacs/legacyheaders/gmx_simd_math_double.h +++ b/src/gromacs/simd/math_double.h @@ -32,8 +32,8 @@ * To help us fund GROMACS development, we humbly ask that you cite * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_simd_math_double_h_ -#define _gmx_simd_math_double_h_ +#ifndef GMX_SIMD_MATH_DOUBLE_H_ +#define GMX_SIMD_MATH_DOUBLE_H_ /* 1.0/sqrt(x) */ @@ -260,4 +260,4 @@ gmx_pmecorrV_pr(gmx_mm_pr z2) } -#endif /*_gmx_simd_math_double_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd_math_single.h b/src/gromacs/simd/math_single.h similarity index 98% rename from src/gromacs/legacyheaders/gmx_simd_math_single.h rename to src/gromacs/simd/math_single.h index b9f20e65ef..dc42e0ca0c 100644 --- a/src/gromacs/legacyheaders/gmx_simd_math_single.h +++ b/src/gromacs/simd/math_single.h @@ -32,8 +32,8 @@ * To help us fund GROMACS development, we humbly ask that you cite * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_simd_math_single_h_ -#define _gmx_simd_math_single_h_ +#ifndef GMX_SIMD_MATH_SINGLE_H_ +#define GMX_SIMD_MATH_SINGLE_H_ /* 1.0/sqrt(x) */ @@ -248,4 +248,4 @@ gmx_pmecorrV_pr(gmx_mm_pr z2) } -#endif /* _gmx_simd_math_single_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_double.h b/src/gromacs/simd/math_x86_avx_128_fma_double.h similarity index 97% rename from src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_double.h rename to src/gromacs/simd/math_x86_avx_128_fma_double.h index 54dbfb9f17..778f3de0d6 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_double.h +++ b/src/gromacs/simd/math_x86_avx_128_fma_double.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_avx_128_fma_double_h_ -#define _gmx_math_x86_avx_128_fma_double_h_ +#ifndef GMX_SIMD_MATH_AVX_128_FMA_DOUBLE_H +#define GMX_SIMD_MATH_AVX_128_FMA_DOUBLE_H #include /* AVX */ #ifdef HAVE_X86INTRIN_H @@ -31,7 +45,7 @@ #include -#include "gmx_x86_avx_128_fma.h" +#include "general_x86_avx_128_fma.h" #ifndef M_PI @@ -1333,4 +1347,4 @@ gmx_mm_atan2_pd(__m128d y, __m128d x) return z; } -#endif /*_gmx_math_x86_avx_128_fma_double_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_single.h b/src/gromacs/simd/math_x86_avx_128_fma_single.h similarity index 96% rename from src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_single.h rename to src/gromacs/simd/math_x86_avx_128_fma_single.h index e5feff3af8..b8454278cc 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_avx_128_fma_single.h +++ b/src/gromacs/simd/math_x86_avx_128_fma_single.h @@ -1,25 +1,39 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_avx_128_fma_single_h_ -#define _gmx_math_x86_avx_128_fma_single_h_ +#ifndef GMX_SIMD_MATH_AVX_128_FMA_SINGLE_H +#define GMX_SIMD_MATH_AVX_128_FMA_SINGLE_H #include /* AVX */ #ifdef HAVE_X86INTRIN_H @@ -31,7 +45,7 @@ #include -#include "gmx_x86_avx_128_fma.h" +#include "general_x86_avx_128_fma.h" #ifndef M_PI @@ -1065,4 +1079,4 @@ gmx_mm_atan2_ps(__m128 y, __m128 x) -#endif /* _gmx_math_x86_avx_128_fma_single_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_avx_256_double.h b/src/gromacs/simd/math_x86_avx_256_double.h similarity index 98% rename from src/gromacs/legacyheaders/gmx_math_x86_avx_256_double.h rename to src/gromacs/simd/math_x86_avx_256_double.h index cc9b6e06db..2828505c6f 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_avx_256_double.h +++ b/src/gromacs/simd/math_x86_avx_256_double.h @@ -1,29 +1,43 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_avx_256_double_h_ -#define _gmx_math_x86_avx_256_double_h_ +#ifndef GMX_SIMD_MATH_AVX_256_DOUBLE_H +#define GMX_SIMD_MATH_AVX_256_DOUBLE_H #include -#include "gmx_x86_avx_256.h" +#include "general_x86_avx_256.h" #ifndef M_PI # define M_PI 3.14159265358979323846264338327950288 @@ -2819,4 +2833,4 @@ gmx_mm_atan2_pd(__m128d y, __m128d x) return z; } -#endif /* _gmx_math_x86_avx_256_double_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_avx_256_single.h b/src/gromacs/simd/math_x86_avx_256_single.h similarity index 98% rename from src/gromacs/legacyheaders/gmx_math_x86_avx_256_single.h rename to src/gromacs/simd/math_x86_avx_256_single.h index db76c8ef94..0411130bbd 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_avx_256_single.h +++ b/src/gromacs/simd/math_x86_avx_256_single.h @@ -1,29 +1,43 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_avx_256_single_h_ -#define _gmx_math_x86_avx_256_single_h_ +#ifndef GMX_SIMD_MATH_AVX_256_SINGLE_H +#define GMX_SIMD_MATH_AVX_256_SINGLE_H #include -#include "gmx_x86_avx_256.h" +#include "general_x86_avx_256.h" #ifndef M_PI # define M_PI 3.14159265358979323846264338327950288 @@ -2206,4 +2220,4 @@ gmx_mm_atan2_ps(__m128 y, __m128 x) return z; } -#endif /* _gmx_math_x86_avx_256_single_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_sse2_double.h b/src/gromacs/simd/math_x86_sse2_double.h similarity index 97% rename from src/gromacs/legacyheaders/gmx_math_x86_sse2_double.h rename to src/gromacs/simd/math_x86_sse2_double.h index 6a33f7efd9..3f7a64e7fe 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_sse2_double.h +++ b/src/gromacs/simd/math_x86_sse2_double.h @@ -1,31 +1,45 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_sse2_double_h_ -#define _gmx_math_x86_sse2_double_h_ +#ifndef GMX_SIMD_MATH_SSE2_DOUBLE_H +#define GMX_SIMD_MATH_SSE2_DOUBLE_H #include #include -#include "gmx_x86_sse2.h" +#include "general_x86_sse2.h" #ifndef M_PI @@ -1479,4 +1493,4 @@ gmx_mm_atan2_pd(__m128d y, __m128d x) return z; } -#endif /*_gmx_math_x86_sse2_double_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_sse2_single.h b/src/gromacs/simd/math_x86_sse2_single.h similarity index 96% rename from src/gromacs/legacyheaders/gmx_math_x86_sse2_single.h rename to src/gromacs/simd/math_x86_sse2_single.h index a57cb1092f..db373c8412 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_sse2_single.h +++ b/src/gromacs/simd/math_x86_sse2_single.h @@ -1,31 +1,45 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_sse2_single_h_ -#define _gmx_math_x86_sse2_single_h_ +#ifndef GMX_SIMD_MATH_SSE2_SINGLE_H +#define GMX_SIMD_MATH_SSE2_SINGLE_H #include #include -#include "gmx_x86_sse2.h" +#include "general_x86_sse2.h" #ifndef M_PI @@ -1164,4 +1178,4 @@ gmx_mm_atan2_ps(__m128 y, __m128 x) } -#endif /* _gmx_math_x86_sse2_single_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_sse4_1_double.h b/src/gromacs/simd/math_x86_sse4_1_double.h similarity index 97% rename from src/gromacs/legacyheaders/gmx_math_x86_sse4_1_double.h rename to src/gromacs/simd/math_x86_sse4_1_double.h index 2498f11c4e..5f87caa88b 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_sse4_1_double.h +++ b/src/gromacs/simd/math_x86_sse4_1_double.h @@ -1,30 +1,44 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_sse4_1_double_h_ -#define _gmx_math_x86_sse4_1_double_h_ +#ifndef GMX_SIMD_MATH_SSE4_1_DOUBLE_H +#define GMX_SIMD_MATH_SSE4_1_DOUBLE_H #include #include -#include "gmx_x86_sse4_1.h" +#include "general_x86_sse4_1.h" @@ -1474,4 +1488,4 @@ gmx_mm_atan2_pd(__m128d y, __m128d x) return z; } -#endif /*_gmx_math_x86_sse4_1_double_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_math_x86_sse4_1_single.h b/src/gromacs/simd/math_x86_sse4_1_single.h similarity index 96% rename from src/gromacs/legacyheaders/gmx_math_x86_sse4_1_single.h rename to src/gromacs/simd/math_x86_sse4_1_single.h index ae0659047f..24fbc21aab 100644 --- a/src/gromacs/legacyheaders/gmx_math_x86_sse4_1_single.h +++ b/src/gromacs/simd/math_x86_sse4_1_single.h @@ -1,30 +1,44 @@ -/* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*- - * - * - * This file is part of GROMACS. - * Copyright (c) 2012- +/* + * This file is part of the GROMACS molecular simulation package. * - * Written by the Gromacs development team under coordination of - * David van der Spoel, Berk Hess, and Erik Lindahl. + * Copyright (c) 2012,2013, by the GROMACS development team, led by + * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, + * and including many others, as listed in the AUTHORS file in the + * top-level source directory and at http://www.gromacs.org. * - * This library is free software; you can redistribute it and/or + * GROMACS is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 + * as published by the Free Software Foundation; either version 2.1 * of the License, or (at your option) any later version. * - * To help us fund GROMACS development, we humbly ask that you cite - * the research papers on the package. Check out http://www.gromacs.org + * GROMACS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * And Hey: - * Gnomes, ROck Monsters And Chili Sauce + * You should have received a copy of the GNU Lesser General Public + * License along with GROMACS; if not, see + * http://www.gnu.org/licenses, or write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * If you want to redistribute modifications to GROMACS, please + * consider that scientific software is very special. Version + * control is crucial - bugs must be traceable. We will be happy to + * consider code for inclusion in the official distribution, but + * derived work must not be called official GROMACS. Details are found + * in the README & COPYING files - if they are missing, get the + * official version at http://www.gromacs.org. + * + * To help us fund GROMACS development, we humbly ask that you cite + * the research papers on the package. Check out http://www.gromacs.org. */ -#ifndef _gmx_math_x86_sse4_1_single_h_ -#define _gmx_math_x86_sse4_1_single_h_ +#ifndef GMX_SIMD_MATH_SSE4_1_SINGLE_H +#define GMX_SIMD_MATH_SSE4_1_SINGLE_H #include #include -#include "gmx_x86_sse4_1.h" +#include "general_x86_sse4_1.h" @@ -1162,4 +1176,4 @@ gmx_mm_atan2_ps(__m128 y, __m128 x) -#endif /* _gmx_math_x86_sse4_1_single_h_ */ +#endif diff --git a/src/gromacs/legacyheaders/gmx_simd_vec.h b/src/gromacs/simd/vector_operations.h similarity index 90% rename from src/gromacs/legacyheaders/gmx_simd_vec.h rename to src/gromacs/simd/vector_operations.h index a17a34c3dd..42448ada0d 100644 --- a/src/gromacs/legacyheaders/gmx_simd_vec.h +++ b/src/gromacs/simd/vector_operations.h @@ -1,8 +1,6 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 1991-2000, University of Groningen, The Netherlands. - * Copyright (c) 2001-2012, The GROMACS Development Team * Copyright (c) 2012,2013, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the @@ -42,14 +40,14 @@ */ /* This file contains vector operation functions using SIMD intrinsics. - * gmx_simd_macros.h should be included before including this file. + * gromacs/simd/macros.h should be included before including this file. */ -#ifndef _gmx_simd_vec_h_ -#define _gmx_simd_vec_h_ +#ifndef GMX_SIMD_VECTOR_OPERATIONS_H +#define GMX_SIMD_VECTOR_OPERATIONS_H -#ifndef _gmx_simd_macros_h_ -#error "gmx_simd_macros.h was not included before including gmx_simd_vec.h" +#ifndef GMX_SIMD_MACROS_H +#error "gromacs/simd/macros.h was not included before including gromacs/simd/vector_operations.h" #endif @@ -111,4 +109,4 @@ gmx_sum4_pr(gmx_mm_pr a, gmx_mm_pr b, gmx_mm_pr c, gmx_mm_pr d) } -#endif /* _gmx_simd_vec_h_ */ +#endif