mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-02 02:10:19 +02:00
Code Activity

Merge remote-tracking branch 'whippet/main' into wip-whippet

Browse source
This commit is contained in:
Andy Wingo 2025-05-15 14:47:07 +02:00
commit b97b12a19b
5 changed files with 93 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libguile/whippet/api/gc-embedder-api.h
View file

@ -50,6 +50,25 @@ GC_EMBEDDER_API inline void gc_trace_heap_roots(struct gc_heap_roots *roots,
struct gc_heap *heap,
void *trace_data);
GC_EMBEDDER_API inline void
gc_trace_mutator_conservative_roots(struct gc_mutator_roots *roots,
void (*trace_range)(uintptr_t start,
uintptr_t end,
int possibly_interior,
struct gc_heap *heap,
void *data),
struct gc_heap *heap,
void *data);
GC_EMBEDDER_API inline void
gc_trace_heap_conservative_roots(struct gc_heap_roots *roots,
void (*trace_range)(uintptr_t start,
uintptr_t end,
int possibly_interior,
struct gc_heap *heap,
void *data),
struct gc_heap *heap,
void *data);
GC_EMBEDDER_API inline uintptr_t gc_object_forwarded_nonatomic(struct gc_ref ref);
GC_EMBEDDER_API inline void gc_object_forward_nonatomic(struct gc_ref ref,
struct gc_ref new_ref);

20
libguile/whippet/benchmarks/simple-gc-embedder.h
View file

