First part of commit for redesigned SIMD module - namechanges.

[alexxy/gromacs.git] / src / gromacs / simd / general_x86_avx_128_fma.h

diff --git a/src/gromacs/simd/general_x86_avx_128_fma.h b/src/gromacs/simd/general_x86_avx_128_fma.h
index 5314d1c4a20695377c57bce67ee1ae80bcace45e..19ec986dd5b5ad11d1156de3ea60d8f2c6d90bdc 100644 (file)
--- a/src/gromacs/simd/general_x86_avx_128_fma.h
+++ b/src/gromacs/simd/general_x86_avx_128_fma.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014, 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.
@@ -139,7 +139,7 @@ _mm_msub_pd(__m128d a, __m128d b, __m128d c)
 #endif /* AMD FMA emulation support */
 
 static void
-gmx_mm_printxmm_ps(const char *s, __m128 xmm)
+gmx_simd_real_tintxmm_ps(const char *s, __m128 xmm)
 {
     float f[4];
 
@@ -149,7 +149,7 @@ gmx_mm_printxmm_ps(const char *s, __m128 xmm)
 
 
 static void
-gmx_mm_printxmmsum_ps(const char *s, __m128 xmm)
+gmx_simd_real_tintxmmsum_ps(const char *s, __m128 xmm)
 {
     float f[4];
 
@@ -159,7 +159,7 @@ gmx_mm_printxmmsum_ps(const char *s, __m128 xmm)
 
 
 static void
-gmx_mm_printxmm_pd(const char *s, __m128d xmm)
+gmx_simd_real_tintxmm_pd(const char *s, __m128d xmm)
 {
     double f[2];
 
@@ -168,7 +168,7 @@ gmx_mm_printxmm_pd(const char *s, __m128d xmm)
 }
 
 static void
-gmx_mm_printxmmsum_pd(const char *s, __m128d xmm)
+gmx_simd_real_tintxmmsum_pd(const char *s, __m128d xmm)
 {
     double f[2];
 
@@ -178,7 +178,7 @@ gmx_mm_printxmmsum_pd(const char *s, __m128d xmm)
 
 
 static void
-gmx_mm_printxmm_epi32(const char *s, __m128i xmmi)
+gmx_simd_real_tintxmm_epi32(const char *s, __m128i xmmi)
 {
     int i[4];
 
@@ -211,7 +211,7 @@ static int gmx_mm_check_and_reset_overflow(void)
 }
 
 /* Work around gcc bug with wrong type for mask formal parameter to maskload/maskstore */
-#ifdef GMX_X86_AVX_GCC_MASKLOAD_BUG
+#ifdef GMX_SIMD_X86_AVX_GCC_MASKLOAD_BUG
 #    define gmx_mm_maskload_ps(mem, mask)       _mm_maskload_ps((mem), _mm_castsi128_ps(mask))
 #    define gmx_mm_maskstore_ps(mem, mask, x)    _mm_maskstore_ps((mem), _mm_castsi128_ps(mask), (x))
 #    define gmx_mm256_maskload_ps(mem, mask)    _mm256_maskload_ps((mem), _mm256_castsi256_ps(mask))