@fraczak/k 7.0.1 → 7.0.2

package/backends/llvm/src/executable.mjs

@@ -292,7 +292,7 @@ export function stdioDriverSource({ inputPattern = null, outputPattern = null }
     "    k_wire_input_free(input);",
     "    return 2;",
     "  }",
-    "  if (!k_pattern_equal(input.pattern, &compiled_input_pattern)) {",
+    "  if (!k_pattern_compatible(input.pattern, &compiled_input_pattern)) {",
     "    k_wire_input_free(input);",
     "    return 5;",
     "  }",
@@ -350,7 +350,7 @@ export function stdioDriverSource({ inputPattern = null, outputPattern = null }
     "    k_value *in_val = k_decode_wire_value_with_prefix(payload, length, &input_prefix, &compiled_input_pattern, rt);",
     "    if (in_val == 0) {",
     "      k_wire_input envelope = k_decode_wire_envelope(payload, length, rt);",
-    "      if (envelope.value != 0 && envelope.pattern != 0 && k_pattern_equal(envelope.pattern, &compiled_input_pattern)) {",
+    "      if (envelope.value != 0 && envelope.pattern != 0 && k_pattern_compatible(envelope.pattern, &compiled_input_pattern)) {",
     "        in_val = envelope.value;",
     "      } else {",
     "        k_wire_input_free(envelope);",
@@ -437,7 +437,7 @@ export function stdioDriverSource({ inputPattern = null, outputPattern = null }
     "    k_rt_free(input_rt);",
     "    return 2;",
     "  }",
-    "  if (!k_pattern_equal(input.pattern, &compiled_input_pattern)) {",
+    "  if (!k_pattern_compatible(input.pattern, &compiled_input_pattern)) {",
     "    k_wire_input_free(input);",
     "    k_rt_free(run_rt);",
     "    k_rt_free(input_rt);",
@@ -478,7 +478,7 @@ export function stdioDriverSource({ inputPattern = null, outputPattern = null }
     "    k_rt_free(rt);",
     "    return 2;",
     "  }",
-    "  if (!k_pattern_equal(input.pattern, &compiled_input_pattern)) {",
+    "  if (!k_pattern_compatible(input.pattern, &compiled_input_pattern)) {",
     "    k_wire_input_free(input);",
     "    k_wire_prefix_free(output_prefix);",
     "    k_rt_free(rt);",

package/backends/llvm/src/kvm2llvm.mjs

@@ -35,15 +35,17 @@ function alignArenaSize(size) {
 }
 
 function cStringBytes(text) {
-  return [...Buffer.from(text, "utf8"), 0]
-    .map((byte) => {
-      if (byte === 10) return "\\0A";
-      if (byte === 34) return "\\22";
-      if (byte === 92) return "\\5C";
-      if (byte >= 32 && byte <= 126) return String.fromCharCode(byte);
-      return `\\${byte.toString(16).padStart(2, "0").toUpperCase()}`;
-    })
-    .join("");
+  const buf = Buffer.from(text, "utf8");
+  let out = "";
+  for (let i = 0; i < buf.length; i++) {
+    const byte = buf[i];
+    if (byte === 10) out += "\\0A";
+    else if (byte === 34) out += "\\22";
+    else if (byte === 92) out += "\\5C";
+    else if (byte >= 32 && byte <= 126) out += String.fromCharCode(byte);
+    else out += `\\${byte.toString(16).padStart(2, "0").toUpperCase()}`;
+  }
+  return out + "\\00";
 }
 
 export function runtimeDeclarations() {
@@ -551,8 +553,7 @@ export function compileKVMModuleToLLVM(entryName, kvmProgram, options = {}) {
   const payload = JSON.stringify({
     format: ARTIFACT_FORMAT,
     version: ARTIFACT_VERSION,
-    relation,
-    kvm: kvmProgram
+    relation
   });
   const payloadBytes = Buffer.byteLength(payload, "utf8") + 1;
   const symbol = llvmIdentifier(options.symbol || relation);
@@ -815,11 +816,32 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
           storeI64At(ctx, product, K_VALUE_PRODUCT_CAPACITY_OFFSET, N);
           storePtrAt(ctx, product, K_VALUE_PRODUCT_FIELDS_OFFSET, fields);
 
-          const sortedFields = [...fieldValues].sort((a, b) => {
-            if (a.label < b.label) return -1;
-            if (a.label > b.label) return 1;
-            return 0;
-          });
+          let sortedFields;
+          if (Array.isArray(inst.pattern) && inst.pattern.length > 0) {
+            const root = inst.pattern[0];
+            if (
+              (root[0] === "open-product" ||
+                root[0] === "closed-product") &&
+              Array.isArray(root[1])
+            ) {
+              const order = new Map(root[1].map(([l], i) => [l, i]));
+              sortedFields = [...fieldValues].sort((a, b) => {
+                const aI = order.has(a.label)
+                  ? order.get(a.label)
+                  : 999999;
+                const bI = order.has(b.label)
+                  ? order.get(b.label)
+                  : 999999;
+                if (aI !== bI) return aI - bI;
+                return a.label.localeCompare(b.label);
+              });
+            }
+          }
+          if (!sortedFields) {
+            sortedFields = [...fieldValues].sort((a, b) =>
+              a.label.localeCompare(b.label)
+            );
+          }
 
           for (let sIdx = 0; sIdx < N; sIdx++) {
             const { label: fLabel, val: fVal } = sortedFields[sIdx];
@@ -838,7 +860,7 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
           const uInput = getReg(inst.src);
 
           if (!isTopLevel) {
-            // Nested union: synthesize a helper function @k_union_expr_${index}
+            // Nested union: synthesize helper @k_union_expr_${index}
             const exprIndex = moduleCtx.unionExprIndex++;
             const exprName = `@k_union_expr_${exprIndex}`;
             const exprFunc = {
@@ -863,7 +885,7 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
             break;
           }
 
-          // Top-level union: synthesize arm functions @k_union_arm_${index}
+          // Top-level union: synthesize arms @k_union_arm_${index}
           const mark = lowerRtMark(ctx);
           const unionDone = ctx.blockName("union_done");
           const N = inst.branches.length;

package/backends/llvm/src/llvm.mjs

@@ -45,15 +45,17 @@ function alignArenaSize(size) {
 }
 
 function cStringBytes(text) {
-  return [...Buffer.from(text, "utf8"), 0]
-    .map((byte) => {
-      if (byte === 10) return "\\0A";
-      if (byte === 34) return "\\22";
-      if (byte === 92) return "\\5C";
-      if (byte >= 32 && byte <= 126) return String.fromCharCode(byte);
-      return `\\${byte.toString(16).padStart(2, "0").toUpperCase()}`;
-    })
-    .join("");
+  const buf = Buffer.from(text, "utf8");
+  let out = "";
+  for (let i = 0; i < buf.length; i++) {
+    const byte = buf[i];
+    if (byte === 10) out += "\\0A";
+    else if (byte === 34) out += "\\22";
+    else if (byte === 92) out += "\\5C";
+    else if (byte >= 32 && byte <= 126) out += String.fromCharCode(byte);
+    else out += `\\${byte.toString(16).padStart(2, "0").toUpperCase()}`;
+  }
+  return out + "\\00";
 }
 
 function readPattern(inputPattern) {
@@ -986,8 +988,7 @@ export function emitLLVMModule(input, options = {}) {
   const payload = JSON.stringify({
     format: ARTIFACT_FORMAT,
     version: ARTIFACT_VERSION,
-    relation,
-    kir
+    relation
   });
   const payloadBytes = Buffer.byteLength(payload, "utf8") + 1;
   const symbol = llvmIdentifier(options.symbol || relation);

package/backends/llvm/tests/perf-support.mjs

@@ -216,7 +216,7 @@ export function runExecutableMainBench(exePath, inputWire, calls) {
         reject(new Error(`${exePath} --bench-main failed with status ${status}\n${text}`.trim()));
         return;
       }
-      const match = text.match(/K_(?:LLVM|ARM64)_BENCH_MAIN calls=(\d+) total_ns=(\d+) per_call_ns=([0-9.]+)/);
+      const match = text.match(/K_LLVM_BENCH_MAIN calls=(\d+) total_ns=(\d+) per_call_ns=([0-9.]+)/);
       if (!match) {
         reject(new Error(`${exePath} --bench-main did not report timing\n${text}`.trim()));
         return;
@@ -599,61 +599,7 @@ export function llvmLaneName() {
     : "LLVM Executable (persistent)";
 }
 
-export function arm64LaneName(optLevel = "-O2") {
-  const mode = process.env.ARM64_SPAWN_PER_CALL === "1"
-    ? "spawn/call"
-    : (process.env.ARM64_PIPELINE === "1" ? "persistent, pipelined" : "persistent");
-  return `Linux ARM64 ${optLevel} (${mode})`;
-}
-
-export function createARM64Runner(testSuite) {
-  const arm64Cases = testSuite.filter(tc => tc.arm64?.status === "ok");
-  if (process.env.ARM64_SPAWN_PER_CALL === "1") {
-    return {
-      run(iterations) {
-        if (arm64Cases.length === 0) return null;
-        return runTimedIterationsAsync(iterations, async () => {
-          for (const tc of arm64Cases) {
-            await runExecutable(tc.arm64.exePath, tc.inputWire);
-          }
-        });
-      },
-      close() {}
-    };
-  }
 
-  const servers = new Map();
-  function serverFor(exePath) {
-    let server = servers.get(exePath);
-    if (server == null) {
-      server = new PersistentExecutable(exePath);
-      servers.set(exePath, server);
-    }
-    return server;
-  }
-
-  return {
-    async run(iterations) {
-      if (arm64Cases.length === 0) return null;
-      return runTimedIterationsAsync(iterations, async () => {
-        if (process.env.ARM64_PIPELINE === "1") {
-          const pending = [];
-          for (const tc of arm64Cases) {
-            pending.push(serverFor(tc.arm64.exePath).request(tc.inputWire));
-          }
-          await Promise.all(pending);
-          return;
-        }
-        for (const tc of arm64Cases) {
-          await serverFor(tc.arm64.exePath).request(tc.inputWire);
-        }
-      });
-    },
-    close() {
-      for (const server of servers.values()) server.close();
-    }
-  };
-}
 
 export function average(times) {
   return times.reduce((sum, time) => sum + time, 0) / times.length;

package/backends/llvm/tests/test-llvm.mjs

@@ -239,11 +239,11 @@ assert.doesNotMatch(nestedUnionLLVM, /call void @k_product_set_at\(ptr %product\
 assert.doesNotMatch(nestedUnionLLVM, /ptr false/);
 
 const productRecurseObject = decodeObject(compileObjectBuffer(`
-  list = ?< {} nil, { {} car, list cdr } cons >;
-  foo = list <
+  list? = ?< {} nil, { {} car, list? cdr } cons >;
+  foo = list? <
     /nil |nil,
     /cons { .car car, .cdr foo cdr } |cons
-  > list;
+  > list?;
   foo
 `, { source: "llvm-product-recurse.k" }));
 const { llvm: productRecurseLLVM } = compileObjectToLLVM(productRecurseObject, {

package/backends/wasm/src/wasm.mjs

@@ -439,7 +439,8 @@ function relTypeStatus(defs, name) {
   const rel = defs.rels?.[name];
   const explicit = rel?.typeDerivation?.status;
   if (explicit) return explicit;
-  const scc = compileStatsByRelName(defs.compileStats).get(name);
+  const stats = compileStatsByRelName(defs.compileStats);
+  const scc = stats.get(name) || (name.includes("$") ? stats.get(name.split("$")[0]) : null);
   if (scc) return scc.converged ? "converged" : "not-converged";
   return "unknown";
 }

package/backends/wasm/tests/test-wasm.mjs

@@ -443,11 +443,11 @@ console.log("==> Running End-to-End Peano Addition & Serialization Tests");
   const runtimeWat = fs.readFileSync("runtime.wat", "utf8");
 
   const script = `
-    nat = ?< {} 0, nat +1 >;
-    0 = {} | 0 nat;
-    inc = | +1 nat;
-    dec = nat / +1;
-    add = ?{ nat x, nat y } = X <
+    nat? = ?< {} 0, nat? +1 >;
+    0 = {} | 0 nat?;
+    inc = | +1 nat?;
+    dec = nat? / +1;
+    add = ?{ nat? x, nat? y } = X <
       { . x dec x, . y inc y } ?X add,
       . y
     >;