From a4d016e071c0b8dfb12173ff51ffd6e9311c30a2 Mon Sep 17 00:00:00 2001 From: Rahul Manocha Date: Tue, 19 Mar 2024 21:04:50 +0000 Subject: [PATCH] [SWDEV-435667][SWDEV-452232] - Fix for Atomic Exch testcase seg faults Change-Id: I36cd008215f41fe8b7c73fba11443a77658828ee [ROCm/hip-tests commit: 4a80eee9f1c509f06a68ec1f126c9b7776147533] --- .../hip-tests/catch/hipTestMain/config/config_amd_linux | 6 ------ .../hip-tests/catch/hipTestMain/config/config_amd_windows | 6 ------ projects/hip-tests/catch/unit/atomics/atomicExch.cc | 4 +++- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux index 5674bbbe39..7a6b4acdad 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux @@ -232,12 +232,6 @@ "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Positive_RangeValidation", "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Positive_RangeValidation", "=== SWDEV-435667: Below tests failing randomly in stress test on 01/12/23 ===", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - int", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned int", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long long", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - float", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - double", "Unit_atomicExch_Positive_Multi_Kernel - int", "Unit_atomicExch_Positive_Multi_Kernel - unsigned int", "Unit_atomicExch_Positive_Multi_Kernel - unsigned long", diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows index fe1617e4b7..32eda36bef 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -280,12 +280,6 @@ "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessor_Positive_RangeValidation", "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Positive_RangeValidation", "=== SWDEV-435667: Below tests failing randomly in stress test on 01/12/23 ===", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - int", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned int", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - unsigned long long", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - float", - "Unit_atomicExch_Positive_Same_Address_Compile_Time - double", "Unit_atomicExch_Positive_Multi_Kernel - int", "Unit_atomicExch_Positive_Multi_Kernel - unsigned int", "Unit_atomicExch_Positive_Multi_Kernel - unsigned long", diff --git a/projects/hip-tests/catch/unit/atomics/atomicExch.cc b/projects/hip-tests/catch/unit/atomics/atomicExch.cc index d296590387..c3b9bfbe15 100644 --- a/projects/hip-tests/catch/unit/atomics/atomicExch.cc +++ b/projects/hip-tests/catch/unit/atomics/atomicExch.cc @@ -58,7 +58,9 @@ TEMPLATE_TEST_CASE("Unit_atomicExch_Positive_Same_Address_Compile_Time", "", int unsigned long, unsigned long long, float, double) { #endif // HT_NVIDIA for (auto current = 0; current < cmd_options.iterations; ++current) { - AtomicExchSameAddressTest(); + DYNAMIC_SECTION("Positive Same Address" << current) { + AtomicExchSameAddressTest(); + } } }