mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

Adapt GC API to have separate heap and mutator structs

Browse source 
Only BDW is adapted, so far.
This commit is contained in:
Andy Wingo 2022-03-28 20:49:24 +02:00
parent 883a761775
commit 06a213d1ed
2 changed files with 99 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

56
bdw.h
View file

@ -27,9 +27,15 @@
up to 256 bytes. */ up to 256 bytes. */
#define GC_INLINE_FREELIST_COUNT (256U / GC_INLINE_GRANULE_BYTES) #define GC_INLINE_FREELIST_COUNT (256U / GC_INLINE_GRANULE_BYTES)
struct context { struct heap {
pthread_mutex_t lock;
int multithreaded;
};
struct mutator {
void *freelists[GC_INLINE_FREELIST_COUNT]; void *freelists[GC_INLINE_FREELIST_COUNT];
void *pointerless_freelists[GC_INLINE_FREELIST_COUNT]; void *pointerless_freelists[GC_INLINE_FREELIST_COUNT];
struct heap *heap;
}; };
static inline size_t gc_inline_bytes_to_freelist_index(size_t bytes) { static inline size_t gc_inline_bytes_to_freelist_index(size_t bytes) {
@ -76,28 +82,28 @@ allocate_small(void **freelist, size_t idx, enum gc_inline_kind kind) {
#define GC_HEADER /**/ #define GC_HEADER /**/
static inline void* allocate(struct context *cx, enum alloc_kind kind, static inline void* allocate(struct mutator *mut, enum alloc_kind kind,
size_t size) { size_t size) {
size_t idx = gc_inline_bytes_to_freelist_index(size); size_t idx = gc_inline_bytes_to_freelist_index(size);
if (UNLIKELY(idx >= GC_INLINE_FREELIST_COUNT)) if (UNLIKELY(idx >= GC_INLINE_FREELIST_COUNT))
return GC_malloc(size); return GC_malloc(size);
return allocate_small(&cx->freelists[idx], idx, GC_INLINE_KIND_NORMAL); return allocate_small(&mut->freelists[idx], idx, GC_INLINE_KIND_NORMAL);
} }
static inline void* allocate_pointerless(struct context *cx, static inline void* allocate_pointerless(struct mutator *mut,
enum alloc_kind kind, size_t size) { enum alloc_kind kind, size_t size) {
size_t idx = gc_inline_bytes_to_freelist_index(size); size_t idx = gc_inline_bytes_to_freelist_index(size);
if (UNLIKELY (idx >= GC_INLINE_FREELIST_COUNT)) if (UNLIKELY (idx >= GC_INLINE_FREELIST_COUNT))
return GC_malloc_atomic(size); return GC_malloc_atomic(size);
return allocate_small(&cx->pointerless_freelists[idx], idx, return allocate_small(&mut->pointerless_freelists[idx], idx,
GC_INLINE_KIND_POINTERLESS); GC_INLINE_KIND_POINTERLESS);
} }
static inline void collect(struct context *cx) { static inline void collect(struct mutator *mut) {
GC_gcollect(); GC_gcollect();
} }
@ -111,7 +117,18 @@ static inline void* get_field(void **addr) {
return *addr; return *addr;
} }
static struct context* initialize_gc(size_t heap_size) { static inline struct mutator *add_mutator(struct heap *heap) {
struct mutator *ret = GC_malloc(sizeof(struct mutator));
ret->heap = heap;
return ret;
}
static inline struct heap *mutator_heap(struct mutator *mutator) {
return mutator->heap;
}
static int initialize_gc(size_t heap_size, struct heap **heap,
struct mutator **mutator) {
// GC_full_freq = 30; // GC_full_freq = 30;
// GC_free_space_divisor = 16; // GC_free_space_divisor = 16;
// GC_enable_incremental(); // GC_enable_incremental();
@ -121,23 +138,32 @@ static struct context* initialize_gc(size_t heap_size) {
GC_set_max_heap_size (heap_size); GC_set_max_heap_size (heap_size);
GC_expand_hp(heap_size - current_heap_size); GC_expand_hp(heap_size - current_heap_size);
} }
GC_allow_register_threads(); *heap = GC_malloc(sizeof(struct heap));
return GC_malloc(sizeof(struct context)); pthread_mutex_init(&(*heap)->lock, NULL);
*mutator = add_mutator(*heap);
return 1;
} }
static struct context* initialize_gc_for_thread(uintptr_t *stack_base, static struct mutator* initialize_gc_for_thread(uintptr_t *stack_base,
struct context *parent) { struct heap *heap) {
pthread_mutex_lock(&heap->lock);
if (!heap->multithreaded) {
GC_allow_register_threads();
heap->multithreaded = 1;
}
pthread_mutex_unlock(&heap->lock);
struct GC_stack_base base = { stack_base }; struct GC_stack_base base = { stack_base };
GC_register_my_thread(&base); GC_register_my_thread(&base);
return GC_malloc(sizeof(struct context)); return add_mutator(heap);
} }
static void finish_gc_for_thread(struct context *cx) { static void finish_gc_for_thread(struct mutator *mut) {
GC_unregister_my_thread(); GC_unregister_my_thread();
} }
static inline void print_start_gc_stats(struct context *cx) { static inline void print_start_gc_stats(struct heap *heap) {
} }
static inline void print_end_gc_stats(struct context *cx) { static inline void print_end_gc_stats(struct heap *heap) {
printf("Completed %ld collections\n", (long)GC_get_gc_no()); printf("Completed %ld collections\n", (long)GC_get_gc_no());
printf("Heap size is %ld\n", (long)GC_get_heap_size()); printf("Heap size is %ld\n", (long)GC_get_heap_size());
} }

116
mt-gcbench.c
View file

@ -91,16 +91,16 @@ visit_double_array_fields(DoubleArray *obj,
typedef HANDLE_TO(Node) NodeHandle; typedef HANDLE_TO(Node) NodeHandle;
typedef HANDLE_TO(DoubleArray) DoubleArrayHandle; typedef HANDLE_TO(DoubleArray) DoubleArrayHandle;
static Node* allocate_node(struct context *cx) { static Node* allocate_node(struct mutator *mut) {
// memset to 0 by the collector. // memset to 0 by the collector.
return allocate(cx, ALLOC_KIND_NODE, sizeof (Node)); return allocate(mut, ALLOC_KIND_NODE, sizeof (Node));
} }
static DoubleArray* allocate_double_array(struct context *cx, static DoubleArray* allocate_double_array(struct mutator *mut,
size_t size) { size_t size) {
// May be uninitialized. // May be uninitialized.
DoubleArray *ret = DoubleArray *ret =
allocate_pointerless(cx, ALLOC_KIND_DOUBLE_ARRAY, allocate_pointerless(mut, ALLOC_KIND_DOUBLE_ARRAY,
sizeof(DoubleArray) + sizeof (double) * size); sizeof(DoubleArray) + sizeof (double) * size);
ret->length = size; ret->length = size;
return ret; return ret;
@ -128,44 +128,44 @@ static int compute_num_iters(int i) {
} }
// Build tree top down, assigning to older objects. // Build tree top down, assigning to older objects.
static void populate(struct context *cx, int depth, Node *node) { static void populate(struct mutator *mut, int depth, Node *node) {
if (depth <= 0) if (depth <= 0)
return; return;
NodeHandle self = { node }; NodeHandle self = { node };
PUSH_HANDLE(cx, self); PUSH_HANDLE(mut, self);
NodeHandle l = { allocate_node(cx) }; NodeHandle l = { allocate_node(mut) };
PUSH_HANDLE(cx, l); PUSH_HANDLE(mut, l);
NodeHandle r = { allocate_node(cx) }; NodeHandle r = { allocate_node(mut) };
PUSH_HANDLE(cx, r); PUSH_HANDLE(mut, r);
set_field((void**)&HANDLE_REF(self)->left, HANDLE_REF(l)); set_field((void**)&HANDLE_REF(self)->left, HANDLE_REF(l));
set_field((void**)&HANDLE_REF(self)->right, HANDLE_REF(r)); set_field((void**)&HANDLE_REF(self)->right, HANDLE_REF(r));
populate(cx, depth-1, HANDLE_REF(self)->left); populate(mut, depth-1, HANDLE_REF(self)->left);
populate(cx, depth-1, HANDLE_REF(self)->right); populate(mut, depth-1, HANDLE_REF(self)->right);
POP_HANDLE(cx); POP_HANDLE(mut);
POP_HANDLE(cx); POP_HANDLE(mut);
POP_HANDLE(cx); POP_HANDLE(mut);
} }
// Build tree bottom-up // Build tree bottom-up
static Node* make_tree(struct context *cx, int depth) { static Node* make_tree(struct mutator *mut, int depth) {
if (depth <= 0) if (depth <= 0)
return allocate_node(cx); return allocate_node(mut);
NodeHandle left = { make_tree(cx, depth-1) }; NodeHandle left = { make_tree(mut, depth-1) };
PUSH_HANDLE(cx, left); PUSH_HANDLE(mut, left);
NodeHandle right = { make_tree(cx, depth-1) }; NodeHandle right = { make_tree(mut, depth-1) };
PUSH_HANDLE(cx, right); PUSH_HANDLE(mut, right);
Node *result = allocate_node(cx); Node *result = allocate_node(mut);
init_field((void**)&result->left, HANDLE_REF(left)); init_field((void**)&result->left, HANDLE_REF(left));
init_field((void**)&result->right, HANDLE_REF(right)); init_field((void**)&result->right, HANDLE_REF(right));
POP_HANDLE(cx); POP_HANDLE(mut);
POP_HANDLE(cx); POP_HANDLE(mut);
return result; return result;
} }
@ -186,18 +186,18 @@ static void validate_tree(Node *tree, int depth) {
#endif #endif
} }
static void time_construction(struct context *cx, int depth) { static void time_construction(struct mutator *mut, int depth) {
int num_iters = compute_num_iters(depth); int num_iters = compute_num_iters(depth);
NodeHandle temp_tree = { NULL }; NodeHandle temp_tree = { NULL };
PUSH_HANDLE(cx, temp_tree); PUSH_HANDLE(mut, temp_tree);
printf("Creating %d trees of depth %d\n", num_iters, depth); printf("Creating %d trees of depth %d\n", num_iters, depth);
{ {
unsigned long start = current_time(); unsigned long start = current_time();
for (int i = 0; i < num_iters; ++i) { for (int i = 0; i < num_iters; ++i) {
HANDLE_SET(temp_tree, allocate_node(cx)); HANDLE_SET(temp_tree, allocate_node(mut));
populate(cx, depth, HANDLE_REF(temp_tree)); populate(mut, depth, HANDLE_REF(temp_tree));
validate_tree(HANDLE_REF(temp_tree), depth); validate_tree(HANDLE_REF(temp_tree), depth);
HANDLE_SET(temp_tree, NULL); HANDLE_SET(temp_tree, NULL);
} }
@ -208,7 +208,7 @@ static void time_construction(struct context *cx, int depth) {
{ {
long start = current_time(); long start = current_time();
for (int i = 0; i < num_iters; ++i) { for (int i = 0; i < num_iters; ++i) {
HANDLE_SET(temp_tree, make_tree(cx, depth)); HANDLE_SET(temp_tree, make_tree(mut, depth));
validate_tree(HANDLE_REF(temp_tree), depth); validate_tree(HANDLE_REF(temp_tree), depth);
HANDLE_SET(temp_tree, NULL); HANDLE_SET(temp_tree, NULL);
} }
@ -216,7 +216,7 @@ static void time_construction(struct context *cx, int depth) {
elapsed_millis(start)); elapsed_millis(start));
} }
POP_HANDLE(cx); POP_HANDLE(mut);
} }
static void* call_with_stack_base(void* (*)(uintptr_t*, void*), void*) NEVER_INLINE; static void* call_with_stack_base(void* (*)(uintptr_t*, void*), void*) NEVER_INLINE;
@ -232,46 +232,46 @@ static void* call_with_stack_base(void* (*f)(uintptr_t *stack_base, void *arg),
} }
struct call_with_gc_data { struct call_with_gc_data {
void* (*f)(struct context *); void* (*f)(struct mutator *);
struct context *parent; struct heap *heap;
}; };
static void* call_with_gc_inner(uintptr_t *stack_base, void *arg) { static void* call_with_gc_inner(uintptr_t *stack_base, void *arg) {
struct call_with_gc_data *data = arg; struct call_with_gc_data *data = arg;
struct context *cx = initialize_gc_for_thread(stack_base, data->parent); struct mutator *mut = initialize_gc_for_thread(stack_base, data->heap);
void *ret = data->f(cx); void *ret = data->f(mut);
finish_gc_for_thread(cx); finish_gc_for_thread(mut);
return ret; return ret;
} }
static void* call_with_gc(void* (*f)(struct context *), static void* call_with_gc(void* (*f)(struct mutator *),
struct context *parent) { struct heap *heap) {
struct call_with_gc_data data = { f, parent }; struct call_with_gc_data data = { f, heap };
return call_with_stack_base(call_with_gc_inner, &data); return call_with_stack_base(call_with_gc_inner, &data);
} }
static void* run_one_test(struct context *cx) { static void* run_one_test(struct mutator *mut) {
NodeHandle long_lived_tree = { NULL }; NodeHandle long_lived_tree = { NULL };
NodeHandle temp_tree = { NULL }; NodeHandle temp_tree = { NULL };
DoubleArrayHandle array = { NULL }; DoubleArrayHandle array = { NULL };
PUSH_HANDLE(cx, long_lived_tree); PUSH_HANDLE(mut, long_lived_tree);
PUSH_HANDLE(cx, temp_tree); PUSH_HANDLE(mut, temp_tree);
PUSH_HANDLE(cx, array); PUSH_HANDLE(mut, array);
// Create a long lived object // Create a long lived object
printf(" Creating a long-lived binary tree of depth %d\n", printf(" Creating a long-lived binary tree of depth %d\n",
long_lived_tree_depth); long_lived_tree_depth);
HANDLE_SET(long_lived_tree, allocate_node(cx)); HANDLE_SET(long_lived_tree, allocate_node(mut));
populate(cx, long_lived_tree_depth, HANDLE_REF(long_lived_tree)); populate(mut, long_lived_tree_depth, HANDLE_REF(long_lived_tree));
// Create long-lived array, filling half of it // Create long-lived array, filling half of it
printf(" Creating a long-lived array of %d doubles\n", array_size); printf(" Creating a long-lived array of %d doubles\n", array_size);
HANDLE_SET(array, allocate_double_array(cx, array_size)); HANDLE_SET(array, allocate_double_array(mut, array_size));
for (int i = 0; i < array_size/2; ++i) { for (int i = 0; i < array_size/2; ++i) {
HANDLE_REF(array)->values[i] = 1.0/i; HANDLE_REF(array)->values[i] = 1.0/i;
} }
for (int d = min_tree_depth; d <= max_tree_depth; d += 2) { for (int d = min_tree_depth; d <= max_tree_depth; d += 2) {
time_construction(cx, d); time_construction(mut, d);
} }
validate_tree(HANDLE_REF(long_lived_tree), long_lived_tree_depth); validate_tree(HANDLE_REF(long_lived_tree), long_lived_tree_depth);
@ -282,15 +282,15 @@ static void* run_one_test(struct context *cx) {
|| HANDLE_REF(array)->values[1000] != 1.0/1000) || HANDLE_REF(array)->values[1000] != 1.0/1000)
fprintf(stderr, "Failed\n"); fprintf(stderr, "Failed\n");
POP_HANDLE(cx); POP_HANDLE(mut);
POP_HANDLE(cx); POP_HANDLE(mut);
POP_HANDLE(cx); POP_HANDLE(mut);
return NULL; return NULL;
} }
static void* run_one_test_in_thread(void *arg) { static void* run_one_test_in_thread(void *arg) {
struct context *parent_cx = arg; struct heap *heap = arg;
return call_with_gc(run_one_test, parent_cx); return call_with_gc(run_one_test, heap);
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -320,8 +320,9 @@ int main(int argc, char *argv[]) {
} }
size_t heap_size = heap_max_live * multiplier * nthreads; size_t heap_size = heap_max_live * multiplier * nthreads;
struct context *cx = initialize_gc(heap_size); struct heap *heap;
if (!cx) { struct mutator *mut;
if (!initialize_gc(heap_size, &heap, &mut)) {
fprintf(stderr, "Failed to initialize GC with heap size %zu bytes\n", fprintf(stderr, "Failed to initialize GC with heap size %zu bytes\n",
heap_size); heap_size);
return 1; return 1;
@ -329,21 +330,21 @@ int main(int argc, char *argv[]) {
printf("Garbage Collector Test\n"); printf("Garbage Collector Test\n");
printf(" Live storage will peak at %zd bytes.\n\n", heap_max_live); printf(" Live storage will peak at %zd bytes.\n\n", heap_max_live);
print_start_gc_stats(cx); print_start_gc_stats(heap);
unsigned long start = current_time(); unsigned long start = current_time();
pthread_t threads[MAX_THREAD_COUNT]; pthread_t threads[MAX_THREAD_COUNT];
// Run one of the threads in the main thread. // Run one of the threads in the main thread.
for (size_t i = 1; i < nthreads; i++) { for (size_t i = 1; i < nthreads; i++) {
int status = pthread_create(&threads[i], NULL, run_one_test_in_thread, cx); int status = pthread_create(&threads[i], NULL, run_one_test_in_thread, heap);
if (status) { if (status) {
errno = status; errno = status;
perror("Failed to create thread"); perror("Failed to create thread");
return 1; return 1;
} }
} }
run_one_test(cx); run_one_test(mut);
for (size_t i = 1; i < nthreads; i++) { for (size_t i = 1; i < nthreads; i++) {
int status = pthread_join(threads[i], NULL); int status = pthread_join(threads[i], NULL);
if (status) { if (status) {
@ -354,6 +355,5 @@ int main(int argc, char *argv[]) {
} }
printf("Completed in %.3f msec\n", elapsed_millis(start)); printf("Completed in %.3f msec\n", elapsed_millis(start));
print_end_gc_stats(cx); print_end_gc_stats(heap);
} }