Merge pull request #1059 from bloomberg/better_scc

accelerate src using ident mask

Author: bobzhang

jscomp/Makefile

@@ -39,7 +39,10 @@ ext/ident_hash_set.ml: ext/hash_set.cppo.ml
 ext/hash_set.ml: ext/hash_set.cppo.ml
 	cppo -D TYPE_FUNCTOR $< -o $@
 ext/hash_set_poly.ml: ext/hash_set.cppo.ml
-	cppo $< -o $@
+	cppo -D TYPE_POLY $< -o $@
+
+# ext/hash_set_ident_mask.ml: ext/hash_set.cppo.ml
+# cppo -D TYPE_IDENT_MASK $< -o $@
 
 ext/int_vec.ml: ext/vec.cppo.ml
 	cppo -D TYPE_INT $< -o $@
@@ -139,6 +142,7 @@ OUNIT_TESTS_SRCS =  ounit_tests_util \
 	ounit_topsort_tests\
 	ounit_sexp_tests\
 	ounit_int_vec_tests\
+	ounit_ident_mask_tests\
 	ounit_tests_main
 OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
 
@@ -162,8 +166,11 @@ EXT_SRCS = ext_util\
 	ext_map \
 	ext_marshal ext_option \
 	ext_pervasives ext_pp ext_ref  ext_sys \
-	hash_set_gen hash_set string_hash_set int_hash_set \
+	hash_set_gen hash_set \
+	string_hash_set \
 	ext_ident\
+	int_hash_set \
+	hash_set_ident_mask\
 	ordered_hash_set_gen\
 	ordered_hash_set_string\
 	ordered_hash_set_ident\
@@ -386,7 +393,7 @@ bin/all_ounit_tests.ml:./bin/bspack.exe
 
 
 bin/all_ounit_tests.exe: stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml
-	ocamloptp -P a -g -I bin -w -a unix.cmxa $^ -o $@
+	ocamloptp -I +compiler-libs ocamlcommon.cmxa -P a -g -I bin -w -a unix.cmxa $^ -o $@
 
 test:bin/all_ounit_tests.exe
 	$^ && ocamlprof bin/all_ounit_tests.ml > bin/all_ounit_tests.i.ml &&	rm ocamlprof.dump
@@ -464,7 +471,7 @@ world:
 travis-world-test:
 	$(MAKE) world
 	@echo "Making test"
-	$(NATIVE) -g -I bin -w -a unix.cmxa stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml -o bin/all_ounit_tests.exe && bin/all_ounit_tests.exe
+	$(NATIVE) -g -I bin -I +compiler-libs -w -a ocamlcommon.cmxa unix.cmxa stubs/ext_basic_hash_stubs.c bin/all_ounit_tests.mli bin/all_ounit_tests.ml -o bin/all_ounit_tests.exe && bin/all_ounit_tests.exe
 	$(MAKE) -C test all
 	@echo "Making test finsihed"
 

jscomp/all.depend

@@ -32,10 +32,12 @@ ext/hash_set_gen.cmx : ext/ext_util.cmx
 ext/hash_set.cmx : ext/hash_set_gen.cmx ext/hash_set.cmi
 ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_string.cmx \
     stubs/bs_hash_stubs.cmx ext/string_hash_set.cmi
-ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
-    stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
 ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
     ext/ext_string.cmx ext/ext_ident.cmi
+ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
+    stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
+ext/hash_set_ident_mask.cmx : ext/ext_util.cmx ext/ext_ident.cmx \
+    stubs/bs_hash_stubs.cmx ext/hash_set_ident_mask.cmi
 ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx
 ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
     ext/ext_util.cmx ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
@@ -101,8 +103,9 @@ ext/ext_ref.cmi :
 ext/ext_sys.cmi :
 ext/hash_set.cmi : ext/hash_set_gen.cmx
 ext/string_hash_set.cmi : ext/hash_set_gen.cmx
-ext/int_hash_set.cmi : ext/hash_set_gen.cmx
 ext/ext_ident.cmi :
+ext/int_hash_set.cmi : ext/hash_set_gen.cmx
+ext/hash_set_ident_mask.cmi :
 ext/ordered_hash_set_string.cmi : ext/ordered_hash_set_gen.cmx
 ext/ordered_hash_set_ident.cmi : ext/ordered_hash_set_gen.cmx
 ext/union_find.cmi :
@@ -324,7 +327,8 @@ core/lam.cmx : ext/ordered_hash_map_local_ident.cmx \
     core/ocaml_stdlib_slots.cmx ext/literals.cmx common/js_config.cmx \
     ext/int_vec_vec.cmx ext/int_vec_util.cmx ext/int_vec.cmx \
     ext/ident_set.cmx ext/ident_hashtbl.cmx ext/ident_hash_set.cmx \
-    ext/ext_string.cmx ext/ext_scc.cmx core/lam.cmi
+    ext/hash_set_ident_mask.cmx ext/ext_string.cmx ext/ext_scc.cmx \
+    core/lam.cmi
 core/lam_print.cmx : core/lam.cmx core/lam_print.cmi
 core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
     core/lam_beta_reduce_util.cmi
@@ -607,6 +611,8 @@ ounit_tests/ounit_topsort_tests.cmx : ext/set_int.cmx ounit/oUnit.cmx \
 ounit_tests/ounit_sexp_tests.cmx : ounit/oUnit.cmx ext/ext_sexp.cmx
 ounit_tests/ounit_int_vec_tests.cmx : ounit/oUnit.cmx ext/int_vec_util.cmx \
     ext/int_vec.cmx
+ounit_tests/ounit_ident_mask_tests.cmx : ounit/oUnit.cmx \
+    ext/hash_set_ident_mask.cmx
 ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
     ounit_tests/ounit_topsort_tests.cmx ounit_tests/ounit_string_tests.cmx \
@@ -615,6 +621,7 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_ordered_hash_set_tests.cmx \
     ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
     ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_int_vec_tests.cmx \
+    ounit_tests/ounit_ident_mask_tests.cmx \
     ounit_tests/ounit_hashtbl_tests.cmx ounit_tests/ounit_hash_stubs_test.cmx \
     ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
     ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \

jscomp/bin/all_ounit_tests.d

@@ -41,6 +41,11 @@ bin/all_ounit_tests.ml : ext/hashtbl_gen.ml
 bin/all_ounit_tests.ml : ext/string_hashtbl.ml
 bin/all_ounit_tests.ml : ext/string_hashtbl.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_hashtbl_tests.ml
+bin/all_ounit_tests.ml : ext/ext_ident.ml
+bin/all_ounit_tests.ml : ext/ext_ident.mli
+bin/all_ounit_tests.ml : ext/hash_set_ident_mask.ml
+bin/all_ounit_tests.ml : ext/hash_set_ident_mask.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_ident_mask_tests.ml
 bin/all_ounit_tests.ml : ext/vec_gen.ml
 bin/all_ounit_tests.ml : ext/int_vec.ml
 bin/all_ounit_tests.ml : ext/int_vec.mli