Tags update + optimizations for ocaml 4.03

This commit is contained in:
Guillaume Bury 2016-05-20 16:21:06 +02:00
parent fd4d52b7a6
commit 6d706f55e5
2 changed files with 17 additions and 15 deletions

View file

@ -1,10 +1,8 @@
# copyright (c) 2014, guillaume bury # copyright (c) 2014, guillaume bury
LOG=build.log LOG=build.log
COMP=ocamlbuild -log $(LOG) -use-ocamlfind -classic-display COMP=ocamlbuild -log $(LOG) -use-ocamlfind
FLAGS= FLAGS=-cflags -color,always
#-ocamlc ocamlopt -cflag -O3
DIRS=-Is solver,sat,smt,backend,util,util/smtlib
DOC=msat.docdir/index.html DOC=msat.docdir/index.html
BIN=main.native BIN=main.native
NAME=msat NAME=msat
@ -14,13 +12,13 @@ LIB=$(addprefix $(NAME), .cma .cmxa .cmxs)
all: lib test all: lib test
lib: lib:
$(COMP) $(FLAGS) $(DIRS) $(LIB) $(COMP) $(FLAGS) $(LIB)
doc: doc:
$(COMP) $(FLAGS) $(DIRS) $(DOC) $(COMP) $(FLAGS) $(DOC)
bin: bin:
$(COMP) $(FLAGS) $(DIRS) $(BIN) $(COMP) $(FLAGS) $(BIN)
cp $(BIN) $(NAME) && rm $(BIN) cp $(BIN) $(NAME) && rm $(BIN)
test: bin test: bin

20
_tags
View file

@ -1,17 +1,21 @@
# optimization options
true: optimize(3), unbox_closures
# Include paths
<sat>: include
<smt>: include
<solver>: include
<backend>: include
<util>: include
<util/smtlib>: include
# Pack options
<util/*.cmx>: for-pack(Msat) <util/*.cmx>: for-pack(Msat)
#<util/*.native>:
<smt/*.cmx>: for-pack(Msat) <smt/*.cmx>: for-pack(Msat)
<sat/*.cmx>: for-pack(Msat) <sat/*.cmx>: for-pack(Msat)
<solver/*.cmx>: for-pack(Msat) <solver/*.cmx>: for-pack(Msat)
<backend/*.cmx>: for-pack(Msat) <backend/*.cmx>: for-pack(Msat)
# enable stronger inlining everywhere
<util/{vec,hashcons,hstring,iheap}.cmx>: inline(100)
<solver/*.cmx>: inline(50)
<sat/**/*.cmx>: inline(100)
<smt/**/*.cmx>: inline(100)
<util/log.cmx>: inline(30)
# more warnings # more warnings
<**/*.ml>: warn_K, warn_Y, warn_X <**/*.ml>: warn_K, warn_Y, warn_X
<**/*.ml>: short_paths, safe_string, strict_sequence <**/*.ml>: short_paths, safe_string, strict_sequence