Add wasm-opt to build

0rphee · Jan 17, 2025 · cb86fb8 · cb86fb8
1 parent 6e93cfa
commit cb86fb8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -173,3 +173,4 @@ dist
 
 *~
 web/src/ghc_wasm_jsffi.js
+web/static/xolsh-exe.wasm
diff --git a/flake.nix b/flake.nix
@@ -47,6 +47,8 @@
           jlox-test
           ghc-wasm-meta.packages.${system}.wasm32-wasi-ghc-9_10
           ghc-wasm-meta.packages.${system}.wasm32-wasi-cabal-9_10
+
+          pkgs.binaryen # wasm-opt
           pkgs.wasmtime
 
           # for https://gitlab.haskell.org/ghc/ghc/-/blob/master/utils/jsffi/post-link.mjs

diff --git a/loxexamples/ch10.lox b/loxexamples/ch10.lox
@@ -6,7 +6,7 @@ fun fib(n) {
 }
 
 print "begin fib";
-for (var i = 0; i < 35; i = i + 1) {
+for (var i = 0; i < 25; i = i + 1) {
   print fib(i);
 }
 print "end fib, begin count";

diff --git a/web/build.sh b/web/build.sh
@@ -9,13 +9,13 @@ outdir=""
 case $1 in
     dev) 
         echo "dev run"
-        outdir="./static/"
+        outdir="./static"
         ;;
     prod)
         echo "prod run"
         wasm32-wasi-cabal update
         npm install
-        outdir="./dist/"
+        outdir="./dist"
         cp -R static/ $outdir/
         ;;
     *)
@@ -28,6 +28,16 @@ wasm32-wasi-cabal build xolsh-exe && wasmpath=$(wasm32-wasi-cabal list-bin xolsh
 
 cp -f $wasmpath $outdir/xolsh-exe.wasm
 
+# O1 is better than On n>=2
+optflags="-O1 --strip-debug"
+optargs="$outdir/xolsh-exe.wasm -o $outdir/xolsh-exe.wasm"
+echo running wasm-opt $optflags $optargs
+wasm-opt $optflags $optargs
+# "wasm-tools strip" doesnt seem to have any effect (size changed 5056952 -> 5057240)
+# it even seems to degrade a bit the performance
+# wasm-tools strip $optargs
+echo end running wasm-opt
+
 case $1 in
     dev)
         esbuild ./src/index.js --bundle --serve=127.0.0.1:9000 --servedir=./static --outfile=./static/index.js --format=esm --platform=browser "--external:node:timers"

diff --git a/web/static/index.html b/web/static/index.html
@@ -12,11 +12,11 @@
   </head>
   <body>
     <header>
-      <div>
+      <div class="h-title">
         <h2>xolsh - hslox</h2>
         <div>a lox interpreter</div>
       </div>
-      <div>
+      <div class="h-buttons">
         <button id="run-button" class="btn btn-primary">
           <i class="fa-solid fa-play"></i> Run
         </button>

diff --git a/web/static/style.css b/web/static/style.css
@@ -26,6 +26,8 @@ header {
   align-items: center;
   padding: 1.5rem;
   background-color: var(--normal-bg);
+  /* small screens*/
+  gap: 2rem;
 }
 
 a {
@@ -45,13 +47,21 @@ header>div>h2 {
   margin: 0;
 }
 
-header>div {
+.h-title,
+.h-buttons {
   margin: 0;
   display: flex;
-  gap: 2rem;
   align-items: center;
 }
 
+.h-title {
+  gap: 1.5rem;
+}
+
+.h-buttons {
+  gap: 1.5rem;
+}
+
 button {
   font-family: monospace;
   margin: 0;

diff --git a/web/xolsh-web.wasm b/web/xolsh-web.wasm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -173,3 +173,4 @@ dist

		*~
		web/src/ghc_wasm_jsffi.js
		web/static/xolsh-exe.wasm