From 228748a9d8d13032463925151b9b2c48e60be04f Mon Sep 17 00:00:00 2001
From: German Andryeyev <German.Andryeyev@amd.com>
Date: Fri, 16 Feb 2024 16:37:42 -0500
Subject: [PATCH] SWDEV-311270 - Fix HIP tests for mempool IPC

Change-Id: Ib5065a259e66fd53c3ffd6bc038dd65be00a3a3d
---
 .../stream/hipMemPoolImportFromShareableHandle.cc        | 9 +++++++--
 catch/performance/stream/hipMemPoolImportPointer.cc      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/catch/performance/stream/hipMemPoolImportFromShareableHandle.cc b/catch/performance/stream/hipMemPoolImportFromShareableHandle.cc
index fb37f6c951..180efbf3de 100644
--- a/catch/performance/stream/hipMemPoolImportFromShareableHandle.cc
+++ b/catch/performance/stream/hipMemPoolImportFromShareableHandle.cc
@@ -29,14 +29,19 @@ class MemPoolImportFromShareableHandleBenchmark : public Benchmark<MemPoolImport
  public:
   void operator()() {
     hipMemPool_t mem_pool{nullptr};
-    int share_handle;
+#if defined(_WIN32)
+    void* share_handle;
+#else
+    int64_t share_handle;
+#endif
 
     hipMemPoolProps props = CreateMemPoolProps(0, kHandleType);
     HIP_CHECK(hipMemPoolCreate(&mem_pool, &props));
     HIP_CHECK(hipMemPoolExportToShareableHandle(&share_handle, mem_pool, kHandleType, 0));
 
     TIMED_SECTION(kTimerTypeCpu) {
-      HIP_CHECK(hipMemPoolImportFromShareableHandle(&mem_pool, &share_handle, kHandleType, 0));
+      HIP_CHECK(hipMemPoolImportFromShareableHandle(
+        &mem_pool, (void*)share_handle, kHandleType, 0));
     }
 
     HIP_CHECK(hipMemPoolDestroy(mem_pool));
diff --git a/catch/performance/stream/hipMemPoolImportPointer.cc b/catch/performance/stream/hipMemPoolImportPointer.cc
index de439e7c93..84f7f241e4 100644
--- a/catch/performance/stream/hipMemPoolImportPointer.cc
+++ b/catch/performance/stream/hipMemPoolImportPointer.cc
@@ -40,7 +40,7 @@ class MemPoolImportPointerBenchmark : public Benchmark<MemPoolImportPointerBench
     HIP_CHECK(hipMemPoolExportPointer(&exp_data, device_ptr));
 
     TIMED_SECTION(kTimerTypeCpu) {
-      HIP_CHECK(hipMemPoolImportPointer(reinterpret_cast<void**>(device_ptr_import), mem_pool, &exp_data));
+      HIP_CHECK(hipMemPoolImportPointer(reinterpret_cast<void**>(&device_ptr_import), mem_pool, &exp_data));
     }
 
     HIP_CHECK(hipFree(device_ptr));