porffor 0.16.0-8107e135a → 0.16.0-97bb4f33b

package/compiler/index.js

@@ -27,10 +27,7 @@ const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs'))
 const execSync = (typeof process?.version !== 'undefined' ? (await import('node:child_process')).execSync : undefined);
 
 export default (code, flags) => {
-  let target = Prefs.target ?? 'wasm';
-  if (Prefs.native) target = 'native';
-
-  let outFile = Prefs.o;
+  const target = Prefs.target ?? 'wasm';
 
   globalThis.valtype = 'f64';
   const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
@@ -116,6 +113,8 @@ export default (code, flags) => {
 
   const out = { wasm, funcs, globals, tags, exceptions, pages, data };
 
+  const outFile = Prefs.o;
+
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 
@@ -136,8 +135,6 @@ export default (code, flags) => {
   }
 
   if (target === 'native') {
-    outFile ??= Prefs.native ? './porffor_tmp' : file.split('/').at(-1).split('.').at(0, -1).join('.');
-
     let compiler = Prefs.compiler ?? 'clang';
     const cO = Prefs._cO ?? 'Ofast';
 
@@ -156,29 +153,7 @@ export default (code, flags) => {
 
     fs.unlinkSync(tmpfile);
 
-    if (process.version) {
-      if (Prefs.native) {
-        const cleanup = () => {
-          try {
-            fs.unlinkSync(outFile);
-          } catch {}
-        };
-
-        process.on('exit', cleanup);
-        process.on('beforeExit', cleanup);
-        process.on('SIGINT', () => {
-          cleanup();
-          process.exit();
-        });
-
-        const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
-        try {
-          execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
-        } catch {}
-      }
-
-      process.exit();
-    }
+    if (process.version) process.exit();
   }
 
   return out;

package/compiler/opt.js

@@ -125,8 +125,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
       // main pass
       for (let i = 0; i < wasm.length; i++) {
         let inst = wasm[i];
-        inst = [ ...inst ];
-        wasm[i] = inst;
 
         if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block) depth.push(inst[0]);
         if (inst[0] === Opcodes.end) depth.pop();
@@ -174,14 +172,14 @@ export default (funcs, globals, pages, tags, exceptions) => {
           }
         }
 
-        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString && Prefs.rmUnusedTypes) {
+        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 && Prefs.rmUnusedTypes) {
+        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString&& !Prefs.noRmUnusedTypes) {
           let j = i;
           for (; j < wasm.length; j++) {
             const op = wasm[j];
@@ -195,7 +193,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           inst = wasm[i];
         }
 
-        if (inst[0] === Opcodes.if && typeof inst[2] === 'string' && Prefs.rmUnusedTypes) {
+        if (inst[0] === Opcodes.if && typeof inst[2] === 'string' && !Prefs.noRmUnusedTypes) {
           // remove unneeded typeswitch checks
 
           const type = inst[2].split('|')[1];
@@ -223,7 +221,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           }
         }
 
-        if (inst[0] === Opcodes.end && inst[1] === 'TYPESWITCH_end' && Prefs.rmUnusedTypes) {
+        if (inst[0] === Opcodes.end && inst[1] === 'TYPESWITCH_end') {
           // remove unneeded entire typeswitch
 
           let j = i - 1, depth = -1, checks = 0;
@@ -371,7 +369,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           continue;
         }
 
-        if (lastInst[0] === Opcodes.i32_const && (inst[0] === Opcodes.i32_from[0] || inst[0] === Opcodes.i32_from_u[0])) {
+        if (lastInst[0] === Opcodes.i32_const && (inst === Opcodes.i32_from || inst === Opcodes.i32_from_u)) {
           // change i32 const and immediate convert to const (opposite way of previous)
           // i32.const 0
           // f64.convert_i32_s || f64.convert_i32_u

package/compiler/parse.js

@@ -43,7 +43,7 @@ export default (input, flags) => {
       webcompat: true,
 
       // babel
-      plugins: types || flags.includes('typed') ? ['estree', 'typescript'] : ['estree'],
+      plugins: types ? ['estree', 'typescript'] : ['estree'],
 
       // multiple
       sourceType: flags.includes('module') ? 'module' : 'script',

package/compiler/pgo.js

@@ -11,7 +11,7 @@ export const setup = () => {
 
   // enable these prefs by default for pgo
   Prefs.typeswitchUniqueTmp = Prefs.typeswitchUniqueTmp === false ? false : true;
-  Prefs.cyclone = Prefs.cyclone === false ? false : true;
+  Prefs.cyclone = Prefs.cyclone === false ? false : true;;
 };
 
 export const run = obj => {
@@ -87,10 +87,9 @@ export const run = obj => {
         localData[activeFunc][i].push(n);
       },
       w: (ind, outPtr) => { // readArgv
-        const pgoInd = process.argv.indexOf('--pgo');
-        const args = process.argv.slice(pgoInd).filter(x => !x.startsWith('-'));
+        const args = process.argv.slice(process.argv.indexOf('--pgo')).filter(x => !x.startsWith('-'));
         const str = args[ind - 1];
-        if (pgoInd === -1 || !str) {
+        if (!str) {
           if (Prefs.pgoLog) console.log('\nPGO warning: script was expecting arguments, please specify args to use for PGO after --pgo arg');
           return -1;
         }
@@ -131,18 +130,16 @@ export const run = obj => {
     func.localValues = localValues;
 
     let counts = new Array(10).fill(0);
-    const consistents = localData[i].map((x, j) => {
-      if (j < func.params.length) return false; // param
-      if (x.length === 0 || !x.every((y, i) => i < 1 ? true : y === x[i - 1])) return false; // not consistent
+    const consistents = localData[i].map(x => {
+      if (x.length === 0 || !x.every((y, i) => i < 1 ? true : y === x[i - 1])) return false;
 
       counts[0]++;
       return x[0];
     });
 
     const integerOnlyF64s = localData[i].map((x, j) => {
-      if (j < func.params.length) return false; // param
       if (localValues[j].type === Valtype.i32) return false; // already i32
-      if (x.length === 0 || !x.every(y => Number.isInteger(y))) return false; // not all integer values
+      if (x.length === 0 || !x.every(y => Number.isInteger(y))) return false;
 
       counts[1]++;
       return true;
@@ -153,14 +150,14 @@ export const run = obj => {
 
     log += `  ${func.name}: identified ${counts[0]}/${total} locals as consistent${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
-      for (let j = func.params.length; j < localData[i].length; j++) {
+      for (let j = 0; j < localData[i].length; j++) {
         log += `    ${consistents[j] !== false ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m: ${new Set(localData[i][j]).size} unique values set\n`;
       }
     }
 
     log += `  ${func.name}: identified ${counts[1]}/${localValues.reduce((acc, x) => acc + (x.type === Valtype.f64 ? 1 : 0), 0)} f64 locals as integer usage only${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
-      for (let j = func.params.length; j < localData[i].length; j++) {
+      for (let j = 0; j < localData[i].length; j++) {
         if (localValues[j].type !== Valtype.f64) continue;
         log += `    ${integerOnlyF64s[j] ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m\n`;
       }
@@ -180,6 +177,7 @@ export const run = obj => {
     for (let i = 0; i < x.integerOnlyF64s.length; i++) {
       const c = x.integerOnlyF64s[i];
       if (c === false) continue;
+      if (i < x.params.length) continue;
 
       targets.push(i);
     }
@@ -192,6 +190,7 @@ export const run = obj => {
     for (let i = 0; i < x.consistents.length; i++) {
       const c = x.consistents[i];
       if (c === false) continue;
+      if (i < x.params.length) continue;
 
       targets.push(i);
 

package/compiler/precompile.js

@@ -26,7 +26,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
 
   const porfCompile = (await import(`./index.js?_=${Date.now()}`)).default;
 
-  let { funcs, globals, data, exceptions } = porfCompile(source, ['module', 'typed']);
+  let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
 
   const allocated = new Set();
 
@@ -35,17 +35,14 @@ const compile = async (file, [ _funcs, _globals ]) => {
     if (x.data) {
       x.data = x.data.map(x => data[x]);
       for (const y in x.data) {
-        if (x.data[y].offset != null) x.data[y].offset -= x.data[0].offset;
+        x.data[y].offset -= x.data[0].offset;
       }
     }
-
-    if (x.exceptions) {
-      x.exceptions = x.exceptions.map(x => {
-        const obj = exceptions[x];
-        if (obj) obj.exceptId = x;
-        return obj;
-      }).filter(x => x);
-    }
+    if (x.exceptions) x.exceptions = x.exceptions.map(x => {
+      const obj = exceptions[x];
+      if (obj) obj.exceptId = x;
+      return obj;
+    }).filter(x => x);
 
     const locals = Object.keys(x.locals).reduce((acc, y) => {
       acc[x.locals[y].idx] = { ...x.locals[y], name: y };
@@ -90,8 +87,6 @@ const compile = async (file, [ _funcs, _globals ]) => {
 };
 
 const precompile = async () => {
-  if (globalThis._porf_loadParser) await globalThis._porf_loadParser('@babel/parser');
-
   const dir = join(__dirname, 'builtins');
 
   let funcs = [], globals = [];

package/compiler/prefs.js

@@ -1,4 +1,4 @@
-const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'rmUnusedTypes' ];
+const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused' ];
 
 let cache = {};
 const obj = new Proxy({}, {

package/compiler/prototype.js

@@ -1,5 +1,6 @@
 import { Opcodes, Blocktype, Valtype, ValtypeSize } from './wasmSpec.js';
 import { number } from './embedding.js';
+import { unsignedLEB128 } from './encoding.js';
 import { UNDEFINED } from './builtins.js';
 import { TYPES } from './types.js';
 import Prefs from './prefs.js';
@@ -54,10 +55,10 @@ export const PrototypeFuncs = function() {
 
       // read from memory
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.load, 0, ValtypeSize.i32 ],
+      [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ]
     ],
 
     // todo: only for 1 argument
@@ -73,12 +74,12 @@ export const PrototypeFuncs = function() {
       // store value
       [ Opcodes.local_get, iTmp ],
       ...wNewMember,
-      [ Opcodes.store, 0, ValtypeSize.i32 ],
+      [ Opcodes.store, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
       // store type
       [ Opcodes.local_get, iTmp ],
       ...wType,
-      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
 
       // bump array length by 1 and return it
       ...length.setI32([
@@ -136,10 +137,10 @@ export const PrototypeFuncs = function() {
         [ Opcodes.local_set, iTmp ],
 
         [ Opcodes.local_get, iTmp ],
-        [ Opcodes.load, 0, ValtypeSize.i32 ],
+        [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
         [ Opcodes.local_get, iTmp ],
-        [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
+        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ]
       ])
     ],
 
@@ -167,10 +168,10 @@ export const PrototypeFuncs = function() {
       // load first element
       // todo/perf: unusedValue opt
       ...pointer,
-      [ Opcodes.load, 0, ValtypeSize.i32 ],
+      [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
       ...pointer,
-      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
 
       // offset page by -1 ind
       // ...number(pointer + ValtypeSize.i32, Valtype.i32), // dst = base array index + length size
@@ -249,12 +250,12 @@ export const PrototypeFuncs = function() {
       // store value
       [ Opcodes.local_get, iTmp2 ],
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.store, 0, ValtypeSize.i32 ],
+      [ Opcodes.store, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
       // store type
       [ Opcodes.local_get, iTmp2 ],
       ...wType,
-      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
 
       // pointer - sizeof value
       ...length.getCachedI32(),
@@ -291,8 +292,11 @@ export const PrototypeFuncs = function() {
       const [ newOut, newPointer ] = arrayShell(1, 'i16');
 
       return [
-        // setup new/out array and use pointer for store
+        // setup new/out array
         ...newOut,
+        [ Opcodes.drop ],
+
+        ...number(0, Valtype.i32), // base 0 for store later
 
         ...wIndex,
         Opcodes.i32_to_u,
@@ -331,14 +335,13 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
 
         // store to new string ind 0
-        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
 
         // return new string (pointer)
-        ...newPointer,
-        Opcodes.i32_from_u
+        ...number(newPointer)
       ];
     },
 
@@ -347,8 +350,11 @@ export const PrototypeFuncs = function() {
       const [ newOut, newPointer ] = arrayShell(1, 'i16');
 
       return [
-        // setup new/out array and use as pointer for store
+        // setup new/out array
         ...newOut,
+        [ Opcodes.drop ],
+
+        ...number(0, Valtype.i32), // base 0 for store later
 
         ...wIndex,
         Opcodes.i32_to,
@@ -360,14 +366,13 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
 
         // store to new string ind 0
-        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
 
         // return new string (page)
-        ...newPointer,
-        Opcodes.i32_from_u
+        ...number(newPointer)
       ];
     },
 
@@ -406,7 +411,7 @@ export const PrototypeFuncs = function() {
       [ Opcodes.i32_add ],
 
       // load current string ind {arg}
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
       Opcodes.i32_from_u
     ],
 
@@ -428,7 +433,7 @@ export const PrototypeFuncs = function() {
       [ Opcodes.block, Blocktype.void ],
 
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
       [ Opcodes.local_set, iTmp2 ],
 
       // if not surrogate, continue
@@ -450,7 +455,7 @@ export const PrototypeFuncs = function() {
 
       // if not followed by trailing surrogate, return false
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 + ValtypeSize.i16 ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize.i16) ],
       ...number(0xFC00, Valtype.i32),
       [ Opcodes.i32_and ],
       ...number(0xDC00, Valtype.i32),
@@ -502,8 +507,11 @@ export const PrototypeFuncs = function() {
         const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
-          // setup new/out array and use pointer for store later
+          // setup new/out array
           ...newOut,
+          [ Opcodes.drop ],
+
+          ...number(0, Valtype.i32), // base 0 for store later
 
           ...wIndex,
           Opcodes.i32_to_u,
@@ -540,14 +548,13 @@ export const PrototypeFuncs = function() {
           [ Opcodes.i32_add ],
 
           // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
+          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
           // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
+          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
 
           // return new string (pointer)
-          ...newPointer,
-          Opcodes.i32_from_u
+          ...number(newPointer)
         ];
       },
 
@@ -556,8 +563,11 @@ export const PrototypeFuncs = function() {
         const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
-          // setup new/out array and use pointer for later
+          // setup new/out array
           ...newOut,
+          [ Opcodes.drop ],
+
+          ...number(0, Valtype.i32), // base 0 for store later
 
           ...wIndex,
           Opcodes.i32_to,
@@ -566,14 +576,13 @@ export const PrototypeFuncs = function() {
           [ Opcodes.i32_add ],
 
           // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
+          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
 
           // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
+          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
 
           // return new string (page)
-          ...newPointer,
-          Opcodes.i32_from_u
+          ...number(newPointer)
         ];
       },
 
@@ -609,7 +618,7 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
+        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
         Opcodes.i32_from_u
       ],
 

package/compiler/wasmSpec.js

@@ -191,8 +191,6 @@ 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
@@ -211,6 +209,8 @@ 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

@@ -104,14 +104,13 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
 
     case TYPES.symbol: {
       const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
-      if (!descStore) return Symbol();
-
       const offset = descStore + 4 + ((value - 1) * 9);
 
       const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
       const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
 
       const desc = porfToJSValue({ memory, funcs, pages }, v, t);
+
       return Symbol(desc);
     }
 
@@ -129,7 +128,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
 
   if (source.includes?.('export ')) flags.push('module');
 
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));