porffor 0.37.8 → 0.37.10

package/README.md

@@ -64,8 +64,7 @@ Expect nothing to work! Only very limited JS is currently supported. See files i
 - `--valtype=i32|i64|f64` (default: `f64`) to set valtype
 - `-O0` to disable opt
 - `-O1` (default) to enable basic opt (simplify insts, treeshake wasm imports)
-- `-O2` to enable advanced opt (inlining). unstable!
-- `-O3` to enable advanceder opt (precompute const math). unstable!
+- `-O2` to enable advanced opt (partial evaluation). unstable!
 
 ## Current limitations
 - Limited async support
@@ -274,7 +273,7 @@ Currently, Porffor is seriously limited in features and functionality, however i
 - More in future probably?
 
 ## Todo
-No particular order and no guarentees, just what could happen soon™
+No particular order and no guarantees, just what could happen soon™
 
 - Asur
   - Support memory
@@ -328,7 +327,7 @@ Porffor intentionally does not use Wasm proposals which are not commonly impleme
 ### 2. Why at all?
 Yes!
 
-## 3. Isn't this the same as AssemblyScript/other Wasm langs?
+### 3. Isn't this the same as AssemblyScript/other Wasm langs?
 No. they are not alike at all internally and have very different goals/ideals:
 - Porffor is made as a generic JS engine, not for Wasm stuff specifically
 - Porffor primarily consumes JS

package/compiler/assemble.js

