@grain/binaryen.ml 0.16.0 → 0.18.0

binaryen-archive/src/binaryen_stubs_settings.js

@@ -1,120 +1,118 @@
 //Provides: caml_binaryen_get_optimize_level
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_optimize_level() {
-  return binaryen.getOptimizeLevel();
+  return Binaryen.getOptimizeLevel();
 }
 
 //Provides: caml_binaryen_set_optimize_level
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_optimize_level(level) {
-  return binaryen.setOptimizeLevel(level);
+  return Binaryen.setOptimizeLevel(level);
 }
 
 //Provides: caml_binaryen_get_shrink_level
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_shrink_level() {
-  return binaryen.getShrinkLevel();
+  return Binaryen.getShrinkLevel();
 }
 
 //Provides: caml_binaryen_set_shrink_level
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_shrink_level(level) {
-  return binaryen.setShrinkLevel(level);
+  return Binaryen.setShrinkLevel(level);
 }
 
 //Provides: caml_binaryen_get_debug_info
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_debug_info() {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenGetDebugInfo();
+  return Binaryen._BinaryenGetDebugInfo();
 }
 
 //Provides: caml_binaryen_set_debug_info
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_debug_info(on) {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenSetDebugInfo(on);
+  return Binaryen._BinaryenSetDebugInfo(on);
 }
 
 //Provides: caml_binaryen_get_low_memory_unused
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_low_memory_unused() {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenGetLowMemoryUnused();
+  return Binaryen._BinaryenGetLowMemoryUnused();
 }
 
 //Provides: caml_binaryen_set_low_memory_unused
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_low_memory_unused(on) {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenSetLowMemoryUnused(on);
+  return Binaryen._BinaryenSetLowMemoryUnused(on);
 }
 
 //Provides: caml_binaryen_get_pass_argument
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_jsstring_of_string
 function caml_binaryen_get_pass_argument(name) {
-  return binaryen.getPassArgument(
-    caml_jsstring_of_string(name)
-  );
+  return Binaryen.getPassArgument(caml_jsstring_of_string(name));
 }
 
 //Provides: caml_binaryen_set_pass_argument
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_jsstring_of_string
 function caml_binaryen_set_pass_argument(name, value) {
-  return binaryen.setPassArgument(
+  return Binaryen.setPassArgument(
     caml_jsstring_of_string(name),
     caml_jsstring_of_string(value)
   );
 }
 
 //Provides: caml_binaryen_get_always_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_always_inline_max_size() {
-  return binaryen.getAlwaysInlineMaxSize();
+  return Binaryen.getAlwaysInlineMaxSize();
 }
 
 //Provides: caml_binaryen_set_always_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_always_inline_max_size(size) {
-  return binaryen.setAlwaysInlineMaxSize(size);
+  return Binaryen.setAlwaysInlineMaxSize(size);
 }
 
 //Provides: caml_binaryen_get_flexible_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_flexible_inline_max_size() {
-  return binaryen.getFlexibleInlineMaxSize();
+  return Binaryen.getFlexibleInlineMaxSize();
 }
 
 //Provides: caml_binaryen_set_flexible_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_flexible_inline_max_size(size) {
-  return binaryen.setFlexibleInlineMaxSize(size);
+  return Binaryen.setFlexibleInlineMaxSize(size);
 }
 
 //Provides: caml_binaryen_get_one_caller_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_get_one_caller_inline_max_size() {
-  return binaryen.getOneCallerInlineMaxSize();
+  return Binaryen.getOneCallerInlineMaxSize();
 }
 
 //Provides: caml_binaryen_set_one_caller_inline_max_size
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_one_caller_inline_max_size(size) {
-  return binaryen.setOneCallerInlineMaxSize(size);
+  return Binaryen.setOneCallerInlineMaxSize(size);
 }
 
 //Provides: caml_binaryen_set_colors_enabled
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_set_colors_enabled(on) {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenSetColorsEnabled(on);
+  return Binaryen._BinaryenSetColorsEnabled(on);
 }
 
 //Provides: caml_binaryen_are_colors_enabled
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_are_colors_enabled() {
   // Uses the `_Binaryen` function because then we are working with ints which are also booleans to JSOO
-  return binaryen._BinaryenAreColorsEnabled();
+  return Binaryen._BinaryenAreColorsEnabled();
 }

