From 50ecfb39c96be16e544f17ebcbd7fdbbcf959356 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Wed, 20 Mar 2024 00:01:02 +0000
Subject: [PATCH] SWDEV-451736 - Revert "SWDEV-444670 - Register the
 Runtime::tearDown function to be called at exit"

This reverts commit 8392200773c553139802cb75b61d0e6458780155.

Change-Id: Ib9cb1cc0c3903bfba56c9a5d05ae8afe96be583a


[ROCm/clr commit: 51926b6b6b042b5d4208f408617656f229f8d598]
---
 projects/clr/rocclr/device/rocm/rocmemory.cpp | 6 +++---
 projects/clr/rocclr/platform/runtime.cpp      | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/projects/clr/rocclr/device/rocm/rocmemory.cpp b/projects/clr/rocclr/device/rocm/rocmemory.cpp
index 6113262340..6ab08b00a9 100644
--- a/projects/clr/rocclr/device/rocm/rocmemory.cpp
+++ b/projects/clr/rocclr/device/rocm/rocmemory.cpp
@@ -615,7 +615,7 @@ Buffer::Buffer(const roc::Device& dev, size_t size) : roc::Memory(dev, size) {}
 
 Buffer::~Buffer() {
   if (owner() == nullptr) {
-    dev().memFree(deviceMemory_, size());
+    dev().hostFree(deviceMemory_, size());
   } else {
     destroy();
 
@@ -663,7 +663,7 @@ void Buffer::destroy() {
               ClPrint(amd::LOG_DEBUG, amd::LOG_MEM, "[ROCClr] munmap failed \n");
             }
           } else {
-            dev().memFree(deviceMemory_, size());
+            dev().hostFree(deviceMemory_, size());
           }
         } else if (memFlags & ROCCLR_MEM_HSA_SIGNAL_MEMORY) {
           if (HSA_STATUS_SUCCESS != hsa_signal_destroy(signal_)) {
@@ -672,7 +672,7 @@ void Buffer::destroy() {
           }
           deviceMemory_ = nullptr;
         } else {
-          dev().memFree(deviceMemory_, size());
+          dev().hostFree(deviceMemory_, size());
         }
       } else {
         dev().memFree(deviceMemory_, size());
diff --git a/projects/clr/rocclr/platform/runtime.cpp b/projects/clr/rocclr/platform/runtime.cpp
index 6072a62a9b..7f80919c46 100644
--- a/projects/clr/rocclr/platform/runtime.cpp
+++ b/projects/clr/rocclr/platform/runtime.cpp
@@ -120,12 +120,4 @@ uint ReferenceCountedObject::release() {
   return newCount;
 }
 
-#ifndef _WIN32
-void __attribute__((destructor)) hipTearDown() {
-  if (amd::IS_HIP) {
-    Runtime::tearDown();
-  }
-}
-#endif
-
 }  // namespace amd