From 7c3b43fec28610c36d9721e9b188945efd2dc73f Mon Sep 17 00:00:00 2001 From: Oscar Spencer Date: Fri, 28 Feb 2025 22:57:44 -0600 Subject: [PATCH] feat!: Upgrade to Binaryen v119 --- binaryen.opam | 2 +- esy.lock/index.json | 12 ++++++------ package.json | 2 +- src/op.c | 16 ++++++++-------- src/op.js | 24 ++++++++++++------------ src/op.ml | 24 ++++++++++++------------ src/op.mli | 8 ++++---- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/binaryen.opam b/binaryen.opam index a2356a71..6d317024 100644 --- a/binaryen.opam +++ b/binaryen.opam @@ -16,6 +16,6 @@ depends: [ "dune" {>= "3.0.0"} "dune-configurator" {>= "3.0.0"} "js_of_ocaml-compiler" {>= "6.0.0" < "7.0.0"} - "libbinaryen" {> "118.0.0" < "119.0.0"} + "libbinaryen" {> "119.0.0" < "120.0.0"} ] x-maintenance-intent: ["0.(latest)"] diff --git a/esy.lock/index.json b/esy.lock/index.json index 7866c645..db614c0e 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "6cabedd34420da31165803fc405c807c", + "checksum": "6cb531cab3703f0b827eee004e70e100", "root": "@grain/binaryen.ml@link-dev:./package.json", "node": { "ocaml@5.3.0@d41d8cd9": { @@ -1663,14 +1663,14 @@ "devDependencies": [ "ocaml@5.3.0@d41d8cd9" ], "available": "true" }, - "@grain/libbinaryen@118.0.0-b@d41d8cd9": { - "id": "@grain/libbinaryen@118.0.0-b@d41d8cd9", + "@grain/libbinaryen@119.0.0-b@d41d8cd9": { + "id": "@grain/libbinaryen@119.0.0-b@d41d8cd9", "name": "@grain/libbinaryen", - "version": "118.0.0-b", + "version": "119.0.0-b", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-118.0.0-b.tgz#sha1:8c5330a7cd5ee8c89b21d8b57da9d4009417db09" + "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-119.0.0-b.tgz#sha1:15f974daa35cd203b106bfe1f7b17fa89342bb82" ] }, "overrides": [], @@ -1697,7 +1697,7 @@ "ocaml@5.3.0@d41d8cd9", "@opam/dune-configurator@opam:3.20.2@7eb6ff01", "@opam/dune@opam:3.20.2@8daef28d", - "@grain/libbinaryen@118.0.0-b@d41d8cd9" + "@grain/libbinaryen@119.0.0-b@d41d8cd9" ], "devDependencies": [ "@opam/ocamlformat@opam:0.27.0@c40d4612", diff --git a/package.json b/package.json index 9bd103d3..9b690678 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "dependencies": { "ocaml": ">= 4.13.0 < 5.4.0", - "@grain/libbinaryen": "118.0.0-b", + "@grain/libbinaryen": "119.0.0-b", "@opam/dune": ">= 3.0.0", "@opam/dune-configurator": ">= 3.0.0" }, diff --git a/src/op.c b/src/op.c index e39a3bd7..a8d2bc8c 100644 --- a/src/op.c +++ b/src/op.c @@ -1477,30 +1477,30 @@ caml_binaryen_bitselect_vec128(value unit) { } CAMLprim value -caml_binaryen_relaxed_fma_vec_f32x4(value unit) { +caml_binaryen_relaxed_madd_vec_f32x4(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenRelaxedFmaVecF32x4(); + BinaryenOp op = BinaryenRelaxedMaddVecF32x4(); CAMLreturn(alloc_BinaryenOp(op)); } CAMLprim value -caml_binaryen_relaxed_fms_vec_f32x4(value unit) { +caml_binaryen_relaxed_nmadd_vec_f32x4(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenRelaxedFmsVecF32x4(); + BinaryenOp op = BinaryenRelaxedNmaddVecF32x4(); CAMLreturn(alloc_BinaryenOp(op)); } CAMLprim value -caml_binaryen_relaxed_fma_vec_f64x4(value unit) { +caml_binaryen_relaxed_madd_vec_f64x4(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenRelaxedFmaVecF64x2(); + BinaryenOp op = BinaryenRelaxedMaddVecF64x2(); CAMLreturn(alloc_BinaryenOp(op)); } CAMLprim value -caml_binaryen_relaxed_fms_vec_f64x4(value unit) { +caml_binaryen_relaxed_nmadd_vec_f64x4(value unit) { CAMLparam1(unit); - BinaryenOp op = BinaryenRelaxedFmsVecF64x2(); + BinaryenOp op = BinaryenRelaxedNmaddVecF64x2(); CAMLreturn(alloc_BinaryenOp(op)); } diff --git a/src/op.js b/src/op.js index f99ffd99..b35fe1fd 100644 --- a/src/op.js +++ b/src/op.js @@ -1258,28 +1258,28 @@ function caml_binaryen_bitselect_vec128() { return Binaryen.Operations.BitselectVec128; } -//Provides: caml_binaryen_relaxed_fma_vec_f32x4 +//Provides: caml_binaryen_relaxed_madd_vec_f32x4 //Requires: Binaryen -function caml_binaryen_relaxed_fma_vec_f32x4() { - return Binaryen.Operations.RelaxedFmaVecF32x4; +function caml_binaryen_relaxed_madd_vec_f32x4() { + return Binaryen.Operations.RelaxedMaddVecF32x4; } -//Provides: caml_binaryen_relaxed_fms_vec_f32x4 +//Provides: caml_binaryen_relaxed_nmadd_vec_f32x4 //Requires: Binaryen -function caml_binaryen_relaxed_fms_vec_f32x4() { - return Binaryen.Operations.RelaxedFmsVecF32x4; +function caml_binaryen_relaxed_nmadd_vec_f32x4() { + return Binaryen.Operations.RelaxedNmaddVecF32x4; } -//Provides: caml_binaryen_relaxed_fma_vec_f64x4 +//Provides: caml_binaryen_relaxed_madd_vec_f64x4 //Requires: Binaryen -function caml_binaryen_relaxed_fma_vec_f64x4() { - return Binaryen.Operations.RelaxedFmaVecF64x2; +function caml_binaryen_relaxed_madd_vec_f64x4() { + return Binaryen.Operations.RelaxedMaddVecF64x2; } -//Provides: caml_binaryen_relaxed_fms_vec_f64x4 +//Provides: caml_binaryen_relaxed_nmadd_vec_f64x4 //Requires: Binaryen -function caml_binaryen_relaxed_fms_vec_f64x4() { - return Binaryen.Operations.RelaxedFmsVecF64x2; +function caml_binaryen_relaxed_nmadd_vec_f64x4() { + return Binaryen.Operations.RelaxedNmaddVecF64x2; } //Provides: caml_binaryen_laneselect_i8x16 diff --git a/src/op.ml b/src/op.ml index a0091b90..e503bfc6 100644 --- a/src/op.ml +++ b/src/op.ml @@ -878,25 +878,25 @@ external bitselect_vec128 : unit -> t = "caml_binaryen_bitselect_vec128" let bitselect_vec128 = bitselect_vec128 () -external relaxed_fma_vec_f32x4 : unit -> t - = "caml_binaryen_relaxed_fma_vec_f32x4" +external relaxed_madd_vec_f32x4 : unit -> t + = "caml_binaryen_relaxed_madd_vec_f32x4" -let relaxed_fma_vec_f32x4 = relaxed_fma_vec_f32x4 () +let relaxed_madd_vec_f32x4 = relaxed_madd_vec_f32x4 () -external relaxed_fms_vec_f32x4 : unit -> t - = "caml_binaryen_relaxed_fms_vec_f32x4" +external relaxed_nmadd_vec_f32x4 : unit -> t + = "caml_binaryen_relaxed_nmadd_vec_f32x4" -let relaxed_fms_vec_f32x4 = relaxed_fms_vec_f32x4 () +let relaxed_nmadd_vec_f32x4 = relaxed_nmadd_vec_f32x4 () -external relaxed_fma_vec_f64x4 : unit -> t - = "caml_binaryen_relaxed_fma_vec_f64x4" +external relaxed_madd_vec_f64x4 : unit -> t + = "caml_binaryen_relaxed_madd_vec_f64x4" -let relaxed_fma_vec_f64x4 = relaxed_fma_vec_f64x4 () +let relaxed_madd_vec_f64x4 = relaxed_madd_vec_f64x4 () -external relaxed_fms_vec_f64x4 : unit -> t - = "caml_binaryen_relaxed_fms_vec_f64x4" +external relaxed_nmadd_vec_f64x4 : unit -> t + = "caml_binaryen_relaxed_nmadd_vec_f64x4" -let relaxed_fms_vec_f64x4 = relaxed_fms_vec_f64x4 () +let relaxed_nmadd_vec_f64x4 = relaxed_nmadd_vec_f64x4 () external laneselect_i8x16 : unit -> t = "caml_binaryen_laneselect_i8x16" diff --git a/src/op.mli b/src/op.mli index 66261ea4..00062395 100644 --- a/src/op.mli +++ b/src/op.mli @@ -210,10 +210,10 @@ val or_vec128 : t val xor_vec128 : t val and_not_vec128 : t val bitselect_vec128 : t -val relaxed_fma_vec_f32x4 : t -val relaxed_fms_vec_f32x4 : t -val relaxed_fma_vec_f64x4 : t -val relaxed_fms_vec_f64x4 : t +val relaxed_madd_vec_f32x4 : t +val relaxed_nmadd_vec_f32x4 : t +val relaxed_madd_vec_f64x4 : t +val relaxed_nmadd_vec_f64x4 : t val laneselect_i8x16 : t val laneselect_i16x8 : t val laneselect_i32x4 : t