Same fix for XeonPhi (double precision)

Breakege was caused by I646b8b37f14e498f1a9a3a6e0d7a45761951ee0e

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

diff --git a/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
index c971d273bade2ef0fd58ec3d5b9d526c816f4f6f..5d8efa758405038dabfb284a5339da5df8c7fc73 100644 (file)
--- a/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.h
+++ b/src/gromacs/simd/impl_x86_mic/impl_x86_mic_util_double.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.
@@ -142,7 +142,7 @@ gatherLoadTranspose(const double *        base,
                     SimdDouble *          v2,
                     SimdDouble *          v3)
 {
-    gatherLoadBySimdIntTranspose<align>(base, loadDI(offset), v0, v1, v2, v3);
+    gatherLoadBySimdIntTranspose<align>(base, simdLoadDI(offset), v0, v1, v2, v3);
 }
 
 template <int align>
@@ -152,7 +152,7 @@ gatherLoadTranspose(const double *        base,
                     SimdDouble *          v0,
                     SimdDouble *          v1)
 {
-    gatherLoadBySimdIntTranspose<align>(base, loadDI(offset), v0, v1);
+    gatherLoadBySimdIntTranspose<align>(base, simdLoadDI(offset), v0, v1);
 }
 
 static const int c_simdBestPairAlignmentDouble = 2;
@@ -169,7 +169,7 @@ gatherLoadUTranspose(const double *        base,
 
     assert(std::size_t(offset) % 32 == 0);
 
-    simdoffset = loadDI(offset);
+    simdoffset = simdLoadDI(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),
@@ -204,7 +204,7 @@ transposeScatterStoreU(double *            base,
 
     assert(std::size_t(offset) % 32 == 0);
 
-    simdoffset = loadDI(offset);
+    simdoffset = simdLoadDI(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),