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.

Sign up for GitHub

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

Add LTO and M1 arch to CMake #2106

Merged
merged 6 commits into from
May 3, 2023
Merged

Add LTO and M1 arch to CMake #2106

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
408ceea
Add LTO and M1 arch.
thorstenhater Apr 17, 2023
e99d92f
Bail on empty watchers.
thorstenhater Apr 17, 2023
aa649c6
Typo.
thorstenhater Apr 17, 2023
29ed2db
Bail empty threshold watchers.
thorstenhater Apr 17, 2023
8e1d10e
Merge remote-tracking branch 'origin/master' into perf/lto
thorstenhater Apr 19, 2023
e69f4af
Apply suggestions from code review
thorstenhater May 2, 2023
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
9 changes: 9 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.19)
include(CMakeDependentOption)
include(CheckIPOSupported)

# Make CUDA support throw errors if architectures remain unclear
cmake_policy(SET CMP0104 NEW)
Expand All @@ -16,6 +17,14 @@ include(GNUInstallDirs)
# Effectively adds '-fpic' flag to CXX_FLAGS. Needed for dynamic catalogues.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

# Have LTO where possible, ie add -flto
check_ipo_supported(RESULT HAVE_LTO OUTPUT ERR_LTO)
if(HAVE_LTO AND NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
message (STATUS "LTO support found, enabling")
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
else()
message(STATUS "No LTO: ${ERR_LTO}")
endif()

# Turn on this option to force the compilers to produce color output when output is
# redirected from the terminal (e.g. when using ninja or a pager).
Expand Down
1 change: 1 addition & 0 deletions arbor/backends/multicore/threshold_watcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class threshold_watcher {
/// Crossing events are recorded for each threshold that
/// is crossed since the last call to test
void test(array& time_since_spike, const arb_value_type& t_before, const arb_value_type& t_after) {
if (cv_index_.empty() || n_detectors_ == 0) return;
arb_assert(values_!=nullptr);

// Reset all spike times to -1.0 indicating no spike has been recorded on the detector
Expand Down
9 changes: 4 additions & 5 deletions cmake/CompilerOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,11 @@ function(set_arch_target optvar arch)
endforeach(line)
string(REGEX REPLACE "-.*" "" target_model "${target}")

# Use -mcpu for all supported targets _except_ for x86, where it should be -march.

if("${target}" MATCHES "aarch64-apple-darwin")
set(arch_opt "-mcpu=${arch}")
# Use -mcpu for all supported targets _except_ for x86 and Apple arm64, where it should be -march.
if("${target}" MATCHES "aarch64-apple-darwin" OR "${target}" MATCHES "arm64-apple-darwin")
set(arch_opt "-march=${arch} -mtune=${arch}")
elseif(target_model MATCHES "x86|i[3456]86" OR target_model MATCHES "amd64" OR target_model MATCHES "aarch64")
set(arch_opt "-march=${arch}")
set(arch_opt "-march=${arch} -mtune=${arch}")
else()
set(arch_opt "-mcpu=${arch}")
endif()
Expand Down