Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Set compilation flags for different build types with Clang #734

Merged
olupton merged 6 commits into from
Jan 6, 2022
Merged

Set compilation flags for different build types with Clang #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da3d1d3
Set compilation flags for different build types with Clang
pramodk Jan 4, 2022
9ac0325
Update tqperf test: change repo url and copy mod files into single di…
pramodk Jan 4, 2022
cd1bfcf
Jenkins CI test: modx only is part of tqperf
pramodk Jan 5, 2022
ad33ca1
Fixup.
olupton Jan 5, 2022
39cc0b6
fixup
olupton Jan 5, 2022
79073db
fixup
olupton Jan 5, 2022
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
11 changes: 11 additions & 0 deletions CMake/config/CompilerFlagsHelpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST})

# CLANG
elseif(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_CLANG)
set(CMAKE_${COMPILER_LANGUAGE}_WARNING_ALL "-Wall")
set(CMAKE_${COMPILER_LANGUAGE}_DEBUGINFO_FLAGS "-g")

set(CMAKE_${COMPILER_LANGUAGE}_OPT_NONE "-O0")
set(CMAKE_${COMPILER_LANGUAGE}_OPT_NORMAL "-O2")
set(CMAKE_${COMPILER_LANGUAGE}_OPT_AGGRESSIVE "-O3")
set(CMAKE_${COMPILER_LANGUAGE}_OPT_FASTEST "-Ofast -march=native")

set(CMAKE_${COMPILER_LANGUAGE}_STACK_PROTECTION "-fstack-protector")
set(CMAKE_${COMPILER_LANGUAGE}_POSITION_INDEPENDENT "-fPIC")

# Force same ld behavior as when called from gcc --as-needed forces the linker to check whether
# a dynamic library mentioned in the command line is actually needed by the objects being
# linked. Symbols needed in shared objects are already linked when building that library.
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ pipeline {
stage('tqperf'){
steps{
dir('tqperf'){
git url: 'https://github.com/nrnhines/tqperf.git'
git url: 'https://github.com/neuronsimulator/tqperf'
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion tests/jenkins/nrnivmodl-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@ mkdir -p ${CORENRN_TYPE}
pushd ${CORENRN_TYPE}

set +x

# tqperf has extra mod files under modx
if [ "${TEST_DIR}" = "tqperf" ]; then
cp ../modx/*.mod ../mod/
extra_args="-l -lcrypto"
fi

if [ "${TEST_DIR}" = "ringtest" ]; then
echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ."
$WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core .
else
echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod"
$WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod
$WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ${extra_args} ../mod
fi
set -x

Expand Down
8 changes: 7 additions & 1 deletion tests/jenkins/nrnivmodl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@ set -x
TEST_DIR="$1"

cd $WORKSPACE/${TEST_DIR}
nrnivmodl mod

# tqperf has extra mod files under modx
if [ "${TEST_DIR}" = "tqperf" ]; then
cp modx/*.mod mod/
fi

nrnivmodl -loadflags -lcrypto mod