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 combination of old and new thread memory code selectable by new option USE_TLS #1742

Merged
merged 7 commits into from
Aug 28, 2018
Merged

Add combination of old and new thread memory code selectable by new option USE_TLS #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd42ca4
Combo of default pre-0.3.1 memory.c and band-aided version of PR1739
martin-frbg Aug 25, 2018
2a589c4
Add USE_TLS option to switch between old and new memory.c
martin-frbg Aug 25, 2018
2caa221
Add USE_TLS option to choose between old and new implementation of me…
martin-frbg Aug 25, 2018
b1b743f
Merge branch 'develop' into interim033
martin-frbg Aug 25, 2018
5991d1a
Update memory.c
martin-frbg Aug 25, 2018
b902a40
Rewrite glibc version check
martin-frbg Aug 26, 2018
b55690a
typo fix
martin-frbg Aug 26, 2018
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
8 changes: 7 additions & 1 deletion Makefile.rule
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,13 @@ BUILD_LAPACK_DEPRECATED = 1
# BUILD_RELAPACK = 1

# If you want to use legacy threaded Level 3 implementation.
# USE_SIMPLE_THREADED_LEVEL3 = 1
USE_SIMPLE_THREADED_LEVEL3 = 1

# If you want to use the new, still somewhat experimental code that uses
# thread-local storage instead of a central memory buffer in memory.c
# Note that if your system uses GLIBC, it needs to have at least glibc 2.21
# for this to work.
USE_TLS = 1

# If you want to drive whole 64bit region by BLAS. Not all Fortran
# compiler supports this. It's safe to keep comment it out if you
Expand Down
4 changes: 4 additions & 0 deletions Makefile.system
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,10 @@ ifdef USE_SIMPLE_THREADED_LEVEL3
CCOMMON_OPT += -DUSE_SIMPLE_THREADED_LEVEL3
endif

ifdef USE_TLS
CCOMMON_OPT += -DUSE_TLS
endif

ifndef SYMBOLPREFIX
SYMBOLPREFIX =
endif
Expand Down
4 changes: 4 additions & 0 deletions cmake/system.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@ if (CONSISTENT_FPCSR)
set(CCOMMON_OPT "${CCOMMON_OPT} -DCONSISTENT_FPCSR")
endif ()

if (USE_TLS)
set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_TLS")
endif ()

# Only for development
# set(CCOMMON_OPT "${CCOMMON_OPT} -DPARAMTEST")
# set(CCOMMON_OPT "${CCOMMON_OPT} -DPREFETCHTEST")
Expand Down
Loading