Fix 887

Backend destruction was done along with _hipUnregisterFatBinary. delay destruction by using destructor attribute
CHIP-SPV · Jul 23, 2024 · 8f8cc8f · 8f8cc8f
1 parent 1f94cd5
commit 8f8cc8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/CHIPBindings.cc b/src/CHIPBindings.cc
@@ -4968,9 +4968,6 @@ extern "C" void __hipUnregisterFatBinary(void *Data) {
 
   logDebug("Modules left: {}", NumBins - 1);
 
-  if (Backend && NumBins == 1)
-    CHIPUninitialize();
-
   CHIP_CATCH_NO_RETURN
 }
 

diff --git a/src/CHIPDriver.hh b/src/CHIPDriver.hh
@@ -91,7 +91,7 @@ extern void CHIPInitialize();
  * @brief
  * Singleton backend initialization function outer wrapper
  */
-extern void CHIPUninitialize();
+__attribute__((destructor)) extern void CHIPUninitialize();
 
 /**
  * @brief
@@ -175,7 +175,7 @@ private:
   Type Type_;
 
 public:
-  BackendType(){};
+  BackendType() {};
   BackendType(const std::string &StrIn) {
     if (StrIn == "opencl") {
       Type_ = BackendType::OpenCL;