Merge pull request #24 from pi8027/replace-ocamlbuild-with-dune

Replace OCamlbuild with Dune

Makefile.benchmark.coq.local

@@ -2,9 +2,9 @@
 # versions of OCaml.
 OCAML_OPAMSWITCH?=
 ifeq (,$(OCAML_OPAMSWITCH))
-OCAMLBUILD?= ocamlbuild
+DUNE?= dune
 else
-OCAMLBUILD?= opam exec --switch $(OCAML_OPAMSWITCH) -- ocamlbuild
+DUNE?= opam exec --switch $(OCAML_OPAMSWITCH) -- dune
 endif
 
 HSDIR := benchmark/haskell
@@ -26,10 +26,9 @@ EXTRACTED_ML_FILES := \
   $(MLDIR)/mergesort_coq_cbn_tmc.ml \
   $(MLDIR)/mergesort_coq_cbnacc_tmc.ml
 
-ML_FLAGS := -cflags -w,a -verbose 0 -package unix -tag 'optimize(3)'
-
-EXTRACTED_BINARIES := $(HSDIR)/Benchmark $(HSDIR)/BenchmarkExp \
-  $(MLDIR)/benchmark.native $(MLDIR)/benchmark_exp.native
+EXTRACTED_BINARIES := \
+  $(HSDIR)/Benchmark $(HSDIR)/BenchmarkExp \
+  $(MLDIR)/benchmark $(MLDIR)/benchmark_exp
 
 $(HSDIR)/Benchmark: $(HSDIR)/Benchmark.hs $(HSDIR)/Benchlib.hs \
                     $(EXTRACTED_HS_FILES)
@@ -39,13 +38,17 @@ $(HSDIR)/BenchmarkExp: $(HSDIR)/BenchmarkExp.hs $(HSDIR)/Benchlib.hs \
                        $(EXTRACTED_HS_FILES)
 	cd $(HSDIR) && stack ghc BenchmarkExp.hs -- $(HS_FLAGS)
 
-$(MLDIR)/benchmark.native: $(MLDIR)/benchmark.ml $(MLDIR)/benchlib.ml \
-                           $(EXTRACTED_ML_FILES) $(EXTRACTED_ML_FILES:.ml=.mli)
-	cd $(MLDIR) && $(OCAMLBUILD) benchmark.native $(ML_FLAGS)
-
-$(MLDIR)/benchmark_exp.native: $(MLDIR)/benchmark_exp.ml $(MLDIR)/benchlib.ml \
-                               $(EXTRACTED_ML_FILES) $(EXTRACTED_ML_FILES:.ml=.mli)
-	cd $(MLDIR) && $(OCAMLBUILD) benchmark_exp.native $(ML_FLAGS)
+$(MLDIR)/benchmark: $(MLDIR)/benchmark.ml $(MLDIR)/benchlib.ml \
+                        $(EXTRACTED_ML_FILES) $(EXTRACTED_ML_FILES:.ml=.mli)
+	cd $(MLDIR) && \
+	  $(DUNE) build benchmark.exe && \
+	  ln -s _build/default/benchmark.exe benchmark
+
+$(MLDIR)/benchmark_exp: $(MLDIR)/benchmark_exp.ml $(MLDIR)/benchlib.ml \
+                        $(EXTRACTED_ML_FILES) $(EXTRACTED_ML_FILES:.ml=.mli)
+	cd $(MLDIR) && \
+	  $(DUNE) build benchmark_exp.exe && \
+	  ln -s _build/default/benchmark_exp.exe benchmark_exp
 
 $(HSDIR)/MergesortCoqCbn.hs $(MLDIR)/mergesort_coq_cbn.ml: \
     benchmark/extraction_cbn.vo

benchmark/ocaml/dune

@@ -0,0 +1,5 @@
+(executables
+ (names benchmark benchmark_exp)
+ (libraries unix)
+ (flags (:standard -w a))
+ (ocamlopt_flags (:standard -O3)))

benchmark/ocaml/dune-project

@@ -0,0 +1,2 @@
+(lang dune 3.0)
+(name stablesort_benchmarks)