@grain/binaryen.ml 0.19.0 → 0.20.1

binaryen-archive/src/expression.ml

@@ -57,8 +57,6 @@ type kind =
   | RefTest
   | RefCast
   | BrOn
-  | RttCanon
-  | RttSub
   | StructNew
   | StructGet
   | StructSet
@@ -310,14 +308,6 @@ external id_br_on : unit -> int = "caml_binaryen_expression_id_br_on"
 
 let id_br_on = id_br_on ()
 
-external id_rtt_canon : unit -> int = "caml_binaryen_expression_id_rtt_canon"
-
-let id_rtt_canon = id_rtt_canon ()
-
-external id_rtt_sub : unit -> int = "caml_binaryen_expression_id_rtt_sub"
-
-let id_rtt_sub = id_rtt_sub ()
-
 external id_struct_new : unit -> int = "caml_binaryen_expression_id_struct_new"
 
 let id_struct_new = id_struct_new ()
@@ -409,8 +399,6 @@ let get_kind expr =
   | n when n = id_ref_test -> RefTest
   | n when n = id_ref_cast -> RefCast
   | n when n = id_br_on -> BrOn
-  | n when n = id_rtt_canon -> RttCanon
-  | n when n = id_rtt_sub -> RttSub
   | n when n = id_struct_new -> StructNew
   | n when n = id_struct_get -> StructGet
   | n when n = id_struct_set -> StructSet
@@ -630,10 +618,11 @@ module Global_set = struct
 end
 
 module Load = struct
-  external make : Module.t -> int -> bool -> int -> int -> Type.t -> t -> t
+  external make :
+    Module.t -> int -> bool -> int -> int -> Type.t -> t -> string -> t
     = "caml_binaryen_load__bytecode" "caml_binaryen_load"
 
-  (** Module, num_bytes, ?signed, offset, align, type, ptr. *)
+  (** Module, num_bytes, ?signed, offset, align, type, ptr, memory_name *)
   let make wasm_mod bytes ?(signed = false) offset align ty ptr =
     make wasm_mod bytes signed offset align ty ptr
 
@@ -642,9 +631,10 @@ module Load = struct
 end
 
 module Store = struct
-  external make : Module.t -> int -> int -> int -> t -> t -> Type.t -> t
+  external make :
+    Module.t -> int -> int -> int -> t -> t -> Type.t -> string -> t
     = "caml_binaryen_store__bytecode" "caml_binaryen_store"
-  (** Module, num_bytes, offset, align, ptr, value, type. *)
+  (** Module, num_bytes, offset, align, ptr, value, type, memory_name *)
 
   external get_ptr : t -> t = "caml_binaryen_store_get_ptr"
   external set_ptr : t -> t -> unit = "caml_binaryen_store_set_ptr"
@@ -698,18 +688,23 @@ module Return = struct
 end
 
 module Memory_size = struct
-  external make : Module.t -> t = "caml_binaryen_memory_size"
+  external make : Module.t -> string -> bool -> t = "caml_binaryen_memory_size"
+  (** Module, memory_name, memory_is_64 *)
 end
 
 module Memory_grow = struct
-  external make : Module.t -> t -> t = "caml_binaryen_memory_grow"
+  external make : Module.t -> t -> string -> bool -> t
+    = "caml_binaryen_memory_grow"
+  (** Module, delta, memory_name, memory_is_64 *)
+
   external get_delta : t -> t = "caml_binaryen_memory_grow_get_delta"
   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 make : Module.t -> int -> t -> t -> t -> string -> t
+    = "caml_binaryen_memory_init__bytecode" "caml_binaryen_memory_init"
+  (** Module, segment, destination, offset, size, memory_name *)
 
   external get_segment : t -> int = "caml_binaryen_memory_init_get_segment"
 
@@ -735,8 +730,9 @@ module Data_drop = struct
 end
 
 module Memory_copy = struct
