Merge pull request #63 from effect-handlers/ocaml5.3

Update to OCaml5.3

Author: hflsmax

.github/workflows/system_ocaml.yml

@@ -1,4 +1,4 @@
-name: Multicore OCaml
+name: OCaml
 
 # Controls when the workflow will run
 on:

Makefile

@@ -3,7 +3,7 @@ DOCKERHUB=effecthandlers/effect-handlers
 all: bench_eff bench_hia bench_koka bench_links bench_ocaml
 
 system_base:
-	docker build -t $(DOCKERHUB):base systems
+	docker build --build-arg UID=$$(id -u) --build-arg GID=$$(id -g) -t $(DOCKERHUB):base systems
 
 # Eff in ocaml
 system_eff: system_base
@@ -101,7 +101,7 @@ test_libhandler: system_libhandler
 	docker run -v $(shell pwd):/source $(DOCKERHUB):libhandler \
 		make -C /source/benchmarks/libhandler test
 
-# Multicore OCaml
+# OCaml
 system_ocaml: system_base
 	docker build -t $(DOCKERHUB):ocaml systems/ocaml
 

README.md

@@ -17,7 +17,7 @@ $ make bench_ocaml
 ```
 
 runs the OCaml benchmarks and produces `benchmarks/ocaml/results.csv` which
-contains the results of running the Multicore OCaml benchmarks.
+contains the results of running the OCaml benchmarks.
 
 ## System availability
 
@@ -31,12 +31,13 @@ contains the results of running the Multicore OCaml benchmarks.
 | [libmpeff](https://github.com/koka-lang/libmprompt) | [![libmpeff](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_libmpeff.yml/badge.svg)](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_libmpeff.yml) |
 | [libseff](https://github.com/effect-handlers/libseff.git) | [![libseff](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_libseff.yml/badge.svg)](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_libseff.yml) |
 | [Links](https://github.com/links-lang/links) | [![Links](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_links.yml/badge.svg)](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_links.yml) |
-| [Multicore OCaml](https://github.com/ocaml-multicore/ocaml-multicore) | [![Multicore OCaml](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_ocaml.yml/badge.svg)](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_ocaml.yml) |
+| [OCaml](https://github.com/ocaml/ocaml)\* | [![OCaml](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_ocaml.yml/badge.svg)](https://github.com/effect-handlers/effect-handlers-bench/actions/workflows/system_ocaml.yml) |
 
+\* OCaml's multishot continuations are supported via [ocaml-multicont](https://github.com/dhil/ocaml-multicont)
 
 ## Benchmark availability
 
-|                         | Eff                | Effekt             | Handlers in Action | Koka               | Multicore OCaml    | Libseff            | Libmpeff            |
+|                         | Eff                | Effekt             | Handlers in Action | Koka               | OCaml              | Libseff            | Libmpeff            |
 | :---------------------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
 | **Countdown**           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | **Fibonacci Recursive** | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
@@ -144,4 +145,4 @@ related to work on effect handlers). Whilst we do not enforce any
 standards on artifacts, we do recommend that artifacts conform with
 [the artifacts evaluation packaging guidelines used by various
 programming language
-conferences](https://artifact-eval.org/guidelines.html).
+conferences](https://artifact-eval.org/guidelines.html).

benchmarks/ocaml/Makefile

@@ -26,17 +26,17 @@ test: build
 	cd handler_sieve ; ./main 10 > actual ; echo 17 > expected ; diff expected actual
 
 build:
-	cd countdown ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd fibonacci_recursive ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd product_early ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd iterator ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd nqueens ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd generator ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd tree_explore ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd triples ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd parsing_dollars ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd resume_nontail ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
-	cd handler_sieve ; opam exec --switch=4.12.0+domains+effects -- ocamlopt -O3 -o main main.ml
+	cd countdown ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd fibonacci_recursive ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd product_early ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd iterator ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd nqueens ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd generator ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd tree_explore ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd triples ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd parsing_dollars ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd resume_nontail ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
+	cd handler_sieve ; opam exec --switch=5.3.0 -- ocamlopt -O3 -I $$(opam var lib)/multicont multicont.cmxa -o main main.ml
 
 clean:
 	-rm */main.cmi

benchmarks/ocaml/countdown/main.ml

@@ -1,6 +1,8 @@
+open Effect
+open Effect.Deep
 
-effect Get : unit -> int
-effect Set : int -> unit
+type _ Effect.t += Get : unit -> int t
+type _ Effect.t += Set : int -> unit t
 
 let rec countdown () =
   let i = perform (Get ()) in
@@ -15,13 +17,12 @@ let run n =
   try
     countdown ()
   with
-  | effect (Get ()) k -> continue k (!s)
-  | effect (Set i) k -> s := i; continue k ()
+  | effect (Get ()), k -> continue k (!s)
+  | effect (Set i), k -> s := i; continue k ()
 
 let main () =
   let n = try int_of_string (Sys.argv.(1)) with _ -> 5 in
   let r = run n in
   Printf.printf "%d\n" r
 
 let _ = main ()
-

benchmarks/ocaml/generator/main.ml

@@ -1,5 +1,7 @@
+open Effect
+open Effect.Deep
 
-effect Yield : int -> unit
+type _ Effect.t += Yield : int -> unit t
 
 type tree =
 | Leaf
@@ -20,7 +22,7 @@ let rec iterate = function
 let rec generate f =
   match f () with
     | () -> Empty
-    | effect (Yield v) k -> Thunk (v, fun () -> continue k ())
+    | effect (Yield v), k -> Thunk (v, fun () -> continue k ())
 
 let rec sum a = function
   | Empty -> a

benchmarks/ocaml/handler_sieve/main.ml

@@ -1,5 +1,7 @@
+open Effect
+open Effect.Deep
 
-effect Prime : int -> bool
+type _ Effect.t += Prime: int -> bool t
 
 let rec primes i n a =
   if (i >= n)
@@ -10,7 +12,7 @@ let rec primes i n a =
           try
             primes (i + 1) n (a + i)
           with
-          | effect (Prime e) k ->
+          | effect (Prime e), k ->
             if (e mod i = 0)
               then continue k false
               else continue k (perform (Prime e))
@@ -21,7 +23,7 @@ let run n =
   try
     primes 2 n 0
   with
-  | effect (Prime e) k -> continue k true
+  | effect (Prime e), k -> continue k true
 
 let main () =
   let n = try int_of_string (Sys.argv.(1)) with _ -> 10 in

benchmarks/ocaml/iterator/main.ml

@@ -1,5 +1,7 @@
+open Effect
+open Effect.Deep
 
-effect Emit : int -> unit
+type _ Effect.t += Emit: int -> unit t
 
 let rec range l u =
   if (l > u)
@@ -14,7 +16,7 @@ let run n =
     (range 0 n;
     !s)
   with
-  | effect (Emit e) k -> (s := !s + e ; continue k ())
+  | effect (Emit e), k -> (s := !s + e ; continue k ())
 
 let main () =
   let n = try int_of_string (Sys.argv.(1)) with _ -> 5 in

benchmarks/ocaml/nqueens/main.ml

@@ -1,5 +1,7 @@
+open Effect
+open Effect.Deep
 
-effect Pick : int -> int
+type _ Effect.t += Pick: int -> int t
 exception Fail
 
 let rec safe queen diag xs =
@@ -24,10 +26,10 @@ let run n =
   match place n n with
   | _x -> 1
   | exception Fail -> 0
-  | effect (Pick size) k ->
+  | effect (Pick size), k ->
       let rec loop i a =
         if i = size then (a + continue k i)
-        else loop (i+1) (a + continue (Obj.clone_continuation k) i)
+        else loop (i+1) (a + continue (Multicont.Deep.clone_continuation k) i)
       in loop 1 0
 
 let main () =

benchmarks/ocaml/parsing_dollars/main.ml

@@ -1,13 +1,13 @@
+open Effect
+open Effect.Deep
 
 type chr = int
 
-effect Read : unit -> chr
-
-effect Emit : int -> unit
+type _ Effect.t += Read: unit -> chr t
+type _ Effect.t += Emit: int -> unit t
 
 exception Stop
 
-
 let newline = 10
 let is_newline c = c = 10
 let dollar = 36
@@ -26,7 +26,7 @@ let sum action =
   try
     (action () ; !s)
   with
-  | effect (Emit e) k -> (s := !s + e ; continue k ())
+  | effect (Emit e), k -> (s := !s + e ; continue k ())
 
 let catch action =
   try
@@ -40,7 +40,7 @@ let feed n action =
   try
     action ()
   with
-  | effect (Read ()) k ->
+  | effect (Read ()), k ->
     if (!i > n)
       then raise Stop
       else if(!j = 0)