porffor 0.22.5 → 0.22.6

package/compiler/builtins/_internal_object.ts

@@ -269,6 +269,51 @@ local.set ${err}`;
     0, 12);
 };
 
+export const __Porffor_object_delete = (_this: object, key: any): boolean => {
+  const entryPtr: i32 = __Porffor_object_lookup(_this, key);
+  if (entryPtr == -1) {
+    // not found, stop
+    return true;
+  }
+
+  const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
+  if (!(tail & 0b0010)) {
+    // not configurable
+    // todo: throw in strict mode
+    return false;
+  }
+
+  const ind: i32 = (entryPtr - Porffor.wasm`local.get ${_this}`) / 14;
+
+  // decrement size
+  let size: i32 = Porffor.wasm.i32.load(_this, 0, 0);
+  Porffor.wasm.i32.store(_this, --size, 0, 0);
+
+  if (size > ind) {
+    // offset all elements after by -1 ind
+    Porffor.wasm`
+;; dst = entryPtr
+local.get ${entryPtr}
+
+;; src = entryPtr + 14 (+ 1 entry)
+local.get ${entryPtr}
+i32.const 14
+i32.add
+
+;; size = (size - ind) * 14
+local.get ${size}
+local.get ${ind}
+i32.sub
+i32.const 14
+i32.mul
+
+memory.copy 0 0`;
+  }
+
+  return true;
+};
+
+
 export const __Porffor_object_isEnumerable = (entryPtr: i32): boolean => {
   const out: boolean = Porffor.wasm.i32.load8_u(entryPtr, 0, 12) & 0b0100;
   return out;

package/compiler/builtins/reflect.ts

@@ -0,0 +1,34 @@
+import type {} from './porffor.d.ts';
+
+// todo: support receiver
+export const __Reflect_get = (target: any, property: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  const p: any = ecma262.ToPropertyKey(property);
+
+  const t: i32 = Porffor.rawType(target);
+  if (t == Porffor.TYPES.object) {
+    return Porffor.object.get(target, p);
+  }
+
+  const keys: any[] = Object.keys(target);
+  const idx: i32 = __Array_prototype_indexOf(keys, p);
+  if (idx == -1) return undefined;
+
+  const vals: any[] = Object.values(target);
+  return vals[idx];
+};
+
+export const __Reflect_has = (target: any, property: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  const p: any = ecma262.ToPropertyKey(property);
+
+  const t: i32 = Porffor.rawType(target);
+  if (t == Porffor.TYPES.object) {
+    return Porffor.object.lookup(target, p) != -1;
+  }
+
+  const keys: any[] = Object.keys(target);
+  return __Array_prototype_includes(keys, p);
+};

package/compiler/codegen.js

@@ -2843,6 +2843,15 @@ const generateVar = (scope, decl) => {
   return out;
 };
 
+const getMemberProperty = decl => {
+  if (decl.computed) return decl.property;
+
+  return {
+    type: 'Literal',
+    value: decl.property.name
+  };
+};
+
 // todo: optimize this func for valueUnused
 const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
@@ -2897,10 +2906,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     const pointerTmp = localTmp(scope, '#member_setter_ptr_tmp', Valtype.i32);
 
     const object = decl.left.object;
-    const property = decl.left.computed ? decl.left.property : {
-      type: 'Literal',
-      value: decl.left.property.name
-    };
+    const property = getMemberProperty(decl.left);
 
     // todo/perf: use i32 object (and prop?) locals
     const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj') ] ];
@@ -3249,6 +3255,25 @@ const generateUnary = (scope, decl) => {
     }
 
     case 'delete': {
+      if (decl.argument.type === 'MemberExpression') {
+        const object = decl.argument.object;
+        const property = getMemberProperty(decl.argument);
+
+        return [
+          ...generate(scope, object),
+          Opcodes.i32_to_u,
+          ...getNodeType(scope, object),
+
+          ...generate(scope, property),
+          ...getNodeType(scope, property),
+          ...toPropertyKey(scope, true),
+
+          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_delete').index) ],
+          [ Opcodes.drop ],
+          Opcodes.i32_from_u
+        ];
+      }
+
       let toReturn = true, toGenerate = true;
 
       if (decl.argument.type === 'Identifier') {
@@ -3256,6 +3281,7 @@ const generateUnary = (scope, decl) => {
 
         // if ReferenceError (undeclared var), ignore and return true. otherwise false
         if (!out[1]) {
+          // todo: throw in strict mode
           // exists
           toReturn = false;
         } else {
@@ -4654,20 +4680,29 @@ const generateMember = (scope, decl, _global, _name) => {
       return number(0);
     }
 
+    const useTmp = !Prefs.lengthNoTmp;
+    const tmp = useTmp && localTmp(scope, '#length_tmp', Valtype.i32);
     return [
-      ...out,
-      [ Opcodes.local_set, localTmp(scope, '#length_tmp', Valtype.i32) ],
+      ...(useTmp ? [
+        ...out,
+        [ Opcodes.local_set, tmp ],
+      ] : []),
 
       ...getNodeType(scope, decl.object),
       ...number(TYPE_FLAGS.length, Valtype.i32),
       [ Opcodes.i32_and ],
       [ Opcodes.if, valtypeBinary ],
-        [ Opcodes.local_get, localTmp(scope, '#length_tmp', Valtype.i32) ],
+        ...(useTmp ? [ [ Opcodes.local_get, tmp ] ] : out),
         [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
         Opcodes.i32_from_u,
 
         ...setLastType(scope, TYPES.number),
       [ Opcodes.else ],
+        ...(useTmp ? [] : [
+          ...out,
+          [ Opcodes.drop ]
+        ]),
+
         ...number(0),
         ...setLastType(scope, TYPES.undefined),
       [ Opcodes.end ]
@@ -4703,10 +4738,7 @@ const generateMember = (scope, decl, _global, _name) => {
   }
 
   const object = decl.object;
-  const property = decl.computed ? decl.property : {
-    type: 'Literal',
-    value: decl.property.name
-  };
+  const property = getMemberProperty(decl);
 
   // todo/perf: use i32 object (and prop?) locals
   const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj') ] ];

package/compiler/generated_builtins.js

@@ -56,6 +56,12 @@ export const BuiltinFuncs = function() {
     returns: [127,127], typedReturns: 1,
     locals: [127,127,127,127,127,127,127,127], localNames: ["_this","_this#type","key","key#type","value","value#type","flags","flags#type","entryPtr","#last_type","#logicinner_tmp","#typeswitch_tmp","size","tail","err","logictmp"],
   };
+  this.__Porffor_object_delete = {
+    wasm: (scope, {builtin}) => [[32,0],[65,7],[32,2],[32,3],[16, ...builtin('__Porffor_object_lookup')],[26],[34,4],[65,127],[70],[4,64],[65,1],[65,2],[15],[11],[32,4],[47,0,12],[34,6],[65,2],[113],[69],[4,64],[65,0],[65,2],[15],[11],[32,4],[32,0],[107],[65,14],[109],[33,7],[32,0],[40,0,0],[33,8],[32,0],[32,8],[65,1],[107],[34,8],[54,0,0],[32,8],[32,7],[74],[4,64],[32,4],[32,4],[65,14],[106],[32,8],[32,7],[107],[65,14],[108],[252,10,0,0],[11],[65,1],[65,2],[15]],
+    params: [127,127,127,127], typedParams: 1,
+    returns: [127,127], typedReturns: 1,
+    locals: [127,127,127,127,127], localNames: ["_this","_this#type","key","key#type","entryPtr","#last_type","tail","ind","size"],
+  };
   this.__Porffor_object_isEnumerable = {
     wasm: (scope, {}) => [[32,0],[45,0,12],[65,4],[113],[34,2],[65,2],[15]],
     params: [127,127], typedParams: 1,
@@ -1835,6 +1841,18 @@ export const BuiltinFuncs = function() {
     returns: [124,127], typedReturns: 1,
     locals: [], localNames: ["_this","_this#type"],
   };
+  this.__Reflect_get = {
+    wasm: (scope, {builtin,internalThrow}) => [[32,0],[252,2],[32,1],[16, ...builtin('__Porffor_object_isObject')],[33,4],[183],[33,5],[32,4],[33,6],[2,124],[32,6],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,5],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,6],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,5],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,5],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],...internalThrow(scope, 'TypeError', `Target is a non-object`),[11],[32,2],[32,3],[16, ...builtin('__ecma262_ToPropertyKey')],[33,8],[33,7],[32,0],[32,1],[16, ...builtin('__Porffor_rawType')],[34,9],[68,0,0,0,0,0,0,28,64],[97],[4,64],[32,0],[252,2],[32,1],[32,7],[252,2],[32,8],[16, ...builtin('__Porffor_object_get')],[34,4],[15],[11],[32,0],[32,1],[16, ...builtin('__Object_keys')],[26],[34,10],[65,208,0],[32,7],[32,8],[68,0,0,0,0,0,0,0,0],[65,128,1],[16, ...builtin('__Array_prototype_indexOf')],[26],[34,11],[68,0,0,0,0,0,0,240,191],[97],[4,64],[68,0,0,0,0,0,0,0,0],[65,128,1],[15],[11],[32,0],[32,1],[16, ...builtin('__Object_values')],[26],[34,12],[33,13],[32,11],[34,14],[252,3],[65,9],[108],[32,13],[252,3],[106],[34,15],[43,0,4],[32,15],[45,0,12],[34,4],[15]],
+    params: [124,127,124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [127,124,127,124,127,124,124,124,124,124,124,127,127], localNames: ["target","target#type","property","property#type","#last_type","#logicinner_tmp","#typeswitch_tmp","p","p#type","t","keys","idx","vals","#member_obj","#member_prop","#loadArray_offset","#swap"],
+  };
+  this.__Reflect_has = {
+    wasm: (scope, {builtin,internalThrow}) => [[32,0],[252,2],[32,1],[16, ...builtin('__Porffor_object_isObject')],[33,4],[183],[33,5],[32,4],[33,6],[2,124],[32,6],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,5],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,6],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,5],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,5],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],...internalThrow(scope, 'TypeError', `Target is a non-object`),[11],[32,2],[32,3],[16, ...builtin('__ecma262_ToPropertyKey')],[33,8],[33,7],[32,0],[32,1],[16, ...builtin('__Porffor_rawType')],[34,9],[68,0,0,0,0,0,0,28,64],[97],[4,64],[32,0],[252,2],[32,1],[32,7],[252,2],[32,8],[16, ...builtin('__Porffor_object_lookup')],[33,4],[183],[68,0,0,0,0,0,0,240,191],[98],[184],[65,2],[15],[11],[32,0],[32,1],[16, ...builtin('__Object_keys')],[26],[34,10],[65,208,0],[32,7],[32,8],[68,0,0,0,0,0,0,0,0],[65,128,1],[16, ...builtin('__Array_prototype_includes')],[34,4],[15]],
+    params: [124,127,124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [127,124,127,124,127,124,124], localNames: ["target","target#type","property","property#type","#last_type","#logicinner_tmp","#typeswitch_tmp","p","p#type","t","keys"],
+  };
   this.__Porffor_set_read = {
     wasm: (scope, {}) => [[32,2],[252,3],[65,9],[108],[32,0],[252,3],[106],[34,4],[43,0,4],[32,4],[45,0,12],[15]],
     params: [124,127,124,127], typedParams: 1,

package/compiler/havoc.js

@@ -90,4 +90,29 @@ export const f64ToI32s = (func, targets) => {
       }
     }
   }
+};
+
+export const withLocalDomains = (func, targets, domains) => {
+  const { wasm } = func;
+
+  // update wasm
+  for (let i = 0; i < wasm.length; i++) {
+    const op = wasm[i];
+    const opcode = op[0];
+    const idx = op[1];
+
+    let target;
+    if ((opcode === Opcodes.local_get || opcode === Opcodes.local_tee) &&
+        (target = targets.indexOf(idx)) !== -1) {
+      const n1 = wasm[i + 1];
+      if (n1?.[0] !== Opcodes.i32_const && n1?.[0] !== Opcodes.f64_const) continue;
+
+      const n2 = wasm[i + 2];
+      if (!n2?.[0]) continue;
+
+      switch (n2[0]) {
+
+      }
+    }
+  }
 };

package/compiler/pgo.js

@@ -10,8 +10,13 @@ export const setup = () => {
   importedFuncs[importedFuncs.profile2].params = [ Valtype.i32, valtypeBinary ];
 
   // enable these prefs by default for pgo
-  Prefs.typeswitchUniqueTmp = Prefs.typeswitchUniqueTmp === false ? false : true;
-  Prefs.cyclone = Prefs.cyclone === false ? false : true;
+  for (const x of [
+    'typeswitchUniqueTmp', // use unique tmps for typeswitches
+    'lengthNoTmp', // use duplicated inline code instead of tmp for .length
+    'cyclone', // enable cyclone pre-evaler
+  ]) {
+    Prefs[x] = Prefs[x] === false ? false : true;
+  }
 };
 
 export const run = obj => {
@@ -158,8 +163,24 @@ export const run = obj => {
       return true;
     });
 
+    const domains = localData[i].map((x, j) => {
+      if (j < func.params.length) return false; // param
+      if (consistents[j] !== false) return false; // already consistent
+      if (x.length < 2) return false; // <2 samples
+
+      let min = Infinity, max = -Infinity;
+      for (const y of x) {
+        if (y < min) min = y;
+        if (y > max) max = y;
+      }
+
+      counts[2]++;
+      return [ min, max ];
+    });
+
     func.consistents = consistents;
     func.integerOnlyF64s = integerOnlyF64s;
+    func.domains = domains;
 
     log += `  ${func.name}: identified ${counts[0]}/${total} locals as consistent${Prefs.verbosePgo ? ':' : ''}\n`;
     if (Prefs.verbosePgo) {
@@ -174,12 +195,20 @@ export const run = obj => {
         if (localValues[j].type !== Valtype.f64) continue;
         log += `    ${integerOnlyF64s[j] ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m\n`;
       }
+    }
+
+    log += `  ${func.name}: identified ${counts[2]}/${total} local non-consistent domains${Prefs.verbosePgo ? ':' : ''}\n`;
+    if (Prefs.verbosePgo) {
+      for (let j = func.params.length; j < localData[i].length; j++) {
+        if (domains[j] === false) continue;
+        log += `    ${domains[j] !== false ? '\u001b[92m' : '\u001b[91m'}${localKeys[j]}\u001b[0m: ${domains[j] !== false ? `${domains[j][0]} ≤ x ≤ ${domains[j][1]}` : ''}\n`;
+      }
 
       log += '\n';
     }
   }
 
-  time(2, 'processed PGO data' + log);
+  time(2, 'processed PGO data\n' + log);
   time(3, 'optimizing using PGO data...');
 
   log = '';
@@ -216,5 +245,5 @@ export const run = obj => {
     if (targets.length > 0) Havoc.localsToConsts(wasmFunc, targets, consts, { localKeys: x.localKeys });
   }
 
-  time(3, 'optimized using PGO data' + log);
+  time(3, 'optimized using PGO data\n' + log);
 };

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.22.5+dd1e07d06",
+  "version": "0.22.6+e32079e96",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.22.5+dd1e07d06';
+globalThis.version = '0.22.6+e32079e96';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {