Merge pull request #1082 from bloomberg/fast_string

fast string

Author: bobzhang

jscomp/.ocamlinit

@@ -2,4 +2,22 @@
 #require "compiler-libs.common";;
 #load "bs_hash.cma";;
 #load "ext.cma";;
-#directory "./ext";;
+#directory "./ext";;
+#directory "./stubs";;
+
+let bench ?(times=10_000_000) f = 
+    let start = Sys.time () in 
+    for i = 0 to times - 1  do 
+        ignore @@ f ()
+    done;    
+    Printf.printf " -- %f elapsed \n" (Sys.time () -. start )
+
+let a = "xxx"
+let b = "yyy"
+let () = 
+    bench (fun _ -> String.compare a  "yyy"
+    
+    );
+    bench (fun _ -> 
+        Bs_hash_stubs.string_length_based_compare a   "yyy" 
+    )

jscomp/Makefile

@@ -93,7 +93,7 @@ ext/hashtbl_make.ml: ext/hashtbl.cppo.ml
 	cppo -D TYPE_FUNCTOR $< -o $@
 ## Stubs 
 .c.o:
-	$(NATIVE) -ccopt -o -ccopt $@ -c $< 
+	$(NATIVE) -ccopt -O2 -ccopt -o -ccopt $@ -c $< 
 
 STUBS_OBJS=stubs/ext_basic_hash_stubs.o
 
@@ -138,6 +138,7 @@ OUNIT_TESTS_SRCS =  ounit_tests_util \
 	ounit_json_tests ounit_map_tests \
 	ounit_ordered_hash_set_tests \
 	ounit_vec_test \
+	ounit_data_random\
 	ounit_string_tests\
 	ounit_topsort_tests\
 	ounit_sexp_tests\
@@ -271,7 +272,7 @@ bsb.cmxa:$(BSB_CMXS)
 
 check:  $(EXT_CMXS) $(COMMON_CMXS) $(SYNTAX_CMXS) $(DEPENDS_CMXS) $(CORE_CMXS) $(BSB_CMXS) $(OTHER_CORE_CMXS) $(MAIN_CMXS) $(OUNIT_CMXS) $(OUNIT_TESTS_CMXS)
 
-bin/bsb.exe: ext.cmxa common.cmxa  bsb.cmxa bsb/bsb_main.cmx
+bin/bsb.exe: bs_hash.cmxa ext.cmxa common.cmxa  bsb.cmxa bsb/bsb_main.cmx
 	$(NATIVE) -g  unix.cmxa str.cmxa $^ -o $@
 
 # bin/bsc:  ext.cmxa common.cmxa  depends.cmxa syntax.cmxa core.cmxa

jscomp/all.depend

@@ -57,8 +57,8 @@ ext/ordered_hash_map_local_ident.cmx : ext/ordered_hash_map_gen.cmx \
     ext/ordered_hash_map_local_ident.cmi
 ext/int_map.cmx : ext/map_gen.cmx ext/ext_int.cmx ext/int_map.cmi
 ext/literals.cmx : ext/literals.cmi
-ext/string_map.cmx : ext/map_gen.cmx ext/string_map.cmi
-ext/string_set.cmx : ext/set_gen.cmx ext/string_set.cmi
+ext/string_map.cmx : ext/map_gen.cmx ext/ext_string.cmx ext/string_map.cmi
+ext/string_set.cmx : ext/set_gen.cmx ext/ext_string.cmx ext/string_set.cmi
 ext/set_int.cmx : ext/set_gen.cmx ext/ext_int.cmx ext/set_int.cmi
 ext/set_poly.cmx : ext/set_gen.cmx ext/set_poly.cmi
 ext/ext_scc.cmx : ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_scc.cmi
@@ -543,8 +543,9 @@ core/lam_compile_group.cmx : core/lam_util.cmx core/lam_stats_export.cmx \
     core/js_pass_flatten.cmx core/js_pass_debug.cmx core/js_output.cmx \
     core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
     common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
