Revert "generate precompile as part of build process (#28118)" (#28318)

This reverts commit b43e7ad.

Makefile

@@ -206,7 +206,7 @@ define sysimg_builder
 $$(build_private_libdir)/sys$1-o.a $$(build_private_libdir)/sys$1-bc.a : $$(build_private_libdir)/sys$1-%.a : $$(build_private_libdir)/sys.ji
 	@$$(call PRINT_JULIA, cd $$(JULIAHOME)/base && \
 	if ! $$(call spawn,$3) $2 -C "$$(JULIA_CPU_TARGET)" --output-$$* $$(call cygpath_w,$$@).tmp $$(JULIA_SYSIMG_BUILD_FLAGS) \
-		--startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$<) $$(call cygpath_w,$$(JULIAHOME)/contrib/generate_precompile.jl) $$(call cygpath_w,$$<); then \
+		--startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$<) -e nothing; then \
 		echo '*** This error is usually fixed by running `make clean`. If the error persists$$(COMMA) try `make cleanall`. ***'; \
 		false; \
 	fi )

base/options.jl

@@ -26,7 +26,6 @@ struct JLOptions
     warn_overwrite::Int8
     can_inline::Int8
     polly::Int8
-    trace_compile::Int8
     fast_math::Int8
     worker::Int8
     cookie::Ptr{UInt8}

base/sysimg.jl

@@ -522,9 +522,9 @@ let
             :SuiteSparse,
             :Distributed,
             :SharedArrays,
+            :Pkg,
             :Test,
             :REPL,
-            :Pkg,
             :Statistics,
         ]
 
@@ -922,9 +922,11 @@ Base.init_load_path() # want to be able to find external packages in userimg.jl
 
 let
 tot_time_userimg = @elapsed (Base.isfile("userimg.jl") && Base.include(Main, "userimg.jl"))
+tot_time_precompile = Base.is_primary_base_module ? (@elapsed Base.include(Base, "precompile.jl")) : 0.0
+
 
 tot_time_base = (Base.end_base_include - Base.start_base_include) * 10.0^(-9)
-tot_time = tot_time_base + Base.tot_time_stdlib[] + tot_time_userimg
+tot_time = tot_time_base + Base.tot_time_stdlib[] + tot_time_userimg + tot_time_precompile
 
 println("Sysimage built. Summary:")
 print("Total ─────── "); Base.time_print(tot_time               * 10^9); print(" \n");
@@ -933,6 +935,7 @@ print("Stdlibs: ──── "); Base.time_print(Base.tot_time_stdlib[] * 10^9);
 if isfile("userimg.jl")
 print("Userimg: ──── "); Base.time_print(tot_time_userimg       * 10^9); print(" "); show(IOContext(stdout, :compact=>true), (tot_time_userimg       / tot_time) * 100); println("%")
 end
+print("Precompile: ─ "); Base.time_print(tot_time_precompile    * 10^9); print(" "); show(IOContext(stdout, :compact=>true), (tot_time_precompile    / tot_time) * 100); println("%")
 end
 
 empty!(LOAD_PATH)

contrib/add_license_to_files.jl

@@ -30,6 +30,7 @@ const excludedirs = [
 
 const skipfiles = [
     "../contrib/add_license_to_files.jl",
+    "../contrib/fixup_precompile.jl",
     # files to check - already copyright
     # see: https://github.com/JuliaLang/julia/pull/11073#issuecomment-98099389
     "../base/special/trig.jl",

contrib/fixup_precompile.jl

@@ -0,0 +1,70 @@
+# This file is a part of Julia. License is MIT: https://julialang.org/license
+
+function needs_USE_GPL_LIBS(s::String)
+    occursin("CHOLMOD", s) && return true
+    return false
+end
+
+const HEADER = """
+# This file is a part of Julia. License is MIT: https://julialang.org/license
+
+# Steps to regenerate this file:
+# 1. Remove all `precompile` calls
+# 2. Rebuild system image
+# 3. Enable TRACE_COMPILE in options.h and rebuild
+# 4. Run `./julia 2> precompiles.txt` and do various things.
+# 5. Run `./julia contrib/fixup_precompile.jl precompiles.txt to overwrite `precompile.jl`
+#    or ./julia contrib/fixup_precompile.jl --merge precompiles.txt to merge into existing
+#    `precompile.jl`
+"""
+
+function fixup_precompile(new_precompile_file; merge=false)
+    old_precompile_file = joinpath(Sys.BINDIR, "..", "..", "base", "precompile.jl")
+    precompile_statements = Set{String}()
+
+    for file in [new_precompile_file; merge ? old_precompile_file : []]
+        for line in eachline(file)
+            line = strip(line)
+            # filter out closures, which might have different generated names in different environments
+            occursin(r"#[0-9]", line) && continue
+            # Other stuff than precompile statements might have been written to STDERR
+            startswith(line, "precompile(Tuple{") || continue
+            # Ok, add the line
+            push!(precompile_statements, line)
+        end
+    end
+
+    open(old_precompile_file, "w") do f
+        println(f, HEADER)
+        println(f, """
+        let
+        PrecompileStagingArea = Module()
+        for (_pkgid, _mod) in Base.loaded_modules
+            if !(_pkgid.name in ("Main", "Core", "Base"))
+                @eval PrecompileStagingArea \$(Symbol(_mod)) = \$_mod
+            end
+        end
+        @eval PrecompileStagingArea begin""")
+        for statement in sort(collect(precompile_statements))
+            isgpl = needs_USE_GPL_LIBS(statement)
+            isgpl && print(f, "if Base.USE_GPL_LIBS\n    ")
+            println(f, statement)
+            isgpl && println(f, "end")
+        end
+        println(f, "end\nend")
+    end
+    if merge
+        "Merged $new_precompile_file into $old_precompile_file"
+    else
+        "Overwrite $old_precompile_file with $new_precompile_file"
+    end
+end
+
+if length(ARGS) == 1
+    fixup_precompile(joinpath(pwd(), ARGS[1]))
+elseif length(ARGS) == 2
+    @assert ARGS[1] == "--merge"
+    fixup_precompile(joinpath(pwd(), ARGS[2]); merge = true)
+else
+    error("invalid arguments")
+end

src/gf.c

@@ -1088,13 +1088,13 @@ static jl_method_instance_t *jl_mt_assoc_by_type(jl_methtable_t *mt, jl_datatype
     if (entry != NULL) {
         jl_method_t *m = entry->func.method;
         if (!jl_has_call_ambiguities((jl_value_t*)tt, m)) {
-            if (jl_options.trace_compile) {
-                if (!jl_has_free_typevars((jl_value_t*)tt)) {
-                    jl_printf(JL_STDERR, "precompile(");
-                    jl_static_show(JL_STDERR, (jl_value_t*)tt);
-                    jl_printf(JL_STDERR, ")\n");
-                }
+#ifdef TRACE_COMPILE
+            if (!jl_has_free_typevars((jl_value_t*)tt)) {
+                jl_printf(JL_STDERR, "precompile(");
+                jl_static_show(JL_STDERR, (jl_value_t*)tt);
+                jl_printf(JL_STDERR, ")\n");
             }
+#endif
             if (!mt_cache) {
                 intptr_t nspec = (mt == jl_type_type_mt ? m->nargs + 1 : mt->max_args + 2);
                 jl_compilation_sig(tt, env, m, nspec, &newparams);