From 705a2adbd39339ba106008cb54c1eed54322360a Mon Sep 17 00:00:00 2001 From: "Bhardwaj, Gopesh" Date: Fri, 21 Mar 2025 00:26:14 +0530 Subject: [PATCH] [CI] Disable OpenMP test for sanitizers (#296) * Disable openmp test for sanitizers * fixing review feedback [ROCm/rocprofiler-sdk commit: 4dcb2398724d6b8e0ab87e9b6187ae57c69a8e27] --- .../samples/openmp_target/CMakeLists.txt | 11 +++++++---- .../tests/openmp-tools/CMakeLists.txt | 13 ++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/projects/rocprofiler-sdk/samples/openmp_target/CMakeLists.txt b/projects/rocprofiler-sdk/samples/openmp_target/CMakeLists.txt index 13dbdf76de..946c2ba9cf 100644 --- a/projects/rocprofiler-sdk/samples/openmp_target/CMakeLists.txt +++ b/projects/rocprofiler-sdk/samples/openmp_target/CMakeLists.txt @@ -36,10 +36,13 @@ set(OPENMP_GPU_TARGETS "${DEFAULT_GPU_TARGETS}" CACHE STRING "GPU targets to compile for") -if(ROCPROFILER_MEMCHECK STREQUAL "ThreadSanitizer") - set(IS_THREAD_SANITIZER ON) +set(ROCPROFILER_MEMCHECK_TYPES "ThreadSanitizer" "AddressSanitizer" + "UndefinedBehaviorSanitizer") + +if(ROCPROFILER_MEMCHECK AND ROCPROFILER_MEMCHECK IN_LIST ROCPROFILER_MEMCHECK_TYPES) + set(IS_SANITIZER ON) else() - set(IS_THREAD_SANITIZER OFF) + set(IS_SANITIZER OFF) endif() find_package(Threads REQUIRED) @@ -83,4 +86,4 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}" DISABLED - "${IS_THREAD_SANITIZER}") + "${IS_SANITIZER}") diff --git a/projects/rocprofiler-sdk/tests/openmp-tools/CMakeLists.txt b/projects/rocprofiler-sdk/tests/openmp-tools/CMakeLists.txt index 15ca9c35b2..ab62cdf8d9 100644 --- a/projects/rocprofiler-sdk/tests/openmp-tools/CMakeLists.txt +++ b/projects/rocprofiler-sdk/tests/openmp-tools/CMakeLists.txt @@ -22,10 +22,13 @@ else() set(PRELOAD_ENV "LD_PRELOAD=$") endif() -if(ROCPROFILER_MEMCHECK STREQUAL "ThreadSanitizer") - set(IS_THREAD_SANITIZER ON) +set(ROCPROFILER_MEMCHECK_TYPES "ThreadSanitizer" "AddressSanitizer" + "UndefinedBehaviorSanitizer") + +if(ROCPROFILER_MEMCHECK AND ROCPROFILER_MEMCHECK IN_LIST ROCPROFILER_MEMCHECK_TYPES) + set(IS_SANITIZER ON) else() - set(IS_THREAD_SANITIZER OFF) + set(IS_SANITIZER OFF) endif() add_test(NAME test-openmp-tools-execute COMMAND $) @@ -51,7 +54,7 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}" DISABLED - "${IS_THREAD_SANITIZER}") + "${IS_SANITIZER}") # copy to binary directory rocprofiler_configure_pytest_files(COPY validate.py conftest.py CONFIG pytest.ini) @@ -72,4 +75,4 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}" DISABLED - "${IS_THREAD_SANITIZER}") + "${IS_SANITIZER}")