@grain/binaryen.ml 0.20.0 → 0.20.1

binaryen-archive/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.20.1](https://github.com/grain-lang/binaryen.ml/compare/v0.20.0...v0.20.1) (2023-01-19)
+
+
+### Features
+
+* Add gufa & gufa_optimizing passes ([#180](https://github.com/grain-lang/binaryen.ml/issues/180)) ([7395a1f](https://github.com/grain-lang/binaryen.ml/commit/7395a1fe0591a835eeeeb6e6e58c28c32b69342d))
+
+
+### Bug Fixes
+
+* Properly handle load & store instructions in JS ([#178](https://github.com/grain-lang/binaryen.ml/issues/178)) ([becd3b8](https://github.com/grain-lang/binaryen.ml/commit/becd3b82ac31c7f2ba1055b320c7ff537b58d971))
+
 ## [0.20.0](https://github.com/grain-lang/binaryen.ml/compare/v0.19.0...v0.20.0) (2023-01-13)
 
 

binaryen-archive/binaryen.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "0.20.0"
+version: "0.20.1"
 synopsis: "OCaml bindings for Binaryen"
 maintainer: "oscar@grain-lang.org"
 author: "Oscar Spencer"

binaryen-archive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "license": "Apache-2.0",

binaryen-archive/src/binaryen_stubs_expressions.js

@@ -189,11 +189,12 @@ function caml_binaryen_load(
 
   switch (typ) {
     case Binaryen.i32: {
-      if (signed) {
-        if (bytes === 4) {
-          return wasm_mod.i32.load(offset, align, ptr, name);
-        }
+      // Using four bytes doesn't matter if it is signed or unsigned
+      if (bytes === 4) {
+        return wasm_mod.i32.load(offset, align, ptr, name);
+      }
 
+      if (signed) {
         if (bytes === 1) {
           return wasm_mod.i32.load8_s(offset, align, ptr, name);
         }
@@ -210,13 +211,16 @@ function caml_binaryen_load(
           return wasm_mod.i32.load16_u(offset, align, ptr, name);
         }
       }
+
+      break;
     }
     case Binaryen.i64: {
-      if (signed) {
-        if (bytes === 8) {
-          return wasm_mod.i64.load(offset, align, ptr, name);
-        }
+      // Using eight bytes doesn't matter if it is signed or unsigned
+      if (bytes === 8) {
+        return wasm_mod.i64.load(offset, align, ptr, name);
+      }
 
+      if (signed) {
         if (bytes === 1) {
           return wasm_mod.i64.load8_s(offset, align, ptr, name);
         }
@@ -241,6 +245,8 @@ function caml_binaryen_load(
           return wasm_mod.i64.load32_u(offset, align, ptr, name);
         }
       }
+
+      break;
     }
     case Binaryen.f32: {
       return wasm_mod.f32.load(offset, align, ptr, name);
@@ -300,6 +306,8 @@ function caml_binaryen_store(
       if (bytes === 2) {
         return wasm_mod.i32.store16(offset, align, ptr, value, name);
       }
+
+      break;
     }
     case Binaryen.i64: {
       if (bytes === 8) {
@@ -317,6 +325,8 @@ function caml_binaryen_store(
       if (bytes === 4) {
         return wasm_mod.i64.store32(offset, align, ptr, value, name);
       }
+
+      break;
     }
     case Binaryen.f32: {
       return wasm_mod.f32.store(offset, align, ptr, value, name);

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/test/test.expected

@@ -33,7 +33,7 @@
    (i32.add
     (select
      (local.get $0)
-     (i32.load8_s
+     (i32.load
       (local.get $1)
      )
      (i32.const 1)
@@ -85,7 +85,7 @@
   (i32.add
    (select
     (local.get $0)
-    (i32.load8_s
+    (i32.load
      (local.get $1)
     )
     (i32.const 1)
@@ -133,7 +133,7 @@
   (i32.add
    (select
     (local.get $0)
-    (i32.load8_s
+    (i32.load
      (local.get $1)
     )
     (i32.const 1)
@@ -180,7 +180,7 @@
  (func $0 (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
-  i32.load8_s $0
+  i32.load $0
   i32.const 1
   select
   local.get $1

binaryen-archive/test/test.ml

@@ -58,7 +58,7 @@ let x () = Expression.Local_get.make wasm_mod 0 Type.int32
 let y () = Expression.Local_get.make wasm_mod 1 Type.int32
 
 let load =
-  Expression.Load.make wasm_mod 1 ~signed:true 0 0 Type.int32 (y ()) "0"
+  Expression.Load.make wasm_mod 4 ~signed:false 0 0 Type.int32 (y ()) "0"
 
 let select =
   Expression.Select.make wasm_mod
@@ -204,6 +204,7 @@ let _ =
        Type.int32)
 
 let _ = Export.add_function_export wasm_mod "hello" "hello"
+let _ = Module.validate wasm_mod
 
 (* Shouldn't actually do anything since we aren't doing function renames *)
 let _ = Module.update_maps wasm_mod
@@ -233,7 +234,13 @@ let new_mod = Module.read byts
 
 let _ =
   Module.run_passes new_mod
-    [ Passes.name_types; Passes.merge_similar_functions; Passes.spill_pointers ]
+    [
+      Passes.name_types;
+      Passes.merge_similar_functions;
+      Passes.spill_pointers;
+      Passes.gufa;
+      Passes.gufa_optimizing;
+    ]
 
 let _ =
   Module.set_features new_mod