🙅 revert aggressive optimization experiments pending benchmark

Reverts three changes that need benchmarks before landing:
- -Oz / wasm-opt
- brotli+Z85 wasm compression
- wcwidth.c rewrite

Author: natemoo-re

.github/workflows/preview.yml

@@ -21,9 +21,6 @@ jobs:
         with:
           deno-version: v2.x
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 

.github/workflows/publish.yml

@@ -23,9 +23,6 @@ jobs:
         with:
           deno-version: v2.x
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 
@@ -52,9 +49,6 @@ jobs:
         with:
           deno-version: v2.x
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 
@@ -115,9 +109,6 @@ jobs:
         with:
           deno-version: v2.x
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 

.github/workflows/verify.yaml

@@ -30,9 +30,6 @@ jobs:
       - name: lint
         run: deno lint
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 
@@ -91,9 +88,6 @@ jobs:
         with:
           deno-version: v2.x
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 
@@ -122,9 +116,6 @@ jobs:
         with:
           node-version: 24
 
-      - name: install binaryen
-        run: sudo apt-get install -y binaryen
-
       - name: build wasm
         run: make
 

Makefile

@@ -1,9 +1,8 @@
 CC = clang
-WASM_OPT ?= wasm-opt
 TARGET = clayterm.wasm
 SRC = src/module.c
 
-CFLAGS = --target=wasm32 -nostdlib -Oz \
+CFLAGS = --target=wasm32 -nostdlib -O2 \
          -ffunction-sections -fdata-sections \
          -mbulk-memory \
          -DCLAY_IMPLEMENTATION -DCLAY_WASM \
@@ -49,7 +48,6 @@ DEPS = $(wildcard src/*.c src/*.h)
 
 $(TARGET): $(DEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRC)
-	$(WASM_OPT) -Oz --enable-bulk-memory -o $@ $@
 
 wasm.ts: $(TARGET)
 	deno run --allow-read --allow-write tasks/bundle-wasm.ts

deno.json

@@ -15,8 +15,7 @@
     "@sinclair/typebox": "npm:@sinclair/typebox@^0.34",
     "dnt": "jsr:@deno/dnt@0.42.3",
     "effection": "npm:effection@^4.0.2",
-    "@std/encoding": "jsr:@std/encoding@1",
-    "@types/node": "npm:@types/node@^22"
+    "@std/encoding": "jsr:@std/encoding@1"
   },
   "exports": {
     ".": "./mod.ts",
@@ -26,9 +25,6 @@
     "include": ["*.ts"],
     "exclude": ["!wasm.ts"]
   },
-  "compilerOptions": {
-    "types": ["@types/node"]
-  },
   "fmt": {
     "exclude": ["clay", "build"]
   },

deno.lock

@@ -1,54 +1,13 @@
-import { brotliCompressSync, constants } from "node:zlib";
-
-const Z85 =
-  "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-:+=^!/*?&<>()[]{}@%$#";
-
-function encodeZ85(data: Uint8Array): string {
-  let padLen = (4 - (data.length % 4)) % 4;
-  let src = data;
-  if (padLen > 0) {
-    src = new Uint8Array(data.length + padLen);
-    src.set(data);
-  }
-  let out: string[] = [];
-  for (let i = 0; i < src.length; i += 4) {
-    let v = src[i] * 16777216 + src[i + 1] * 65536 + src[i + 2] * 256 +
-      src[i + 3];
-    out.push(
-      Z85[Math.floor(v / 52200625)],
-      Z85[Math.floor(v / 614125) % 85],
-      Z85[Math.floor(v / 7225) % 85],
-      Z85[Math.floor(v / 85) % 85],
-      Z85[v % 85],
-    );
-  }
-  return out.join("");
-}
+import { encodeBase64 } from "@std/encoding/base64";
 
 const wasm = await Deno.readFile("clayterm.wasm");
+const base64 = encodeBase64(wasm);
 
-const compressed = new Uint8Array(brotliCompressSync(wasm, {
-  params: {
-    [constants.BROTLI_PARAM_QUALITY]: 11,
-    [constants.BROTLI_PARAM_SIZE_HINT]: wasm.length,
-    [constants.BROTLI_PARAM_LGWIN]: 24,
-  },
-}));
-
-const z85 = encodeZ85(compressed);
-
-// Decoder uses division instead of >>> to avoid 32-bit truncation on values near 0xFFFFFFFF.
-const source = `import{brotliDecompressSync}from"node:zlib";
-const Z="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-:+=^!/*?&<>()[]{}@%$#";
-const T=new Uint8Array(128);for(let i=0;i<85;i++)T[Z.charCodeAt(i)]=i;
-function d(s:string,n:number){const b=new Uint8Array(n);let o=0;for(let i=0;i<s.length&&o<n;i+=5){const v=T[s.charCodeAt(i)]*52200625+T[s.charCodeAt(i+1)]*614125+T[s.charCodeAt(i+2)]*7225+T[s.charCodeAt(i+3)]*85+T[s.charCodeAt(i+4)];if(o<n)b[o++]=Math.floor(v/16777216);if(o<n)b[o++]=Math.floor(v/65536)%256;if(o<n)b[o++]=Math.floor(v/256)%256;if(o<n)b[o++]=v%256;}return b;}
-const compressed=d(${JSON.stringify(z85)},${compressed.byteLength});
-export const compiled=await WebAssembly.compile(brotliDecompressSync(compressed));
+const source = `const bin = atob("${base64}");
+const bytes = new Uint8Array(bin.length);
+for (let i = 0; i < bin.length; i++) bytes[i] = bin.charCodeAt(i);
+export const compiled = await WebAssembly.compile(bytes);
 `;
 
 await Deno.writeTextFile("wasm.ts", source);
-console.log(
-  `wrote wasm.ts (${wasm.length} → ${compressed.byteLength} bytes compressed, ${z85.length} bytes z85, ${
-    Math.round(z85.length / wasm.length * 100)
-  }%)`,
-);
+console.log(`wrote wasm.ts (${wasm.length} bytes encoded)`);