From: Aleksei Iupinov <a.yupinov@gmail.com>
Date: Thu, 9 Nov 2017 18:07:30 +0000 (+0100)
Subject: Rename synchronous GPU transfer functions to match the asynchronous ones
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=290e00508a2bf685b8a116b2adc26de46452d3d0;p=alexxy%2Fgromacs.git

Rename synchronous GPU transfer functions to match the asynchronous ones

Change-Id: I5cb8e9cab208c1d0c62f985ec3140540ea427fb2
---

diff --git a/src/gromacs/gpu_utils/cudautils.cu b/src/gromacs/gpu_utils/cudautils.cu
index 28316f8ba9..caba44f3cc 100644
--- a/src/gromacs/gpu_utils/cudautils.cu
+++ b/src/gromacs/gpu_utils/cudautils.cu
@@ -74,7 +74,7 @@ static int cu_copy_D2H_generic(void * h_dest, void * d_src, size_t bytes,
     return 0;
 }
 
-int cu_copy_D2H(void * h_dest, void * d_src, size_t bytes)
+int cu_copy_D2H_sync(void * h_dest, void * d_src, size_t bytes)
 {
     return cu_copy_D2H_generic(h_dest, d_src, bytes, false);
 }
@@ -115,7 +115,7 @@ static int cu_copy_H2D_generic(void * d_dest, void * h_src, size_t bytes,
     return 0;
 }
 
-int cu_copy_H2D(void * d_dest, void * h_src, size_t bytes)
+int cu_copy_H2D_sync(void * d_dest, void * h_src, size_t bytes)
 {
     return cu_copy_H2D_generic(d_dest, h_src, bytes, false);
 }
@@ -204,7 +204,7 @@ void cu_realloc_buffered(void **d_dest, void *h_src,
         }
         else
         {
-            cu_copy_H2D(*d_dest, h_src,  *curr_size * type_size);
+            cu_copy_H2D_sync(*d_dest, h_src,  *curr_size * type_size);
         }
     }
 }
@@ -290,7 +290,7 @@ void initParamLookupTable(T                        * &d_ptr,
     const size_t sizeInBytes = numElem * sizeof(*d_ptr);
     cudaError_t  stat        = cudaMalloc((void **)&d_ptr, sizeInBytes);
     CU_RET_ERR(stat, "cudaMalloc failed in initParamLookupTable");
-    cu_copy_H2D(d_ptr, (void *)h_ptr, sizeInBytes);
+    cu_copy_H2D_sync(d_ptr, (void *)h_ptr, sizeInBytes);
 
     if (!c_disableCudaTextures)
     {
diff --git a/src/gromacs/gpu_utils/cudautils.cuh b/src/gromacs/gpu_utils/cudautils.cuh
index feb241d593..b05cf65f99 100644
--- a/src/gromacs/gpu_utils/cudautils.cuh
+++ b/src/gromacs/gpu_utils/cudautils.cuh
@@ -135,14 +135,14 @@ struct gmx_device_info_t
 };
 
 
-/*! Launches asynchronous host to device memory copy in stream 0. */
-int cu_copy_D2H(void * /*h_dest*/, void * /*d_src*/, size_t /*bytes*/);
+/*! Launches synchronous host to device memory copy in stream 0. */
+int cu_copy_D2H_sync(void * /*h_dest*/, void * /*d_src*/, size_t /*bytes*/);
 
 /*! Launches asynchronous host to device memory copy in stream s. */
 int cu_copy_D2H_async(void * /*h_dest*/, void * /*d_src*/, size_t /*bytes*/, cudaStream_t /*s = 0*/);
 
 /*! Launches synchronous host to device memory copy. */
-int cu_copy_H2D(void * /*d_dest*/, void * /*h_src*/, size_t /*bytes*/);
+int cu_copy_H2D_sync(void * /*d_dest*/, void * /*h_src*/, size_t /*bytes*/);
 
 /*! Launches asynchronous host to device memory copy in stream s. */
 int cu_copy_H2D_async(void * /*d_dest*/, void * /*h_src*/, size_t /*bytes*/, cudaStream_t /*s = 0*/);
diff --git a/src/gromacs/gpu_utils/oclutils.cpp b/src/gromacs/gpu_utils/oclutils.cpp
index 0e38ddb8ea..384242f827 100644
--- a/src/gromacs/gpu_utils/oclutils.cpp
+++ b/src/gromacs/gpu_utils/oclutils.cpp
@@ -102,9 +102,9 @@ int ocl_copy_H2D_async(cl_mem d_dest, void * h_src,
 
 /*! \brief Launches synchronous host to device memory copy.
  */
-int ocl_copy_H2D(cl_mem d_dest, void * h_src,
-                 size_t offset, size_t bytes,
-                 cl_command_queue command_queue)
+int ocl_copy_H2D_sync(cl_mem d_dest, void * h_src,
+                      size_t offset, size_t bytes,
+                      cl_command_queue command_queue)
 {
     return ocl_copy_H2D_generic(d_dest, h_src, offset, bytes, false, command_queue, NULL);
 }
diff --git a/src/gromacs/gpu_utils/oclutils.h b/src/gromacs/gpu_utils/oclutils.h
index 0ca91f7b59..232ad4f5fe 100644
--- a/src/gromacs/gpu_utils/oclutils.h
+++ b/src/gromacs/gpu_utils/oclutils.h
@@ -115,9 +115,9 @@ int ocl_copy_D2H_async(void * h_dest, cl_mem d_src,
                        cl_event *copy_event);
 
 /*! \brief Launches synchronous host to device memory copy. */
-int ocl_copy_H2D(cl_mem d_dest, void * h_src,
-                 size_t offset, size_t bytes,
-                 cl_command_queue command_queue);
+int ocl_copy_H2D_sync(cl_mem d_dest, void * h_src,
+                      size_t offset, size_t bytes,
+                      cl_command_queue command_queue);
 
 /*! \brief Allocate host memory in malloc style */
 void ocl_pmalloc(void **h_ptr, size_t nbytes);
diff --git a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
index 6174281e3d..e6d2cb15b9 100644
--- a/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
+++ b/src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
@@ -178,7 +178,7 @@ static void ocl_realloc_buffered(cl_mem *d_dest, void *h_src,
         }
         else
         {
-            ocl_copy_H2D(*d_dest, h_src,  0, *curr_size * type_size, s);
+            ocl_copy_H2D_sync(*d_dest, h_src,  0, *curr_size * type_size, s);
         }
     }
 }