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

Install and use libatomic on windows. #22189

Merged
merged 3 commits into from
Jul 19, 2017
Merged

Install and use libatomic on windows. #22189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca9d07
add libatomic as a std_dll
vchuravy Jun 2, 2017
b30da43
use libatomic on mingw
vchuravy Jun 2, 2017
eca1f1e
Revert "Disable szclass 12 for i686 systems. (#19647)"
vchuravy Jun 2, 2017
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ $(eval $(call std_dll,gcc_s_seh-1))
endif
$(eval $(call std_dll,ssp-0))
$(eval $(call std_dll,winpthread-1))
$(eval $(call std_dll,atomic-1))
endif
define stringreplace
$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
Expand Down
11 changes: 8 additions & 3 deletions src/jitlayers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,17 @@ void NotifyDebugger(jit_code_entry *JITCodeEntry)
}
// ------------------------ END OF TEMPORARY COPY FROM LLVM -----------------

#if defined(_OS_LINUX_)
#if defined(_OS_LINUX_) || defined(_OS_WINDOWS_)
// Resolve non-lock free atomic functions in the libatomic library.
// This is the library that provides support for c11/c++11 atomic operations.
static uint64_t resolve_atomic(const char *name)
{
static void *atomic_hdl = jl_load_dynamic_library_e("libatomic",
#if defined(_OS_LINUX_)
static const char *const libatomic = "libatomic";
#elif defined(_OS_WINDOWS_)
static const char *const libatomic = "libatomic-1";
#endif
static void *atomic_hdl = jl_load_dynamic_library_e(libatomic,
JL_RTLD_LOCAL);
static const char *const atomic_prefix = "__atomic_";
if (!atomic_hdl)
Expand Down Expand Up @@ -578,7 +583,7 @@ void JuliaOJIT::addModule(std::unique_ptr<Module> M)
// Step 2: Search the program symbols
if (uint64_t addr = SectionMemoryManager::getSymbolAddressInProcess(Name))
return JL_SymbolInfo(addr, JITSymbolFlags::Exported);
#if defined(_OS_LINUX_)
#if defined(_OS_LINUX_) || defined(_OS_WINDOWS_)
if (uint64_t addr = resolve_atomic(Name.c_str()))
return JL_SymbolInfo(addr, JITSymbolFlags::Exported);
#endif
Expand Down
9 changes: 3 additions & 6 deletions src/julia_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,9 @@ void *jl_gc_perm_alloc(size_t sz, int zero, unsigned align, unsigned offset);
static const int jl_gc_sizeclasses[JL_GC_N_POOLS] = {
#ifdef _P64
8,
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
// ARM and PowerPC have max alignment of 8,
// make sure allocation of size 8 has that alignment.
// for x86 alignment is important for atomic ops and
// the corresponding platform ABI. Once we can use
// libatomic on Windows this is no longer necessary.
4, 8,
#else
4, 8, 12,
Expand Down Expand Up @@ -177,7 +174,7 @@ STATIC_INLINE int jl_gc_alignment(size_t sz)
#ifdef _P64
(void)sz;
return 16;
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
return sz <= 4 ? 8 : 16;
#else
// szclass 8
Expand All @@ -198,7 +195,7 @@ STATIC_INLINE int JL_CONST_FUNC jl_gc_szclass(size_t sz)
if (sz <= 8)
return 0;
const int N = 0;
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
if (sz <= 8)
return (sz + 3) / 4 - 1;
const int N = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/julia_threads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ typedef struct {
// variables for allocating objects from pools
#ifdef _P64
# define JL_GC_N_POOLS 41
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
# define JL_GC_N_POOLS 42
#else
# define JL_GC_N_POOLS 43
Expand Down