static compile round 2

.travis.yml

@@ -15,7 +15,7 @@ notifications:
           - http://criid.ee.washington.edu:8000/travis-hook
           - http://julia.mit.edu:8000/travis-hook
 before_install:
-    - BUILDOPTS="LLVM_CONFIG=llvm-config-3.3 VERBOSE=1 USE_BLAS64=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND READLINE GRISU OPENLIBM RMATH; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
+    - BUILDOPTS="LLVM_CONFIG=llvm-config-3.3 LLVM_LLC=llc-3.3 VERBOSE=1 USE_BLAS64=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND READLINE GRISU OPENLIBM RMATH; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
     - sudo apt-get update -qq -y
     - sudo apt-get install zlib1g-dev
     - sudo add-apt-repository ppa:staticfloat/julia-deps -y

Make.inc

@@ -248,6 +248,9 @@ ifneq ($(ARCH), ppc64)
 endif
 endif
 
+ifeq ($(OS),WINNT)
+LIBUNWIND=
+else
 ifeq ($(USE_SYSTEM_LIBUNWIND), 1)
 ifneq ($(OS),Darwin)
 LIBUNWIND=-lunwind-generic -lunwind
@@ -260,11 +263,14 @@ else
 LIBUNWIND=$(BUILD)/$(JL_LIBDIR)/libunwind-generic.a $(BUILD)/$(JL_LIBDIR)/libunwind.a
 endif
 endif
+endif
 
 ifeq ($(USE_SYSTEM_LLVM), 1)
 LLVM_CONFIG ?= llvm-config$(EXE)
+LLVM_LLC ?= llc$(EXE)
 else
 LLVM_CONFIG=$(LLVMROOT)/bin/llvm-config$(EXE)
+LLVM_LLC=$(LLVMROOT)/bin/llc$(EXE)
 endif
 
 ifeq ($(USE_SYSTEM_READLINE), 1)

Makefile

