OxCaml: expose float16 <-> float conversion primitives

Author: vouillon

compiler/lib-wasm/gc_target.ml

@@ -1564,7 +1564,7 @@ module Bigarray = struct
           , fun x ->
               let* conv =
                 register_import
-                  ~name:"caml_double_to_float16"
+                  ~name:"caml_float16_of_double"
                   (Fun { W.params = [ F64 ]; result = [ I32 ] })
               in
               let* x = x in

compiler/lib-wasm/generate.ml

@@ -146,6 +146,8 @@ module Generate (Target : Target_sig.S) = struct
       ; "caml_erf_float32_bytecode", (`Pure, [ Float32 ], Float32)
       ; "caml_erfc_float32_bytecode", (`Pure, [ Float32 ], Float32)
       ; "caml_float32_compare", (`Pure, [ Float32; Float32 ], Int Normalized)
+      ; "caml_float16_of_double", (`Pure, [ Float ], Int32)
+      ; "caml_double_of_float16", (`Pure, [ Int32 ], Float)
       ];
     h
 

runtime/js/bigarray.js

@@ -42,8 +42,8 @@ function caml_ba_get_size(dims) {
   return size;
 }
 
-//Provides: caml_unpackFloat16
-var caml_unpackFloat16 = (function () {
+//Provides: caml_double_of_float16 pure
+var caml_double_of_float16 = (function () {
   var pow = Math.pow;
 
   var EXP_MASK16 = 31; // 2 ** 5 - 1
@@ -72,8 +72,8 @@ var caml_unpackFloat16 = (function () {
   };
 })();
 
-//Provides: caml_packFloat16
-var caml_packFloat16 = (function () {
+//Provides: caml_float16_of_double pure
+var caml_float16_of_double = (function () {
   const INVERSE_OF_EPSILON = 1 / Number.EPSILON;
 
   function roundTiesToEven(num) {
@@ -252,7 +252,7 @@ var caml_ba_custom_name = "_bigarr02";
 //Provides: Ml_Bigarray
 //Requires: caml_array_bound_error, caml_invalid_argument, caml_ba_custom_name
 //Requires: caml_int64_create_lo_hi, caml_int64_hi32, caml_int64_lo32
-//Requires: caml_packFloat16, caml_unpackFloat16
+//Requires: caml_float16_of_double, caml_double_of_float16
 class Ml_Bigarray {
   constructor(kind, layout, dims, buffer) {
     this.kind = kind;
@@ -299,7 +299,7 @@ class Ml_Bigarray {
         var i = this.data[ofs * 2 + 1];
         return [254, r, i];
       case 13:
-        return caml_unpackFloat16(this.data[ofs]);
+        return caml_double_of_float16(this.data[ofs]);
       default:
         return this.data[ofs];
     }
@@ -319,7 +319,7 @@ class Ml_Bigarray {
         this.data[ofs * 2 + 1] = v[2];
         break;
       case 13:
-        this.data[ofs] = caml_packFloat16(v);
+        this.data[ofs] = caml_float16_of_double(v);
         break;
       default:
         this.data[ofs] = v;
@@ -356,7 +356,7 @@ class Ml_Bigarray {
         }
         break;
       case 13:
-        this.data.fill(caml_packFloat16(v));
+        this.data.fill(caml_float16_of_double(v));
         break;
       default:
         this.data.fill(v);
@@ -406,8 +406,8 @@ class Ml_Bigarray {
         break;
       case 13:
         for (var i = 0; i < this.data.length; i++) {
-          var aa = caml_unpackFloat16(this.data[i]);
-          var bb = caml_unpackFloat16(b.data[i]);
+          var aa = caml_double_of_float16(this.data[i]);
+          var bb = caml_double_of_float16(b.data[i]);
           if (aa < bb) return -1;
           if (aa > bb) return 1;
         }
@@ -769,7 +769,7 @@ function caml_ba_reshape(ba, vind) {
 //Provides: caml_ba_serialize
 //Requires: caml_int64_bits_of_float, caml_int64_to_bytes
 //Requires: caml_int32_bits_of_float
-//Requires: caml_packFloat16
+//Requires: caml_float16_of_double
 function caml_ba_serialize(writer, ba, sz) {
   writer.write(32, ba.dims.length);
   writer.write(32, ba.kind | (ba.layout << 8));
@@ -859,7 +859,7 @@ function caml_ba_serialize(writer, ba, sz) {
 //Requires: caml_int64_of_bytes, caml_int64_float_of_bits
 //Requires: caml_int32_float_of_bits
 //Requires: caml_ba_create_buffer
-//Requires: caml_unpackFloat16
+//Requires: caml_double_of_float16
 function caml_ba_deserialize(reader, sz, name) {
   var num_dims = reader.read32s();
   if (num_dims < 0 || num_dims > 16)
@@ -985,7 +985,7 @@ function caml_ba_create_from(data1, data2, _jstyp, kind, layout, dims) {
 
 //Provides: caml_ba_hash const
 //Requires: caml_ba_get_size, caml_hash_mix_int, caml_hash_mix_float
-//Requires: caml_unpackFloat16, caml_hash_mix_float16, caml_hash_mix_float32
+//Requires: caml_double_of_float16, caml_hash_mix_float16, caml_hash_mix_float32
 function caml_ba_hash(ba) {
   var num_elts = caml_ba_get_size(ba.dims);
   var h = 0;

runtime/wasm/bigarray.wat

@@ -184,7 +184,7 @@
             (field $ba_kind i8) ;; kind
             (field $ba_layout i8)))) ;; layout
 
-   (func $double_to_float16 (export "caml_double_to_float16")
+   (func $double_to_float16 (export "caml_float16_of_double")
       (param $f f64) (result i32)
       (local $x i32) (local $sign i32) (local $o i32)
       (local.set $x (i32.reinterpret_f32 (f32.demote_f64 (local.get $f))))