Merge "Sync streams when freeing or destroying mem" into amd-master-next

[ROCm/clr commit: 436e5bb664]
2020-03-21 13:33:41 -04:00
parent f037cb7285 adc574b2ed
commit f69dbb2438
1 changed files with 14 additions and 1 deletions
@@ -274,6 +274,13 @@ hipError_t hipHostFree(void* ptr) {
  HIP_INIT_API(hipHostFree, ptr);

  if (amd::SvmBuffer::malloced(ptr)) {
+    for (auto& dev : g_devices) {
+      amd::HostQueue* queue = hip::getNullStream(*dev->asContext());
+      if (queue != nullptr) {
+        queue->finish();
+      }
+      hip::syncStreams(dev->deviceId());
+    }
    amd::SvmBuffer::free(*hip::getCurrentDevice()->asContext(), ptr);
    HIP_RETURN(hipSuccess);
  }
@@ -289,7 +296,13 @@ hipError_t ihipArrayDestroy(hipArray* array) {
  if (is_valid(memObj) == false) {
    return hipErrorInvalidValue;
  }
-
+  for (auto& dev : g_devices) {
+    amd::HostQueue* queue = hip::getNullStream(*dev->asContext());
+    if (queue != nullptr) {
+      queue->finish();
+    }
+    hip::syncStreams(dev->deviceId());
+  }
  as_amd(memObj)->release();

  delete array;