binaryen-archive/src/binaryen_stubs_tables.js

@@ -11,7 +11,13 @@ function caml_binaryen_add_table(wasm_mod, table, initial, maximum, tableType) {
 
 //Provides: caml_binaryen_add_active_element_segment
 //Requires: caml_jsstring_of_string, caml_list_to_js_array
-function caml_binaryen_add_active_element_segment(wasm_mod, table, name, funcnames, offset) {
+function caml_binaryen_add_active_element_segment(
+  wasm_mod,
+  table,
+  name,
+  funcnames,
+  offset
+) {
   return wasm_mod.addActiveElementSegment(
     caml_jsstring_of_string(table),
     caml_jsstring_of_string(name),
@@ -43,42 +49,42 @@ function caml_binaryen_get_element_segment_by_index(wasm_mod, index) {
 }
 
 //Provides: caml_binaryen_element_segment_get_name
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_string_of_jsstring
 function caml_binaryen_element_segment_get_name(elem) {
-  var element_segment_info = binaryen.getElementSegmentInfo(elem);
-  return caml_string_of_jsstring(element_segment_info.name)
+  var element_segment_info = Binaryen.getElementSegmentInfo(elem);
+  return caml_string_of_jsstring(element_segment_info.name);
 }
 
 // TODO: Implement caml_binaryen_element_segment_set_name
 
 //Provides: caml_binaryen_element_segment_get_table
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_string_of_jsstring
 function caml_binaryen_element_segment_get_table(elem) {
-  var element_segment_info = binaryen.getElementSegmentInfo(elem);
+  var element_segment_info = Binaryen.getElementSegmentInfo(elem);
   return caml_string_of_jsstring(element_segment_info.table);
 }
 
 // TODO: Implement caml_binaryen_element_segment_set_table
 
 //Provides: caml_binaryen_element_segment_get_offset
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_element_segment_get_offset(elem) {
-  var element_segment_info = binaryen.getElementSegmentInfo(elem);
+  var element_segment_info = Binaryen.getElementSegmentInfo(elem);
   return element_segment_info.offset;
 }
 
 //Provides: caml_binaryen_element_segment_get_length
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_element_segment_get_length(elem) {
-  return binaryen._BinaryenElementSegmentGetLength(elem);
+  return Binaryen._BinaryenElementSegmentGetLength(elem);
 }
 
 //Provides: caml_binaryen_element_segment_get_data
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_string_of_jsstring
 function caml_binaryen_element_segment_get_data(elem, index) {
-  var element_segment_info = binaryen.getElementSegmentInfo(elem);
+  var element_segment_info = Binaryen.getElementSegmentInfo(elem);
   return caml_string_of_jsstring(element_segment_info.data[index]);
 }

binaryen-archive/src/binaryen_stubs_types.c

@@ -66,9 +66,30 @@ caml_binaryen_type_funcref(value unit) {
 }
 
 CAMLprim value
-caml_binaryen_type_externref(value unit) {
+caml_binaryen_type_anyref(value unit) {
   CAMLparam1(unit);
-  BinaryenType ty = BinaryenTypeExternref();
+  BinaryenType ty = BinaryenTypeAnyref();
+  CAMLreturn(alloc_BinaryenType(ty));
+}
+
+CAMLprim value
+caml_binaryen_type_eqref(value unit) {
+  CAMLparam1(unit);
+  BinaryenType ty = BinaryenTypeEqref();
+  CAMLreturn(alloc_BinaryenType(ty));
+}
+
+CAMLprim value
+caml_binaryen_type_i31ref(value unit) {
+  CAMLparam1(unit);
+  BinaryenType ty = BinaryenTypeI31ref();
+  CAMLreturn(alloc_BinaryenType(ty));
+}
+
+CAMLprim value
+caml_binaryen_type_dataref(value unit) {
+  CAMLparam1(unit);
+  BinaryenType ty = BinaryenTypeDataref();
   CAMLreturn(alloc_BinaryenType(ty));
 }
 

binaryen-archive/src/binaryen_stubs_types.js

@@ -1,73 +1,91 @@
 //Provides: caml_binaryen_type_none
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_none() {
-  return binaryen.none;
+  return Binaryen.none;
 }
 
 //Provides: caml_binaryen_type_int32
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_int32() {
-  return binaryen.i32;
+  return Binaryen.i32;
 }
 
 //Provides: caml_binaryen_type_int64
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_int64() {
-  return binaryen.i64;
+  return Binaryen.i64;
 }
 
 //Provides: caml_binaryen_type_float32
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_float32() {
-  return binaryen.f32;
+  return Binaryen.f32;
 }
 
 //Provides: caml_binaryen_type_float64
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_float64() {
-  return binaryen.f64;
+  return Binaryen.f64;
 }
 
 //Provides: caml_binaryen_type_vec128
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_vec128() {
-  return binaryen.v128;
+  return Binaryen.v128;
 }
 
 //Provides: caml_binaryen_type_funcref
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_funcref() {
-  return binaryen.funcref;
+  return Binaryen.funcref;
 }
 
-//Provides: caml_binaryen_type_externref
-//Requires: binaryen
-function caml_binaryen_type_externref() {
-  return binaryen.externref;
+//Provides: caml_binaryen_type_anyref
+//Requires: Binaryen
+function caml_binaryen_type_anyref() {
+  return Binaryen.anyref;
+}
+
+//Provides: caml_binaryen_type_eqref
+//Requires: Binaryen
+function caml_binaryen_type_eqref() {
+  return Binaryen.eqref;
+}
+
+//Provides: caml_binaryen_type_i31ref
+//Requires: Binaryen
+function caml_binaryen_type_i31ref() {
+  return Binaryen.i31ref;
+}
+
+//Provides: caml_binaryen_type_dataref
+//Requires: Binaryen
+function caml_binaryen_type_dataref() {
+  return Binaryen.dataref;
 }
 
 //Provides: caml_binaryen_type_unreachable
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_unreachable() {
-  return binaryen.unreachable;
+  return Binaryen.unreachable;
 }
 
 //Provides: caml_binaryen_type_auto
-//Requires: binaryen
+//Requires: Binaryen
 function caml_binaryen_type_auto() {
-  return binaryen.auto;
+  return Binaryen.auto;
 }
 
 //Provides: caml_binaryen_type_create
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_js_from_array
 function caml_binaryen_type_create(typs) {
-  return binaryen.createType(caml_js_from_array(typs));
+  return Binaryen.createType(caml_js_from_array(typs));
 }
 
 //Provides: caml_binaryen_type_expand
-//Requires: binaryen
+//Requires: Binaryen
 //Requires: caml_js_to_array
 function caml_binaryen_type_expand(typ) {
-  return caml_js_to_array(binaryen.expandType(typ));
+  return caml_js_to_array(Binaryen.expandType(typ));
 }

binaryen-archive/src/expression.ml

@@ -707,6 +707,33 @@ module Memory_grow = struct
   external set_delta : t -> t -> unit = "caml_binaryen_memory_grow_set_delta"
 end
 
+module Memory_init = struct
+  external make : Module.t -> int -> t -> t -> t = "caml_binaryen_memory_init"
+  (** Module, segment, destination, offset, size. *)
+
+  external get_segment : t -> int = "caml_binaryen_memory_init_get_segment"
+
+  external set_segment : t -> int -> unit
+    = "caml_binaryen_memory_init_set_segment"
+
+  external get_dest : t -> t = "caml_binaryen_memory_init_get_dest"
+  external set_dest : t -> t -> unit = "caml_binaryen_memory_init_set_dest"
+  external get_offset : t -> t = "caml_binaryen_memory_init_get_offset"
+  external set_offset : t -> t -> unit = "caml_binaryen_memory_init_set_offset"
+  external get_size : t -> t = "caml_binaryen_memory_init_get_size"
+  external set_size : t -> t -> unit = "caml_binaryen_memory_init_set_size"
+end
+
+module Data_drop = struct
+  external make : Module.t -> int -> t = "caml_binaryen_data_drop"
+  (** Module, segment. *)
+
+  external get_segment : t -> int = "caml_binaryen_data_drop_get_segment"
+
+  external set_segment : t -> int -> unit
+    = "caml_binaryen_data_drop_set_segment"
+end
+
 module Memory_copy = struct
   external make : Module.t -> t -> t -> t -> t = "caml_binaryen_memory_copy"
   (** Module, destination, source, size. *)

binaryen-archive/src/expression.mli

@@ -255,6 +255,24 @@ module Memory_grow : sig
   val set_delta : t -> t -> unit
 end
 
+module Memory_init : sig
+  val make : Module.t -> int -> t -> t -> t
+  val get_segment : t -> int
+  val set_segment : t -> int -> unit
+  val get_dest : t -> t
+  val set_dest : t -> t -> unit
+  val get_offset : t -> t
+  val set_offset : t -> t -> unit
+  val get_size : t -> t
+  val set_size : t -> t -> unit
+end
+
+module Data_drop : sig
+  val make : Module.t -> int -> t
+  val get_segment : t -> int
+  val set_segment : t -> int -> unit
+end
+
 module Memory_copy : sig
   val make : Module.t -> t -> t -> t -> t
   val get_dest : t -> t

binaryen-archive/src/memory.ml

@@ -3,31 +3,34 @@ external set_memory :
   int ->
   int ->
   string ->
-  string list ->
+  bytes list ->
   bool list ->
   Expression.t list ->
   int list ->
   bool ->
   unit = "caml_binaryen_set_memory__bytecode" "caml_binaryen_set_memory"
 
-type segment = {
-  data : string;
-  passive : bool;
-  offset : Expression.t;
-  size : int;
-}
+type segment = { data : bytes; kind : segment_kind; size : int }
+and segment_kind = Passive | Active of { offset : Expression.t }
 
 (** Module, initial size, maximum size, export name, segments, shared. *)
 let set_memory wasm_mod initial maximum export_name (segments : segment list)
     shared =
   let split_segments segments =
     List.fold_right
-      (fun { data; passive; offset; size }
+      (fun { data; kind; size }
            (segment_data, segment_passive, segment_offsets, segment_sizes) ->
-        ( data :: segment_data,
-          passive :: segment_passive,
-          offset :: segment_offsets,
-          size :: segment_sizes ))
+        match kind with
+        | Active { offset } ->
+            ( data :: segment_data,
+              false :: segment_passive,
+              offset :: segment_offsets,
+              size :: segment_sizes )
+        | Passive ->
+            ( data :: segment_data,
+              true :: segment_passive,
+              Expression.Null.make () :: segment_offsets,
+              size :: segment_sizes ))
       segments ([], [], [], [])
   in
   let segment_data, segment_passive, segment_offsets, segment_sizes =

binaryen-archive/src/memory.mli

@@ -1,9 +1,5 @@
-type segment = {
-  data : string;
-  passive : bool;
-  offset : Expression.t;
-  size : int;
-}
+type segment = { data : bytes; kind : segment_kind; size : int }
+and segment_kind = Passive | Active of { offset : Expression.t }
 
 val set_memory :
   Module.t -> int -> int -> string -> segment list -> bool -> unit

binaryen-archive/src/module.ml

@@ -69,6 +69,10 @@ module Feature = struct
 
   let relaxed_simd = relaxed_simd ()
 
+  external extended_const : unit -> t = "caml_binaryen_feature_extended_const"
+
+  let extended_const = extended_const ()
+
   external all : unit -> t = "caml_binaryen_feature_all"
 
   let all = all ()

binaryen-archive/src/module.mli

@@ -18,6 +18,7 @@ module Feature : sig
   val memory64 : t
   val typed_function_references : t
   val relaxed_simd : t
+  val extended_const : t
   val all : t
 end
 

binaryen-archive/src/passes.ml

@@ -147,6 +147,9 @@ let memory_packing = "memory-packing"
 (** merges blocks to their parents *)
 let merge_blocks = "merge-blocks"
 
+(** merges similar functions when benefical *)
+let merge_similar_functions = "merge-similar-functions"
+
 (** merges locals when beneficial *)
 let merge_locals = "merge-locals"
 
@@ -275,6 +278,9 @@ let safe_heap = "safe-heap"
 (** sets specified globals to specified values *)
 let set_globals = "set-globals"
 
+(** remove params from function signature types where possible *)
+let signature_pruning = "signature-pruning"
+
 (** apply more specific subtypes to signature types where possible *)
 let signature_refining = "signature-refining"
 

binaryen-archive/src/passes.mli

@@ -147,6 +147,9 @@ val memory_packing : t
 val merge_blocks : t
 (** merges blocks to their parents *)
 
+val merge_similar_functions : t
+(** merges similar functions when benefical *)
+
 val merge_locals : t
 (** merges locals when beneficial *)
 
@@ -273,6 +276,9 @@ val safe_heap : t
 val set_globals : t
 (** sets specified globals to specified values *)
 
+val signature_pruning : t
+(** remove params from function signature types where possible *)
+
 val signature_refining : t
 (** apply more specific subtypes to signature types where possible *)
 

binaryen-archive/src/type.ml

@@ -28,9 +28,21 @@ external funcref : unit -> t = "caml_binaryen_type_funcref"
 
 let funcref = funcref ()
 
-external externref : unit -> t = "caml_binaryen_type_externref"
+external anyref : unit -> t = "caml_binaryen_type_anyref"
 
-let externref = externref ()
+let anyref = anyref ()
+
+external eqref : unit -> t = "caml_binaryen_type_eqref"
+
+let eqref = eqref ()
+
+external i31ref : unit -> t = "caml_binaryen_type_i31ref"
+
+let i31ref = i31ref ()
+
+external dataref : unit -> t = "caml_binaryen_type_dataref"
+
+let dataref = dataref ()
 
 external unreachable : unit -> t = "caml_binaryen_type_unreachable"
 

binaryen-archive/src/type.mli

@@ -7,7 +7,10 @@ val float32 : t
 val float64 : t
 val vec128 : t
 val funcref : t
-val externref : t
+val anyref : t
+val eqref : t
+val i31ref : t
+val dataref : t
 val unreachable : t
 val auto : t
 val create : t array -> t

binaryen-archive/test/test.expected

@@ -9,14 +9,15 @@
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
- (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
- (type $externref_=>_i32 (func (param externref) (result i32)))
- (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
+ (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
+ (type $anyref_=>_i32 (func (param anyref) (result i32)))
+ (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
  (global $max_int64 i64 (i64.const 9223372036854775807))
  (global $max_int64_mut (mut i64) (i64.const 9223372036854775807))
  (global $test_float64_bits f64 (f64.const 1.23))
  (memory $0 1)
  (data (i32.const 0) "hello")
+ (data "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -50,7 +51,7 @@
    )
   )
  )
- (func $hello (param $0 externref) (result i32)
+ (func $hello (param $0 anyref) (result i32)
   (call $write
    (local.get $0)
    (i32.const 0)
@@ -61,9 +62,9 @@
 (module
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $none_=>_none (func))
- (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
- (type $externref_=>_i32 (func (param externref) (result i32)))
- (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
+ (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
+ (type $anyref_=>_i32 (func (param anyref) (result i32)))
+ (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data (i32.const 0) "hello")
  (table $table 1 1 funcref)
@@ -92,7 +93,7 @@
    )
   )
  )
- (func $hello (; has Stack IR ;) (param $0 externref) (result i32)
+ (func $hello (; has Stack IR ;) (param $0 anyref) (result i32)
   (call $write
    (local.get $0)
    (i32.const 0)
@@ -101,11 +102,11 @@
  )
 )
 (module
- (type $type$0 (func (param externref i32 i32) (result i32)))
+ (type $type$0 (func (param anyref i32 i32) (result i32)))
  (type $type$1 (func (param i32 i32) (result i32)))
  (type $type$2 (func))
- (type $type$3 (func (param externref) (result i32)))
- (import "future-wasi" "write" (func $fimport$0 (param externref i32 i32) (result i32)))
+ (type $type$3 (func (param anyref) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data (i32.const 0) "hello")
  (table $0 1 1 funcref)
@@ -134,7 +135,7 @@
    )
   )
  )
- (func $2 (param $0 externref) (result i32)
+ (func $2 (param $0 anyref) (result i32)
   (call $fimport$0
    (local.get $0)
    (i32.const 0)