Skip to content

Backport: In --trace-compile Tag nested precompiles with # nested const compilation. (#59366) #252

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

Open
wants to merge 1 commit into
base: v1.10.2+RAI
Choose a base branch
from
Open

Backport: In --trace-compile Tag nested precompiles with # nested const compilation. (#59366) #252

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
24 changes: 19 additions & 5 deletions src/gf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,7 +2392,10 @@ JL_DLLEXPORT void jl_force_trace_compile_timing_disable(void)
jl_atomic_fetch_add(&jl_force_trace_compile_timing_enabled, -1);
}

static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time)
static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time,
// NOTE: These two parameters were backported in from #59366. is_recompile is not
// currently used in our fork, though we could add it w/ some effort.
int is_recompile, int is_nested)
{
static ios_t f_precompile;
static JL_STREAM* s_precompile = NULL;
Expand Down Expand Up @@ -2420,7 +2423,17 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila
jl_printf(s_precompile, "#= %6.1f =# ", compilation_time / 1e6);
jl_printf(s_precompile, "precompile(");
jl_static_show(s_precompile, mi->specTypes);
jl_printf(s_precompile, ")\n");
jl_printf(s_precompile, ")");
if (is_recompile) {
jl_printf(s_precompile, " # recompile");
if (s_precompile == JL_STDERR && jl_options.color != JL_OPTIONS_COLOR_OFF) {
jl_printf(s_precompile, "\e[0m");
}
}
if (is_nested) {
jl_printf(s_precompile, " # nested const compilation");
}
jl_printf(s_precompile, "\n");
if (s_precompile != JL_STDERR)
ios_flush(&f_precompile);
}
Expand Down Expand Up @@ -2580,7 +2593,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
codeinst->rettype_const = unspec->rettype_const;
jl_atomic_store_release(&codeinst->invoke, unspec_invoke);
jl_mi_cache_insert(mi, codeinst);
record_precompile_statement(mi, 0);
record_precompile_statement(mi, 0, 0, 0);
return codeinst;
}
}
Expand All @@ -2597,7 +2610,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
0, 1, ~(size_t)0, 0, 0, jl_nothing, 0);
jl_atomic_store_release(&codeinst->invoke, jl_fptr_interpret_call);
jl_mi_cache_insert(mi, codeinst);
record_precompile_statement(mi, 0);
record_precompile_statement(mi, 0, 0, 0);
return codeinst;
}
if (compile_option == JL_OPTIONS_COMPILE_OFF) {
Expand All @@ -2609,6 +2622,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t

double compile_time = jl_hrtime();
int did_compile = 0;
int is_nested_compile = (jl_current_task->reentrant_timing & 1);
codeinst = jl_generate_fptr(mi, world, &did_compile);
compile_time = jl_hrtime() - compile_time;

Expand Down Expand Up @@ -2652,7 +2666,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
jl_mi_cache_insert(mi, codeinst);
}
else if (did_compile) {
record_precompile_statement(mi, compile_time);
record_precompile_statement(mi, compile_time, 0, is_nested_compile);
}
jl_atomic_store_relaxed(&codeinst->precompile, 1);
return codeinst;
Expand Down