-  external make : Module.t -> t -> t -> t -> t = "caml_binaryen_memory_copy"
-  (** Module, destination, source, size. *)
+  external make : Module.t -> t -> t -> t -> string -> string -> t
+    = "caml_binaryen_memory_copy__bytecode" "caml_binaryen_memory_copy"
+  (** Module, destination, source, size, dest_memory, source_memory *)
 
   external get_dest : t -> t = "caml_binaryen_memory_copy_get_dest"
   external set_dest : t -> t -> unit = "caml_binaryen_memory_copy_set_dest"
@@ -747,8 +743,9 @@ module Memory_copy = struct
 end
 
 module Memory_fill = struct
-  external make : Module.t -> t -> t -> t -> t = "caml_binaryen_memory_fill"
-  (** Module, destination, value, size. *)
+  external make : Module.t -> t -> t -> t -> string -> t
+    = "caml_binaryen_memory_fill"
+  (** Module, destination, value, size, memory_name *)
 
   external get_dest : t -> t = "caml_binaryen_memory_fill_get_dest"
   external set_dest : t -> t -> unit = "caml_binaryen_memory_fill_set_dest"

binaryen-archive/src/expression.mli

@@ -57,8 +57,6 @@ type kind =
   | RefTest
   | RefCast
   | BrOn
-  | RttCanon
-  | RttSub
   | StructNew
   | StructGet
   | StructSet
@@ -192,13 +190,15 @@ module Global_set : sig
 end
 
 module Load : sig
-  val make : Module.t -> int -> ?signed:bool -> int -> int -> Type.t -> t -> t
+  val make :
+    Module.t -> int -> ?signed:bool -> int -> int -> Type.t -> t -> string -> t
+
   val get_ptr : t -> t
   val set_ptr : t -> t -> unit
 end
 
 module Store : sig
-  val make : Module.t -> int -> int -> int -> t -> t -> Type.t -> t
+  val make : Module.t -> int -> int -> int -> t -> t -> Type.t -> string -> t
   val get_ptr : t -> t
   val set_ptr : t -> t -> unit
   val get_value : t -> t
@@ -246,17 +246,17 @@ module Return : sig
 end
 
 module Memory_size : sig
-  val make : Module.t -> t
+  val make : Module.t -> string -> bool -> t
 end
 
 module Memory_grow : sig
-  val make : Module.t -> t -> t
+  val make : Module.t -> t -> string -> bool -> t
   val get_delta : t -> t
   val set_delta : t -> t -> unit
 end
 
 module Memory_init : sig
-  val make : Module.t -> int -> t -> t -> t
+  val make : Module.t -> int -> t -> t -> t -> string -> t
   val get_segment : t -> int
   val set_segment : t -> int -> unit
   val get_dest : t -> t
@@ -274,7 +274,7 @@ module Data_drop : sig
 end
 
 module Memory_copy : sig
-  val make : Module.t -> t -> t -> t -> t
+  val make : Module.t -> t -> t -> t -> string -> string -> t
   val get_dest : t -> t
   val set_dest : t -> t -> unit
   val get_source : t -> t
@@ -284,7 +284,7 @@ module Memory_copy : sig
 end
 
 module Memory_fill : sig
-  val make : Module.t -> t -> t -> t -> t
+  val make : Module.t -> t -> t -> t -> string -> t
   val get_dest : t -> t
   val set_dest : t -> t -> unit
   val get_value : t -> t

binaryen-archive/src/heap_type.ml

@@ -0,0 +1,15 @@
+type t
+
+external ext : unit -> t = "caml_binaryen_heap_type_ext"
+external func : unit -> t = "caml_binaryen_heap_type_func"
+external any : unit -> t = "caml_binaryen_heap_type_any"
+external eq : unit -> t = "caml_binaryen_heap_type_eq"
+external i31 : unit -> t = "caml_binaryen_heap_type_i31"
+external data : unit -> t = "caml_binaryen_heap_type_data"
+external string : unit -> t = "caml_binaryen_heap_type_string"
+external stringview_wtf8 : unit -> t = "caml_binaryen_heap_type_stringview_wtf8"
+
+external stringview_wtf16 : unit -> t
+  = "caml_binaryen_heap_type_stringview_wtf16"
+
+external stringview_iter : unit -> t = "caml_binaryen_heap_type_stringview_iter"

