porffor 0.37.6 → 0.37.8

package/compiler/opt.js

@@ -4,40 +4,6 @@ import { read_signedLEB128, read_ieee754_binary64 } from './encoding.js';
 import { log } from './log.js';
 import {} from './prefs.js';
 
-const forceRemoveTypes = new Set(Prefs.forceRemoveTypes?.split?.(','));
-const hasType = (funcs, pages, type) => {
-  if (forceRemoveTypes.has(type)) return false;
-
-  switch (type) {
-    case 'Array':
-      return pages.hasArray;
-    case 'String':
-      return pages.hasString;
-    case 'ByteString':
-      return pages.hasByteString;
-
-    case 'Map':
-    case 'Set':
-    case 'WeakMap':
-    case 'WeakSet':
-    case 'WeakRef':
-    case 'Date':
-    case 'Uint8Array':
-    case 'Int8Array':
-    case 'Uint8ClampedArray':
-    case 'Uint16Array':
-    case 'Int16Array':
-    case 'Uint32Array':
-    case 'Int32Array':
-    case 'Float32Array':
-    case 'Float64Array':
-      return funcs.some(x => x.name === type);
-
-    default:
-      return true;
-  }
-}
-
 export default (funcs, globals, pages, tags, exceptions) => {
   const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
   if (optLevel === 0) return;
@@ -189,85 +155,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
           }
         }
 
