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

Disable szclass 12 for i686 systems. #19647

Merged
merged 1 commit into from
Dec 20, 2016
Merged

Disable szclass 12 for i686 systems. #19647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 3 deletions src/julia_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@ void *jl_gc_perm_alloc(size_t sz);
static const int jl_gc_sizeclasses[JL_GC_N_POOLS] = {
#ifdef _P64
8,
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
// 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 @@ -99,7 +102,7 @@ STATIC_INLINE int jl_gc_alignment(size_t sz)
#ifdef _P64
(void)sz;
return 16;
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
return sz <= 4 ? 8 : 16;
#else
// szclass 8
Expand All @@ -120,7 +123,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_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
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 @@ -56,7 +56,7 @@ typedef struct {
// variables for allocating objects from pools
#ifdef _P64
# define JL_GC_N_POOLS 41
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
# define JL_GC_N_POOLS 42
#else
# define JL_GC_N_POOLS 43
Expand Down