Merge wasm_of_ocaml #1724

OlivierNicole · 2024-10-31T10:21:36Z

This aims to merge wasm_of_ocaml, currently hosted at https://github.com/ocaml-wasm/wasm_of_ocaml, back into this repo.

This is pending on Dune support ocaml/dune#11029. For now, Dune is pinned for the CI jobs.

In particular, include part of the string contents in the name for short strings.

We had to work around some Firefox limitations which are now fixed. This reverts commit 8ed4e18.

The call to 'eval' is usually optimized away. So only generate it if needed.

No file in compiler/lib depends on a file in compiler/lib/wasm, so we no longer need to compile these two directories together.

https://github.com/WebAssembly/js-string-builtins Enabled with flag --experimental-wasm-imported-strings in node, and through chrome://flags/#enable-experimental-webassembly-features in Chrome.

Implement mapping between source and wasm locations. To work, this requires a version of Binaryen compiled with Jérôme's patch WebAssembly/binaryen#6372. Single-stepping can jump around in slightly surprising ways in the OCaml code, due to the different order of operations in wasm. This could be improved by modifying Binaryen to support “no location” annotations. Another future improvement can be to support mapping Wasm identifiers to OCaml ones. Co-authored-by: Jérôme Vouillon <[email protected]>

Sourcemap support for wasm

Tuple syntax changes

We were just numbering them. This should make the output more readable since we are propagating names from the OCaml source code.

Directly use the name from the OCaml code if possible, with a suffix in case of ambiguity. Use short names for not explictly named variables.

Use Js string builtins when available

- more options - do not keep temp files - use a relative path as a sourcemap url

Minify runtime

Improve Wat output

When one of the fields is not used, we fill it with the float value 0. rather than using the generic placeholder `(ref.i31 (i32.const 0))`, which does not make sense.

Fix bad interaction of deadcode elimination and unboxed float records

Stricter float_of_string

Get latest changes from js_of_ocaml

Fix creation of float arrays

When the size of a piece of code changes, report that its end position changes, rather than its start position.

- Wasm AST: use a standalone event instruction to indicate code locations - Add location at end of functions - Hide code with no location

Source map improvements

So that we test whole-program compilation a bit.

vouillon · 2024-10-31T14:51:55Z

@hhugo You can have a first look.

Regarding the directory structure, the wasm-specific code of wasm_of_ocaml is in compiler/lib/wasm (and compiler/lib/bin-wasm_of_ocaml for the binary itself). Initially, these files were included in the js_of_ocaml-compiler library, so I added a wa_ prefix to avoid confusing them with JavaScript related files. Now that it's a separate library, I should probably remove the prefix. The runtime files are in runtime/wasm. Maybe we should move the JavaScript runtime to runtime/js to get something more symmetric?

hhugo · 2024-10-31T15:02:47Z

compiler/lib/wasm/wa_closure_conversion.ml

