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

Resurrect GC parameter caml_major_heap_increment #3672

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −22
Open

Resurrect GC parameter caml_major_heap_increment #3672

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
1 change: 1 addition & 0 deletions runtime/caml/startup_aux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct caml_params {
uintnat init_percent_free;
uintnat init_max_percent_free;
uintnat init_minor_heap_wsz;
uintnat init_major_heap_increment;
uintnat init_custom_major_ratio;
uintnat init_custom_minor_ratio;
uintnat init_custom_minor_max_bsz;
Expand Down
32 changes: 20 additions & 12 deletions runtime/gc_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,9 @@
atomic_uintnat caml_max_stack_wsize;
uintnat caml_fiber_wsz;

extern uintnat caml_major_heap_increment; /* percent or words; see major_gc.c */
extern uintnat caml_major_heap_increment; /* percent or words; see shared_heap.c */
extern uintnat caml_percent_free; /* see major_gc.c */
extern uintnat caml_max_percent_free; /* see major_gc.c */
extern uintnat caml_allocation_policy; /* see freelist.c */
extern uintnat caml_custom_major_ratio; /* see custom.c */
extern uintnat caml_custom_minor_ratio; /* see custom.c */
extern uintnat caml_custom_minor_max_bsz; /* see custom.c */
Expand Down Expand Up @@ -137,7 +136,7 @@ CAMLprim value caml_gc_get(value v)

res = caml_alloc_tuple (11);
Store_field (res, 0, Val_long (Caml_state->minor_heap_wsz)); /* s */
Store_field (res, 1, Val_long (0));
Store_field (res, 1, Val_long (caml_major_heap_increment)); /* i */
Store_field (res, 2, Val_long (caml_percent_free)); /* o */
Store_field (res, 3, Val_long (atomic_load_relaxed(&caml_verb_gc))); /* v */
Store_field (res, 4, Val_long (caml_max_percent_free));
Expand Down Expand Up @@ -175,16 +174,31 @@ static uintnat norm_custom_min (uintnat p)
CAMLprim value caml_gc_set(value v)
{
uintnat newminwsz = caml_norm_minor_heap_size (Long_val (Field (v, 0)));
uintnat newheapincr = Long_val (Field (v, 1));
uintnat newpf = norm_pfree (Long_val (Field (v, 2)));
uintnat new_verb_gc = Long_val (Field (v, 3));
uintnat newpm = norm_pmax (Long_val (Field (v, 4)));
uintnat new_max_stack_size = Long_val (Field (v, 5));
/* ignore fields 6 (allocation policy) and 7 (window size) */
uintnat new_custom_maj = norm_custom_maj (Long_val (Field (v, 8)));
uintnat new_custom_min = norm_custom_min (Long_val (Field (v, 9)));
uintnat new_custom_sz = Long_val (Field (v, 10));

CAML_EV_BEGIN(EV_EXPLICIT_GC_SET);

if (newheapincr != caml_major_heap_increment) {
caml_major_heap_increment = newheapincr;
if (newheapincr > 1000) {
CAML_GC_MESSAGE(PARAMS, "New heap increment size: %"
ARCH_INTNAT_PRINTF_FORMAT "uk words\n",
caml_major_heap_increment/1024);
} else {
CAML_GC_MESSAGE(PARAMS, "New heap increment size: %"
ARCH_INTNAT_PRINTF_FORMAT "u%%\n",
caml_major_heap_increment);
}
}

caml_change_max_stack_size (new_max_stack_size);

if (newpf != caml_percent_free){
Expand Down Expand Up @@ -383,6 +397,7 @@ void caml_init_gc (void)
caml_custom_minor_ratio =
norm_custom_min (caml_params->init_custom_minor_ratio);
caml_custom_minor_max_bsz = caml_params->init_custom_minor_max_bsz;
caml_major_heap_increment = caml_params->init_major_heap_increment;

caml_gc_phase = Phase_sweep_and_mark_main;
#ifdef NATIVE_CODE
Expand All @@ -391,13 +406,6 @@ void caml_init_gc (void)
caml_init_domains(caml_params->max_domains,
caml_params->init_minor_heap_wsz);
caml_init_gc_stats(caml_params->max_domains);

/*
caml_major_heap_increment = major_incr;
caml_percent_free = norm_pfree (percent_fr);
caml_max_percent_free = norm_pmax (percent_m);
caml_init_major_heap (major_heap_size);
*/
}

/* FIXME After the startup_aux.c unification, move these functions there. */
Expand Down Expand Up @@ -568,7 +576,7 @@ CAMLprim value caml_runtime_parameters (value unit)
char *no_tweaks = "";
/* keep in sync with runtime4 and with parse_ocamlrunparam */
value res = caml_alloc_sprintf
("b=%d,c="F_Z",d="F_Z",e="F_Z",l="F_Z
("b=%d,c="F_Z",d="F_Z",e="F_Z",i="F_Z",l="F_Z
",m="F_Z",M="F_Z",n="F_Z",o="F_Z",O="F_Z
",p="F_Z",s="F_Z",t="F_Z",v="F_Z",V="F_Z
",W="F_Z"%s",
Expand All @@ -579,7 +587,7 @@ CAMLprim value caml_runtime_parameters (value unit)
/* e */ caml_params->runtime_events_log_wsize,
/* h is runtime 4 init heap size */
/* H is runtime 4 huge pages */
/* i is runtime 4 heap chunk size */
/* i */ caml_major_heap_increment,
/* l */ caml_max_stack_wsize,
/* m */ caml_custom_minor_ratio,
/* M */ caml_custom_major_ratio,
Expand Down
19 changes: 13 additions & 6 deletions runtime/shared_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,23 @@ void caml_teardown_shared_heap(struct caml_heap_state* heap) {
released, released_large);
}

/* TODO: resurrect major_heap_increment */
uintnat caml_major_heap_increment; /* percent or words */

uintnat new_chunk_bsize(void)
{
uintnat new_pools = pool_freelist.active_pools * 15 / 100;
uintnat min_new_pools =
Wsize_bsize(caml_pool_min_chunk_bsz) / POOL_WSIZE;
if (new_pools < min_new_pools) new_pools = min_new_pools;
uintnat new_pools;
if (caml_major_heap_increment > 1000) {
new_pools =
(caml_major_heap_increment + (POOL_WSIZE-1)) / POOL_WSIZE;
} else {
new_pools = pool_freelist.active_pools * caml_major_heap_increment / 100;
}
uintnat bsize = Bsize_wsize(new_pools * POOL_WSIZE);
if (bsize < caml_pool_min_chunk_bsz) {
bsize = caml_pool_min_chunk_bsz;
}

return caml_mem_round_up_mapping_size(Bsize_wsize(POOL_WSIZE) * new_pools);
return caml_mem_round_up_mapping_size(bsize);
}

uintnat caml_shared_heap_grow_bsize(void)
Expand Down
2 changes: 1 addition & 1 deletion runtime/startup_aux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static void parse_ocamlrunparam(char_os* opt)
case 'e': scanmult (opt, &params.runtime_events_log_wsize); break;
case 'h': break; /* init heap size in runtime 4 */
case 'H': break; /* use huge pages in runtime 4 */
case 'i': break; /* heap chunk size in runtime 4 */
case 'i': scanmult (opt, &params.init_major_heap_increment); break;
case 'l': scanmult (opt, &params.init_max_stack_wsz); break;
case 'm': scanmult (opt, &params.init_custom_minor_ratio); break;
case 'M': scanmult (opt, &params.init_custom_major_ratio); break;
Expand Down
4 changes: 1 addition & 3 deletions stdlib/gc.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,7 @@ type control =
number is less than or equal to 1000, it is a percentage of
the current heap size (i.e. setting it to 100 will double the heap
size at each increase). If it is more than 1000, it is a fixed
number of words that will be added to the heap. Default: 15.
This metric is currently not available in OCaml 5: the field value is
always [0]. *)
number of words that will be added to the heap. Default: 15. *)

space_overhead : int;
(** The major GC speed is computed from this parameter.
Expand Down