porffor 0.2.0-536e463 → 0.2.0-5ac7ea0

package/compiler/wrap.js

@@ -1,6 +1,8 @@
 import compile from './index.js';
 import decompile from './decompile.js';
-// import fs from 'node:fs';
+import { encodeVector, encodeLocal } from './encoding.js';
+import Prefs from './prefs.js';
+import { log } from './log.js';
 
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
@@ -18,7 +20,8 @@ const TYPES = {
 
   // internal
   [internalTypeBase]: '_array',
-  [internalTypeBase + 1]: '_regexp'
+  [internalTypeBase + 1]: '_regexp',
+  [internalTypeBase + 2]: '_bytestring'
 };
 
 export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
@@ -29,20 +32,110 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
   if (source.includes('export function')) flags.push('module');
 
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  // (await import('node:fs')).writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
   if (flags.includes('info')) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
   const t2 = performance.now();
-  const { instance } = await WebAssembly.instantiate(wasm, {
-    '': {
-      p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
-      c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
-      t: _ => performance.now(),
-      ...customImports
+
+  let instance;
+  try {
+    let wasmEngine = WebAssembly;
+    if (Prefs.asur) {
+      log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
+      wasmEngine = await import('../asur/index.js');
+    }
+
+    0, { instance } = await wasmEngine.instantiate(wasm, {
+      '': {
+        p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
+        c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
+        t: _ => performance.now(),
+        ...customImports
+      }
+    });
+  } catch (e) {
+    // only backtrace for runner, not test262/etc
+    if (!process.argv[1].includes('/runner')) throw e;
+
+    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)[1]);
+    const blobOffset = parseInt(e.message.split('@')[1]);
+
+    // convert blob offset -> function wasm offset.
+    // this is not good code and is somewhat duplicated
+    // I just want it to work for debugging, I don't care about perf/yes
+
+    const func = funcs.find(x => x.index === funcInd);
+    const locals = Object.values(func.locals).sort((a, b) => a.idx - b.idx).slice(func.params.length).sort((a, b) => a.idx - b.idx);
+
+    let localDecl = [], typeCount = 0, lastType;
+    for (let i = 0; i < locals.length; i++) {
+      const local = locals[i];
+      if (i !== 0 && local.type !== lastType) {
+        localDecl.push(encodeLocal(typeCount, lastType));
+        typeCount = 0;
+      }
+
+      typeCount++;
+      lastType = local.type;
+    }
+
+    if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
+
+    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 40));
+
+    let i = 0;
+    for (; i < wasm.length; i++) {
+      let mismatch = false;
+      for (let j = 0; j < toFind.length; j++) {
+        if (wasm[i + j] !== toFind[j]) {
+          mismatch = true;
+          break;
+        }
+      }
+
+      if (!mismatch) break;
+    }
+
+    if (i === wasm.length) throw e;
+
+    const offset = (blobOffset - i) + encodeVector(localDecl).length;
+
+    let cumLen = 0;
+    i = 0;
+    for (; i < func.wasm.length; i++) {
+      cumLen += func.wasm[i].filter(x => x != null && x <= 0xff).length;
+      if (cumLen === offset) break;
     }
-  });
+
+    if (cumLen !== offset) throw e;
+
+    i -= 1;
+
+    console.log(`\x1B[35m\x1B[1mporffor backtrace\u001b[0m`);
+
+    console.log('\x1B[4m' + func.name + '\x1B[0m');
+
+    const surrounding = 6;
+
+    const decomp = decompile(func.wasm.slice(i - surrounding, i + surrounding + 1), '', 0, func.locals, func.params, func.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
+
+    const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
+    let longest = 0;
+    for (let j = 0; j < decomp.length; j++) {
+      longest = Math.max(longest, noAnsi(decomp[j]).length);
+    }
+
+    const middle = Math.floor(decomp.length / 2);
+    decomp[middle] = `\x1B[47m\x1B[30m${noAnsi(decomp[middle])}${'\u00a0'.repeat(longest - noAnsi(decomp[middle]).length)}\x1B[0m`;
+
+    console.log('\x1B[90m...\x1B[0m');
+    console.log(decomp.join('\n'));
+    console.log('\x1B[90m...\x1B[0m\n');
+
+    throw e;
+  }
 
   times.push(performance.now() - t2);
   if (flags.includes('info')) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
@@ -95,10 +188,18 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
             return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
           }
 
