porffor 0.16.0-0e931a1fa → 0.16.0-21627938

package/compiler/codegen.js

@@ -3270,7 +3270,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     firstAssign = true;
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
-    const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
+    const uniqueName = name === '$undeclared' ? name + randId() : name;
 
     let page;
     if (Prefs.scopedPageNames) page = allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${uniqueName}`, itemType);
@@ -3658,7 +3658,7 @@ const generateMember = (scope, decl, _global, _name) => {
   });
 };
 
-const randId = () => Math.random().toString(16).slice(0, -4);
+const randId = () => Math.random().toString(16).slice(1, -2).padEnd(12, '0');
 
 const objectHack = node => {
   if (!node) return node;
@@ -3710,7 +3710,7 @@ const generateFunc = (scope, decl) => {
   if (decl.async) return todo(scope, 'async functions are not supported');
   if (decl.generator) return todo(scope, 'generator functions are not supported');
 
-  const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
+  const name = decl.id ? decl.id.name : `anonymous${randId()}`;
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!

package/compiler/havoc.js

@@ -1,4 +1,4 @@
-// havoc: wasm rewrite library (it wreaks havoc upon wasm bytecode)
+// havoc: wasm rewrite library (it wreaks havoc upon wasm bytecode hence "havoc")
 import { Opcodes, Valtype } from './wasmSpec.js';
 
 export const localsToConsts = (func, targets, consts, { localKeys }) => {

package/compiler/index.js

@@ -158,10 +158,23 @@ export default (code, flags) => {
 
     if (process.version) {
       if (Prefs.native) {
-        const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
-        process.on('beforeExit', () => { fs.unlinkSync(outFile); });
+        const cleanup = () => {
+          try {
+            fs.unlinkSync(outFile);
+          } catch {}
+        };
+
+        process.on('exit', cleanup);
+        process.on('beforeExit', cleanup);
+        process.on('SIGINT', () => {
+          cleanup();
+          process.exit();
+        });
 
-        execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
+        const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
+        try {
+          execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
+        } catch {}
       }
 
       process.exit();

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

@@ -128,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`));

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-0e931a1fa",
+  "version": "0.16.0-021627938",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {
@@ -28,5 +28,5 @@
   "bugs": {
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
-  "homepage": "https://porffor.goose.icu"
+  "homepage": "https://porffor.dev"
 }