porffor 0.2.0-fdf0fc5 → 0.14.0-0ad2c8a7c

package/compiler/index.js

@@ -12,14 +12,7 @@ globalThis.decompile = decompile;
 const logFuncs = (funcs, globals, exceptions) => {
   console.log('\n' + underline(bold('funcs')));
 
-  const startIndex = funcs.sort((a, b) => a.index - b.index)[0].index;
   for (const f of funcs) {
-    console.log(`${underline(f.name)} (${f.index - startIndex})`);
-
-    console.log(`params: ${f.params.map((_, i) => Object.keys(f.locals)[Object.values(f.locals).indexOf(Object.values(f.locals).find(x => x.idx === i))]).join(', ')}`);
-    console.log(`returns: ${f.returns.length > 0 ? true : false}`);
-    console.log(`locals: ${Object.keys(f.locals).sort((a, b) => f.locals[a].idx - f.locals[b].idx).map(x => `${x} (${f.locals[x].idx})`).join(', ')}`);
-    console.log();
     console.log(decompile(f.wasm, f.name, f.index, f.locals, f.params, f.returns, funcs, globals, exceptions));
   }
 
@@ -44,12 +37,14 @@ export default (code, flags) => {
   opt(funcs, globals, pages, tags, exceptions);
   if (Prefs.profileCompiler) console.log(`3. optimized in ${(performance.now() - t2).toFixed(2)}ms`);
 
-  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
+  // if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
 
   const t3 = performance.now();
   const wasm = assemble(funcs, globals, tags, pages, data, flags);
   if (Prefs.profileCompiler) console.log(`4. assembled in ${(performance.now() - t3).toFixed(2)}ms`);
 
+  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
+
   if (Prefs.allocLog) {
     const wasmPages = Math.ceil((pages.size * pageSize) / 65536);
     const bytes = wasmPages * 65536;
@@ -89,9 +84,8 @@ export default (code, flags) => {
       else compiler = [ compiler ];
 
     const tmpfile = 'porffor_tmp.c';
-    // const args = [ compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-ffunction-sections', '-fdata-sections', '-Wl', '-fno-ident', '-fno-exceptions', '-ffast-math' ];
-    // const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions', '-target', 'x86_64-linux' ];
-    const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions' ];
+    const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO ];
+    if (!Prefs.compiler) args.push('-flto=thin', '-march=native', '-s', '-ffast-math', '-fno-exceptions', '-fno-ident', '-fno-asynchronous-unwind-tables', '-ffunction-sections', '-fdata-sections', '-Wl,--gc-sections');
 
     const c = toc(out);
     fs.writeFileSync(tmpfile, c);

package/compiler/opt.js

@@ -1,7 +1,7 @@
-import { Opcodes, Valtype } from "./wasmSpec.js";
-import { number } from "./embedding.js";
-import { read_signedLEB128, read_ieee754_binary64 } from "./encoding.js";
-import { log } from "./log.js";
+import { Opcodes, Valtype } from './wasmSpec.js';
+import { number } from './embedding.js';
+import { read_signedLEB128, read_ieee754_binary64 } from './encoding.js';
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
 const performWasmOp = (op, a, b) => {
@@ -172,14 +172,14 @@ export default (funcs, globals, pages, tags, exceptions) => {
           }
         }
 
-        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString) {
+        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString && !Prefs.noRmUnusedTypes) {
           // remove this inst
           wasm.splice(i, 1);
           if (i > 0) i--;
           inst = wasm[i];
         }
 
-        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString) {
+        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString&& !Prefs.noRmUnusedTypes) {
           let j = i;
           for (; j < wasm.length; j++) {
             const op = wasm[j];
@@ -193,7 +193,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           inst = wasm[i];
         }
 
-        if (inst[0] === Opcodes.if && typeof inst[2] === 'string') {
+        if (inst[0] === Opcodes.if && typeof inst[2] === 'string' && !Prefs.noRmUnusedTypes) {
           // remove unneeded typeswitch checks
 
           const type = inst[2].split('|')[1];

package/compiler/parse.js

@@ -1,15 +1,13 @@
-import { log } from "./log.js";
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
-// import { parse } from 'acorn';
-
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
   const textEncoder = new TextEncoder();
   globalThis.process = { argv: ['', '', ...Deno.args], stdout: { write: str => Deno.writeAllSync(Deno.stdout, textEncoder.encode(str)) } };
 }
 
-const file = process.argv.slice(2).find(x => x[0] !== '-');
+const file = process.argv.slice(2).find(x => x[0] !== '-' && !['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(x));
 
 // should we try to support types (while parsing)
 const types = Prefs.parseTypes || file?.endsWith('.ts');

package/compiler/precompile.js

@@ -7,9 +7,6 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
-// import porfParse from './parse.js';
-// import porfCodegen from './codeGen.js';
-
 const argv = process.argv.slice();
 
 const compile = async (file, [ _funcs, _globals ]) => {
@@ -21,17 +18,12 @@ const compile = async (file, [ _funcs, _globals ]) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--bytestring', '--todo-time=compile', '--no-aot-pointer-opt', '--no-treeshake-wasm-imports', '--scoped-page-names', '--parse-types', '--opt-types'];
+  let args = ['--bytestring', '--todo-time=compile', '--truthy=no_nan_negative', '--no-treeshake-wasm-imports', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--fast-length', '--parse-types', '--opt-types'];
   if (first.startsWith('// @porf')) {
-    args = args.concat(first.slice('// @porf '.length).split(' '));
+    args = first.slice('// @porf '.length).split(' ').concat(args);
   }
   process.argv = argv.concat(args);
 
-  // const porfParse = (await import(`./parse.js?_=${Date.now()}`)).default;
-  // const porfCodegen = (await import(`./codeGen.js?_=${Date.now()}`)).default;
-
-  // let { funcs, globals, data } = porfCodegen(porfParse(source, ['module']));
-
   const porfCompile = (await import(`./index.js?_=${Date.now()}`)).default;
 
   let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
@@ -78,7 +70,14 @@ const compile = async (file, [ _funcs, _globals ]) => {
         allocated.add(pageName);
 
         y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
-        // y.push(x.pages.get(pageName));
+      }
+
+      if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
+        const id = y[1];
+        y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
+
+        // remove throw inst
+        x.wasm.splice(i + 1, 1);
       }
     }
   }
@@ -98,18 +97,14 @@ const precompile = async () => {
     await compile(join(dir, file), [ funcs, globals ]);
   }
 
-  // const a = funcs.find(x => x.name === '__ecma262_ToUTCDTSF');
-  // console.log(Object.values(a.locals).slice(a.params.length));
-
-  // ${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
-  // ${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
-
   return `// autogenerated by compiler/precompile.js
 import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
-${funcs.map(x => `  this.${x.name} = {
-    wasm: (scope, { allocPage, builtin }) => ${JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`)},
+${funcs.map(x => {
+  const wasm = JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`).replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
+  return `  this.${x.name} = {
+    wasm: (scope, {${wasm.includes('allocPage(') ? 'allocPage,' : ''}${wasm.includes('builtin(') ? 'builtin,' : ''}${wasm.includes('internalThrow(') ? 'internalThrow,' : ''}}) => ${wasm},
     params: ${JSON.stringify(x.params)},
     typedParams: true,
     returns: ${JSON.stringify(x.returns)},
@@ -117,12 +112,10 @@ ${funcs.map(x => `  this.${x.name} = {
     locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))},
     localNames: ${JSON.stringify(Object.keys(x.locals))},
 ${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
-${x.exceptions && x.exceptions.length > 0 ? `    exceptions: ${JSON.stringify(x.exceptions)},` : ''}
-  };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n')).join('\n')}
+${x.table ? `    table: true` : ''}
+  };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
+}).join('\n')}
 };`;
 };
 
-const code = await precompile();
-// console.log(code);
-
-fs.writeFileSync(join(__dirname, 'generated_builtins.js'), code);
+fs.writeFileSync(join(__dirname, 'generated_builtins.js'), await precompile());

package/compiler/prefs.js

@@ -1,4 +1,4 @@
-const onByDefault = [ 'bytestring', 'aotPointerOpt', 'treeshakeWasmImports', 'alwaysMemory' ];
+const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused' ];
 
 let cache = {};
 const obj = new Proxy({}, {
@@ -6,7 +6,7 @@ const obj = new Proxy({}, {
     // intentionally misses with undefined values cached
     if (cache[p]) return cache[p];
 
-    return cache[p] = (() => {
+    const ret = (() => {
       // fooBar -> foo-bar
       const name = p[0] === '_' ? p : p.replace(/[A-Z]/g, c => `-${c.toLowerCase()}`);
       const prefix = name.length === 1 ? '-' : '--';
@@ -19,6 +19,10 @@ const obj = new Proxy({}, {
       if (onByDefault.includes(p)) return true;
       return undefined;
     })();
+
+    // do not cache in web demo as args are changed live
+    if (!globalThis.document) cache[p] = ret;
+    return ret;
   }
 });