porffor 0.16.0-688a50c13 → 0.16.0-7339fdd79

package/compiler/index.js

@@ -45,6 +45,8 @@ export default (code, flags) => {
   if (target !== 'wasm') Prefs.pgo = Prefs.pgo === false ? false : true;
   if (Prefs.pgo) pgo.setup();
 
+  if (Prefs.profileCompiler) console.log(`0. began compilation (host runtime startup) in ${performance.now().toFixed(2)}ms`);
+
   const t0 = performance.now();
   const program = parse(code, flags);
   if (Prefs.profileCompiler) console.log(`1. parsed in ${(performance.now() - t0).toFixed(2)}ms`);
@@ -107,7 +109,7 @@ export default (code, flags) => {
 
   if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
 
-  if (Prefs.allocLog) {
+  if (Prefs.compileAllocLog) {
     const wasmPages = Math.ceil((pages.size * pageSize) / 65536);
     const bytes = wasmPages * 65536;
     log('alloc', `\x1B[1mallocated ${bytes / 1024}KiB\x1B[0m for ${pages.size} things using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}`);
@@ -148,7 +150,12 @@ export default (code, flags) => {
     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 t4 = performance.now();
     const c = toc(out);
+    if (Prefs.profileCompiler) console.log(`5. compiled to c in ${(performance.now() - t4).toFixed(2)}ms`);
+
+    const t5 = performance.now();
+
     fs.writeFileSync(tmpfile, c);
 
     // obvious command escape is obvious
@@ -156,6 +163,8 @@ export default (code, flags) => {
 
     fs.unlinkSync(tmpfile);
 
+    if (Prefs.profileCompiler) console.log(`6. compiled to native (using ${compiler}) in ${(performance.now() - t5).toFixed(2)}ms`);
+
     if (process.version) {
       if (Prefs.native) {
         const cleanup = () => {
@@ -177,6 +186,11 @@ export default (code, flags) => {
         } catch {}
       }
 
+      if (!Prefs.native && globalThis.file) {
+        const total = performance.now();
+        console.log(`\u001b[90m[${total.toFixed(2)}ms]\u001b[0m \u001b[92mcompiled ${globalThis.file} -> ${outFile}\u001b[0m`);
+      }
+
       process.exit();
     }
   }

package/compiler/opt.js

@@ -250,7 +250,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
         }
 
         // remove setting last type if it is never gotten
-        if (!f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType) {
+        if (!f.internal && !f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType) {
           // replace this inst with drop
           wasm.splice(i, 1, [ Opcodes.drop ]); // remove this and last inst
           if (i > 0) i--;

package/compiler/parse.js

@@ -1,12 +1,6 @@
 import { log } from './log.js';
 import Prefs from './prefs.js';
 
-// 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] !== '-' && !['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(x));
 
 // should we try to support types (while parsing)

package/compiler/pgo.js

@@ -78,6 +78,9 @@ export const run = obj => {
   try {
     obj.wasm = assemble(obj.funcs, obj.globals, obj.tags, obj.pages, obj.data, obj.flags, true);
 
+    Prefs._profileCompiler = Prefs.profileCompiler;
+    Prefs.profileCompiler = false;
+
     const { exports } = wrap(obj, [], {
       y: n => {
         activeFunc = n;
@@ -105,6 +108,8 @@ export const run = obj => {
     throw e;
   }
 
+  Prefs.profileCompiler = Prefs._profileCompiler;
+
   for (const x of funcs) {
     const wasmFunc = wasmFuncs.find(y => y.name === x.name);
     wasmFunc.wasm = wasmFunc.originalWasm;

package/compiler/precompile.js

@@ -35,7 +35,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
     if (x.data) {
       x.data = x.data.map(x => data[x]);
       for (const y in x.data) {
-        x.data[y].offset -= x.data[0].offset;
+        if (x.data[y].offset != null) x.data[y].offset -= x.data[0].offset;
       }
     }
 

package/compiler/prefs.js

@@ -3,8 +3,7 @@ const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'ind
 let cache = {};
 const obj = new Proxy({}, {
   get(_, p) {
-    // intentionally misses with undefined values cached
-    if (cache[p]) return cache[p];
+    if (cache[p] != null) return cache[p];
 
     const ret = (() => {
       // fooBar -> foo-bar

package/compiler/wasmSpec.js

@@ -191,6 +191,8 @@ export const Opcodes = {
   i32_trunc_sat_f64_s: [ 0xfc, 0x02 ],
   i32_trunc_sat_f64_u: [ 0xfc, 0x03 ],
 
+  memory_init: [ 0xfc, 0x08 ],
+  data_drop: [ 0xfc, 0x09 ],
   memory_copy: [ 0xfc, 0x0a ],
 
   // simd insts are 0xFD simdop: varuint32
@@ -209,8 +211,6 @@ export const Opcodes = {
   i32x4_add: [ 0xfd, 0xae, 0x01 ],
   i32x4_sub: [ 0xfd, 0xb1, 0x01 ],
   i32x4_mul: [ 0xfd, 0xb5, 0x01 ],
-
-  i32x4_dot_i16x8_s: [ 0xfd, 0xba, 0x01 ],
 };
 
 export const FuncType = 0x60;

package/compiler/wrap.js

@@ -11,13 +11,13 @@ const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs'))
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
 export const readByteStr = (memory, ptr) => {
-  const length = (new Int32Array(memory.buffer.slice(ptr, ptr + 4), 0, 1))[0];
+  const length = (new Int32Array(memory.buffer, ptr, 1))[0];
   return Array.from(new Uint8Array(memory.buffer, ptr + 4, length)).map(x => String.fromCharCode(x)).join('');
 };
 
 export const writeByteStr = (memory, ptr, str) => {
   const length = str.length;
-  (new Int32Array(memory.buffer.slice(ptr, ptr + 4), 0, 1))[0] = length;
+  (new Int32Array(memory.buffer, ptr, 1))[0] = length;
 
   const arr = new Uint8Array(memory.buffer, ptr + 4, length);
   for (let i = 0; i < length; i++) {
@@ -46,17 +46,17 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.string: {
-      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
       return Array.from(new Uint16Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.bytestring: {
-      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
       return Array.from(new Uint8Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.array: {
-      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
 
       const out = [];
       for (let i = 0; i < length; i++) {
@@ -77,12 +77,12 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.date: {
-      const t = (new Float64Array(memory.buffer.slice(value, value + 8), 0, 1))[0];
+      const t = (new Float64Array(memory.buffer, value, 1))[0];
       return new Date(t);
     }
 
     case TYPES.set: {
-      const size = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const size = (new Int32Array(memory.buffer, value, 1))[0];
 
       const out = new Set();
       for (let i = 0; i < size; i++) {
@@ -102,17 +102,18 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return out;
     }
 
-    // case TYPES.symbol: {
-    //   const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
-    //   const offset = descStore + 4 + ((value - 1) * 9);
+    case TYPES.symbol: {
+      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+      if (!descStore) return Symbol();
 
-    //   const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
-    //   const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+      const offset = descStore + 4 + ((value - 1) * 9);
 
-    //   const desc = porfToJSValue({ memory, funcs, pages }, v, t);
+      const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+      const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
 
-    //   return Symbol(desc);
-    // }
+      const desc = porfToJSValue({ memory, funcs, pages }, v, t);
+      return Symbol(desc);
+    }
 
     default: return value;
   }

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.16.0-688a50c13",
+  "version": "0.16.0-7339fdd79",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,11 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
 
+// deno compat
+if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
+  globalThis.process = await import('node:process');
+}
+
 const start = performance.now();
 
 if (process.argv.includes('--compile-hints')) {