From c28acac74d4cfdf18543e42f6cd3030ec8348289 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <38722728+iassiour@users.noreply.github.com>
Date: Wed, 3 Sep 2025 10:01:15 +0100
Subject: [PATCH] SWDEV-550882 - Fix hang in Unit_hipIpcMemAccess_Semaphores
 (#816)

---
 projects/hip-tests/catch/multiproc/hipIpcMemAccessTest.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/hip-tests/catch/multiproc/hipIpcMemAccessTest.cc b/projects/hip-tests/catch/multiproc/hipIpcMemAccessTest.cc
index 0aed8a5a91..032e3a6193 100644
--- a/projects/hip-tests/catch/multiproc/hipIpcMemAccessTest.cc
+++ b/projects/hip-tests/catch/multiproc/hipIpcMemAccessTest.cc
@@ -138,9 +138,11 @@ TEST_CASE("Unit_hipIpcMemAccess_Semaphores") {
         }
       }
       for (int i = 0; i < Num_devices; ++i) {
-        HIP_CHECK(hipSetDevice(i));
+        
         HIP_CHECK(hipDeviceCanAccessPeer(&CanAccessPeer, i, shrd_mem->device));
         if (CanAccessPeer == 1) {
+          HIP_CHECK(hipDeviceEnablePeerAccess(i, 0));
+          HIP_CHECK(hipSetDevice(i));
           HIP_CHECK(hipMalloc(&C_d, Nbytes));
           HIP_CHECK(hipIpcOpenMemHandle(reinterpret_cast<void**>(&B_d), shrd_mem->memHandle,
                                         hipIpcMemLazyEnablePeerAccess));