Make GROMACS compile again on XeonPhi

Breakege was caused by I646b8b37f14e498f1a9a3a6e0d7a45761951ee0e

Change-Id: Ia73fbd80cf1366cfa7eb6599cc3943f39e195179
Signed-off-by: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>

diff --git a/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
index ad506592519396e07d8c38b95a57163efed2fe9d..bfd2280ced1af001e057ada011f710ea67b4553c 100644 (file)
--- a/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
+++ b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_float.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2016, 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.
@@ -144,7 +144,7 @@ gatherLoadTranspose(const float *        base,
                     SimdFloat *          v2,
                     SimdFloat *          v3)
 {
-    gatherLoadBySimdIntTranspose<align>(base, loadFI(offset), v0, v1, v2, v3);
+    gatherLoadBySimdIntTranspose<align>(base, simdLoadFI(offset), v0, v1, v2, v3);
 }
 
 template <int align>
@@ -154,7 +154,7 @@ gatherLoadTranspose(const float *        base,
                     SimdFloat *          v0,
                     SimdFloat *          v1)
 {
-    gatherLoadBySimdIntTranspose<align>(base, loadFI(offset), v0, v1);
+    gatherLoadBySimdIntTranspose<align>(base, simdLoadFI(offset), v0, v1);
 }
 
 static const int c_simdBestPairAlignmentFloat = 2;
@@ -171,7 +171,7 @@ gatherLoadUTranspose(const float *        base,
 
     assert(std::size_t(offset) % 64 == 0);
 
-    simdoffset = loadFI(offset);
+    simdoffset = simdLoadFI(offset);
 
     // All instructions might be latency ~4 on MIC, so we use shifts where we
     // only need a single instruction (since the shift parameter is an immediate),
@@ -207,7 +207,7 @@ transposeScatterStoreU(float *              base,
 
     assert(sdt::size_t(offset) % 64 == 0);
 
-    simdoffset = loadFI(offset);
+    simdoffset = simdLoadFI(offset);
 
     // All instructions might be latency ~4 on MIC, so we use shifts where we
     // only need a single instruction (since the shift parameter is an immediate),