From ea68344f2f117fe52017f11edca5339d14e21c7f Mon Sep 17 00:00:00 2001
From: marandje <marko.arandjelovic@amd.com>
Date: Thu, 11 Sep 2025 01:15:18 +0200
Subject: [PATCH] SWDEV-553962 - Add p2p check to multidevice virtual memory
 tests (#898)

---
 .../catch/unit/virtualMemoryManagement/hipMemMap.cc      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/hip-tests/catch/unit/virtualMemoryManagement/hipMemMap.cc b/projects/hip-tests/catch/unit/virtualMemoryManagement/hipMemMap.cc
index 77ca9e9de2..eb711f16bc 100644
--- a/projects/hip-tests/catch/unit/virtualMemoryManagement/hipMemMap.cc
+++ b/projects/hip-tests/catch/unit/virtualMemoryManagement/hipMemMap.cc
@@ -276,6 +276,7 @@ TEST_CASE("Unit_hipMemMap_PhysicalMemory_Map2MultVMMs") {
  *    - HIP_VERSION >= 6.1
  */
 TEST_CASE("Unit_hipMemMap_PhysicalMemoryReuse_MultiDev") {
+  CHECK_P2P_SUPPORT
   int devicecount = 0;
   HIP_CHECK(hipGetDeviceCount(&devicecount));
   if (devicecount < 2) {
@@ -423,6 +424,7 @@ TEST_CASE("Unit_hipMemMap_VMMMemoryReuse_SingleGPU") {
  *    - HIP_VERSION >= 6.1
  */
 TEST_CASE("Unit_hipMemMap_VMMMemoryReuse_MultiGPU") {
+  CHECK_P2P_SUPPORT
   int deviceId = 0, devicecount = 0;
   HIP_CHECK(hipGetDeviceCount(&devicecount));
   if (devicecount < 2) {
@@ -432,6 +434,7 @@ TEST_CASE("Unit_hipMemMap_VMMMemoryReuse_MultiGPU") {
   size_t granularity = 0;
   size_t buffer_size = N * sizeof(int);
   hipDevice_t device;
+  HIP_CHECK(hipSetDevice(0));
   HIP_CHECK(hipDeviceGet(&device, deviceId));
   checkVMMSupported(device);
   hipMemAllocationProp prop{};
@@ -451,9 +454,9 @@ TEST_CASE("Unit_hipMemMap_VMMMemoryReuse_MultiGPU") {
   }
   // Allocate a physical memory chunk
   for (int dev = 0; dev < devicecount; dev++) {
-    hipDevice_t device;
-    HIP_CHECK(hipDeviceGet(&device, dev));
-    prop.location.id = device;
+    hipDevice_t dev_handle;
+    HIP_CHECK(hipDeviceGet(&dev_handle, dev));
+    prop.location.id = dev_handle;
     HIP_CHECK(hipMemCreate(&handle[dev], size_mem, &prop, 0));
   }
   // Allocate devicecount virtual address ranges