[Memory] Cleaned up how slices are handled

libocca · Sep 2, 2018 · dba0db9 · dba0db9
1 parent fc52919
commit dba0db9
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/include/occa/memory.hpp b/include/occa/memory.hpp
@@ -60,7 +60,7 @@ namespace occa {
     occa::modeDevice_t *modeDevice;
 
     udim_t size;
-    bool canBeFreed;
+    bool isOrigin;
 
     modeMemory_t(modeDevice_t *modeDevice_,
                  udim_t size_,

diff --git a/src/memory.cpp b/src/memory.cpp
@@ -40,7 +40,7 @@ namespace occa {
     uvaPtr(NULL),
     modeDevice(modeDevice_),
     size(size_),
-    canBeFreed(true) {
+    isOrigin(true) {
     modeDevice->addMemoryRef(this);
   }
 
@@ -396,12 +396,15 @@ namespace occa {
                (offset + (dim_t) bytes_) <= (dim_t) size());
 
     occa::memory m(modeMemory->addOffset(offset));
-    modeMemory_t &mv = *(m.modeMemory);
-    mv.modeDevice = modeMemory->modeDevice;
-    mv.size = bytes_;
+
+    modeMemory_t &mm = *(m.modeMemory);
+    mm.modeDevice = modeMemory->modeDevice;
+    mm.size = bytes_;
+    mm.isOrigin = false;
     if (modeMemory->uvaPtr) {
-      mv.uvaPtr = (modeMemory->uvaPtr + offset);
+      mm.uvaPtr = (modeMemory->uvaPtr + offset);
     }
+
     return m;
   }
 
@@ -550,19 +553,22 @@ namespace occa {
     modeDevice_t *modeDevice = modeMemory->modeDevice;
 
     // Free the actual backend memory object
-    if (modeMemory->canBeFreed) {
+    if (modeMemory->isOrigin) {
       modeDevice->bytesAllocated -= (modeMemory->size);
 
       if (modeMemory->uvaPtr) {
-        uvaMap.erase(modeMemory->uvaPtr);
-        modeDevice->uvaMap.erase(modeMemory->uvaPtr);
+        void *ptr = modeMemory->ptr;
+        void *uvaPtr = modeMemory->uvaPtr;
+
+        uvaMap.erase(uvaPtr);
+        modeDevice->uvaMap.erase(uvaPtr);
 
         // CPU case where memory is shared
-        if (modeMemory->uvaPtr != modeMemory->ptr) {
-          uvaMap.erase(modeMemory->ptr);
-          modeDevice->uvaMap.erase(modeMemory->uvaPtr);
+        if (uvaPtr != ptr) {
+          uvaMap.erase(ptr);
+          modeDevice->uvaMap.erase(ptr);
 
-          sys::free(modeMemory->uvaPtr);
+          sys::free(uvaPtr);
         }
       }
 

diff --git a/src/mode/cuda/memory.cpp b/src/mode/cuda/memory.cpp
@@ -62,7 +62,6 @@ namespace occa {
         m->mappedPtr = mappedPtr + offset;
       }
       m->isUnified = isUnified;
-      m->canBeFreed = false;
       return m;
     }
 
@@ -138,6 +137,13 @@ namespace occa {
     }
 
     void memory::free() {
+      if (!isOrigin) {
+        cuPtr = 0;
+        mappedPtr = NULL;
+        size = 0;
+        return;
+      }
+
       if (mappedPtr) {
         OCCA_CUDA_ERROR("Device: mappedFree()",
                         cuMemFreeHost(mappedPtr));

diff --git a/src/mode/hip/memory.cpp b/src/mode/hip/memory.cpp
@@ -60,7 +60,6 @@ namespace occa {
       if (mappedPtr) {
         m->mappedPtr = mappedPtr + offset;
       }
-      m->canBeFreed = false;
       return m;
     }
 
@@ -136,6 +135,13 @@ namespace occa {
     }
 
     void memory::free() {
+      if (!isOrigin) {
+        hipPtr = 0;
+        mappedPtr = NULL;
+        size = 0;
+        return;
+      }
+
       if (mappedPtr) {
         OCCA_HIP_ERROR("Device: mappedFree()",
                        hipHostFree(mappedPtr));

diff --git a/src/mode/serial/memory.cpp b/src/mode/serial/memory.cpp
@@ -51,7 +51,6 @@ namespace occa {
                              size - offset,
                              properties);
       m->ptr = ptr + offset;
-      m->canBeFreed = false;
       return m;
     }
 
@@ -89,7 +88,9 @@ namespace occa {
 
     void memory::free() {
       if (ptr) {
-        sys::free(ptr);
+        if (isOrigin) {
+          sys::free(ptr);
+        }
         ptr = NULL;
         size = 0;
       }

diff --git a/src/tools/sys.cpp b/src/tools/sys.cpp
@@ -591,8 +591,7 @@ namespace occa {
             cache = info.Size;
             break;
           }
-        }
-        }
+        }}
         ++pos;
         off += sk;
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -591,8 +591,7 @@ namespace occa { @@
                 cache = info.Size;
                 break;
               }
-            }
-            }
+            }}
             ++pos;
             off += sk;
           }
@@ Expand Down @@