[GPU] Added getMappedPtr

libocca · Jul 20, 2018 · 405fb35 · 405fb35
1 parent 6f4f5c1
commit 405fb35
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/include/occa/modes/cuda/memory.hpp b/include/occa/modes/cuda/memory.hpp
@@ -36,11 +36,14 @@ namespace occa {
 
     class memory : public occa::memory_v {
       friend class cuda::device;
+
       friend occa::memory wrapMemory(occa::device device,
                                      void *ptr,
                                      const udim_t bytes,
                                      const occa::properties &props);
 
+      friend void* getMappedPtr(occa::memory mem);
+
     public:
       CUdeviceptr &cuPtr;
       char *mappedPtr;

diff --git a/include/occa/modes/cuda/utils.hpp b/include/occa/modes/cuda/utils.hpp
@@ -100,6 +100,8 @@ namespace occa {
 
     CUcontext getContext(occa::device device);
 
+    void* getMappedPtr(occa::memory mem);
+
     occa::device wrapDevice(CUdevice device,
                             CUcontext context,
                             const occa::properties &props = occa::properties());

diff --git a/include/occa/modes/opencl/memory.hpp b/include/occa/modes/opencl/memory.hpp
@@ -38,7 +38,7 @@ namespace occa {
 
       friend cl_mem getCLMemory(occa::memory memory);
 
-      friend void* getCLMappedPtr(occa::memory memory);
+      friend void* getMappedPtr(occa::memory memory);
 
       friend occa::memory wrapMemory(occa::device device,
                                      cl_mem clMem,

diff --git a/include/occa/modes/opencl/utils.hpp b/include/occa/modes/opencl/utils.hpp
@@ -121,10 +121,10 @@ namespace occa {
 
     cl_mem getCLMemory(occa::memory memory);
 
-    void* getCLMappedPtr(occa::memory memory);
-
     cl_kernel getCLKernel(occa::kernel kernel);
 
+    void* getMappedPtr(occa::memory memory);
+
     occa::device wrapDevice(cl_device_id clDevice,
                             cl_context context,
                             const occa::properties &props = occa::properties());

diff --git a/src/modes/cuda/utils.cpp b/src/modes/cuda/utils.cpp
@@ -223,6 +223,11 @@ namespace occa {
       return ((cuda::device*) device.getDHandle())->cuContext;
     }
 
+    void* getMappedPtr(occa::memory mem) {
+      cuda::memory *handle = (cuda::memory*) mem.getMHandle();
+      return handle ? handle->mappedPtr : NULL;
+    }
+
     occa::device wrapDevice(CUdevice device,
                             CUcontext context,
                             const occa::properties &props) {

diff --git a/src/modes/opencl/utils.cpp b/src/modes/opencl/utils.cpp
@@ -443,14 +443,15 @@ namespace occa {
       return ((opencl::memory*) memory.getMHandle())->clMem;
     }
 
-    void* getCLMappedPtr(occa::memory memory) {
-      return ((opencl::memory*) memory.getMHandle())->mappedPtr;
-    }
-
     cl_kernel getCLKernel(occa::kernel kernel) {
       return ((opencl::kernel*) kernel.getKHandle())->clKernel;
     }
 
+    void* getMappedPtr(occa::memory memory) {
+      opencl::memory *handle = (opencl::memory*) memory.getMHandle();
+      return handle ? handle->mappedPtr : NULL;
+    }
+
     occa::device wrapDevice(cl_device_id clDevice,
                             cl_context context,
                             const occa::properties &props) {