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

Jump to bottom

Page based heap size heuristics #50144

Merged
merged 13 commits into from
Jul 23, 2023
Merged

Page based heap size heuristics #50144

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5f36833
Implement new GC heuristics.
gbaraldi Jul 3, 2023
2f42cd5
Relax some of the atomics for sweeping
gbaraldi Jul 5, 2023
01d6e39
Apply review suggestions.
gbaraldi Jul 7, 2023
b033c0a
Add batching for counted functions
gbaraldi Jul 7, 2023
2ab7f95
Small fixup
gbaraldi Jul 7, 2023
7af549e
Batch other big allocations as well
gbaraldi Jul 7, 2023
4da775f
Readd testenv changes
gbaraldi Jul 13, 2023
b4bab03
Let the heap increase a bit if we are thrashing
gbaraldi Jul 14, 2023
2cbba34
Whitespace
gbaraldi Jul 14, 2023
df3fcb0
Merge branch 'master' into new-heuristics
gbaraldi Jul 17, 2023
e6a18f3
Experiment with not setting a max size by default at all
gbaraldi Jul 17, 2023
15b34a5
Add under pressure callback
gbaraldi Jul 19, 2023
9f3ca7c
Merge branch 'master' into new-heuristics
gbaraldi Jul 20, 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
Prev Previous commit
Next Next commit
Batch other big allocations as well
  • Loading branch information
@gbaraldi
gbaraldi committed Jul 7, 2023
commit 7af549ebf929d48b6ad9e0d7bce2e01759e35eac
24 changes: 21 additions & 3 deletions src/gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,13 @@ STATIC_INLINE jl_value_t *jl_gc_big_alloc_inner(jl_ptls_t ptls, size_t sz)
jl_atomic_load_relaxed(&ptls->gc_num.allocd) + allocsz);
jl_atomic_store_relaxed(&ptls->gc_num.bigalloc,
jl_atomic_load_relaxed(&ptls->gc_num.bigalloc) + 1);
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, allocsz);
uint64_t alloc_acc = jl_atomic_load_relaxed(&ptls->gc_num.alloc_acc);
if (alloc_acc + allocsz < 16*1024)
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, alloc_acc + allocsz);
else {
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, alloc_acc + allocsz);
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, 0);
}
#ifdef MEMDEBUG
memset(v, 0xee, allocsz);
#endif
Expand Down Expand Up @@ -1117,7 +1123,13 @@ void jl_gc_count_allocd(size_t sz) JL_NOTSAFEPOINT
jl_ptls_t ptls = jl_current_task->ptls;
jl_atomic_store_relaxed(&ptls->gc_num.allocd,
jl_atomic_load_relaxed(&ptls->gc_num.allocd) + sz);
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, sz);
uint64_t alloc_acc = jl_atomic_load_relaxed(&ptls->gc_num.alloc_acc);
if (alloc_acc + sz < 16*1024)
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, alloc_acc + sz);
Comment on lines +1141 to +1143
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similary here, you could lose updates if you don't do atomic_inc

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alloc_acc is a per thread value, the global update is a couple lines below with the full fetch_add

else {
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, alloc_acc + sz);
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, 0);
}
}

static void combine_thread_gc_counts(jl_gc_num_t *dest) JL_NOTSAFEPOINT
Expand Down Expand Up @@ -3739,7 +3751,13 @@ JL_DLLEXPORT void *jl_gc_managed_malloc(size_t sz)
jl_atomic_load_relaxed(&ptls->gc_num.allocd) + allocsz);
jl_atomic_store_relaxed(&ptls->gc_num.malloc,
jl_atomic_load_relaxed(&ptls->gc_num.malloc) + 1);
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, allocsz);
uint64_t alloc_acc = jl_atomic_load_relaxed(&ptls->gc_num.alloc_acc);
if (alloc_acc + allocsz < 16*1024)
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, alloc_acc + allocsz);
else {
jl_atomic_fetch_add_relaxed(&gc_heap_stats.heap_size, alloc_acc + allocsz);
jl_atomic_store_relaxed(&ptls->gc_num.alloc_acc, 0);
}
int last_errno = errno;
#ifdef _OS_WINDOWS_
DWORD last_error = GetLastError();
Expand Down