From 9a7d9688d7419fdbb04bfc18274fd875e6bd8623 Mon Sep 17 00:00:00 2001 From: Rahul Manocha Date: Tue, 1 Oct 2024 13:23:03 -0700 Subject: [PATCH] SWDEV-488397 - Enable Peer memory access for threadfence tests Change-Id: I4fa8c033c06dc4d247d29c43438e6a56343b0bf8 --- catch/hipTestMain/config/config_amd_linux | 3 --- catch/unit/threadfence/__threadfence.cc | 2 +- catch/unit/threadfence/__threadfence_block.cc | 2 +- catch/unit/threadfence/__threadfence_system.cc | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux index 0ee633d0eb..ffd5ddeda6 100644 --- a/catch/hipTestMain/config/config_amd_linux +++ b/catch/hipTestMain/config/config_amd_linux @@ -244,9 +244,6 @@ "Unit_atomicMax_Negative_Parameters_RTC", "Unit_Kernel_Launch_bounds_Negative_OutOfBounds", "Unit_Kernel_Launch_bounds_Negative_Parameters_RTC", - "Unit___threadfence_block_Positive_Basic_Peer", - "Unit___threadfence_Positive_Basic_Peer", - "Unit___threadfence_system_Positive_Basic_Peer", "Unit_Device_sin_Accuracy_Positive - float", "Unit_Device_sin_Accuracy_Positive - double", "Unit_Device_cos_Accuracy_Positive - float", diff --git a/catch/unit/threadfence/__threadfence.cc b/catch/unit/threadfence/__threadfence.cc index 5dbbb46e40..43c5028c63 100644 --- a/catch/unit/threadfence/__threadfence.cc +++ b/catch/unit/threadfence/__threadfence.cc @@ -191,7 +191,7 @@ TEST_CASE("Unit___threadfence_Positive_Basic_Peer") { HIP_CHECK(hipMemsetD32((hipDeviceptr_t)(&(in_dev.ptr()[1])), kInitVal2, 1)); HIP_CHECK(hipSetDevice(1)); - + HIP_CHECK(hipDeviceEnablePeerAccess(0, 0)); HipTest::launchKernel(ThreadfenceTestKernel, 2, 1, 0, nullptr, out_dev.ptr(), in_dev.ptr()); HIP_CHECK(hipDeviceSynchronize()); diff --git a/catch/unit/threadfence/__threadfence_block.cc b/catch/unit/threadfence/__threadfence_block.cc index 6760211935..954bc66b7a 100644 --- a/catch/unit/threadfence/__threadfence_block.cc +++ b/catch/unit/threadfence/__threadfence_block.cc @@ -191,7 +191,7 @@ TEST_CASE("Unit___threadfence_block_Positive_Basic_Peer") { HIP_CHECK(hipMemsetD32((hipDeviceptr_t)(&(in_dev.ptr()[1])), kInitVal2, 1)); HIP_CHECK(hipSetDevice(1)); - + HIP_CHECK(hipDeviceEnablePeerAccess(0, 0)); HipTest::launchKernel(ThreadfenceTestKernel, 2, 1, 0, nullptr, out_dev.ptr(), in_dev.ptr()); HIP_CHECK(hipDeviceSynchronize()); diff --git a/catch/unit/threadfence/__threadfence_system.cc b/catch/unit/threadfence/__threadfence_system.cc index be10265304..0626bdae26 100644 --- a/catch/unit/threadfence/__threadfence_system.cc +++ b/catch/unit/threadfence/__threadfence_system.cc @@ -89,6 +89,7 @@ TEST_CASE("Unit___threadfence_system_Positive_Basic_Peer") { HipTest::launchKernel(WriteKernel, 1, 1, 0, nullptr, in_dev.ptr()); HIP_CHECK(hipSetDevice(1)); + HIP_CHECK(hipDeviceEnablePeerAccess(0, 0)); HipTest::launchKernel(ReadKernel, 1, 1, 0, nullptr, out_dev.ptr(), in_dev.ptr()); HIP_CHECK(hipDeviceSynchronize());