summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/Makefile127
-rw-r--r--test/Results/fft.fast.runtest4
-rw-r--r--test/Results/fft.runtest4
-rw-r--r--test/nucleic.ml8
4 files changed, 104 insertions, 39 deletions
diff --git a/test/Makefile b/test/Makefile
index 72c4a7718..cbdf85263 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,36 +1,46 @@
-CAMLC=../boot/camlrun ../camlc -I ../stdlib
+CAMLC=../boot/camlrun ../camlc -I ../stdlib -I KB -I Lex
+CAMLOPT=../boot/camlrun ../camlopt -I ../stdlib -I KB -I Lex
+OPTFLAGS=-S
CAMLYACC=../yacc/camlyacc
CAMLLEX=../boot/camlrun ../lex/camllex
CAMLDEP=../tools/camldep
CAMLRUN=../byterun/camlrun
-EXE=fib takc taku sieve quicksort quicksort.fast fft fft.fast \
- soli soli.fast boyer kb nucleic genlex
+BYTE_EXE=fib.byt takc.byt taku.byt sieve.byt quicksort.byt quicksort.fast.byt \
+ fft.byt fft.fast.byt soli.byt soli.fast.byt boyer.byt kb.byt \
+ nucleic.byt genlex.byt
-all: $(EXE)
+CODE_EXE=$(BYTE_EXE:.byt=.out)
+
+all: $(BYTE_EXE) $(CODE_EXE)
# KB
-KBFILES=KB/terms.mli KB/terms.ml KB/equations.mli KB/equations.ml \
- KB/kb.mli KB/kb.ml KB/orderings.mli KB/orderings.ml KB/kbmain.ml
+BYTE_KB=KB/terms.cmo KB/equations.cmo KB/kb.cmo KB/orderings.cmo KB/kbmain.cmo
+CODE_KB=$(BYTE_KB:.cmo=.cmx)
-kb: $(KBFILES)
- $(CAMLC) -I KB $(KBFILES) -o kb
+kb.byt: $(BYTE_KB)
+ $(CAMLC) -I KB $(BYTE_KB) -o kb.byt
+kb.out: $(CODE_KB)
+ $(CAMLOPT) $(OPTFLAGS) -I KB $(CODE_KB) -o kb.out
clean::
- rm -f KB/*.cm[io]
+ rm -f KB/*.cm[iox] KB/*.[os]
rm -f KB/*~
# Genlex
-GENLEXFILES=Lex/syntax.ml Lex/scan_aux.ml Lex/grammar.mli Lex/scanner.ml \
- Lex/gram_aux.ml Lex/grammar.ml Lex/lexgen.ml Lex/output.ml Lex/main.ml
+BYTE_GENLEX=Lex/syntax.cmo Lex/scan_aux.cmo Lex/scanner.cmo Lex/gram_aux.cmo \
+ Lex/grammar.cmo Lex/lexgen.cmo Lex/output.cmo Lex/main.cmo
+CODE_GENLEX=$(BYTE_GENLEX:.cmo=.cmx)
-genlex: $(GENLEXFILES)
- $(CAMLC) -I Lex $(GENLEXFILES) -o genlex
+genlex.byt: $(BYTE_GENLEX)
+ $(CAMLC) -I Lex $(BYTE_GENLEX) -o genlex.byt
+genlex.out: $(CODE_GENLEX)
+ $(CAMLOPT) $(OPTFLAGS) -I Lex $(CODE_GENLEX) -o genlex.out
clean::
- rm -f Lex/*.cm[io]
+ rm -f Lex/*.cm[iox] Lex/*.[os]
rm -f Lex/*~
Lex/grammar.ml Lex/grammar.mli: Lex/grammar.mly
@@ -38,22 +48,35 @@ Lex/grammar.ml Lex/grammar.mli: Lex/grammar.mly
clean::
rm -f Lex/grammar.ml Lex/grammar.mli
+beforedepend:: Lex/grammar.ml Lex/grammar.mli
Lex/scanner.ml: Lex/scanner.mll
$(CAMLLEX) Lex/scanner.mll
clean::
rm -f Lex/scanner.ml
+beforedepend:: Lex/scanner.ml
# Common rules
-.SUFFIXES: .mli .ml .cmi .cmo .fast
+.SUFFIXES:
+.SUFFIXES: .mli .ml .cmi .cmo .cmx .byt .fast.byt .out .fast.out
+
+.ml.byt:
+ $(CAMLC) -o $*.byt $<
+
+.ml.fast.byt:
+ cp $*.ml $*.fast.ml
+ $(CAMLC) -fast -o $*.fast.byt $*.fast.ml
+ rm -f $*.fast.ml
-.ml:
- $(CAMLC) -o $* $<
+.ml.out:
+ $(CAMLOPT) $(OPTFLAGS) -o $*.out $<
-.ml.fast:
- $(CAMLC) -fast -o $*.fast $<
+.ml.fast.out:
+ cp $*.ml $*.fast.ml
+ $(CAMLOPT) $(OPTFLAGS) -fast -o $*.fast.out $*.fast.ml
+ rm -f $*.fast.ml
.mli.cmi:
$(CAMLC) -c $<
@@ -61,24 +84,42 @@ clean::
.ml.cmo:
$(CAMLC) -c $<
-$(EXE): ../camlc
+.ml.cmx:
+ $(CAMLOPT) $(OPTFLAGS) -c $<
+
+$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ../camlc
+$(BYTE_EXE): ../stdlib/stdlib.cma
+$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ../camlopt
+$(CODE_EXE): ../stdlib/stdlib.cmxa
clean::
- rm -f $(EXE)
- rm -f *.cm[io]
+ rm -f *.byt *.out
+ rm -f *.cm[iox] *.[os]
rm -f *~
# Regression test
-test:
+test: codetest
+
+bytetest:
+ set -e; \
+ for prog in $(BYTE_EXE:.byt=); do \
+ echo $$prog; \
+ if test -f Results/$$prog.runtest; then \
+ sh Results/$$prog.runtest test $(CAMLRUN) $$prog.byt; \
+ elif test -f Results/$$prog.out; then \
+ $(CAMLRUN) $$prog.byt | cmp - Results/$$prog.out; \
+ fi; \
+ done
+
+codetest:
set -e; \
- camlrun=$(CAMLRUN); export camlrun; \
- for prog in $(EXE); do \
+ for prog in $(CODE_EXE:.out=); do \
echo $$prog; \
if test -f Results/$$prog.runtest; then \
- sh Results/$$prog.runtest test; \
+ sh Results/$$prog.runtest test $$prog.out; \
elif test -f Results/$$prog.out; then \
- sh Results/runtest $$prog; \
+ $$prog.out | cmp - Results/$$prog.out; \
fi; \
done
@@ -87,14 +128,34 @@ clean::
# Benchmark
-bench:
+bench: codebench
+
+bytebench:
set -e; \
- camlrun=$(CAMLRUN); export camlrun; \
- for prog in $(EXE); do \
- echo $$prog; \
+ for prog in $(BYTE_EXE:.byt=); do \
+ echo -n "$$prog "; \
+ if test -f Results/$$prog.runtest; then \
+ sh Results/$$prog.runtest bench $$(CAMLRUN) $prog.byt; \
+ else \
+ xtime -o /dev/null -e /dev/null $(CAMLRUN) $$prog.byt; \
+ fi; \
+ done
+
+codebench:
+ set -e; \
+ for prog in $(CODE_EXE:.out=); do \
+ echo -n "$$prog "; \
if test -f Results/$$prog.runtest; then \
- sh Results/$$prog.runtest bench; \
+ sh Results/$$prog.runtest bench $$prog.out; \
else \
- xtime -o /dev/null $(CAMLRUN) $$prog; \
+ xtime -repeat 3 -o /dev/null -e /dev/null $$prog.out; \
fi; \
done
+
+# Dependencies
+
+depend: beforedepend
+ $(CAMLDEP) -I KB -I Lex *.mli *.ml KB/*.mli KB/*.ml Lex/*.mli Lex/*.ml > .depend
+
+include .depend
+
diff --git a/test/Results/fft.fast.runtest b/test/Results/fft.fast.runtest
new file mode 100644
index 000000000..a207a55a0
--- /dev/null
+++ b/test/Results/fft.fast.runtest
@@ -0,0 +1,4 @@
+case $1 in
+ test) shift; $* | awk '$2 >= 1e-10 { exit 2; }';;
+ bench) shift; xtime -o /dev/null $*;;
+esac \ No newline at end of file
diff --git a/test/Results/fft.runtest b/test/Results/fft.runtest
index 465cd3b33..a207a55a0 100644
--- a/test/Results/fft.runtest
+++ b/test/Results/fft.runtest
@@ -1,4 +1,4 @@
case $1 in
- test) $camlrun fft | awk '$2 >= 1e-10 { exit 2; }';;
- bench) xtime -o /dev/null $camlrun fft;;
+ test) shift; $* | awk '$2 >= 1e-10 { exit 2; }';;
+ bench) shift; xtime -o /dev/null $*;;
esac \ No newline at end of file
diff --git a/test/nucleic.ml b/test/nucleic.ml
index e4edcfe0f..1db198dc4 100644
--- a/test/nucleic.ml
+++ b/test/nucleic.ml
@@ -1,9 +1,9 @@
(* Use floating-point arithmetic *)
-external (+) : float -> float -> float = "add_float"
-external (-) : float -> float -> float = "sub_float"
-external ( * ) : float -> float -> float = "mul_float"
-external (/) : float -> float -> float = "div_float"
+external (+) : float -> float -> float = "%addfloat"
+external (-) : float -> float -> float = "%subfloat"
+external ( * ) : float -> float -> float = "%mulfloat"
+external (/) : float -> float -> float = "%divfloat"
type intg = int
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-31 04:41:49 +0000