binaryen-archive/src/heap_type.mli

@@ -0,0 +1,12 @@
+type t
+
+val ext : unit -> t
+val func : unit -> t
+val any : unit -> t
+val eq : unit -> t
+val i31 : unit -> t
+val data : unit -> t
+val string : unit -> t
+val stringview_wtf8 : unit -> t
+val stringview_wtf16 : unit -> t
+val stringview_iter : unit -> t

binaryen-archive/src/import.ml

@@ -20,7 +20,8 @@ external add_global_import :
 external function_import_get_module : Function.t -> string
   = "caml_binaryen_function_import_get_module"
 
-external memory_import_get_module : Module.t -> string = "caml_binaryen_memory_import_get_module"
+external memory_import_get_module : Module.t -> string -> string
+  = "caml_binaryen_memory_import_get_module"
 
 external global_import_get_module : Global.t -> string
   = "caml_binaryen_global_import_get_module"
@@ -28,7 +29,8 @@ external global_import_get_module : Global.t -> string
 external function_import_get_base : Function.t -> string
   = "caml_binaryen_function_import_get_base"
 
-external memory_import_get_base : Module.t -> string = "caml_binaryen_memory_import_get_base"
+external memory_import_get_base : Module.t -> string -> string
+  = "caml_binaryen_memory_import_get_base"
 
 external global_import_get_base : Global.t -> string
   = "caml_binaryen_global_import_get_base"

binaryen-archive/src/import.mli

@@ -8,8 +8,8 @@ val add_global_import :
   Module.t -> string -> string -> string -> Type.t -> bool -> unit
 
 val function_import_get_module : Function.t -> string
-val memory_import_get_module : Module.t -> string
+val memory_import_get_module : Module.t -> string -> string
 val global_import_get_module : Global.t -> string
 val function_import_get_base : Function.t -> string
-val memory_import_get_base : Module.t -> string
+val memory_import_get_base : Module.t -> string -> string
 val global_import_get_base : Global.t -> string

binaryen-archive/src/memory.ml

@@ -8,6 +8,7 @@ external set_memory :
   Expression.t list ->
   int list ->
   bool ->
+  string ->
   unit = "caml_binaryen_set_memory__bytecode" "caml_binaryen_set_memory"
 
 type segment = { data : bytes; kind : segment_kind; size : int }
@@ -41,12 +42,25 @@ let set_memory wasm_mod initial maximum export_name (segments : segment list)
 
 external has_memory : Module.t -> bool = "caml_binaryen_has_memory"
 
-external get_initial : Module.t -> int = "caml_binaryen_memory_get_initial"
-
-external has_max : Module.t -> bool = "caml_binaryen_memory_has_max"
+external get_initial : Module.t -> string -> int
+  = "caml_binaryen_memory_get_initial"
 
-external get_max : Module.t -> int = "caml_binaryen_memory_get_max"
+external has_max : Module.t -> string -> bool = "caml_binaryen_memory_has_max"
+external get_max : Module.t -> string -> int = "caml_binaryen_memory_get_max"
 
-external is_shared : Module.t -> bool = "caml_binaryen_memory_is_shared"
+external is_shared : Module.t -> string -> bool
+  = "caml_binaryen_memory_is_shared"
 
 let unlimited = -1
+
+external get_num_segments : Module.t -> int
+  = "caml_binaryen_get_num_memory_segments"
+
+external get_segment_byte_offset : Module.t -> int -> int
+  = "caml_binaryen_get_memory_segment_byte_offset"
+
+external get_segment_passive : Module.t -> int -> bool
+  = "caml_binaryen_get_memory_segment_passive"
+
+external get_segment_data : Module.t -> int -> bytes
+  = "caml_binaryen_get_memory_segment_data"

binaryen-archive/src/memory.mli

@@ -2,16 +2,15 @@ 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
+  Module.t -> int -> int -> string -> segment list -> bool -> string -> unit
 
 val has_memory : Module.t -> bool
