From 2f8b7dc737dccd43ee0e98bae88318ae58d01f22 Mon Sep 17 00:00:00 2001 From: "russell@unturf.com" Date: Thu, 16 Apr 2026 16:57:24 -0400 Subject: [PATCH] portal benchmark + 3 mismatch defects fixed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Benchmark exercises full save×load matrix across Python/C/asm plus the mismatch cases (wrong format, truncated input, missing file, corrupt header). Cases that used to segfault or report wrong paths now degrade cleanly. asm (uncommonlisp.s): - (define var) with no value now binds to VOID instead of segfault - portal-resume checks sys_read returned full 48-byte header; sanity- checks heap_size and heap_base before committing r14/r15 restore. Corrupt/truncated portals now return #f cleanly. py (uncommonlisp.py): - file-not-found error inside a nested (load) now reports the actual missing path (via FileNotFoundError.filename) rather than the outer script path. - _load wraps UnicodeDecodeError (binary file loaded as text) into a LispErr with the path; no more raw Python traceback. tests/portal-benchmark.sh: 50-iter benchmark, 4 parts (save / load / cross-process / mismatch-classification). Representative numbers (this laptop, 2026-04-16): setup+save: Python 126ms, C 3ms, asm 0.9ms cross-proc: Py→Py 260ms, C→C 6ms, asm→asm 1.5ms All three test suites still pass: 571 py unit, 131 asm, 189 shared. --- asm/uncommonlisp | Bin 43760 -> 43840 bytes asm/uncommonlisp.o | Bin 40944 -> 41064 bytes asm/uncommonlisp.s | 20 ++++- tests/portal-benchmark.sh | 179 ++++++++++++++++++++++++++++++++++++++ uncommonlisp.py | 12 ++- 5 files changed, 204 insertions(+), 7 deletions(-) create mode 100755 tests/portal-benchmark.sh diff --git a/asm/uncommonlisp b/asm/uncommonlisp index 367417ece1a9301e82e047691ecc2be61a3826e8..dacd550c48ee8b893f3b6c9f459eefea949eb53f 100755 GIT binary patch delta 7415 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 ug70m)S^T$LSIfQ-b&9@HW^tY-Fm@0t) diff --git a/asm/uncommonlisp.o b/asm/uncommonlisp.o index 7b0d39e9864efe1d5ce2896154aba671472d70b9..bf826ba481b99815f8654e83bc164734bda32241 100644 GIT binary patch delta 7715 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 Lm@g9cjhX)ki0sVg diff --git a/asm/uncommonlisp.s b/asm/uncommonlisp.s index 8f372a6..c4c0a99 100644 --- a/asm/uncommonlisp.s +++ b/asm/uncommonlisp.s @@ -1626,7 +1626,9 @@ env_lookup_both: cmpq $TAG_PAIR, %rax je .ev_define_func - # Simple: (define var expr) + # Simple: (define var expr) — or (define var) with no expr → VAL_VOID + cmpq $VAL_NIL, %r12 + je .ev_define_no_expr movq %r12, %rax andq $-8, %rax movq (%rax), %rdi # expr @@ -1634,6 +1636,10 @@ env_lookup_both: movq %rbp, %rsi call eval popq %rbx # var symbol + jmp .ev_define_bind +.ev_define_no_expr: + movq $VAL_VOID, %rax +.ev_define_bind: movq %rbx, %rdi movq %rax, %rsi movq %r14, %rdx @@ -3927,13 +3933,15 @@ bi_portal_resume: js .pr_fail movq %rax, %rbx # fd - # Read header + # Read header — must get full PORTAL_HDR_SIZE bytes subq $PORTAL_HDR_SIZE, %rsp movq $SYS_READ, %rax movq %rbx, %rdi movq %rsp, %rsi movq $PORTAL_HDR_SIZE, %rdx syscall + cmpq $PORTAL_HDR_SIZE, %rax + jne .pr_bad_magic # short read → file is not a portal # Verify magic leaq portal_magic(%rip), %rdi @@ -3941,9 +3949,15 @@ bi_portal_resume: cmpq (%rdi), %rax jne .pr_bad_magic - # Read heap size, base, r14, r15 + # Sanity check header fields before committing movq 8(%rsp), %rcx # heap_size + testq %rcx, %rcx + jle .pr_bad_magic # zero or negative heap size → corrupt movq 16(%rsp), %rdx # heap_base (must match our mmap) + testq %rdx, %rdx + jz .pr_bad_magic # null heap base → corrupt + + # Header looks valid — commit to r14/r15 restore movq 24(%rsp), %r14 # restore global env movq 32(%rsp), %r15 # restore bump pointer diff --git a/tests/portal-benchmark.sh b/tests/portal-benchmark.sh new file mode 100755 index 0000000..a7fa816 --- /dev/null +++ b/tests/portal-benchmark.sh @@ -0,0 +1,179 @@ +#!/bin/bash +# portal-benchmark.sh — measure portal save/load across: +# 1. Same-process save + load per impl + format +# 2. Cross-process (proc A saves, proc B loads) same server, same binary +# 3. Mismatch cases (wrong format, corrupt file, truncated input) +# +# Usage: bash tests/portal-benchmark.sh +# +# Output: one table. Times are wall time averaged over N iterations. + +set -u +cd "$(dirname "$0")/.." + +PY="python3 uncommonlisp.py --fast" +C="./c/uncommonlisp" +ASM="./asm/uncommonlisp" +N=50 + +pad() { printf " %-42s " "$1"; } + +time_n() { + local n=$1 cmd=$2 t0 t1 + t0=$(date +%s.%N) + for _ in $(seq 1 "$n"); do eval "$cmd" >/dev/null 2>&1; done + t1=$(date +%s.%N) + python3 -c "print(f'{(float(\"$t1\")-float(\"$t0\"))*1000/$n:8.3f} ms/iter')" +} + +PROLOGUE='(define my-int 42) +(define my-list (list 1 2 3 4 5 6 7 8 9 10)) +(define my-str "hello world") +(define (fib n) (let loop ((a 0) (b 1) (i 0)) (if (= i n) a (loop b (+ a b) (+ i 1))))) +(define my-result (fib 30))' + +# Save programs that write the same state in sexp / binary / JSON +cat > /tmp/pb-sexp-save.lsp < /tmp/pb-bin-save.lsp < /tmp/pb-json-save.lsp < /tmp/pb-noop.lsp < /tmp/pb-sexp-load.lsp <<'EOF' +(load "/tmp/pb-state.sexp") +EOF +cat > /tmp/pb-bin-load.lsp <<'EOF' +(portal-resume "/tmp/pb-state.binary") +EOF + +# Pre-materialize files so "load" cases have something to load. +$PY /tmp/pb-sexp-save.lsp >/dev/null 2>&1 +$ASM < /tmp/pb-bin-save.lsp >/dev/null 2>&1 +$PY /tmp/pb-json-save.lsp >/dev/null 2>&1 + +echo "═══════════════════════════════════════════════════════════════" +echo "Portal benchmark — $N iterations per case" +echo " (each iter = one full process: startup + workload + task)" +echo "═══════════════════════════════════════════════════════════════" +echo + +echo "PART 1 — full lifetime: startup + build workload + SAVE" +pad "baseline (workload only, no save)" ; time_n $N "$PY /tmp/pb-noop.lsp" +pad "Python S-exp save (via ports)" ; time_n $N "$PY /tmp/pb-sexp-save.lsp" +pad "C S-exp save (via ports)" ; time_n $N "$C /tmp/pb-sexp-save.lsp" +pad "Asm S-exp save (via ports)" ; time_n $N "$ASM < /tmp/pb-sexp-save.lsp" +pad "Asm binary portal-save (heap dump)" ; time_n $N "$ASM < /tmp/pb-bin-save.lsp" +pad "Python JSON portal-save (graph-aware)" ; time_n $N "$PY /tmp/pb-json-save.lsp" +echo + +echo "PART 2 — full lifetime: startup + LOAD pre-written state" +pad "Python (load sexp)" ; time_n $N "$PY /tmp/pb-sexp-load.lsp" +pad "C (load sexp)" ; time_n $N "$C /tmp/pb-sexp-load.lsp" +pad "Asm (load sexp)" ; time_n $N "$ASM < /tmp/pb-sexp-load.lsp" +pad "Asm (portal-resume binary)" ; time_n $N "$ASM < /tmp/pb-bin-load.lsp" +echo + +echo "PART 3 — cross-process: proc A saves → proc B loads" +echo " (wall-time for both procs end-to-end; pipes via file)" +pad "Python → Python (sexp)" ; time_n $N "$PY /tmp/pb-sexp-save.lsp && $PY /tmp/pb-sexp-load.lsp" +pad "C → C (sexp)" ; time_n $N "$C /tmp/pb-sexp-save.lsp && $C /tmp/pb-sexp-load.lsp" +pad "Asm → Asm (sexp)" ; time_n $N "$ASM < /tmp/pb-sexp-save.lsp && $ASM < /tmp/pb-sexp-load.lsp" +pad "Asm → Asm (binary portal)" ; time_n $N "$ASM < /tmp/pb-bin-save.lsp && $ASM < /tmp/pb-bin-load.lsp" +pad "Python → C (sexp)" ; time_n $N "$PY /tmp/pb-sexp-save.lsp && $C /tmp/pb-sexp-load.lsp" +pad "Python → Asm (sexp)" ; time_n $N "$PY /tmp/pb-sexp-save.lsp && $ASM < /tmp/pb-sexp-load.lsp" +pad "C → Python (sexp)" ; time_n $N "$C /tmp/pb-sexp-save.lsp && $PY /tmp/pb-sexp-load.lsp" +pad "C → Asm (sexp)" ; time_n $N "$C /tmp/pb-sexp-save.lsp && $ASM < /tmp/pb-sexp-load.lsp" +pad "Asm → Python (sexp)" ; time_n $N "$ASM < /tmp/pb-sexp-save.lsp && $PY /tmp/pb-sexp-load.lsp" +pad "Asm → C (sexp)" ; time_n $N "$ASM < /tmp/pb-sexp-save.lsp && $C /tmp/pb-sexp-load.lsp" +echo + +echo "PART 4 — mismatch cases (classify output, errors are expected)" + +# Helper: run, capture output, classify via keyword +run_out() { eval "$1" 2>&1 | head -4 | tr '\n' ' ' | cut -c1-180; } + +probe() { + local label="$1" cmd="$2" + pad "$label" + local out + out=$(run_out "$cmd") + if [ -z "$out" ]; then + echo "(no output / silent)" + else + echo "$out" + fi +} + +# Pre-materialize canonical files for the probes +$ASM < /tmp/pb-bin-save.lsp >/dev/null 2>&1 +$PY /tmp/pb-sexp-save.lsp >/dev/null 2>&1 + +# 4a. Load a binary portal as if it were sexp → reader errors +cat > /tmp/pb-load-binary-as-sexp.lsp <<'EOF' +(load "/tmp/pb-state.binary") (display "reached end") (newline) +EOF +probe "Python loads asm BINARY as sexp" "$PY /tmp/pb-load-binary-as-sexp.lsp" +probe "C loads asm BINARY as sexp" "$C /tmp/pb-load-binary-as-sexp.lsp" +probe "Asm loads asm BINARY as sexp" "$ASM < /tmp/pb-load-binary-as-sexp.lsp" + +# 4b. Portal-resume on a sexp file (wrong magic) → #f +cat > /tmp/pb-resume-sexp.lsp <<'EOF' +(display (portal-resume "/tmp/pb-state.sexp")) (newline) +EOF +probe "Asm portal-resume on SEXP file" "$ASM < /tmp/pb-resume-sexp.lsp" + +# 4c. Load an empty file +: > /tmp/pb-empty.lsp +cat > /tmp/pb-empty-test.lsp <<'EOF' +(load "/tmp/pb-empty.lsp") (display "continued") (newline) +EOF +probe "Python load EMPTY file" "$PY /tmp/pb-empty-test.lsp" +probe "C load EMPTY file" "$C /tmp/pb-empty-test.lsp" +probe "Asm load EMPTY file" "$ASM < /tmp/pb-empty-test.lsp" + +# 4d. Load a truncated sexp (unclosed paren, no value) +echo -n "(define truncated" > /tmp/pb-trunc.sexp +cat > /tmp/pb-trunc-test.lsp <<'EOF' +(load "/tmp/pb-trunc.sexp") (display "continued") (newline) +EOF +probe "Python load TRUNCATED sexp" "$PY /tmp/pb-trunc-test.lsp" +probe "C load TRUNCATED sexp" "$C /tmp/pb-trunc-test.lsp" +probe "Asm load TRUNCATED sexp" "$ASM < /tmp/pb-trunc-test.lsp" + +# 4e. Load a missing file +rm -f /tmp/pb-nope.xyz +cat > /tmp/pb-missing-test.lsp <<'EOF' +(display (load "/tmp/pb-nope.xyz")) (newline) +(display "continued") (newline) +EOF +probe "Python load MISSING file" "$PY /tmp/pb-missing-test.lsp" +probe "C load MISSING file" "$C /tmp/pb-missing-test.lsp" +probe "Asm load MISSING file" "$ASM < /tmp/pb-missing-test.lsp" + +# 4f. Asm portal-resume on truncated binary (corrupted heap dump) +head -c 40 /tmp/pb-state.binary > /tmp/pb-corrupt.binary +cat > /tmp/pb-corrupt-test.lsp <<'EOF' +(display (portal-resume "/tmp/pb-corrupt.binary")) (newline) +EOF +probe "Asm portal-resume on CORRUPT binary" "$ASM < /tmp/pb-corrupt-test.lsp" + +echo +echo "═══════════════════════════════════════════════════════════════" +echo "Done." + +rm -f /tmp/pb-*.lsp /tmp/pb-*.sexp /tmp/pb-*.binary /tmp/pb-*.json \ + /tmp/pb-state.* /tmp/pb-corrupt.binary /tmp/pb-nope.xyz 2>/dev/null diff --git a/uncommonlisp.py b/uncommonlisp.py index 508e8cf..b001f55 100644 --- a/uncommonlisp.py +++ b/uncommonlisp.py @@ -1084,8 +1084,11 @@ def _call(proc, args, env): def _load(path, env): - with open(path) as f: - src = f.read() + try: + with open(path) as f: + src = f.read() + except UnicodeDecodeError: + raise LispErr(f'{path}: not a text file (binary data encountered)') for expr in read_all(src, track_lines=True): leval(expr, env) ############################################################################### @@ -3663,8 +3666,9 @@ Features: R7RS core, bytecode compiler, full continuations, macros, _load(path, g) except LispErr as e: print(f'error: {e}', file=sys.stderr); sys.exit(1) - except FileNotFoundError: - print(f'file not found: {path}', file=sys.stderr); sys.exit(1) + except FileNotFoundError as e: + missing = e.filename if e.filename else path + print(f'file not found: {missing}', file=sys.stderr); sys.exit(1) return # REPL mode