Skip to content
Open
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/gf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3279,7 +3279,8 @@ 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, int is_recompile)
static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time,
int is_recompile, int is_nested)
{
static ios_t f_precompile;
static JL_STREAM* s_precompile = NULL;
Expand Down Expand Up @@ -3318,6 +3319,9 @@ static void record_precompile_statement(jl_method_instance_t *mi, double compila
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 @@ -3528,7 +3532,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
// unspec is probably not specsig, but might be using specptr
jl_atomic_store_relaxed(&codeinst->specsigflags, specsigflags & ~0b1); // clear specsig flag
jl_mi_cache_insert(mi, codeinst);
record_precompile_statement(mi, 0, 0);
record_precompile_statement(mi, 0, 0, 0);
return codeinst;
}
}
Expand All @@ -3545,7 +3549,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
0, 1, ~(size_t)0, 0, jl_nothing, NULL, NULL);
jl_atomic_store_release(&codeinst->invoke, jl_fptr_interpret_call);
jl_mi_cache_insert(mi, codeinst);
record_precompile_statement(mi, 0, 0);
record_precompile_statement(mi, 0, 0, 0);
return codeinst;
}
if (compile_option == JL_OPTIONS_COMPILE_OFF) {
Expand All @@ -3559,6 +3563,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t

// Everything from here on is considered (user facing) compile time
uint64_t compilation_start = jl_hrtime();
int is_nested_compile = (jl_current_task->reentrant_timing & 1);
uint64_t inference_start = jl_typeinf_timing_begin(); // Special-handling for reentrancy

// Is a recompile if there is cached code, and it was compiled (not only inferred) before
Expand Down Expand Up @@ -3600,7 +3605,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
codeinst = NULL;
}
else if (did_compile && codeinst->owner == jl_nothing) {
record_precompile_statement(mi, compile_time, is_recompile);
record_precompile_statement(mi, compile_time, is_recompile, is_nested_compile);
}
JL_GC_POP();
}
Expand Down
Loading