+          case '_bytestring': {
+            const pointer = ret;
+            const length = new Int32Array(memory.buffer, pointer, 1);
+
+            return Array.from(new Uint8Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
+          }
+
           case 'function': {
             // wasm func index, including all imports
             const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
-            if (!func) return ret;
+            // if (!func) return ret;
+            if (!func) return function () {};
 
             // make fake empty func for repl/etc
             return {[func.name]() {}}[func.name];

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.2.0-536e463",
+  "version": "0.2.0-5ac7ea0",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/porf

@@ -0,0 +1,2 @@
+#!/bin/sh
+node runner/index.js "$@"

package/rhemyn/compile.js

@@ -2,6 +2,7 @@ import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from '../compiler/
 import { number } from '../compiler/embedding.js';
 import { signedLEB128, unsignedLEB128 } from '../compiler/encoding.js';
 import parse from './parse.js';
+import Prefs from '../compiler/prefs.js';
 
 // local indexes
 const BasePointer = 0; // base string pointer
@@ -80,7 +81,7 @@ const generate = (node, negated = false, get = true, func = 'test') => {
         })[func], Valtype.i32)
       ];
 
-      if (globalThis.regexLog) {
+      if (Prefs.regexLog) {
         const underline = x => `\u001b[4m\u001b[1m${x}\u001b[0m`;
         console.log(`\n${underline('ast')}`);
         console.log(node);

package/runner/index.js

@@ -3,6 +3,8 @@
 import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
+const start = performance.now();
+
 if (process.argv.includes('-compile-hints')) {
   const v8 = await import('node:v8');
   v8.setFlagsFromString(`--experimental-wasm-compilation-hints`);
@@ -15,9 +17,28 @@ if (process.argv.includes('-compile-hints')) {
   // --experimental-wasm-return-call (on by default)
 }
 
-const file = process.argv.slice(2).find(x => x[0] !== '-');
+let file = process.argv.slice(2).find(x => x[0] !== '-');
+if (['run', 'wasm', 'native', 'c', 'profile'].includes(file)) {
+  if (file === 'profile') {
+    process.argv.splice(process.argv.indexOf(file), 1);
+    await import('./profiler.js');
+    await new Promise(() => {});
+  }
+
+  if (['wasm', 'native', 'c'].includes(file)) {
+    process.argv.push(`-target=${file}`);
+  }
+
+  file = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+
+  const nonOptOutFile = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+  if (nonOptOutFile) {
+    process.argv.push(`-o=${nonOptOutFile}`);
+  }
+}
+
 if (!file) {
-  if (process.argv.includes('-v')) {
+  if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
     console.log((await import('./version.js')).default);
     process.exit(0);
@@ -52,4 +73,6 @@ try {
 } catch (e) {
   if (cache) process.stdout.write(cache);
   console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
-}
+}
+
+if (process.argv.includes('-t')) console.log(`\n\ntotal time: ${(performance.now() - start).toFixed(2)}ms`);

package/runner/profiler.js

@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+
+import compile from '../compiler/wrap.js';
+import fs from 'node:fs';
+
+import Prefs from '../compiler/prefs.js';
+
+const fast = Prefs.profiler === 'fast';
+
+const file = process.argv.slice(2).find(x => x[0] !== '-');
+let source = fs.readFileSync(file, 'utf8');
+
+let profileId = 0;
+source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
+
+// console.log(source);
+
+let tmp = new Array(profileId).fill(0);
+let samples = 0;
+
+const percents = process.argv.includes('-%');
+
+const spinner = ['-', '\\', '|', '/'];
+let spin = 0;
+let last = 0;
+
+try {
+  const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
+    z: fast ? n => {
+      if (n % 2) {
+        tmp[n] += performance.now() - tmp[n - 1];
+      } else {
+        tmp[n] = performance.now();
+      }
+    } : n => {
+      if (n % 3 === 2) {
+        tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
+        samples++;
+
+        if (performance.now() > last) {
+          process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
+          last = performance.now() + 100;
+        }
+      } else {
+        tmp[n] = performance.now();
+      }
+    }
+  });
+
+  const start = performance.now();
+
+  exports.main();
+
+  const total = performance.now() - start;
+
+  console.log(`\nsamples: ${fast ? 'not measured' : samples}\ntotal: ${total}ms\n\n` + source.split('\n').map(x => {
+    let time = 0;
+    if (x.startsWith('profile')) {
+      const id = parseInt(x.slice(8, x.indexOf(')')));
+      time = fast ? tmp[id + 1] : tmp[id + 2];
+    }
+
+    let color = [ 0, 0, 0 ];
+    if (time) {
+      const relativeTime = Math.sqrt(time / total);
+      if (percents) time = relativeTime;
+
+      color = [ (relativeTime * 250) | 0, (Math.sin(relativeTime * Math.PI) * 50) | 0, 0 ];
+    }
+
+    const ansiColor = `2;${color[0]};${color[1]};${color[2]}m`;
+
+    if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : '     '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
+
+    let digits = 2;
+    if (time >= 100) digits = 1;
+    if (time >= 1000) digits = 0;
+
+    return `\x1b[48;${ansiColor}\x1b[97m${time ? time.toFixed(digits).padStart(6, ' ') : '      '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
+  }).join('\n'));
+} catch (e) {
+  console.error(e);
+}

package/runner/repl.js

@@ -45,9 +45,9 @@ let prev = '';
 const run = async (source, _context, _filename, callback, run = true) => {
   // hack: print "secret" before latest code ran to only enable printing for new code
 
-  let toRun = prev + `;\nprint(-0x1337);\n` + source.trim();
+  let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source.trim();
 
-  let shouldPrint = false;
+  let shouldPrint = !prev;
   const { exports, wasm, pages } = await compile(toRun, [], {}, str => {
     if (shouldPrint) process.stdout.write(str);
     if (str === '-4919') shouldPrint = true;

package/compiler/builtins/base64.js

@@ -1,92 +0,0 @@
-var btoa_a = str => {
-  // todo: throw invalid character for unicode
-
-  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-  const mask = (1 << 6) - 1;
-
-  let out = '';
-  let bits = 0, buffer = 0;
-  for (let i = 0; i < str.length; i++) {
-    buffer = (buffer << 8) | (0xff & str.charCodeAt(i));
-    bits += 8;
-
-    while (bits > 6) {
-      bits -= 6;
-      out += chars[mask & (buffer >> bits)];
-    }
-  }
-
-  if (bits) {
-    out += chars[mask & (buffer << (6 - bits))]
-  }
-
-  while ((out.length * 6) & 7) {
-    out += '=';
-  }
-
-  return out;
-};
-
-var btoa = function (input) {
-  // todo: throw invalid character for unicode
-  const keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
-  let output = "";
-  let chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-  let i = 0;
-
-  while (i < input.length) {
-    chr1 = input.charCodeAt(i++);
-    chr2 = input.charCodeAt(i++);
-    chr3 = input.charCodeAt(i++);
-
-    enc1 = chr1 >> 2;
-    enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-    enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-    enc4 = chr3 & 63;
-
-    if (isNaN(chr2)) {
-      enc3 = enc4 = 64;
-    } else if (isNaN(chr3)) {
-      enc4 = 64;
-    }
-
-    output += keyStr.charAt(enc1);
-    output += keyStr.charAt(enc2);
-    output += keyStr.charAt(enc3);
-    output += keyStr.charAt(enc4);
-  }
-
-  return output;
-};
-
-var atob_b = function (input) {
-  const keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
-  let output = "";
-  let chr1, chr2, chr3;
-  let enc1, enc2, enc3, enc4;
-  let i = 0;
-
-  while (i < input.length) {
-    enc1 = keyStr.indexOf(input.charAt(i++));
-    enc2 = keyStr.indexOf(input.charAt(i++));
-    enc3 = keyStr.indexOf(input.charAt(i++));
-    enc4 = keyStr.indexOf(input.charAt(i++));
-
-    chr1 = (enc1 << 2) | (enc2 >> 4);
-    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-    chr3 = ((enc3 & 3) << 6) | enc4;
-
-    output += String.fromCharCode(chr1);
-
-    if (enc3 != 64) {
-      output += String.fromCharCode(chr2);
-    }
-    if (enc4 != 64) {
-      output += String.fromCharCode(chr3);
-    }
-  }
-
-  return output;
-};

package/runner/profile.js

@@ -1,46 +0,0 @@
-import compile from '../compiler/index.js';
-import fs from 'node:fs';
-
-let csv = `phase,time\n`;
-
-csv += `node,${performance.now()}\n`;
-
-const t0 = performance.now();
-const file = process.argv.slice(2).find(x => x[0] !== '-');
-const source = fs.readFileSync(file, 'utf8');
-csv += `read,${performance.now() - t0}\n`;
-
-console.log = x => {
-  if (x.includes(' in ')) {
-    csv += [ 'parse', 'codegen', 'opt', 'sections' ][parseInt(x[0]) - 1] + ',' + x.split(' in ')[1].slice(0, -2) + '\n';
-  }
-};
-
-const wasm = compile(source, [ 'info' ]);
-
-let cache = '';
-const print = str => {
-  cache += str;
-
-  if (str === '\n') {
-    process.stdout.write(cache);
-    cache = '';
-  }
-};
-
-const t1 = performance.now();
-const { instance } = await WebAssembly.instantiate(wasm, {
-  '': {
-    p: i => print(Number(i).toString()),
-    c: i => print(String.fromCharCode(Number(i)))
-  }
-});
-csv += `inst,${performance.now() - t1}\n`;
-
-const t2 = performance.now();
-instance.exports.m();
-print('\n');
-
-csv += `exec,${performance.now() - t2}`;
-
-fs.writeFileSync(`profile.csv`, csv);