From db697c187304c07db1eb89864b24f6ace85764a8 Mon Sep 17 00:00:00 2001 From: Vladana Stojiljkovic Date: Fri, 14 Jun 2024 13:17:47 +0200 Subject: [PATCH] SWDEV-457747 Fix disabled Unit_hipMemSetAccess_Vmm2PeerPeerMemCpy test Change-Id: If83dce52a60dcad94397afe758dc8ebf03d6c69a --- catch/hipTestMain/config/config_amd_linux | 1 - catch/hipTestMain/config/config_amd_windows | 1 - catch/unit/virtualMemoryManagement/hipMemSetGetAccess.cc | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux index 63b384d1c3..c1583236de 100644 --- a/catch/hipTestMain/config/config_amd_linux +++ b/catch/hipTestMain/config/config_amd_linux @@ -133,7 +133,6 @@ "Unit_hipMemMap_VMMMemoryReuse_MultiGPU", "Unit_hipMemSetAccess_FuncTstOnMultDev", "Unit_hipMemSetAccess_Vmm2PeerDevMemCpy", - "Unit_hipMemSetAccess_Vmm2PeerPeerMemCpy", "Unit_hipMemSetAccess_Vmm2VMMInterDevMemCpy", "Unit_hipMemSetAccess_MapPhysChksFromMulDev", "Unit_hipMemSetAccess_GrowVMM", diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows index 61a3d46483..25c3c2e89e 100644 --- a/catch/hipTestMain/config/config_amd_windows +++ b/catch/hipTestMain/config/config_amd_windows @@ -244,7 +244,6 @@ "Unit_hipMemSetAccess_AccessDirectlyFromHost", "Unit_hipMemSetAccess_Vmm2UnifiedMemCpy", "Unit_hipMemSetAccess_Vmm2DevMemCpy", - "Unit_hipMemSetAccess_Vmm2PeerPeerMemCpy", "Unit_hipMemSetAccess_Vmm2VMMInterDevMemCpy", "Unit_hipMemSetAccess_MapPhysChksFromMulDev", "Unit_hipMemSetAccess_GrowVMM", diff --git a/catch/unit/virtualMemoryManagement/hipMemSetGetAccess.cc b/catch/unit/virtualMemoryManagement/hipMemSetGetAccess.cc index def3883670..4a8924bc37 100644 --- a/catch/unit/virtualMemoryManagement/hipMemSetGetAccess.cc +++ b/catch/unit/virtualMemoryManagement/hipMemSetGetAccess.cc @@ -806,6 +806,14 @@ TEST_CASE("Unit_hipMemSetAccess_Vmm2PeerPeerMemCpy") { WARN("Machine does not support Peer Access\n"); break; } + + hipMemAccessDesc accessDesc = {}; + accessDesc.location.type = hipMemLocationTypeDevice; + accessDesc.location.id = deviceId; + accessDesc.flags = hipMemAccessFlagsProtRead; + // Make the address accessible to the rest of the GPUs + HIP_CHECK(hipMemSetAccess(ptrA, size_mem, &accessDesc, 1)); + HIP_CHECK(hipDeviceGet(&device_other, deviceId)); HIP_CHECK(hipDeviceGetAttribute(&value, hipDeviceAttributeVirtualMemoryManagementSupported, device_other));