@@ -33,7 +33,7 @@ $(foreach link,base test doc examples,$(eval $(call symlink_target,$(link),$(BUI
 debug release: | $(DIRS) $(BUILD)/share/julia/base $(BUILD)/share/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples $(BUILD)/etc/julia/juliarc.jl
 	@$(MAKE) $(QUIET_MAKE) julia-$@
 	@export JL_PRIVATE_LIBDIR=$(JL_PRIVATE_LIBDIR) && \
-	$(MAKE) $(QUIET_MAKE) LD_LIBRARY_PATH=$(BUILD)/lib:$(LD_LIBRARY_PATH) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$@)" $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji
+	$(MAKE) $(QUIET_MAKE) LD_LIBRARY_PATH=$(BUILD)/lib:$(LD_LIBRARY_PATH) JULIA_EXECUTABLE="$(JULIA_EXECUTABLE_$@)" $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.$(SHLIB_EXT)
 
 julia-debug-symlink:
 	@ln -sf $(BUILD)/bin/julia-debug-$(DEFAULT_REPL) julia
@@ -65,15 +65,24 @@ $(BUILD)/etc/julia/juliarc.jl: etc/juliarc.jl | $(BUILD)/etc/julia
 	@cp $< $@
 
 # use sys.ji if it exists, otherwise run two stages
-$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.ji:
+$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%ji: $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%bc
+
+$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%o: $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%bc
+	$(call spawn,$(LLVM_LLC)) -filetype=obj -relocation-model=pic -o $@ $<
+
+$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%$(SHLIB_EXT): $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys%o
+	$(CXX) -shared -fPIC -L$(BUILD)/$(JL_PRIVATE_LIBDIR) -L$(BUILD)/$(JL_LIBDIR) -o $@ $< \
+		$$([ $(OS) = Darwin ] && echo -Wl,-undefined,dynamic_lookup || echo -Wl,--unresolved-symbols,ignore-all ) \
+		$$([ $(OS) = WINNT ] && echo -ljulia -lssp)
+
+$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.bc:
 	@$(QUIET_JULIA) cd base && \
-	$(call spawn,$(JULIA_EXECUTABLE)) -bf sysimg.jl
-	mv $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.ji
+	$(call spawn,$(JULIA_EXECUTABLE)) --build $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0 sysimg.jl
 
-$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl base/pkg/*.jl base/linalg/*.jl base/sparse/*.jl $(BUILD)/share/julia/helpdb.jl $(BUILD)/share/man/man1/julia.1 $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.ji
+$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.bc: VERSION base/*.jl base/pkg/*.jl base/linalg/*.jl base/sparse/*.jl $(BUILD)/share/julia/helpdb.jl $(BUILD)/share/man/man1/julia.1 $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.$(SHLIB_EXT)
 	@$(QUIET_JULIA) cd base && \
-	$(call spawn,$(JULIA_EXECUTABLE)) -f \
-		`[ -e $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji ] || echo -J"$(BUILD)/$(JL_PRIVATE_LIBDIR)/sys0.ji"` sysimg.jl \
+	$(call spawn,$(JULIA_EXECUTABLE)) --build $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys \
+		-J$(BUILD)/$(JL_PRIVATE_LIBDIR)/$$([ -e $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji ] && echo sys.ji || echo sys0.ji) -f sysimg.jl \
 		|| (echo "*** This error is usually fixed by running 'make clean'. If the error persists, try 'make cleanall'. ***" && false)
 
 run-julia-debug run-julia-release: run-julia-%:
@@ -157,16 +166,18 @@ endif
 
 PREFIX ?= julia-$(JULIA_COMMIT)
 install:
-	@$(MAKE) $(QUIET_MAKE) debug
 	@$(MAKE) $(QUIET_MAKE) release
+	@$(MAKE) $(QUIET_MAKE) debug
 	@for subdir in "bin" "libexec" $(JL_LIBDIR) $(JL_PRIVATE_LIBDIR) "share/julia" "share/man/man1" "include/julia" "share/julia/site/"$(VERSDIR) "etc/julia" ; do \
 		mkdir -p $(PREFIX)/$$subdir ; \
 	done
 	cp -a $(BUILD)/bin/julia* $(PREFIX)/bin/
-	-cp -a $(BUILD)/bin/*.dll $(BUILD)/bin/*.bat $(PREFIX)/bin/
-	cp -a $(BUILD)/libexec $(PREFIX)
+	#-cp -a $(BUILD)/bin/llc$(EXE) $(PREFIX)/libexec # this needs libLLVM-3.3.$(SHLIB_EXT)
 ifneq ($(OS),WINNT)
+	cp -a $(BUILD)/libexec $(PREFIX)
 	cd $(PREFIX)/bin && ln -sf julia-$(DEFAULT_REPL) julia
+else
+	cp -a $(BUILD)/bin/*.dll $(BUILD)/bin/*.bat $(PREFIX)/bin/
 endif
 	for suffix in $(JL_LIBS) ; do \
 		cp -a $(BUILD)/$(JL_LIBDIR)/lib$${suffix}*.$(SHLIB_EXT)* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
@@ -186,6 +197,7 @@ endif
 	cp -a src/julia.h src/support/*.h $(PREFIX)/include/julia
 	# Copy system image
 	cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(PREFIX)/$(JL_PRIVATE_LIBDIR)
+	cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.$(SHLIB_EXT) $(PREFIX)/$(JL_PRIVATE_LIBDIR)
 	# Copy in all .jl sources as well
 	cp -R -L $(BUILD)/share/julia $(PREFIX)/share/
 ifeq ($(OS), WINNT)
@@ -232,7 +244,6 @@ ifeq ($(OS), WINNT)
    		cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll ../$(PREFIX)/bin && \
 	    mkdir ../$(PREFIX)/Git && \
 	    7z x PortableGit.7z -o"../$(PREFIX)/Git" )
-	cd $(PREFIX)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
 	./dist-extras/7z a -mx9 -sfx7z.sfx julia-$(JULIA_COMMIT)-$(OS)-$(ARCH).exe julia-$(JULIA_COMMIT)
 else
 	tar zcvf julia-$(JULIA_COMMIT)-$(OS)-$(ARCH).tar.gz julia-$(JULIA_COMMIT)

base/precompile.jl

@@ -0,0 +1,162 @@
+include = include_from_node1
+
+# prime method cache with some things we know we'll need right after startup
+precompile(pwd, ())
+precompile(fdio, (Int32,))
+precompile(ProcessGroup, (Int, Array{Any,1}, Array{Any,1}))
+precompile(next, (Dict{Any,Any}, Int))
+precompile(start, (Dict{Any,Any},))
+precompile(perform_work, ())
+precompile(isempty, (Array{Any,1},))
+precompile(getindex, (Dict{Any,Any}, Int32))
+precompile(event_loop, (Bool,))
+precompile(_start, ())
+precompile(process_options, (Array{Any,1},))
+precompile(run_repl, ())
+precompile(any, (Function, Array{Any,1}))
+precompile(Dict{Any,Any}, (Int,))
+precompile(Set, ())
+precompile(setindex!, (Dict{Any,Any}, Bool, Cmd))
+precompile(rehash, (Dict{Any,Any}, Int))
+precompile(wait, (Int32,))
+precompile(systemerror, (Symbol, Bool))
+precompile(SystemError, (ASCIIString,))
+precompile(has, (EnvHash, ASCIIString))
+precompile(parse_input_line, (ASCIIString,))
+precompile(cmp, (Int32, Int32))
+precompile(min, (Int32, Int32))
+precompile(==, (ASCIIString, ASCIIString))
+precompile(arg_gen, (ASCIIString,))
+precompile(Random.librandom_init, ())
+precompile(Random.srand, (ASCIIString, Int))
+precompile(Random.srand, (Uint64,))
+precompile(open, (ASCIIString, Bool, Bool, Bool, Bool))
+precompile(done, (IntSet, Int64))
+precompile(next, (IntSet, Int64))
+precompile(ht_keyindex, (Dict{Any,Any}, Int32))
+precompile(perform_work, (Task,))
+precompile(notify_full, (RemoteValue,))
+precompile(notify_empty, (RemoteValue,))
+precompile(work_result, (RemoteValue,))
+precompile(take, (RemoteValue,))
+precompile(wait_full, (RemoteValue,))
+precompile(enq_work, (Task,))
+precompile(string, (Int,))
+precompile(parseint, (Type{Int}, ASCIIString, Int))
+precompile(repeat, (ASCIIString, Int))
+precompile(KeyError, (Int,))
+precompile(show, (Float64,))
+precompile(match, (Regex, ASCIIString))
+precompile(length, (ASCIIString,))
+precompile(alignment, (Float64,))
+precompile(repl_callback, (Expr, Int))
+precompile(istaskdone, (Task,))
+precompile(int, (Uint64,))
+precompile(copy, (Bool,))
+precompile(bool, (Bool,))
+precompile(bool, (RemoteRef,))
+precompile(wait, (RemoteRef,))
+precompile(hash, (RemoteRef,))
+precompile(take, (RemoteRef,))
+precompile(bitmix, (Int, Int))
+precompile(bitmix, (Uint, Int))
+precompile(bitmix, (Uint64, Int64))
+precompile(hash, (Int,))
+precompile(isequal, (Symbol, Symbol))
+precompile(isequal, (Bool, Bool))
+precompile(get, (EnvHash, ASCIIString, ASCIIString))
+precompile(rr2id, (RemoteRef,))
+precompile(isequal, (RemoteRef, WeakRef))
+precompile(isequal, (RemoteRef, RemoteRef))
+precompile(_ieval, (Symbol,))
+precompile(static_convert, (Nothing, Nothing))
+precompile(setindex!, (Array{Any,1}, WeakRef, Int))
+precompile(isequal, ((Int,Int),(Int,Int)))
+precompile(isequal, (Int,Int))
+precompile(RemoteRef, (Int, Int, Int))
+precompile(eval_user_input, (Expr, Bool))
+precompile(print, (Float64,))
+precompile(a2t, (Array{Any,1},))
+precompile(flush, (IOStream,))
+precompile(getindex, (Type{ByteString}, ASCIIString, ASCIIString))
+precompile(bytestring, (ASCIIString,))
+precompile(int, (Int,))
+precompile(uint, (Uint,))
+precompile(_atexit, ())
+precompile(read, (IOStream, Array{Uint32,1}))
+precompile(hex, (Char, Int))
+precompile(abs, (Char,))
+precompile(abstract_eval, (LambdaStaticData, ObjectIdDict, StaticVarInfo))
+precompile(length, (Range1{Int},))
+precompile(start, (Range1{Int},))
+precompile(done, (Range1{Int},Int))
+precompile(next, (Range1{Int},Int))
+precompile(IOStream, (ASCIIString, Array{Uint8,1}))
+precompile(mk_tupleref, (SymbolNode, Int))
+precompile(abstract_interpret, (Bool, ObjectIdDict, StaticVarInfo))
+precompile(eval_annotate, (LambdaStaticData, ObjectIdDict, StaticVarInfo, ObjectIdDict, Array{Any,1}))
+precompile(occurs_more, (Bool, Function, Int))
+precompile(isconstantfunc, (SymbolNode, StaticVarInfo))
+precompile(CallStack, (Expr, Module, (Nothing,), EmptyCallStack))
+precompile(convert, (Type{Module}, Module))
+precompile(effect_free, (Expr,))
+precompile(effect_free, (TopNode,))
+precompile(abspath, (ASCIIString,))
+precompile(isabspath, (ASCIIString,))
+precompile(split, (ASCIIString,))
+precompile(split, (ASCIIString, ASCIIString, Int, Bool))
+precompile(split, (ASCIIString, Regex, Int, Bool))
+precompile(print_joined, (IOBuffer, Array{String,1}, ASCIIString))
+precompile(beginswith, (ASCIIString, ASCIIString))
+precompile(resolve_globals, (Symbol, Module, Module, Vector{Any}, Vector{Any}))
+precompile(resolve_globals, (SymbolNode, Module, Module, Vector{Any}, Vector{Any}))
+precompile(BitArray, (Int,))
+precompile(getindex, (BitArray{1}, Int,))
+precompile(setindex!, (BitArray{1}, Bool, Int,))
+precompile(fill!, (BitArray{1}, Bool))
+precompile(pop!, (Array{Any,1},))
+precompile(unshift!, (Array{Any,1}, Task))
+precompile(nnz, (BitArray{1},))
+precompile(get_chunks_id, (Int,))
+precompile(occurs_more, (Uint8, Function, Int))
+precompile(abstract_eval_arg, (Uint8, ObjectIdDict, StaticVarInfo))
+precompile(occurs_outside_tupleref, (Function, Symbol, StaticVarInfo, Int))
+precompile(search, (ASCIIString, Regex, Int))
+precompile(setindex!, (Vector{Any}, Uint8, Int))
+precompile(setindex!, (Vector{Any}, Vector{Any}, Int))
+precompile(first, (Range1{Int},))
+precompile(last, (Range1{Int},))
+precompile(isempty, (ASCIIString,))
+precompile(normpath, (ASCIIString,))
+precompile(print, (ASCIIString,))
+precompile(println, (TTY,))
+precompile(print, (TTY,Char))
+precompile(==, (Bool,Bool))
+precompile(try_include, (ASCIIString,))
+precompile(isfile, (ASCIIString,))
+precompile(include_from_node1, (ASCIIString,))
+precompile(source_path, (Nothing,))
+precompile(task_local_storage, ())
+precompile(atexit, (Function,))
+precompile(print, (TTY, ASCIIString))
+precompile(close, (TTY,))
+precompile(read_buffer, (TTY,Int))
+precompile(put, (RemoteRef, Any))
+precompile(getpid, ())
+precompile(print, (IOStream, Int32))
+precompile(show, (IOStream, Int32))
+precompile(open, (ASCIIString, ASCIIString))
+precompile(readline, (ASCIIString,))
+precompile(endof, (Array{Any,1},))
+precompile(sym_replace, (Uint8, Array{Any,1}, Array{Any,1}, Array{Any,1}, Array{Any,1}))
+precompile(isslotempty, (Dict{Any,Any}, Int))
+precompile(setindex!, (Array{Uint8,1}, Uint8, Int))
+precompile(get, (Dict{Any,Any}, Symbol, ASCIIString))
+precompile(*, (ASCIIString, ASCIIString, ASCIIString))
+precompile(chop, (ASCIIString,))
+precompile(ismatch, (Regex, ASCIIString))
+precompile(!=, (Bool, Bool))
+precompile(nextind, (ASCIIString, Int))
+precompile(delete_var!, (Expr, Symbol))
+precompile(close, (IOStream,))
+precompile(haskey, (ObjectIdDict, Symbol))

base/stream.jl

@@ -219,6 +219,8 @@ function init_stdio(handle)
             ret = TcpSocket(handle)
         elseif t == UV_NAMED_PIPE
             ret = Pipe(handle)
+        else
+            error("FATAL: stdio type invalid")
         end
         ret.status = StatusOpen
         ret.line_buffered = false