More flexible API to call binaryen tools

Author: vouillon

compiler/bin-wasm_of_ocaml/compile.ml

@@ -101,10 +101,14 @@ let link_and_optimize
      else None)
   @@ fun opt_temp_sourcemap ->
   Binaryen.link
-    ~runtime_files:(runtime_file :: runtime_wasm_files)
-    ~input_files:wat_files
+    ~inputs:
+      (List.map
+         ~f:(fun file -> { Binaryen.module_name = "env"; file })
+         (runtime_file :: runtime_wasm_files)
+      @ List.map ~f:(fun file -> { Binaryen.module_name = "OCaml"; file }) wat_files)
     ~opt_output_sourcemap:opt_temp_sourcemap
-    ~output_file:temp_file;
+    ~output_file:temp_file
+    ();
   Fs.with_intermediate_file (Filename.temp_file "wasm-dce" ".wasm")
   @@ fun temp_file' ->
   opt_with
@@ -124,7 +128,8 @@ let link_and_optimize
     ~opt_input_sourcemap:opt_temp_sourcemap'
     ~opt_output_sourcemap:opt_sourcemap
     ~input_file:temp_file'
-    ~output_file;
+    ~output_file
+    ();
   Option.iter
     ~f:(update_sourcemap ~sourcemap_root ~sourcemap_don't_inline_content)
     opt_sourcemap_file;
@@ -138,15 +143,19 @@ let link_runtime ~profile runtime_wasm_files output_file =
   @@ fun temp_file ->
   Binaryen.link
     ~opt_output_sourcemap:None
-    ~runtime_files:(runtime_file :: runtime_wasm_files)
-    ~input_files:[]
-    ~output_file:temp_file;
+    ~inputs:
+      (List.map
+         ~f:(fun file -> { Binaryen.module_name = "env"; file })
+         (runtime_file :: runtime_wasm_files))
+    ~output_file:temp_file
+    ();
   Binaryen.optimize
     ~profile
     ~opt_input_sourcemap:None
     ~opt_output_sourcemap:None
     ~input_file:temp_file
     ~output_file
+    ()
 
 let generate_prelude ~out_file =
   Filename.gen_file out_file
@@ -186,7 +195,8 @@ let build_prelude z =
     ~input_file:prelude_file
     ~output_file:tmp_prelude_file
     ~opt_input_sourcemap:None
-    ~opt_output_sourcemap:None;
+    ~opt_output_sourcemap:None
+    ();
   Zip.add_file z ~name:"prelude.wasm" ~file:tmp_prelude_file;
   predefined_exceptions
 
@@ -413,7 +423,8 @@ let run
            ~opt_input_sourcemap:None
            ~opt_output_sourcemap:opt_tmp_map_file
            ~input_file:wat_file
-           ~output_file:tmp_wasm_file;
+           ~output_file:tmp_wasm_file
+           ();
          { Link.unit_name; unit_info; strings; fragments }
        in
        cont unit_data unit_name tmp_wasm_file opt_tmp_map_file

compiler/lib-wasm/binaryen.ml

@@ -45,18 +45,20 @@ let opt_flag flag v =
   | None -> []
   | Some v -> [ flag; Filename.quote v ]
 
-let link ~runtime_files ~input_files ~opt_output_sourcemap ~output_file =
+type link_input =
+  { module_name : string
+  ; file : string
+  }
+
+let link ?options ~inputs ~opt_output_sourcemap ~output_file () =
   command
     ("wasm-merge"
     :: (common_options ()
+       @ Option.value ~default:[] options
        @ List.flatten
            (List.map
-              ~f:(fun runtime_file -> [ Filename.quote runtime_file; "env" ])
-              runtime_files)
-       @ List.flatten
-           (List.map
-              ~f:(fun input_file -> [ Filename.quote input_file; "OCaml" ])
-              input_files)
+              ~f:(fun { file; module_name } -> [ Filename.quote file; module_name ])
+              inputs)
        @ [ "-o"; Filename.quote output_file ]
        @ opt_flag "--output-source-map" opt_output_sourcemap))
 
@@ -114,8 +116,14 @@ let optimization_options =
    ; [ "-O3"; "--skip-pass=inlining-optimizing"; "--traps-never-happen" ]
   |]
 
-let optimize ~profile ~opt_input_sourcemap ~input_file ~opt_output_sourcemap ~output_file
-    =
+let optimize
+    ~profile
+    ?options
+    ~opt_input_sourcemap
+    ~input_file
+    ~opt_output_sourcemap
+    ~output_file
+    () =
   let level =
     match profile with
     | None -> 1
@@ -124,7 +132,7 @@ let optimize ~profile ~opt_input_sourcemap ~input_file ~opt_output_sourcemap ~ou
   command
     ("wasm-opt"
      :: (common_options ()
-        @ optimization_options.(level - 1)
+        @ Option.value ~default:optimization_options.(level - 1) options
         @ [ Filename.quote input_file; "-o"; Filename.quote output_file ])
     @ opt_flag "--input-source-map" opt_input_sourcemap
     @ opt_flag "--output-source-map" opt_output_sourcemap)

compiler/lib-wasm/binaryen.mli

@@ -16,12 +16,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
+type link_input =
+  { module_name : string
+  ; file : string
+  }
+
 val link :
-     runtime_files:string list
-  -> input_files:string list
+     ?options:string list
+  -> inputs:link_input list
   -> opt_output_sourcemap:string option
   -> output_file:string
   -> unit
+  -> unit
 
 val dead_code_elimination :
      dependencies:string
@@ -33,8 +39,10 @@ val dead_code_elimination :
 
 val optimize :
      profile:Driver.profile option
+  -> ?options:string list
   -> opt_input_sourcemap:string option
   -> input_file:string
   -> opt_output_sourcemap:string option
   -> output_file:string
   -> unit
+  -> unit