-    ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_list.cmx \
-    ext/ext_ident.cmx ext/ext_filename.cmx core/lam_compile_group.cmi
+    ext/ext_string.cmx ext/ext_pervasives.cmx common/ext_log.cmx \
+    ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
+    core/lam_compile_group.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_pervasives.cmx common/ext_log.cmx syntax/bs_ast_invariant.cmx \
@@ -590,7 +591,8 @@ ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
 ounit_tests/ounit_list_test.cmx : ounit/oUnit.cmx ext/ext_list.cmx
 ounit_tests/ounit_bal_tree_tests.cmx : ext/set_poly.cmx ext/set_int.cmx \
     ext/set_gen.cmx ounit_tests/ounit_tests_util.cmx ounit/oUnit.cmx
-ounit_tests/ounit_path_tests.cmx : ounit/oUnit.cmx ext/ext_filename.cmx
+ounit_tests/ounit_path_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
+    ext/ext_filename.cmx
 ounit_tests/ounit_union_find_tests.cmx : ext/union_find.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx
 ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
@@ -609,7 +611,9 @@ ounit_tests/ounit_ordered_hash_set_tests.cmx : \
     ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/ext_util.cmx
 ounit_tests/ounit_vec_test.cmx : ext/set_int.cmx ounit/oUnit.cmx \
     ext/int_vec.cmx ext/ext_json.cmx
-ounit_tests/ounit_string_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx
+ounit_tests/ounit_data_random.cmx :
+ounit_tests/ounit_string_tests.cmx : ounit_tests/ounit_data_random.cmx \
+    ounit/oUnit.cmx ext/ext_string.cmx
 ounit_tests/ounit_topsort_tests.cmx : ext/set_int.cmx ounit/oUnit.cmx \
     ext/int_vec.cmx ext/ext_topsort.cmx
 ounit_tests/ounit_sexp_tests.cmx : ounit/oUnit.cmx ext/ext_sexp.cmx

jscomp/bin/Makefile

@@ -6,27 +6,27 @@ ifndef EXE
 endif
 NATIVE=ocamlopt.opt$(EXE)
 
-OCAMLOPT_FLAGS= -inline 1000 -w -a ../stubs/ext_basic_hash_stubs.c
+OCAMLOPT_FLAGS= -g -inline 1000 -w -a ../stubs/ext_basic_hash_stubs.c
 
 bsppx.exe: config_bsppx.mli config_bsppx.ml bsppx.mli bsppx.ml
-	$(NATIVE) -g -inline 1000 -linkall -w -a $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@
 
 bspp.exe:  bspp.mli bspp.ml
-	$(NATIVE) -g -inline 1000 -linkall -w -a $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@
 
 bsdep.exe: config_bsdep.mli config_bsdep.ml bsdep.mli bsdep.ml
-	$(NATIVE) -g -inline 1000 -linkall -w -a $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@
 
 bsb.exe:  bsb.mli bsb.ml
-	$(NATIVE) -g -inline 1000  -linkall unix.cmxa str.cmxa -w -a $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa str.cmxa $^ -o $@
 
 bsb_helper.exe:  bsb_helper.mli bsb_helper.ml
-	$(NATIVE) -g -inline 1000  -linkall unix.cmxa str.cmxa -w -a $^ -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa str.cmxa -w -a $^ -o $@
 
 config_whole_compiler.ml:config_whole_compiler.mlp ../config.js
 	node ../config.js
 bsc.exe: config_whole_compiler.mli config_whole_compiler.ml  whole_compiler.mli whole_compiler.ml
-	$(NATIVE) -w -a ../stubs/ext_basic_hash_stubs.c $^  -o $@
+	$(NATIVE) $(OCAMLOPT_FLAGS) $^  -o $@
 
 bspack.exe: config_bspack.mli config_bspack.ml bspack.mli bspack.ml
 	$(NATIVE) $(OCAMLOPT_FLAGS) unix.cmxa  $^ -o $@

jscomp/bin/all_ounit_tests.d

@@ -86,6 +86,7 @@ bin/all_ounit_tests.ml : ounit_tests/ounit_scc_tests.ml
 bin/all_ounit_tests.ml : ext/ext_sexp.ml
 bin/all_ounit_tests.ml : ext/ext_sexp.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_sexp_tests.ml
+bin/all_ounit_tests.ml : ounit_tests/ounit_data_random.ml
 bin/all_ounit_tests.ml : ounit_tests/ounit_string_tests.ml
 bin/all_ounit_tests.ml : ext/ext_topsort.ml
 bin/all_ounit_tests.ml : ext/ext_topsort.mli