-
-val get_initial : Module.t -> int
-
-val has_max : Module.t -> bool
-
-val get_max : Module.t -> int
-
-val is_shared : Module.t -> bool
-
+val get_initial : Module.t -> string -> int
+val has_max : Module.t -> string -> bool
+val get_max : Module.t -> string -> int
+val is_shared : Module.t -> string -> bool
 val unlimited : int
+val get_num_segments : Module.t -> int
+val get_segment_byte_offset : Module.t -> int -> int
+val get_segment_passive : Module.t -> int -> bool
+val get_segment_data : Module.t -> int -> bytes

binaryen-archive/src/module.ml

@@ -73,6 +73,10 @@ module Feature = struct
 
   let extended_const = extended_const ()
 
+  external strings : unit -> t = "caml_binaryen_feature_strings"
+
+  let strings = strings ()
+
   external all : unit -> t = "caml_binaryen_feature_all"
 
   let all = all ()
@@ -87,7 +91,10 @@ external add_custom_section : t -> string -> string -> unit
 external parse : string -> t = "caml_binaryen_module_parse"
 external print : t -> unit = "caml_binaryen_module_print"
 external print_asmjs : t -> unit = "caml_binaryen_module_print_asmjs"
-external print_stack_ir : t -> unit = "caml_binaryen_module_print_stack_ir"
+
+external print_stack_ir : t -> bool -> unit
+  = "caml_binaryen_module_print_stack_ir"
+
 external validate : t -> int = "caml_binaryen_module_validate"
 external optimize : t -> unit = "caml_binaryen_module_optimize"
 external get_features : t -> int = "caml_binaryen_module_get_features"
@@ -118,7 +125,10 @@ external write : t -> string option -> bytes * string option
   = "caml_binaryen_module_write"
 
 external write_text : t -> string = "caml_binaryen_module_write_text"
-external write_stack_ir : t -> string = "caml_binaryen_module_write_stack_ir"
+
+external write_stack_ir : t -> bool -> string
+  = "caml_binaryen_module_write_stack_ir"
+
 external read : bytes -> t = "caml_binaryen_module_read"
 external interpret : t -> unit = "caml_binaryen_module_interpret"
 

binaryen-archive/src/module.mli

@@ -19,6 +19,7 @@ module Feature : sig
   val typed_function_references : t
   val relaxed_simd : t
   val extended_const : t
+  val strings : t
   val all : t
 end
 
@@ -28,7 +29,7 @@ val add_custom_section : t -> string -> string -> unit
 val parse : string -> t
 val print : t -> unit
 val print_asmjs : t -> unit
-val print_stack_ir : t -> unit
+val print_stack_ir : t -> bool -> unit
 val validate : t -> int
 val optimize : t -> unit
 val get_features : t -> Feature.t list
@@ -37,7 +38,7 @@ val run_passes : t -> Passes.t list -> unit
 val auto_drop : t -> unit
 val write : t -> string option -> bytes * string option
 val write_text : t -> string
-val write_stack_ir : t -> string
+val write_stack_ir : t -> bool -> string
 val read : bytes -> t
 val interpret : t -> unit
 val add_debug_info_filename : t -> string -> int

binaryen-archive/src/ocaml_helpers.h

