From 7313c3752a22e7c2f628b39ea3de09c347705402 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <38722728+iassiour@users.noreply.github.com>
Date: Sat, 22 Nov 2025 23:01:47 +0000
Subject: [PATCH] =?UTF-8?q?SWDEV-567475=20-=20Fix=20failures=20in=20graph?=
 =?UTF-8?q?=20tests=20due=20to=20GraphExec=20destroy=20h=E2=80=A6=20(#1917?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 projects/clr/hipamd/src/hip_graph_internal.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_graph_internal.hpp b/projects/clr/hipamd/src/hip_graph_internal.hpp
index d088cf3f5f..553fb6e2f1 100644
--- a/projects/clr/hipamd/src/hip_graph_internal.hpp
+++ b/projects/clr/hipamd/src/hip_graph_internal.hpp
@@ -591,6 +591,9 @@ class Graph {
     }
     graphUserObj_.clear();
     memAllocNodePtrs_.clear();
+    if (instantiateDeviceId_ != -1) {
+      static_cast<amd::ReferenceCountedObject*>(g_devices[instantiateDeviceId_])->release();
+    }
   }
 
   void AddManualNodeDuringCapture(GraphNode* node) { capturedNodes_.insert(node); }
@@ -779,6 +782,7 @@ class Graph {
   //!< Used to track which devices are accessed by each parallel stream
   //!< during multi-device graph execution scheduling.
   std::unordered_map<int, std::set<int>> streams_dev_ids_;
+  int instantiateDeviceId_ = -1;
 
  private:
   friend class GraphExec;
@@ -836,9 +840,6 @@ class GraphExec : public amd::ReferenceCountedObject, public Graph {
         kernArgManager_->release();
       }
     }
-    if (instantiateDeviceId_ != -1) {
-      static_cast<ReferenceCountedObject*>(g_devices[instantiateDeviceId_])->release();
-    }
 
     packetBatches_.clear();
     nodeCaptureStatus_.clear();
@@ -899,7 +900,6 @@ class GraphExec : public amd::ReferenceCountedObject, public Graph {
   std::unordered_map<int, std::vector<hip::Stream*>> parallel_streams_;
   uint64_t flags_ = 0;
   GraphKernelArgManager* kernArgManager_ = nullptr;  //!< Kernel Arg manager for graph.
-  int instantiateDeviceId_ = -1;
   bool hasHiddenHeap_ = false;  //!< Hidden heap indicator for Kernel node
   bool repeatLaunch_ = false;