Merge pull request #1125 from bloomberg/int_vec_spe

specialize int vector

Author: bobzhang

.gitignore

@@ -24,6 +24,7 @@ _build
 *.jsx
 *.lambda
 *.rawlambda
+*.s
 *.o
 *.lam
 *.0.js

jscomp/Makefile

@@ -385,13 +385,13 @@ bin/whole_compiler.ml:./bin/bspack.exe
 	BS_DEBUG=false $< -bs-MD -prelude-str 'module Config = Config_whole_compiler' -bs-exclude-I config -o $@ -bs-main Js_main -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/typing/ -I ../ocaml/bytecomp/ -I ../ocaml/driver/ -I stubs -I ext -I syntax -I depends -I common -I core
 
 bin/bsdep.ml:./bin/bspack.exe
-	BS_DEBUG=false BS_OCAMLDEP=true $< -bs-MD  -prelude-str 'module Config = Config_bsdep'  -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core  -bs-main Ocamldep -o $@
+	BS_DEBUG=false BS_OCAMLDEP=true $< -bs-MD  -prelude-str 'module Config = Config_bsdep'  -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing/ -I ../ocaml/driver -I ../ocaml/tools -I common -I ext -I syntax -I depends -I core -I stubs -bs-main Ocamldep -o $@
 
 bin/bsb_helper.ml:./bin/bspack.exe
-	BS_DEBUG=false $< -bs-MD   -I common -I ext -I syntax -I depends -I bsb  -bs-main Bsb_helper_main -o $@
+	BS_DEBUG=false $< -bs-MD   -I stubs -I common -I ext -I syntax -I depends -I bsb  -bs-main Bsb_helper_main -o $@
 
 bin/bsb.ml:./bin/bspack.exe
-	BS_DEBUG=false $< -bs-MD -I common -I ext -I syntax -I depends -I bsb -I ext  -bs-main Bsb_main -o $@
+	BS_DEBUG=false $< -bs-MD -I stubs -I common -I ext -I syntax -I depends -I bsb -I ext  -bs-main Bsb_main -o $@
 
 bin/bspp.ml:./bin/bspack.exe
 	BS_DEBUG=false BS_MIN_LEX_DEPS=true $< -bs-MD   -bs-exclude-I config -I ../ocaml/utils/ -I ../ocaml/parsing?parser  -I common -I ext -I syntax -I depends -I bspp -I core -bs-main Bspp_main -o $@

jscomp/all.depend

@@ -4,10 +4,11 @@ ext/ext_int.cmx : ext/ext_int.cmi
 ext/ext_array.cmx : ext/ext_array.cmi
 ext/ext_bytes.cmx : ext/ext_bytes.cmi
 ext/ext_char.cmx : ext/ext_char.cmi
-ext/vec_gen.cmx : ext/ext_array.cmx
-ext/resize_array.cmx : ext/vec_gen.cmx ext/resize_array.cmi
+ext/vec_gen.cmx :
+ext/resize_array.cmx : ext/vec_gen.cmx ext/ext_array.cmx \
+    ext/resize_array.cmi
 ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
-ext/int_vec.cmx : ext/vec_gen.cmx ext/int_vec.cmi
+ext/int_vec.cmx : ext/ext_array.cmx stubs/bs_hash_stubs.cmx ext/int_vec.cmi
 ext/int_vec_util.cmx : ext/int_vec.cmx ext/int_vec_util.cmi
 ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
     ext/int_vec_vec.cmi

jscomp/bin/Makefile

@@ -5,12 +5,15 @@ ifndef EXE
 	EXE := # empty
 endif
 NATIVE=ocamlopt.opt$(EXE)
-
-OCAMLOPT_FLAGS= -inline 1000 -g -w -a ../stubs/ext_basic_hash_stubs.c
-
+BSC_FLAGS= -w -a -I ../runtime -I ../stdlib -bs-files
+BSC=./bsc.exe
+OCAMLOPT_FLAGS= -g -w -a ../stubs/ext_basic_hash_stubs.c
+# -inline 1000 makes size too large
+# TODO: make sure it can be bootstrapped, at least is a very good
+# test case of our optimizations 
 bsppx.exe: config_bsppx.mli config_bsppx.ml bsppx.mli bsppx.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@
-
+	
 bspp.exe:  bspp.mli bspp.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@
 
@@ -31,5 +34,7 @@ bsc.exe: config_whole_compiler.mli config_whole_compiler.ml  whole_compiler.mli
 bspack.exe: config_bspack.mli config_bspack.ml bspack.mli bspack.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa  $^ -o $@
 
+bspack.js:	config_bspack.mli config_bspack.ml bspack.mli bspack.ml
+	$(BSC) $(BSC_FLAGS) $^
 
 all: bsppx.exe bspp.exe bsdep.exe bsc.exe bspack.exe bsb.exe bsb_helper.exe