@@ -58,7 +58,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   const getType = (params, returns) => {
     const hash = `${params.join(',')}_${returns.join(',')}`;
     if (Prefs.optLog) log('assemble', `getType(${JSON.stringify(params)}, ${JSON.stringify(returns)}) -> ${hash} | cache: ${typeCache[hash]}`);
-    if (optLevel >= 1 && typeCache[hash] !== undefined) return typeCache[hash];
+    if (typeCache[hash] !== undefined) return typeCache[hash];
 
     const type = [ FuncType, ...encodeVector(params), ...encodeVector(returns) ];
     const idx = types.length;
@@ -233,7 +233,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   time('global section');
 
   if (Prefs.alwaysMemory && pages.size === 0) pages.set('--always-memory', 0);
-  if (optLevel === 0) pages.set('O0 precaution', 0);
 
   const usesMemory = pages.size > 0;
   const memorySection = !usesMemory ? [] : createSection(

package/compiler/index.js

@@ -53,6 +53,8 @@ const progressClear = () => {
 };
 
 export default (code, flags) => {
+  const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
+
   let target = Prefs.target ?? 'wasm';
   if (Prefs.native) target = 'native';
 
@@ -67,8 +69,13 @@ export default (code, flags) => {
 
   // change some prefs by default for c/native
   if (target !== 'wasm') {
-    Prefs.pgo = Prefs.pgo === false ? false : true;
-    Prefs.passiveData = false;
+    Prefs.pgo = Prefs.pgo === false ? false : true; // enable pgo
+    Prefs.passiveData = false; // disable using passive Wasm data as unsupported by 2c for now
+  }
+
+  // change some prefs by default for -O2
+  if (optLevel >= 2) {
+    Prefs.cyclone = Prefs.cyclone === false ? false : true; // enable cyclone
   }
 
   if (Prefs.pgo) pgo.setup();

package/compiler/opt.js

@@ -9,88 +9,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
   if (optLevel === 0) return;
 
   const tailCall = Prefs.tailCall;
-  if (tailCall) log.warning('opt', 'tail call proposal is not widely implemented! (you used -tail-call)');
-
-  if (optLevel >= 2 && !Prefs.optNoInline) {
-    // inline pass (very WIP)
-    // get candidates for inlining
-    // todo: pick smart in future (if func is used <N times? or?)
-    const callsSelf = f => f.wasm.some(x => x[0] === Opcodes.call && x[1] === f.index);
-    const suitableReturns = wasm => wasm.reduce((acc, x) => acc + (x[0] === Opcodes.return), 0) <= 1;
-    const candidates = funcs.filter(x => x.name !== 'main' && Object.keys(x.locals).length === x.params.length && (x.returns.length === 0 || suitableReturns(x.wasm)) && !callsSelf(x) && !x.throws).reverse();
-    if (Prefs.optLog) {
-      log('opt', `found inline candidates: ${candidates.map(x => x.name).join(', ')} (${candidates.length}/${funcs.length - 1})`);
-
-      let reasons = {};
-      for (const f of funcs) {
-        if (f.name === 'main') continue;
-        reasons[f.name] = [];
-
-        if (f.name === 'main') reasons[f.name].push('main');
-        if (Object.keys(f.locals).length !== f.params.length) reasons[f.name].push('cannot inline funcs with locals yet');
-        if (f.returns.length !== 0 && !suitableReturns(f.wasm)) reasons[f.name].push('cannot inline funcs with multiple returns yet');
-        if (callsSelf(f)) reasons[f.name].push('cannot inline func calling itself');
-        if (f.throws) reasons[f.name].push('will not inline funcs throwing yet');
-      }
-
-      if (Object.values(reasons).some(x => x.length > 0)) console.log(`     reasons not:\n${Object.keys(reasons).filter(x => reasons[x].length > 0).map(x => `       ${x}: ${reasons[x].join(', ')}`).join('\n')}\n`)
-    }
-
-    for (const c of candidates) {
-      const cWasm = c.wasm;
-
-      for (const t of funcs) {
-        const tWasm = t.wasm;
-        if (t.name === c.name) continue; // skip self
-
-        for (let i = 0; i < tWasm.length; i++) {
-          const inst = tWasm[i];
-          if (inst[0] === Opcodes.call && inst[1] === c.index) {
-            if (Prefs.optLog) log('opt', `inlining call for ${c.name} (in ${t.name})`);
-            tWasm.splice(i, 1); // remove this call
-
-            // add params as locals and set in reverse order
-            const paramIdx = {};
-            let localIdx = Math.max(-1, ...Object.values(t.locals).map(x => x.idx)) + 1;
-            for (let j = c.params.length - 1; j >= 0; j--) {
-              const name = `__porf_inline_${c.name}_param_${j}`;
-
-              if (t.locals[name] === undefined) {
-                t.locals[name] = { idx: localIdx++, type: c.params[j] };
-              }
-
-              const idx = t.locals[name].idx;
-              paramIdx[j] = idx;
-
-              tWasm.splice(i, 0, [ Opcodes.local_set, idx ]);
-              i++;
-            }
-
-            let iWasm = cWasm.slice().map(x => x.slice()); // deep clone arr (depth 2)
-            // remove final return
-            if (iWasm.length !== 0 && iWasm[iWasm.length - 1][0] === Opcodes.return) iWasm = iWasm.slice(0, -1);
-
-            // adjust local operands to go to correct param index
-            for (const inst of iWasm) {
-              if ((inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) && inst[1] < c.params.length) {
-                if (Prefs.optLog) log('opt', `replacing local operand in inlined wasm (${inst[1]} -> ${paramIdx[inst[1]]})`);
-                inst[1] = paramIdx[inst[1]];
-              }
-            }
-
-            tWasm.splice(i, 0, ...iWasm);
-            i += iWasm.length;
-          }
-        }
-
-        if (t.index > c.index) t.index--; // adjust index if after removed func
-      }
-
-      funcs.splice(funcs.indexOf(c), 1); // remove func from funcs
-    }
-  }
-
-  if (Prefs.optInlineOnly) return;
+  if (tailCall) log.warning('opt', 'tail call proposal is not widely implemented! (you used --tail-call)');
 
   // todo: this breaks exceptions after due to indexes not being adjusted
   // const tagUse = tags.reduce((acc, x) => { acc[x.idx] = 0; return acc; }, {});

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.8+d9c1c7b17",
+  "version": "0.37.10+b6f7de187",
   "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.8+d9c1c7b17';
+globalThis.version = '0.37.10+b6f7de187';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {