adjust sizes

Author: hhugo

benchmarks/run.ml

@@ -146,17 +146,38 @@ let ml_size param =
         src
         dst)
 
-let file_size param =
+let file_size ?(wasm = false) param =
   compile_no_ext param ~comptime:false (fun ~src ~dst ->
-      Format.sprintf "wc -c < %s > %s" src dst)
+      let files =
+        if wasm then src ^ " " ^ Filename.remove_extension src ^ ".assets/*" else src
+      in
+      Format.sprintf "wc -c --total only %s > %s" files dst)
 
-let compr_file_size param =
+let compr_file_size ?(wasm = false) param =
   compile_no_ext param ~comptime:false (fun ~src ~dst ->
-      Format.sprintf "sed 's/^ *//g' %s | gzip -c | wc -c > %s" src dst)
+      let input =
+        if wasm
+        then
+          Printf.sprintf
+            "echo %s %s | xargs gzip -c"
+            src
+            (Filename.remove_extension src ^ ".assets/*")
+        else Printf.sprintf "sed 's/^ *//g' %s | gzip -c" src
+      in
+      Format.sprintf "%s | wc -c > %s" input dst)
 
-let bzip2_file_size param =
+let bzip2_file_size ?(wasm = false) param =
   compile_no_ext param ~comptime:false (fun ~src ~dst ->
-      Format.sprintf "sed 's/^ *//g' %s | bzip2 -c | wc -c > %s" src dst)
+      let input =
+        if wasm
+        then
+          Printf.sprintf
+            "echo %s %s | xargs bzip2 -c"
+            src
+            (Filename.remove_extension src ^ ".assets/*")
+        else Printf.sprintf "sed 's/^ *//g' %s | bzip2 -c" src
+      in
+      Format.sprintf "%s | wc -c > %s" input dst)
 
 let runtime_size param =
   compile_no_ext param ~comptime:false (fun ~src ~dst ->
@@ -288,7 +309,13 @@ let _ =
   ml_size param src Spec.ml sizes Spec.ml;
   file_size param code Spec.byte sizes Spec.byte;
   file_size param code Spec.js_of_ocaml sizes (Spec.sub_spec Spec.js_of_ocaml "full");
-  file_size param code Spec.wasm_of_ocaml sizes (Spec.sub_spec Spec.wasm_of_ocaml "full");
+  file_size
+    ~wasm:true
+    param
+    code
+    Spec.wasm_of_ocaml
+    sizes
+    (Spec.sub_spec Spec.wasm_of_ocaml "full");
   compr_file_size
     param
     code
@@ -308,6 +335,7 @@ let _ =
     sizes
     (Spec.sub_spec Spec.js_of_ocaml_effects_double_translation "gzipped");
   compr_file_size
+    ~wasm:true
     param
     code
     Spec.wasm_of_ocaml
@@ -332,6 +360,7 @@ let _ =
     sizes
     (Spec.sub_spec Spec.js_of_ocaml "bzip2");
   bzip2_file_size
+    ~wasm:true
     param
     code
     Spec.wasm_of_ocaml