Skip to content

Commit 095fc99

Browse files
authored
make compile go faster with native caches (#57500)
Not sure why we make sure compile go slow, so make it go fast.
1 parent 7b4c6d6 commit 095fc99

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
@@ -3654,9 +3654,7 @@ static void jl_restore_system_image_from_stream_(ios_t *f, jl_image_t *image, jl
36543654
htable_new(&new_dt_objs, 0);
36553655
arraylist_new(&deser_sym, 0);
36563656

3657-
// in --build mode only use sysimg data, not precompiled native code
3658-
int imaging_mode = jl_generating_output() && !jl_options.incremental;
3659-
if (imaging_mode || jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
3657+
if (jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
36603658
memset(&image->fptrs, 0, sizeof(image->fptrs));
36613659
image->gvars_base = NULL;
36623660
IMAGE_NATIVE_CODE_TAINTED = 1;

sysimage.mk

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

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