CI: install Wizard engine

Author: vouillon

.github/workflows/build-wasm_of_ocaml.yml

@@ -119,6 +119,31 @@ jobs:
         run: |
           echo "$GITHUB_WORKSPACE/binaryen/bin" >> $GITHUB_PATH
 
+      - name: Checkout Virgil
+        uses: actions/checkout@v4
+        with:
+          repository: titzer/virgil
+          path: virgil
+
+      - name: Build Virgil
+        working-directory: ./virgil
+        run: |
+          export PATH=$PATH:`pwd`/bin
+          echo `pwd`/bin >> "$GITHUB_PATH"
+          make
+
+      - name: Checkout Wizard engine
+        uses: actions/checkout@v4
+        with:
+          repository: titzer/wizard-engine
+          path: wizard-engine
+
+      - name: Build Wizard engine
+        working-directory: ./wizard-engine
+        run: |
+          make -j 4
+          echo `pwd`/bin >> "$GITHUB_PATH"
+
       - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
         uses: ocaml/setup-ocaml@v3
         with:
@@ -179,8 +204,10 @@ jobs:
         run: opam exec -- dune build @runtest-wasm --profile with-effects
 
       - name: Run tests (WASI runtime)
-        if: ${{ matrix.separate_compilation }}
+        if: ${{ runner.os == 'Linux' && matrix.separate_compilation }}
         working-directory: ./wasm_of_ocaml
+        env:
+          WASM_ENGINE: wizard-fast
         run: opam exec -- dune build @runtest-wasm --profile wasi
 
       - name: Run Base tests

compiler/lib-wasm/binaryen.ml

@@ -113,9 +113,9 @@ let dead_code_elimination
   filter_unused_primitives primitives usage_file
 
 let optimization_options =
-  [| [ "-O2"; "--skip-pass=inlining-optimizing" ]
-   ; [ "-O2"; "--skip-pass=inlining-optimizing" ]
-   ; [ "-O3"; "--skip-pass=inlining-optimizing" ]
+  [| [ "-O2"; "--skip-pass=inlining-optimizing"; "--translate-to-new-eh" ]
+   ; [ "-O2"; "--skip-pass=inlining-optimizing"; "--translate-to-new-eh" ]
+   ; [ "-O3"; "--skip-pass=inlining-optimizing"; "--translate-to-new-eh" ]
   |]
 
 let optimize

dune

@@ -33,7 +33,7 @@
  (wasi
   (wasm_of_ocaml
    (flags
-    (:standard --pretty --enable wasi --enable trap-on-exception))
+    (:standard --pretty --enable wasi))
    (compilation_mode whole_program))
   (binaries
    (tools/node_wrapper.exe as node)

tools/node_wrapper.ml

@@ -18,6 +18,7 @@ let wasmedge_args =
 let extra_args_for_wasoo =
   [ "--experimental-wasm-imported-strings"
   ; "--experimental-wasm-stack-switching"
+  ; "--experimental-wasm-exnref"
   ; "--stack-size=10000"
   ]
 
@@ -59,8 +60,7 @@ let exe, args =
                 ( "/home/jerome/sources/wizard-engine/bin/wizeng.x86-linux"
                 , wizard_args @ (find_wasm file :: List.tl argv) )
             | Some "wizard-fast" ->
-                ( "/home/jerome/sources/wizard-engine/bin/wizeng.x86-64-linux"
-                , wizard_args @ (find_wasm file :: List.tl argv) )
+                "wizeng.x86-64-linux", wizard_args @ (find_wasm file :: List.tl argv)
             | Some "wasmfxtime" ->
                 ( "/home/jerome/sources/wasmfxtime/target/debug/wasmtime"
                 , wasmfxtime_args @ (find_wasm file :: List.tl argv) )