@ -92,6 +92,26 @@ static inline void gc_trace_heap_roots(struct gc_heap_roots *roots,
visit_roots(roots->roots, trace_edge, heap, trace_data);
}
static inline void
gc_trace_mutator_conservative_roots(struct gc_mutator_roots *roots,
void (*trace_range)(uintptr_t start,
uintptr_t end,
int possibly_interior,
struct gc_heap *heap,
void *data),
struct gc_heap *heap,
void *data) {}
static inline void
gc_trace_heap_conservative_roots(struct gc_heap_roots *roots,
void (*trace_range)(uintptr_t start,
uintptr_t end,
int possibly_interior,
struct gc_heap *heap,
void *data),
struct gc_heap *heap,
void *data) {}
static inline uintptr_t gc_object_forwarded_nonatomic(struct gc_ref ref) {
uintptr_t tag = *tag_word(ref);
return (tag & gcobj_not_forwarded_bit) ? 0 : tag;

23
libguile/whippet/src/bdw.c
View file

@ -228,6 +228,20 @@ static void bdw_mark_edge(struct gc_edge edge, struct gc_heap *heap,
NULL);
}
static void bdw_mark_range(uintptr_t lo, uintptr_t hi, int possibly_interior,
struct gc_heap *heap, void *visit_data) {
struct bdw_mark_state *state = visit_data;
GC_ASSERT_EQ (lo, align_up (lo, sizeof(void*)));
GC_ASSERT_EQ (hi, align_up (hi, sizeof(void*)));
for (void **walk = (void**)lo, **end = (void**)hi; walk < end; walk++)
state->mark_stack_ptr = GC_MARK_AND_PUSH (*walk,
state->mark_stack_ptr,
state->mark_stack_limit,
NULL);
}
static int heap_gc_kind;
static int mutator_gc_kind;
static int ephemeron_gc_kind;
@ -380,8 +394,10 @@ mark_heap(GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
if (heap != __the_bdw_gc_heap)
return state.mark_stack_ptr;
if (heap->roots)
if (heap->roots) {
gc_trace_heap_conservative_roots(heap->roots, bdw_mark_range, heap, &state);
gc_trace_heap_roots(heap->roots, bdw_mark_edge, heap, &state);
}
gc_visit_finalizer_roots(heap->finalizer_state, bdw_mark_edge, heap, &state);
@ -415,8 +431,11 @@ mark_mutator(GC_word *addr, struct GC_ms_entry *mark_stack_ptr,
memset(mut->freelists, 0, sizeof(void*) * GC_INLINE_FREELIST_COUNT);
if (mut->roots)
if (mut->roots) {
gc_trace_mutator_conservative_roots(mut->roots, bdw_mark_range,
mut->heap, &state);
gc_trace_mutator_roots(mut->roots, bdw_mark_edge, mut->heap, &state);
}
state.mark_stack_ptr = GC_MARK_AND_PUSH (mut->next,
state.mark_stack_ptr,

19
libguile/whippet/src/mmc.c
View file

@ -328,7 +328,8 @@ load_conservative_ref(uintptr_t addr) {
static inline void
trace_conservative_edges(uintptr_t low, uintptr_t high, int possibly_interior,
struct gc_heap *heap, struct gc_trace_worker *worker) {
struct gc_heap *heap, void *data) {
struct gc_trace_worker *worker = data;
GC_ASSERT(low == align_down(low, sizeof(uintptr_t)));
GC_ASSERT(high == align_down(high, sizeof(uintptr_t)));
for (uintptr_t addr = low; addr < high; addr += sizeof(uintptr_t))
@ -402,6 +403,14 @@ trace_root(struct gc_root root, struct gc_heap *heap,
gc_field_set_visit_edge_buffer(&heap->remembered_set, root.edge_buffer,
trace_remembered_edge, heap, worker);
break;
case GC_ROOT_KIND_HEAP_CONSERVATIVE_ROOTS:
gc_trace_heap_conservative_roots(root.heap->roots, trace_conservative_edges,
heap, worker);
break;
case GC_ROOT_KIND_MUTATOR_CONSERVATIVE_ROOTS:
gc_trace_mutator_conservative_roots(root.mutator->roots,
trace_conservative_edges, heap, worker);
break;
default:
GC_CRASH();
}
@ -639,9 +648,13 @@ enqueue_mutator_conservative_roots(struct gc_heap *heap) {
int possibly_interior = gc_mutator_conservative_roots_may_be_interior();
for (struct gc_mutator *mut = heap->mutators;
mut;
mut = mut->next)
mut = mut->next) {
gc_stack_visit(&mut->stack, enqueue_conservative_roots, heap,
&possibly_interior);
if (mut->roots)
gc_tracer_add_root(&heap->tracer,
gc_root_mutator_conservative_roots(mut));
}
return 1;
}
return 0;
@ -653,6 +666,8 @@ enqueue_global_conservative_roots(struct gc_heap *heap) {
int possibly_interior = 0;
gc_platform_visit_global_conservative_roots
(enqueue_conservative_roots, heap, &possibly_interior);
if (heap->roots)
gc_tracer_add_root(&heap->tracer, gc_root_heap_conservative_roots(heap));
return 1;
}
return 0;

16
libguile/whippet/src/root.h
View file

@ -18,6 +18,8 @@ enum gc_root_kind {
GC_ROOT_KIND_RESOLVED_EPHEMERONS,
GC_ROOT_KIND_EDGE,
GC_ROOT_KIND_EDGE_BUFFER,
GC_ROOT_KIND_HEAP_CONSERVATIVE_ROOTS,
GC_ROOT_KIND_MUTATOR_CONSERVATIVE_ROOTS,
};
struct gc_root {
@ -78,4 +80,18 @@ gc_root_edge_buffer(struct gc_edge_buffer *buf) {
return ret;
}
static inline struct gc_root
gc_root_heap_conservative_roots(struct gc_heap* heap) {
struct gc_root ret = { GC_ROOT_KIND_HEAP_CONSERVATIVE_ROOTS };
ret.heap = heap;
return ret;
}
static inline struct gc_root
gc_root_mutator_conservative_roots(struct gc_mutator* mutator) {
struct gc_root ret = { GC_ROOT_KIND_MUTATOR_CONSERVATIVE_ROOTS };
ret.mutator = mutator;
return ret;
}
#endif // ROOT_H