@@ -23,6 +23,7 @@ static struct custom_operations binaryen_ops = {
 
 #define BinaryenModuleRef_val(v) (*((BinaryenModuleRef*) Data_custom_val(v)))
 #define BinaryenType_val(v) (*((BinaryenType*) Data_custom_val(v)))
+#define BinaryenHeapType_val(v) (*((BinaryenHeapType*) Data_custom_val(v)))
 #define BinaryenExpressionRef_val(v) (*((BinaryenExpressionRef*) Data_custom_val(v)))
 #define BinaryenOp_val(v) (*((BinaryenOp*) Data_custom_val(v)))
 #define BinaryenLiteral_val(v) (*((struct BinaryenLiteral*) Data_custom_val(v)))

binaryen-archive/src/packed_type.ml

@@ -0,0 +1,13 @@
+type t = int
+
+external not_packed : unit -> t = "caml_binaryen_packed_type_not_packed"
+
+let not_packed = not_packed ()
+
+external int8 : unit -> t = "caml_binaryen_packed_type_int8"
+
+let int8 = int8 ()
+
+external int16 : unit -> t = "caml_binaryen_packed_type_int16"
+
+let int16 = int16 ()

binaryen-archive/src/packed_type.mli

@@ -0,0 +1,5 @@
+type t
+
+val not_packed : t
+val int8 : t
+val int16 : t

binaryen-archive/src/passes.ml

@@ -87,11 +87,17 @@ let generate_stack_ir = "generate-stack-ir"
 (** refine the types of globals *)
 let global_refining = "global-refining"
 
+(** globally optimize struct values *)
+let gsi = "gsi"
+
 (** globally optimize GC types *)
 let gto = "gto"
 
-(** globally optimize struct values *)
-let gsi = "gsi"
+(** Grand Unified Flow Analysis: optimize the entire program using information about what content can actually appear in each location *)
+let gufa = "gufa"
+
+(** GUFA plus local optimizations in functions we modified *)
+let gufa_optimizing = "gufa-optimizing"
 
 (** apply more specific subtypes to type fields where possible *)
 let type_refining = "type-refining"

binaryen-archive/src/passes.mli

@@ -87,11 +87,17 @@ val generate_stack_ir : t
 val global_refining : t
 (** refine the types of globals *)
 
+val gsi : t
+(** globally optimize struct values *)
+
 val gto : t
 (** globally optimize GC types *)
 
-val gsi : t
-(** globally optimize struct values *)
+val gufa : t
+(** Grand Unified Flow Analysis: optimize the entire program using information about what content can actually appear in each location *)
+
+val gufa_optimizing : t
+(** GUFA plus local optimizations in functions we modified *)
 
 val type_refining : t
 (** apply more specific subtypes to type fields where possible *)

binaryen-archive/src/type.ml

@@ -44,6 +44,22 @@ external dataref : unit -> t = "caml_binaryen_type_dataref"
 
 let dataref = dataref ()
 
+external stringref : unit -> t = "caml_binaryen_type_stringref"
+
+let stringref = stringref ()
+
+external stringview_wtf8 : unit -> t = "caml_binaryen_type_stringview_wtf8"
+
+let stringview_wtf8 = stringview_wtf8 ()
+
+external stringview_wtf16 : unit -> t = "caml_binaryen_type_stringview_wtf16"
+
+let stringview_wtf16 = stringview_wtf16 ()
+
+external stringview_iter : unit -> t = "caml_binaryen_type_stringview_iter"
+
+let stringview_iter = stringview_iter ()
+
 external unreachable : unit -> t = "caml_binaryen_type_unreachable"
 
 let unreachable = unreachable ()
@@ -54,3 +70,6 @@ let auto = auto ()
 
 external create : t array -> t = "caml_binaryen_type_create"
 external expand : t -> t array = "caml_binaryen_type_expand"
+external is_nullable : t -> bool = "caml_binaryen_type_is_nullable"
+external from_heap_type : Heap_type.t -> t = "caml_binaryen_type_from_heap_type"
+external get_heap_type : t -> Heap_type.t = "caml_binaryen_type_get_heap_type"

binaryen-archive/src/type.mli

@@ -11,7 +11,14 @@ val anyref : t
 val eqref : t
 val i31ref : t
 val dataref : t
+val stringref : t
+val stringview_wtf8 : t
+val stringview_wtf16 : t
+val stringview_iter : t
 val unreachable : t
 val auto : t
 val create : t array -> t
 val expand : t -> t array
+val is_nullable : t -> bool
+val from_heap_type : Heap_type.t -> t
+val get_heap_type : t -> Heap_type.t

binaryen-archive/src/type_system.ml

@@ -0,0 +1,7 @@
+type t = int
+
+external equirecursive : unit -> t = "caml_binaryen_type_system_equirecursive"
+external nominal : unit -> t = "caml_binaryen_type_system_nominal"
+external isorecursive : unit -> t = "caml_binaryen_type_system_isorecursive"
+external get_type_system : unit -> t = "caml_binaryen_get_type_system"
+external set_type_system : t -> unit = "caml_binaryen_set_type_system"

binaryen-archive/src/type_system.mli

@@ -0,0 +1,7 @@
+type t
+
+val equirecursive : unit -> t
+val nominal : unit -> t
+val isorecursive : unit -> t
+val get_type_system : unit -> t
+val set_type_system : t -> unit

binaryen-archive/test/dune

@@ -1,30 +1,29 @@
-(test
+(executable
  (name test)
- (modules test)
  (libraries binaryen)
- (ocamlopt_flags
+ (modes exe js)
+ (flags
+  :standard
   (:include ./config/ocamlopt_flags.sexp))
- (action
-  (run %{test})))
-
-; Tests for binaryen.js implementation
+ (js_of_ocaml
+  (flags --no-sourcemap)))
 
 (rule
- (target test_js.ml)
+ (alias runtest)
  (action
   (progn
-   (copy %{dep:test.ml} %{target})
-   (copy test.expected test_js.expected))))
+   (with-stdout-to
+    test.out
+    (run %{exe:test.exe}))
+   (diff test.out test.expected))))
 
