@fraczak/k 6.5.0 → 6.6.0

package/backends/llvm/src/kvm2llvm.mjs

@@ -53,6 +53,7 @@ export function runtimeDeclarations() {
     "",
     "declare %k_rt_mark @k_rt_mark(ptr)",
     "declare void @k_rt_rewind(ptr, %k_rt_mark)",
+    "declare ptr @k_rt_compact(ptr, ptr, ptr)",
     "declare ptr @k_rt_alloc(ptr, i64)",
     "declare ptr @k_unit(ptr)",
     "declare ptr @k_bit0(ptr)",
@@ -146,10 +147,11 @@ function lowerRawVariant(ctx, tag, payload) {
   return variant;
 }
 
-function lowerProductGetAt(ctx, input, edgeIndex) {
+function lowerProductGetAt(ctx, input, edgeIndex, label = null) {
   const nonNullBlock = ctx.blockName("product_non_null");
   const productBlock = ctx.blockName("product_kind");
   const fieldBlock = ctx.blockName("product_field");
+  const fallbackBlock = ctx.blockName("product_fallback");
   const missingBlock = ctx.blockName("product_missing");
   const doneBlock = ctx.blockName("product_done");
   const isMissing = ctx.tempName("product_is_missing");
@@ -172,16 +174,38 @@ function lowerProductGetAt(ctx, input, edgeIndex) {
   const fields = loadPtrAt(ctx, input, K_VALUE_PRODUCT_FIELDS_OFFSET, "product_fields_ptr");
   const slot = bytePtr(ctx, fields, edgeIndex * K_FIELD_SIZE, "field_slot");
   const value = loadPtrAt(ctx, slot, K_FIELD_VALUE_OFFSET, "field");
-  ctx.lines.push(`  br label %${doneBlock}`);
 
-  ctx.lines.push(`${missingBlock}:`);
-  ctx.lines.push(`  br label %${doneBlock}`);
+  if (label) {
+    const fLabel = loadPtrAt(ctx, slot, K_FIELD_LABEL_OFFSET, "field_label");
+    const labelMatch = ctx.tempName("label_match");
+    ctx.lines.push(`  ${labelMatch} = icmp eq ptr ${fLabel}, ${label.pointer}`);
+    ctx.lines.push(`  br i1 ${labelMatch}, label %${doneBlock}, label %${fallbackBlock}`);
+
+    ctx.lines.push(`${fallbackBlock}:`);
+    const fallbackVal = ctx.tempName("fallback_field");
+    ctx.lines.push(`  ${fallbackVal} = call ptr @k_product_get_n(ptr ${input}, ptr ${label.pointer}, i64 ${label.length})`);
+    ctx.lines.push(`  br label %${doneBlock}`);
+
+    ctx.lines.push(`${missingBlock}:`);
+    ctx.lines.push(`  br label %${doneBlock}`);
+
+    ctx.lines.push(`${doneBlock}:`);
+    const resultValue = ctx.tempName("field_value");
+    ctx.lines.push(`  ${resultValue} = phi ptr [${value}, %${fieldBlock}], [${fallbackVal}, %${fallbackBlock}], [null, %${missingBlock}]`);
+    ctx.currentBlock = doneBlock;
+    return resultValue;
+  } else {
+    ctx.lines.push(`  br label %${doneBlock}`);
 
-  ctx.lines.push(`${doneBlock}:`);
-  const resultValue = ctx.tempName("field_value");
-  ctx.lines.push(`  ${resultValue} = phi ptr [${value}, %${fieldBlock}], [null, %${missingBlock}]`);
-  ctx.currentBlock = doneBlock;
-  return resultValue;
+    ctx.lines.push(`${missingBlock}:`);
+    ctx.lines.push(`  br label %${doneBlock}`);
+
+    ctx.lines.push(`${doneBlock}:`);
+    const resultValue = ctx.tempName("field_value");
+    ctx.lines.push(`  ${resultValue} = phi ptr [${value}, %${fieldBlock}], [null, %${missingBlock}]`);
+    ctx.currentBlock = doneBlock;
+    return resultValue;
+  }
 }
 
 function lowerVariantMatchBranch(ctx, input, label, matchBlock, mismatchBlock) {
@@ -287,6 +311,56 @@ function lowerRtRewind(ctx, mark) {
   ctx.currentBlock = doneBlock;
 }
 
+function lowerRtCompact(ctx, val, tailMarkSlot = "%tail_mark_slot") {
+  const curBlock = loadPtrAt(ctx, "%rt", K_RT_BLOCKS_OFFSET, "cur_block");
+  const hasBlock = ctx.tempName("has_block");
+  const markBlockPtr = ctx.tempName("mark_block_ptr");
+  ctx.lines.push(`  ${hasBlock} = icmp ne ptr ${curBlock}, null`);
+  ctx.lines.push(`  ${markBlockPtr} = getelementptr inbounds %k_rt_mark, ptr ${tailMarkSlot}, i32 0, i32 0`);
+  const markBlock = ctx.tempName("mark_block");
+  ctx.lines.push(`  ${markBlock} = load ptr, ptr ${markBlockPtr}`);
+
+  const diffBlock = ctx.tempName("diff_block");
+  ctx.lines.push(`  ${diffBlock} = icmp ne ptr ${curBlock}, ${markBlock}`);
+  const needCheck = ctx.tempName("need_growth_check");
+  ctx.lines.push(`  ${needCheck} = and i1 ${hasBlock}, ${diffBlock}`);
+
+  const checkGrowthBlock = ctx.blockName("check_growth");
+  const doCompactBlock = ctx.blockName("do_compact");
+  const doneBlock = ctx.blockName("compact_done");
+
+  ctx.lines.push(`  br i1 ${needCheck}, label %${doCompactBlock}, label %${checkGrowthBlock}`);
+
+  ctx.lines.push(`${checkGrowthBlock}:`);
+  const checkBlockHasBlock = ctx.tempName("check_has_block");
+  ctx.lines.push(`  ${checkBlockHasBlock} = icmp ne ptr ${curBlock}, null`);
+  const loadGrowthBlock = ctx.blockName("load_growth");
+  ctx.lines.push(`  br i1 ${checkBlockHasBlock}, label %${loadGrowthBlock}, label %${doneBlock}`);
+
+  ctx.lines.push(`${loadGrowthBlock}:`);
+  const curUsed = loadI64At(ctx, curBlock, K_ARENA_BLOCK_USED_OFFSET, "cur_used");
+  const markUsedPtr = ctx.tempName("mark_used_ptr");
+  ctx.lines.push(`  ${markUsedPtr} = getelementptr inbounds %k_rt_mark, ptr ${tailMarkSlot}, i32 0, i32 1`);
+  const markUsed = ctx.tempName("mark_used");
+  ctx.lines.push(`  ${markUsed} = load i64, ptr ${markUsedPtr}`);
+  const growth = ctx.tempName("arena_growth");
+  ctx.lines.push(`  ${growth} = sub i64 ${curUsed}, ${markUsed}`);
+  const threshExceeded = ctx.tempName("thresh_exceeded");
+  ctx.lines.push(`  ${threshExceeded} = icmp ugt i64 ${growth}, 4194304`);
+  ctx.lines.push(`  br i1 ${threshExceeded}, label %${doCompactBlock}, label %${doneBlock}`);
+
+  ctx.lines.push(`${doCompactBlock}:`);
+  const compacted = ctx.tempName("compacted");
+  ctx.lines.push(`  ${compacted} = call ptr @k_rt_compact(ptr %rt, ptr ${val}, ptr ${tailMarkSlot})`);
+  ctx.lines.push(`  br label %${doneBlock}`);
+
+  ctx.lines.push(`${doneBlock}:`);
+  const finalVal = ctx.tempName("compact_res");
+  ctx.lines.push(`  ${finalVal} = phi ptr [${val}, %${checkGrowthBlock}], [${val}, %${loadGrowthBlock}], [${compacted}, %${doCompactBlock}]`);
+  ctx.currentBlock = doneBlock;
+  return finalVal;
+}
+
 function nullCheck(ctx, val, failTarget) {
   const isMissing = ctx.tempName("missing");
   const okBlock = ctx.blockName("nonnull");
@@ -322,7 +396,8 @@ function statusCheck(ctx, callResult, failTarget = "func_fail") {
   if (ctx.catchTail) {
     const tailInput = ctx.tempName("tail_arg");
     ctx.lines.push(`  ${tailInput} = extractvalue %k_result ${callResult}, 1`);
-    ctx.lines.push(`  store ptr ${tailInput}, ptr %tail_input_slot`);
+    const compacted = lowerRtCompact(ctx, tailInput, "%tail_mark_slot");
+    ctx.lines.push(`  store ptr ${compacted}, ptr %tail_input_slot`);
     ctx.lines.push("  br label %tail_loop");
   } else {
     ctx.lines.push(`  ret %k_result ${callResult}`);
@@ -366,8 +441,7 @@ function hasSelfTailCall(insts, funcName, isTail = true) {
     if (inst.branches) {
       const unionIsTail = isTail && tailValueAfter(insts, i + 1, inst.dest);
       for (let bIdx = 0; bIdx < inst.branches.length; bIdx++) {
-        const isLast = (bIdx === inst.branches.length - 1);
-        if (hasSelfTailCall(inst.branches[bIdx].body, funcName, unionIsTail && isLast)) return true;
+        if (hasSelfTailCall(inst.branches[bIdx].body, funcName, unionIsTail)) return true;
       }
     }
   }
@@ -384,13 +458,6 @@ function getFieldEdgeIndex(inst, regPatterns, kvmFunc) {
       if (idx >= 0) return idx;
     }
   }
-  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 idx = root[1].findIndex(([l]) => l === inst.label);
-      if (idx >= 0) return idx;
-    }
-  }
   return -1;
 }
 
@@ -538,7 +605,11 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
 
   if (isCatchTail) {
     ctx.allocas.push("  %tail_input_slot = alloca ptr");
+    ctx.allocas.push("  %tail_mark_slot = alloca %k_rt_mark");
     ctx.lines.push("  store ptr %input, ptr %tail_input_slot");
+    const initMark = ctx.tempName("init_mark");
+    ctx.lines.push(`  ${initMark} = call %k_rt_mark @k_rt_mark(ptr %rt)`);
+    ctx.lines.push(`  store %k_rt_mark ${initMark}, ptr %tail_mark_slot`);
     ctx.lines.push("  br label %tail_loop");
     ctx.lines.push("tail_loop:");
     ctx.lines.push("  %tail_input = load ptr, ptr %tail_input_slot");
@@ -598,17 +669,13 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
           const input = getReg(inst.src);
           nullCheck(ctx, input, failTarget);
           const edgeIndex = getFieldEdgeIndex(inst, regPatterns, kvmFunc);
+          const label = ctx.labelRef(inst.label);
           let val;
           if (edgeIndex >= 0 && ctx.runtimeMode !== "compact") {
-            val = lowerProductGetAt(ctx, input, edgeIndex);
+            val = lowerProductGetAt(ctx, input, edgeIndex, label);
           } else {
-            const label = ctx.labelRef(inst.label);
             val = ctx.tempName("field");
-            if (edgeIndex >= 0) {
-              ctx.lines.push(`  ${val} = call ptr @k_product_get_at(ptr ${input}, i64 ${edgeIndex})`);
-            } else {
-              ctx.lines.push(`  ${val} = call ptr @k_product_get_n(ptr ${input}, ptr ${label.pointer}, i64 ${label.length})`);
-            }
+            ctx.lines.push(`  ${val} = call ptr @k_product_get_n(ptr ${input}, ptr ${label.pointer}, i64 ${label.length})`);
           }
           nullCheck(ctx, val, failTarget);
           regValues.set(cleanReg(inst.dest), val);
@@ -656,7 +723,8 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
           const v = getReg(inst.src);
           if (isSelfTailCall(insts, i, tailRef)) {
             if (ctx.catchTail) {
-              ctx.lines.push(`  store ptr ${v}, ptr %tail_input_slot`);
+              const compacted = lowerRtCompact(ctx, v, "%tail_mark_slot");
+              ctx.lines.push(`  store ptr ${compacted}, ptr %tail_input_slot`);
               ctx.lines.push("  br label %tail_loop");
               return;
             } else {
@@ -796,7 +864,7 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
               outputPattern: kvmFunc.outputPattern,
               body: branch.body
             };
-            const armTailRef = (isLast && tailValueAfter(insts, i + 1, inst.dest)) ? tailRef : null;
+            const armTailRef = tailValueAfter(insts, i + 1, inst.dest) ? tailRef : null;
             const armBody = lowerKVMFunction(armFunc, armName, armFunc.name, moduleCtx, "internal", { ...options, tailRef: armTailRef });
             moduleCtx.syntheticFunctions.push(armBody);
 
@@ -818,7 +886,8 @@ function lowerKVMFunction(kvmFunc, symbol, funcName, moduleCtx, linkage = "", op
             if (ctx.catchTail) {
               const tailArg = ctx.tempName("arm_tail_arg");
               ctx.lines.push(`  ${tailArg} = extractvalue %k_result ${armCall}, 1`);
-              ctx.lines.push(`  store ptr ${tailArg}, ptr %tail_input_slot`);
+              const compacted = lowerRtCompact(ctx, tailArg, "%tail_mark_slot");
+              ctx.lines.push(`  store ptr ${compacted}, ptr %tail_input_slot`);
               ctx.lines.push("  br label %tail_loop");
             } else {
               ctx.lines.push(`  ret %k_result ${armCall}`);

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

@@ -33,7 +33,7 @@ function sha256(text) {
 function backendFingerprint() {
   if (cachedBackendFingerprint != null) return cachedBackendFingerprint;
   const hash = crypto.createHash("sha256");
-  for (const relPath of ["src/llvm.mjs", "src/executable.mjs", "runtime/krt.c", "runtime/krt.h"]) {
+  for (const relPath of ["src/llvm.mjs", "src/kvm2llvm.mjs", "src/executable.mjs", "runtime/krt.c", "runtime/krt.h"]) {
     hash.update(relPath);
     hash.update("\0");
     hash.update(fs.readFileSync(path.join(root, relPath)));

package/browser/repl-browser.mjs

@@ -20,6 +20,7 @@ import {
 import { Value, isProduct, isVariant } from "../Value.mjs";
 import { encodeLibrary } from "../object.mjs";
 import { setVfsFile, getVfsFile, getAllVfsFiles } from "./shims/fs.mjs";
+import { createOutputEntryElement } from "./tree-view.mjs";
 
 // Make Value and helpers globally available for custom codecs
 if (typeof window !== "undefined") {
@@ -155,7 +156,7 @@ function setStatus(busy, text = "Ready") {
   }
 }
 
-function appendEntry({ prompt, command, outputs = [], errors = [], warnings = [], duration = null, timing = null }) {
+function appendEntry({ prompt, command, outputs = [], errors = [], warnings = [], duration = null, timing = null, value = null }) {
   if (!outputEl) return;
 
   const entry = document.createElement("div");
@@ -220,11 +221,26 @@ function appendEntry({ prompt, command, outputs = [], errors = [], warnings = []
   }
 
   // Outputs
-  for (const out of outputs) {
-    const outDiv = document.createElement("div");
-    outDiv.className = "entry-line line-output";
-    outDiv.innerHTML = ansiToHtml(out);
-    entry.appendChild(outDiv);
+  if (value && outputs.length > 0) {
+    const rawText = outputs.join("\n");
+    const allLines = outputs[0].split("\n");
+    const codecOutputs = allLines.slice(1);
+    const timingText = outputs.length > 1 ? outputs[1] : null;
+
+    const outElement = createOutputEntryElement({
+      value,
+      rawText,
+      codecOutputs,
+      timingText
+    });
+    entry.appendChild(outElement);
+  } else {
+    for (const out of outputs) {
+      const outDiv = document.createElement("div");
+      outDiv.className = "entry-line line-output";
+      outDiv.innerHTML = ansiToHtml(out);
+      entry.appendChild(outDiv);
+    }
   }
 
   outputEl.appendChild(entry);
@@ -298,7 +314,8 @@ export async function executeCommand(input) {
     errors,
     warnings,
     duration,
-    timing: state.lastTiming
+    timing: state.lastTiming,
+    value: state.lastResult
   });
 
   // Re-create completer with updated state