Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OpenMP Launch Mem Leak and Add Clang Sanitizer Build #1730

Merged
merged 7 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions host-configs/lc-builds/toss4/clang_X_asan.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
###############################################################################
# Copyright (c) 2016-24, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/LICENSE file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
###############################################################################

set(RAJA_COMPILER "RAJA_COMPILER_CLANG" CACHE STRING "")

set(CMAKE_CXX_FLAGS_RELEASE "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O3 -march=native -funroll-loops -finline-functions -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O3 -g -march=native -funroll-loops -finline-functions -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")
set(CMAKE_CXX_FLAGS_DEBUG "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O0 -g -fsanitize=address -fno-omit-frame-pointer" CACHE STRING "")

set(RAJA_HOST_CONFIG_LOADED On CACHE BOOL "")
14 changes: 14 additions & 0 deletions host-configs/lc-builds/toss4/clang_X_ubsan.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
###############################################################################
# Copyright (c) 2016-24, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/LICENSE file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
###############################################################################

set(RAJA_COMPILER "RAJA_COMPILER_CLANG" CACHE STRING "")

set(CMAKE_CXX_FLAGS_RELEASE "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O3 -march=native -funroll-loops -finline-functions -fsanitize=undefined -fno-omit-frame-pointer -fsanitize=integer" CACHE STRING "")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O3 -g -march=native -funroll-loops -finline-functions -fsanitize=undefined -fno-omit-frame-pointer -fsanitize=integer" CACHE STRING "")
set(CMAKE_CXX_FLAGS_DEBUG "--gcc-toolchain=/usr/tce/packages/gcc/gcc-10.3.1 -O0 -g -fsanitize=undefined -fno-omit-frame-pointer -fsanitize=integer" CACHE STRING "")

set(RAJA_HOST_CONFIG_LOADED On CACHE BOOL "")
3 changes: 3 additions & 0 deletions include/RAJA/policy/openmp/launch.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ struct LaunchExecute<RAJA::omp_launch_t> {
ctx.shared_mem_ptr = (char*) malloc(launch_params.shared_mem_size);

expt::invoke_body(f_params, loop_body.get_priv(), ctx);

free(ctx.shared_mem_ptr);
ctx.shared_mem_ptr = nullptr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for finding this!

}

expt::ParamMultiplexer::resolve<EXEC_POL>(f_params);
Expand Down
57 changes: 57 additions & 0 deletions scripts/lc-builds/toss4_clang_san.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/usr/bin/env bash

###############################################################################
# Copyright (c) 2016-24, Lawrence Livermore National Security, LLC
# and RAJA project contributors. See the RAJA/LICENSE file for details.
#
# SPDX-License-Identifier: (BSD-3-Clause)
###############################################################################

if [ "$1" == "" ]; then
echo
echo "You must pass 2 arguments to the script (in this order): "
echo " 1) compiler version number for clang"
echo " 2) sanitizer version (one of 2 options: asan, or ubsan)"
echo
echo "For example: "
echo " toss4_clang.sh 14.0.6-magic asan"
exit
fi

COMP_VER=$1
SAN_VER=$2
shift 2

if [[ ( ${SAN_VER} != "asan" ) && ( ${SAN_VER} != "ubsan" ) ]] ; then
echo "Sanitizer version must be \"asan\" or \"ubsan\". Exiting!" ; exit
fi

BUILD_SUFFIX=lc_toss4-clang-${COMP_VER}-${SAN_VER}

echo
echo "Creating build directory build_${BUILD_SUFFIX} and generating configuration in it"
echo "Configuration extra arguments:"
echo " $@"
echo

rm -rf build_${BUILD_SUFFIX} 2>/dev/null
mkdir build_${BUILD_SUFFIX} && cd build_${BUILD_SUFFIX}

module load cmake/3.23.1

cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/clang/clang-${COMP_VER}/bin/clang++ \
-DBLT_CXX_STD=c++14 \
-C ../host-configs/lc-builds/toss4/clang_X_${SAN_VER}.cmake \
-DENABLE_OPENMP=On \
-DCMAKE_INSTALL_PREFIX=../install_${BUILD_SUFFIX} \
"$@" \
..

if [[ ( ${SAN_VER} = "ubsan" ) ]] ; then
echo "To view ubsan output, set the following environment variable: "
echo " UBSAN_OPTIONS=log_path=/path/to/ubsan_log_prefix"
echo
echo "Each test will create a ubsan output file with the prefix \"ubsan_log_prefix\"."
fi
2 changes: 1 addition & 1 deletion scripts/lc-builds/toss4_icpc-classic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ echo
echo " Please note that you may need to add some intel openmp libraries to your"
echo " LD_LIBRARY_PATH to run with openmp."
echo
echo " LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/tce/packages/intel/intel-${COMP_VER}/compiler/lib/intel64_lin"
echo " LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/usr/tce/packages/intel-classic/intel-classic-${COMP_VER}/compiler/lib/intel64_lin"
echo
echo "***********************************************************************"
4 changes: 2 additions & 2 deletions scripts/lc-builds/toss4_icpx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ source /usr/tce/packages/intel/intel-${COMP_VER}/setvars.sh

cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/compiler/${COMP_VER}/linux/bin/icpx \
-DCMAKE_C_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/compiler/${COMP_VER}/linux/bin/icx \
-DCMAKE_CXX_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/bin/icpx \
-DCMAKE_C_COMPILER=/usr/tce/packages/intel/intel-${COMP_VER}/bin/icx \
-DBLT_CXX_STD=c++14 \
-C ../host-configs/lc-builds/toss4/icpx_X.cmake \
-DRAJA_ENABLE_FORCEINLINE_RECURSIVE=Off \
Expand Down
Loading