-(test
- (name test_js)
+(rule
+ (alias runtest)
  (enabled_if
-  (<> %{system} mingw64))
- (modules test_js)
- (modes
-  (byte js))
- (libraries binaryen)
+  (= %{bin-available:node} true))
  (action
-  (run node %{dep:test_js.bc.js}))
- (js_of_ocaml
-  (flags --no-sourcemap --disable share)))
+  (progn
+   (with-stdout-to
+    test_js.out
+    (run node %{dep:test.bc.js}))
+   (diff test_js.out test.expected))))

binaryen-archive/test/test.expected

@@ -33,7 +33,7 @@
    (i32.add
     (select
      (local.get $0)
-     (i32.load8_s
+     (i32.load
       (local.get $1)
      )
      (i32.const 1)
@@ -43,11 +43,18 @@
   )
  )
  (func $start
-  (drop
-   (call_indirect $table (type $i32_i32_=>_i32)
-    (i32.const 3)
-    (i32.const 5)
+  (block $start
+   (memory.init 1
+    (i32.const 2048)
     (i32.const 0)
+    (i32.const 5)
+   )
+   (drop
+    (call_indirect $table (type $i32_i32_=>_i32)
+     (i32.const 3)
+     (i32.const 5)
+     (i32.const 0)
+    )
    )
   )
  )
@@ -67,6 +74,7 @@
  (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
  (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))
@@ -77,7 +85,7 @@
   (i32.add
    (select
     (local.get $0)
-    (i32.load8_s
+    (i32.load
      (local.get $1)
     )
     (i32.const 1)
@@ -86,6 +94,11 @@
   )
  )
  (func $start (; has Stack IR ;)
+  (memory.init 1
+   (i32.const 2048)
+   (i32.const 0)
+   (i32.const 5)
+  )
   (drop
    (call $adder
     (i32.const 3)
@@ -109,6 +122,7 @@
  (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data (i32.const 0) "hello")
+ (data "world")
  (table $0 1 1 funcref)
  (elem (i32.const 0) $0)
  (export "adder" (func $0))
@@ -119,7 +133,7 @@
   (i32.add
    (select
     (local.get $0)
-    (i32.load8_s
+    (i32.load
      (local.get $1)
     )
     (i32.const 1)
@@ -128,6 +142,11 @@
   )
  )
  (func $1
+  (memory.init 1
+   (i32.const 2048)
+   (i32.const 0)
+   (i32.const 5)
+  )
   (drop
    (call $0
     (i32.const 3)
@@ -151,6 +170,7 @@
  (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data (i32.const 0) "hello")
+ (data "world")
  (table $0 1 1 funcref)
  (elem (i32.const 0) $0)
  (export "adder" (func $0))
@@ -160,13 +180,17 @@
  (func $0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
-  i32.load8_s
+  i32.load $0
   i32.const 1
   select
   local.get $1
   i32.add
  )
  (func $1
+  i32.const 2048
+  i32.const 0
+  i32.const 5
+  memory.init $0 1
   i32.const 3
   i32.const 5
   call $0