Skip to content

Commit 7cd4fff

Browse files
vtjnashKristofferC
authored andcommitted
make compile go faster with native caches (#57500)
Not sure why we make sure compile go slow, so make it go fast. (cherry picked from commit 095fc99)
1 parent 7216482 commit 7cd4fff

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/staticdata.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3821,9 +3821,7 @@ static void jl_restore_system_image_from_stream_(ios_t *f, jl_image_t *image,
38213821
htable_new(&new_dt_objs, 0);
38223822
arraylist_new(&deser_sym, 0);
38233823

3824-
// in --build mode only use sysimg data, not precompiled native code
3825-
int imaging_mode = jl_generating_output() && !jl_options.incremental;
3826-
if (imaging_mode || jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
3824+
if (jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
38273825
memset(&image->fptrs, 0, sizeof(image->fptrs));
38283826
image->gvars_base = NULL;
38293827
IMAGE_NATIVE_CODE_TAINTED = 1;

sysimage.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,13 @@ $(build_private_libdir)/basecompiler.ji: $(COMPILER_SRCS)
7373
--startup-file=no --warn-overwrite=yes --depwarn=error -g$(BOOTSTRAP_DEBUG_LEVEL) -O1 Base_compiler.jl --buildroot $(RELBUILDROOT) --dataroot $(RELDATADIR))
7474
@mv $@.tmp $@
7575

76-
$(build_private_libdir)/sys.ji: $(build_private_libdir)/basecompiler.ji $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
76+
$(build_private_libdir)/basecompiler-o.a $(build_private_libdir)/basecompiler-bc.a: $(build_private_libdir)/basecompiler-%.a : $(COMPILER_SRCS)
77+
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
78+
JULIA_NUM_THREADS=1 $(call spawn,$(JULIA_EXECUTABLE)) -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-$* $(call cygpath_w,$@).tmp \
79+
--startup-file=no --warn-overwrite=yes -g$(BOOTSTRAP_DEBUG_LEVEL) -O1 Base_compiler.jl --buildroot $(RELBUILDROOT) --dataroot $(RELDATADIR))
80+
@mv $@.tmp $@
81+
82+
$(build_private_libdir)/sys.ji: $(build_private_libdir)/basecompiler.$(SHLIB_EXT) $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
7783
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
7884
if ! JULIA_BINDIR=$(call cygpath_w,$(build_bindir)) WINEPATH="$(call cygpath_w,$(build_bindir));$$WINEPATH" \
7985
JULIA_NUM_THREADS=1 $(call spawn, $(JULIA_EXECUTABLE)) -g1 -O1 -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-ji $(call cygpath_w,$@).tmp $(JULIA_SYSIMG_BUILD_FLAGS) \

0 commit comments

Comments
 (0)