From d1dff962d7fed9993d844b8d62b0019f4ab017d2 Mon Sep 17 00:00:00 2001 From: Ioannis Assiouras Date: Thu, 11 Apr 2024 15:06:34 +0100 Subject: [PATCH] SWDEV-455444 - Fixed Unit_AtomicBuiltins_Negative_Parameters_RTC After compiler change atomic_compare_exchange{weak,strong} now checks the failure memory order as well as the success memory order. As a result there is additional warnings from RTC compilation. Modified Unit_AtomicBuiltins_Negative_Parameters_RTC unit test to reflect that. Change-Id: I55f954f3a870b947d1df393207d19e5f7989ee80 --- catch/hipTestMain/config/config_amd_linux | 1 - catch/unit/atomics/atomic_builtins.cc | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux index 4752cf069f..827630aaa1 100644 --- a/catch/hipTestMain/config/config_amd_linux +++ b/catch/hipTestMain/config/config_amd_linux @@ -262,7 +262,6 @@ "Unit_unsafeAtomicMax_Positive_Multi_Kernel_Same_Address - float", "Unit___hip_atomic_fetch_min_Positive_Wavefront_Adjacent_Addresses - double", "Unit___hip_atomic_fetch_min_Positive_Wavefront_Scattered_Addresses - double", - "Unit_AtomicBuiltins_Negative_Parameters_RTC", "SWDEV-446588 - Disable graph multi gpu testcases until graph has support for it", "Unit_hipGraphExecUpdate_Negative_MultiDevice_Context_Changed", "Unit_hipGraphMem_Alloc_Free_NodeGetParams_Functional_MultiDevice", diff --git a/catch/unit/atomics/atomic_builtins.cc b/catch/unit/atomics/atomic_builtins.cc index cd14c70e85..545af00c18 100644 --- a/catch/unit/atomics/atomic_builtins.cc +++ b/catch/unit/atomics/atomic_builtins.cc @@ -83,10 +83,8 @@ void AtomicBuiltinsRTCWrapper(const char* program_source, int expected_errors_nu TEST_CASE("Unit_AtomicBuiltins_Negative_Parameters_RTC") { AtomicBuiltinsRTCWrapper(kBuiltinStore, 5, 5); AtomicBuiltinsRTCWrapper(kBuiltinLoad, 4, 4); - /* Begin: Should be 5 errors, 6 warnings for both. See EXSWHTEC-309*/ - AtomicBuiltinsRTCWrapper(kBuiltinCompExWeak, 5, 2); - AtomicBuiltinsRTCWrapper(kBuiltinCompExStrong, 5, 2); - /* End. */ + AtomicBuiltinsRTCWrapper(kBuiltinCompExWeak, 5, 7); + AtomicBuiltinsRTCWrapper(kBuiltinCompExStrong, 5, 7); AtomicBuiltinsRTCWrapper(kBuiltinExchange, 5, 2); AtomicBuiltinsRTCWrapper(kBuiltinFetchAdd, 5, 2); AtomicBuiltinsRTCWrapper(kBuiltinFetchAnd, 7, 2);