From b1800c4fb47de8e6244cab5614b991d0e2548b47 Mon Sep 17 00:00:00 2001 From: Todd tiantuo Li Date: Fri, 1 Nov 2024 02:09:17 -0700 Subject: [PATCH] SWDEV-453284 - Skip threadfence peer tests when peer access is unavailable Change-Id: I943c5a8f9830f1e7dc900ed7538e582ba57d0324 --- catch/unit/threadfence/__threadfence.cc | 8 ++++++-- catch/unit/threadfence/__threadfence_block.cc | 8 ++++++-- catch/unit/threadfence/__threadfence_system.cc | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/catch/unit/threadfence/__threadfence.cc b/catch/unit/threadfence/__threadfence.cc index b7ccfac783..5dbbb46e40 100644 --- a/catch/unit/threadfence/__threadfence.cc +++ b/catch/unit/threadfence/__threadfence.cc @@ -171,9 +171,13 @@ TEST_CASE("Unit___threadfence_Positive_Basic_Peer") { return; } - int can_access_peer; + int can_access_peer = 0; HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, 0, 1)); - REQUIRE(can_access_peer); + if (!can_access_peer) { + std::string msg = "Skipped as peer access cannot be enabled between devices"; + HipTest::HIP_SKIP_TEST(msg.c_str()); + return; + } HIP_CHECK(hipSetDevice(0)); diff --git a/catch/unit/threadfence/__threadfence_block.cc b/catch/unit/threadfence/__threadfence_block.cc index bcb9521650..6760211935 100644 --- a/catch/unit/threadfence/__threadfence_block.cc +++ b/catch/unit/threadfence/__threadfence_block.cc @@ -171,9 +171,13 @@ TEST_CASE("Unit___threadfence_block_Positive_Basic_Peer") { return; } - int can_access_peer; + int can_access_peer = 0; HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, 0, 1)); - REQUIRE(can_access_peer); + if (!can_access_peer) { + std::string msg = "Skipped as peer access cannot be enabled between devices"; + HipTest::HIP_SKIP_TEST(msg.c_str()); + return; + } HIP_CHECK(hipSetDevice(0)); diff --git a/catch/unit/threadfence/__threadfence_system.cc b/catch/unit/threadfence/__threadfence_system.cc index 9ae9ef55ad..be10265304 100644 --- a/catch/unit/threadfence/__threadfence_system.cc +++ b/catch/unit/threadfence/__threadfence_system.cc @@ -67,9 +67,13 @@ TEST_CASE("Unit___threadfence_system_Positive_Basic_Peer") { return; } - int can_access_peer; + int can_access_peer = 0; HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, 0, 1)); - REQUIRE(can_access_peer); + if (!can_access_peer) { + std::string msg = "Skipped as peer access cannot be enabled between devices"; + HipTest::HIP_SKIP_TEST(msg.c_str()); + return; + } HIP_CHECK(hipSetDevice(0));