+                    List.map ~f:(fun f -> f, Var.Map.find f arities) fun_lst
+                  in
+                  (*
+                  Format.eprintf "AAA";


do you wan't to keep this comment ?

hhugo · 2024-10-31T15:04:13Z

compiler/lib/wasm/sexp.ml

+    | None -> assert false
+end
+(*
+parse


this could be dropped or moved to a test directory

hhugo · 2024-10-31T15:05:22Z

compiler/lib/wasm/sexp.ml

+  let single f v =
+    match v with
+    | [ v ] -> f v
+    | _ -> assert false


should this assert be invalid_arg ? same below ..

hhugo · 2024-10-31T15:15:34Z

README.md

- ocp-indent: needed to support indentation in the toplevel
- higlo: needed to support Syntax highlighting in the toplevel
- cohttp: needed to build the toplevel webserver
+# Wasm_of_ocaml


Should we merge the two readmes ?

Yes, certainly.

hhugo · 2024-10-31T15:15:57Z

biome.json

@@ -37,7 +37,8 @@
      },
      "suspicious": {
        "noAssignInExpressions": "off",
-        "noRedeclare": "off"
+        "noRedeclare": "off",
+        "noRedundantUseStrict": "off"


Why is this ?

hhugo · 2024-10-31T15:16:58Z

compiler/lib/wasm/dune

@@ -0,0 +1,7 @@
+(library
+ (name wasm_of_ocaml_compiler)


how do you feel about moving this lib to compiler/lib-wasm ?

hhugo · 2024-10-31T15:22:35Z

.github/workflows/merge.yml

@@ -0,0 +1,39 @@
+name: Automatic Merge with Js_of_ocaml


I presume this file is not meant for this repo

hhugo · 2024-10-31T22:07:34Z

The runtime files are in runtime/wasm. Maybe we should move the JavaScript runtime to runtime/js to get something more symmetric?

Sounds good

hhugo · 2024-11-01T12:25:21Z

compiler/lib/wasm/wa_source_map.ml

+  ; mutable pos : int
+  }
+
+module Vlq = struct


This should probably be merged with the vlq module from lib

vouillon and others added 30 commits March 25, 2024 09:39

Better variable names

ab98abb

In particular, include part of the string contents in the name for short strings.

Simpler code to import JavaScript strings

862274b

We had to work around some Firefox limitations which are now fixed. This reverts commit 8ed4e18.

Use a fragment to call the JavaScript 'eval' function

0707886

The call to 'eval' is usually optimized away. So only generate it if needed.

Split off the wasm_of_ocaml-compiler library

8d259a2

No file in compiler/lib depends on a file in compiler/lib/wasm, so we no longer need to compile these two directories together.

Simpler string conversion functions

dba5093

Use JS String Builtins for string conversions

e04f918

https://github.com/WebAssembly/js-string-builtins Enabled with flag --experimental-wasm-imported-strings in node, and through chrome://flags/#enable-experimental-webassembly-features in Chrome.

Merge pull request ocsigen#27 from OlivierNicole/sourcemaps

d8bb665

Sourcemap support for wasm

Tuple syntax changes

b4c7103

Merge pull request ocsigen#31 from ocaml-wasm/syntax-update

6aa4b92

Tuple syntax changes

Name locals in WAT ouput

3dd3b28

We were just numbering them. This should make the output more readable since we are propagating names from the OCaml source code.

Use shorter names in WAT output

6cb2f7e

Directly use the name from the OCaml code if possible, with a suffix in case of ambiguity. Use short names for not explictly named variables.

Merge pull request ocsigen#33 from ocaml-wasm/js-string-builtins

3c96f1e

Use Js string builtins when available

Source map fixes and improvements

753732e

- more options - do not keep temp files - use a relative path as a sourcemap url

Minify runtime

2188fc7

Merge pull request ocsigen#35 from ocaml-wasm/minify

ab24656

Minify runtime

WAT output: fix float output

d4c5423

Merge pull request ocsigen#34 from ocaml-wasm/names

ef48ae6

Improve Wat output

Move binaryen related operations to a distinct file

a7dcef8

Generate code for reporting missing primitives

4a5ed46

AST: allow to export globals

bf1a8fa

Move code around

91ad556

Separate compilation: handle set/get globals + predefined exceptions

5b063bb

JSON serialization of build and unit info

a7f25df

Code generation changes

d1902c0

Reading/writing zip file

2d66d6a

Separate compilation

555cb4e

CI updates for separate compilation

db69298

Limit parallelism when loading Wasm modules

1ef25fa

Use unique file names to avoid cache issues

92080d2

vouillon and others added 26 commits October 23, 2024 15:07

Fix bad interaction of deadcode elimination and unboxed float records

0b432e7

When one of the fields is not used, we fill it with the float value 0. rather than using the generic placeholder `(ref.i31 (i32.const 0))`, which does not make sense.

Tests: more test for float conv

7a1d85c

Runtime: make float_of_string strict

aede507

Stricter float_of_string

48c22c6

Merge pull request ocsigen#108 from ocaml-wasm/dead-code-fix

15bea92

Fix bad interaction of deadcode elimination and unboxed float records

Merge pull request ocsigen#110 from ocaml-wasm/float_of_string

102f8dd

Stricter float_of_string

JavaScript if statement simplification: use appropriate locations

3698fe4

Add location after return statement

f1f0d24

Add location on new expression

d1ecd6b

Move source code location resolution from code output to code generation

eba73eb

Test: miscompilation of float array creation

fdbc151

Fix creation of float arrays

65e727a

Merge remote-tracking branch 'jsoo/master' into jsoo

badd68f

Add more tests of caml_make_array

0310c5c

Merge pull request ocsigen#111 from ocaml-wasm/jsoo

fb4d189

Get latest changes from js_of_ocaml

Merge pull request ocsigen#113 from ocaml-wasm/caml-make-array

c1390f7

Fix creation of float arrays

Wasm linker fixes

9293f3f

When the size of a piece of code changes, report that its end position changes, rather than its start position.

Sourcemap improvements

ea93a52

- Wasm AST: use a standalone event instruction to indicate code locations - Add location at end of functions - Hide code with no location

Merge pull request ocsigen#118 from ocaml-wasm/sm

3547c4c

Source map improvements

Compile a raise within a try as a branch to the exception handler

b37c665

Delete asset directory if it already exists

dea31d2

Github action: automatically merge with js_of_ocaml

f428e0e

Update README.md

f33288a

Source map: align with Js_of_ocaml

ba44373

Run Bonsai test with profile release as well

d6b458d

So that we test whole-program compilation a bit.

Make sure we open files in binary mode

5cf44d5

hhugo reviewed Oct 31, 2024

View reviewed changes

hhugo reviewed Nov 1, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge wasm_of_ocaml #1724

Merge wasm_of_ocaml #1724

OlivierNicole commented Oct 31, 2024

vouillon commented Oct 31, 2024

hhugo Oct 31, 2024

hhugo Oct 31, 2024

hhugo Oct 31, 2024

hhugo Oct 31, 2024

vouillon Oct 31, 2024

hhugo Oct 31, 2024

hhugo Oct 31, 2024

hhugo Oct 31, 2024

hhugo commented Oct 31, 2024

hhugo Nov 1, 2024

Merge wasm_of_ocaml #1724

Are you sure you want to change the base?

Merge wasm_of_ocaml #1724

Conversation

OlivierNicole commented Oct 31, 2024

vouillon commented Oct 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hhugo commented Oct 31, 2024

Choose a reason for hiding this comment