From 4dd97ee92c68f9b40f97e7e418c73a11d18b78be Mon Sep 17 00:00:00 2001
From: Rakesh Roy <Rakesh.Roy@amd.com>
Date: Fri, 7 Mar 2025 06:43:07 -0500
Subject: [PATCH] Revert "SWDEV-508982 - [6.4 Preview] - Handle
 hipMemPoolCreate, hipMemPoolDestory & hipDeviceSetMemPool during stream
 capture."

This reverts commit f674ba58f0537124f00f640efc3d3489ab8f1260.

Reason for revert: 6.4 Preview changes need not be merged to amd-staging as of now

Change-Id: I86452adfed14655f72d90440a486089743cc6587


[ROCm/clr commit: 5da8ce45ab92cb4a7d21750201923c20126eb6ce]
---
 projects/clr/hipamd/src/hip_mempool.cpp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_mempool.cpp b/projects/clr/hipamd/src/hip_mempool.cpp
index 3f723ee9ef..567928a844 100644
--- a/projects/clr/hipamd/src/hip_mempool.cpp
+++ b/projects/clr/hipamd/src/hip_mempool.cpp
@@ -59,11 +59,7 @@ hipError_t hipDeviceSetMemPool(int device, hipMemPool_t mem_pool) {
   if ((mem_pool == nullptr) || (device >= g_devices.size())) {
     HIP_RETURN(hipErrorInvalidValue);
   }
-  if (DEBUG_HIP_7_PREVIEW & amd::CHANGE_HIP_STREAM_CAPTURE_API) {
-    if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
-      HIP_RETURN(hipErrorStreamCaptureUnsupported);
-    }
-  }
+
   auto poolDevice = reinterpret_cast<hip::MemoryPool*>(mem_pool)->Device();
   if (poolDevice->deviceId() != device) {
     HIP_RETURN(hipErrorInvalidDevice);
@@ -332,11 +328,7 @@ hipError_t hipMemPoolCreate(hipMemPool_t* mem_pool, const hipMemPoolProps* pool_
   if (IS_WINDOWS && pool_props->handleTypes == hipMemHandleTypePosixFileDescriptor) {
     HIP_RETURN(hipErrorInvalidValue);
   }
-  if (DEBUG_HIP_7_PREVIEW & amd::CHANGE_HIP_STREAM_CAPTURE_API) {
-    if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
-      HIP_RETURN(hipErrorStreamCaptureUnsupported);
-    }
-  }
+
   auto device = g_devices[pool_props->location.id];
   auto pool = new hip::MemoryPool(device, pool_props);
   if (pool == nullptr) {
@@ -352,11 +344,6 @@ hipError_t hipMemPoolDestroy(hipMemPool_t mem_pool) {
   if (mem_pool == nullptr) {
     HIP_RETURN(hipErrorInvalidValue);
   }
-  if (DEBUG_HIP_7_PREVIEW & amd::CHANGE_HIP_STREAM_CAPTURE_API) {
-    if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
-      HIP_RETURN(hipErrorStreamCaptureUnsupported);
-    }
-  }
   hip::MemoryPool* hip_mem_pool = reinterpret_cast<hip::MemoryPool*>(mem_pool);
 
   if (!IsMemPoolValid(hip_mem_pool)) {