-        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString && Prefs.rmUnusedTypes) {
-          // remove this inst
-          wasm.splice(i, 1);
-          if (i > 0) i--;
-          inst = wasm[i];
-        }
-
-        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString && Prefs.rmUnusedTypes) {
-          let j = i;
-          for (; j < wasm.length; j++) {
-            const op = wasm[j];
-            if (op[op.length - 1] === 'string_only|end') break;
-          }
-
-          // remove section
-          wasm.splice(i, 1 + j - i);
-
-          if (i > 0) i--;
-          inst = wasm[i];
-        }
-
-        if (inst[0] === Opcodes.if && typeof inst[2] === 'string' && Prefs.rmUnusedTypes) {
-          // remove unneeded typeswitch checks
-
-          const types = inst[2].split('|')[1].split(',');
-          let missing = true;
-          for (const type of types) {
-            if (hasType(funcs, pages, type)) {
-              missing = false;
-              break;
-            }
-          }
-
-          if (missing) {
-            let j = i, depth = 0;
-            for (; j < wasm.length; j++) {
-              const op = wasm[j][0];
-              if (op === Opcodes.if || op === Opcodes.block || op === Opcodes.loop || op === Opcodes.try) depth++;
-              if (op === Opcodes.end) {
-                depth--;
-                if (depth <= 0) break;
-              }
-            }
-
-            const offset = 3 + 4 * (types.length - 1);
-            wasm.splice(i - offset, j - (i - offset) + 1); // remove cond and this if
-            i -= 1 + offset;
-            inst = wasm[i];
-
-            if (Prefs.optLog) log('opt', `removed unneeded typeswitch check (${types})`);
-          }
-        }
-
-        if (inst[0] === Opcodes.end && inst[1] === 'TYPESWITCH_end' && Prefs.rmUnusedTypes) {
-          // remove unneeded entire typeswitch
-
-          let j = i - 1, depth = -1, checks = 0;
-          for (; j > 0; j--) {
-            const op = wasm[j][0];
-            if (op === Opcodes.if || op === Opcodes.block || op === Opcodes.loop || op === Opcodes.try) {
-              depth++;
-              if (depth === 0) break;
-            }
-            if (op === Opcodes.end) depth--;
-            if (wasm[j][2]?.startsWith?.('TYPESWITCH')) checks++;
-          }
-
-          if (checks === 0) {
-            // todo: review indexes below
-            wasm.splice(j - 1, 2, [ Opcodes.drop ]); // remove typeswitch start
-            wasm.splice(i - 1, 1); // remove this inst
-
-            if (Prefs.optLog) log('opt', 'removed unneeded entire typeswitch');
-
-            if (i > 0) i--;
-            continue;
-          }
-        }
-
         // remove setting last type if it is never gotten
         if (!f.internal && !f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType) {
           // replace this inst with drop

package/compiler/precompile.js

@@ -204,19 +204,21 @@ import { number } from './embedding.js';
 export const BuiltinFuncs = function() {
 ${funcs.map(x => {
   const rewriteWasm = wasm => {
-    const str = JSON.stringify(wasm.filter(x => x.length && x[0] != null), (k, v) => {
-        if (Number.isNaN(v) || v === Infinity || v === -Infinity) return v.toString();
-        return v;
-      })
+    const str = JSON.stringify(wasm.filter(x => x.length && (x[0] != null || typeof x[1] === 'string')), (k, v) => {
+      if (Number.isNaN(v) || v === Infinity || v === -Infinity) return v.toString();
+      return v;
+    })
       .replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(_,'${reason}','${type}'),${valtype})`)
       .replace(/\["global",(.*?),"(.*?)",(.*?)\]/g, (_, opcode, name, valtype) => `...glbl(${opcode},'${name}',${valtype})`)
       .replace(/\"local","(.*?)",(.*?)\]/g, (_, name, valtype) => `loc('${name}',${valtype})]`)
       .replace(/\[16,"(.*?)"]/g, (_, name) => `[16,builtin('${name}')]`)
       .replace(/\[68,"funcref","(.*?)"]/g, (_, name) => `...funcRef('${name}')`)
       .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(_,'${constructor}',\`${message}\`)`)
-      .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(_,{name:'${objName}'})`);
+      .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(_,{name:'${objName}'})`)
+      .replace(/\[null,"typeswitch case start",\[(.*?)\]\],/g, (_, types) => `...t([${types}],()=>[`)
+      .replaceAll(',[null,"typeswitch case end"]', '])');
 
-    return `(_,{${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('funcRef(') ? 'funcRef,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}${str.includes('generateIdent(') ? 'generateIdent,' : ''}`.slice(0, -1)}})=>`.replace('_,{}', '') + str;
+    return `(_,{${str.includes('...t(') ? 't,' : ''}${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('funcRef(') ? 'funcRef,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}${str.includes('generateIdent(') ? 'generateIdent,' : ''}`.slice(0, -1)}})=>`.replace('_,{}', '') + str;
   };
 
   const locals = Object.entries(x.locals).sort((a,b) => a[1].idx - b[1].idx)
@@ -224,10 +226,13 @@ ${funcs.map(x => {
   // todo: check for other identifier unsafe characters
   const name = x.name.includes('#') ? `['${x.name}']` : `.${x.name}`;
 
+  const usedTypes = [...(x.usedTypes ?? [])].filter(x => ![ TYPES.empty, TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ].includes(x));
+
   return `this${name} = {
 wasm:${rewriteWasm(x.wasm)},
 params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.returns)},${x.returnType != null ? `returnType:${JSON.stringify(x.returnType)}` : 'typedReturns:1'},
 locals:${JSON.stringify(locals.slice(x.params.length).map(x => x[1].type))},localNames:${JSON.stringify(locals.map(x => x[0]))},
+${usedTypes.length > 0 ? `usedTypes:${JSON.stringify(usedTypes)},` : ''}
 ${x.globalInits ? `globalInits:{${Object.keys(x.globalInits).map(y => `${y}:${rewriteWasm(x.globalInits[y])}`).join(',')}},` : ''}${x.data && Object.keys(x.data).length > 0 ? `data:${JSON.stringify(x.data)},` : ''}
 ${x.table ? `table:1,` : ''}${x.constr ? `constr:1,` : ''}${x.hasRestArgument ? `hasRestArgument:1,` : ''}
 };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.37.6+834657df0",
+  "version": "0.37.8+d9c1c7b17",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.37.6+834657df0';
+globalThis.version = '0.37.8+d9c1c7b17';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {