diff --git a/scripts/refactor/rename-dvalue-api.py b/scripts/refactor/rename-dvalue-api.py deleted file mode 100755 index 93e4b42..0000000 --- a/scripts/refactor/rename-dvalue-api.py +++ /dev/null @@ -1,118 +0,0 @@ -#!/usr/bin/env python3 -"""Mechanical one-shot rename script for UCE's legacy value-tree API. - -The old tokens are constructed rather than written literally so this script can -remain in the tree after the rename without reintroducing the retired names. -""" -from __future__ import annotations - -import os -from pathlib import Path - -ROOT = Path(__file__).resolve().parents[2] -OLD_TYPE = "D" + "Tree" -OLD_LOWER = "d" + "tree" -NEW_TYPE = "DValue" -NEW_LOWER = "dvalue" - -DIR_EXCLUDES = { - ".git", - ".hg", - ".svn", - "3rdparty", - "bin", - "node_modules", - "pkg", - "tmp", - "work", - "__pycache__", -} - -BINARY_SUFFIXES = { - ".bin", - ".gif", - ".ico", - ".jpg", - ".jpeg", - ".lock", - ".o", - ".pdf", - ".png", - ".pyc", - ".so", - ".sqlite", - ".webp", - ".zip", -} - -REPLACEMENTS = ( - (OLD_TYPE, NEW_TYPE), - (OLD_TYPE.upper(), NEW_TYPE.upper()), - (OLD_LOWER + "_", "dv_"), - (OLD_LOWER, NEW_LOWER), -) - - -def replace_text(value: str) -> str: - for old, new in REPLACEMENTS: - value = value.replace(old, new) - return value - - -def skip_dir(name: str) -> bool: - return name in DIR_EXCLUDES or name.startswith(".fuse") - - -def skip_file(path: Path) -> bool: - return path.name.startswith(".fuse") or path.suffix in BINARY_SUFFIXES - - -def rewrite_text_files() -> int: - changed = 0 - for current, dirs, files in os.walk(ROOT): - dirs[:] = [name for name in dirs if not skip_dir(name)] - for name in files: - path = Path(current) / name - if skip_file(path): - continue - data = path.read_bytes() - if b"\0" in data: - continue - try: - original = data.decode("utf-8") - except UnicodeDecodeError: - continue - updated = replace_text(original) - if updated != original: - path.write_text(updated, encoding="utf-8") - changed += 1 - return changed - - -def rename_paths() -> int: - changed = 0 - matches: list[Path] = [] - for current, dirs, files in os.walk(ROOT, topdown=False): - dirs[:] = [name for name in dirs if not skip_dir(name)] - current_path = Path(current) - for name in files + dirs: - new_name = replace_text(name) - if new_name != name: - matches.append(current_path / name) - for path in sorted(matches, key=lambda item: len(item.parts), reverse=True): - if not path.exists(): - continue - target = path.with_name(replace_text(path.name)) - if target.exists(): - raise RuntimeError(f"cannot rename {path} -> {target}: target exists") - path.rename(target) - changed += 1 - return changed - - -def main() -> None: - print(f"Updated {rewrite_text_files()} files and renamed {rename_paths()} paths.") - - -if __name__ == "__main__": - main() diff --git a/scripts/wasm/build_w1_smoke.sh b/scripts/wasm/build_w1_smoke.sh deleted file mode 100755 index adac7fb..0000000 --- a/scripts/wasm/build_w1_smoke.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# Build the W1 host smoke driver. Run on k-uce. -set -euo pipefail -cd "$(dirname "$0")/../.." - -OUT=${UCE_WASM_OUT:-/tmp/uce/wasm-w1} -WASMTIME_HOME=${WASMTIME_HOME:-/opt/wasmtime} -WASMTIME_INCLUDE=${WASMTIME_INCLUDE:-$WASMTIME_HOME/include} -WASMTIME_LIB=${WASMTIME_LIB:-$WASMTIME_HOME/lib} -mkdir -p "$OUT" - -if [ ! -d "$WASMTIME_INCLUDE" ] || [ ! -d "$WASMTIME_LIB" ]; then - echo "Wasmtime C API not found; set WASMTIME_HOME or WASMTIME_INCLUDE/WASMTIME_LIB" >&2 - exit 1 -fi - -g++ -std=c++17 -O2 -Wall -Wextra \ - -I"$WASMTIME_INCLUDE" \ - src/wasm/w1_smoke.cpp \ - -L"$WASMTIME_LIB" \ - -Wl,-rpath,"$WASMTIME_LIB" \ - -lwasmtime \ - -o "$OUT/w1_smoke" - -ls -lh "$OUT/w1_smoke" diff --git a/scripts/wasm/build_w2_units.sh b/scripts/wasm/build_w2_units.sh deleted file mode 100755 index 2117195..0000000 --- a/scripts/wasm/build_w2_units.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# Batch-build W2 wasm side modules for already-known/generated UCE units. -set -euo pipefail -cd "$(dirname "$0")/../.." - -BIN_DIR=${UCE_BIN_DIRECTORY:-/tmp/uce/work} -KNOWN_FILE=${UCE_KNOWN_UNITS_FILE:-$BIN_DIR/known-uce-files.txt} -MIN_UNITS=${UCE_W2_MIN_UNITS:-1} - -if [ "$#" -gt 0 ]; then - UNITS=("$@") -else - if [ ! -f "$KNOWN_FILE" ]; then - echo "known unit registry not found: $KNOWN_FILE" >&2 - exit 1 - fi - mapfile -t UNITS < <(grep -v '^[[:space:]]*$' "$KNOWN_FILE") -fi - -count=0 -checked=0 -skipped=0 - -for unit in "${UNITS[@]}"; do - case "$unit" in - *.uce|*.ws.uce) ;; - *) continue ;; - esac - src_dir=$(dirname "$unit") - base=$(basename "$unit") - dest_dir="$BIN_DIR$src_dir" - pp_fn="$base.cpp" - wasm_fn="$base.wasm" - if [ ! -f "$dest_dir/$pp_fn" ]; then - echo "missing preprocessed unit: $dest_dir/$pp_fn" >&2 - exit 1 - fi - if [ -s "$dest_dir/$wasm_fn" ] && [ "$dest_dir/$wasm_fn" -nt "$dest_dir/$pp_fn" ] && [ "$dest_dir/$wasm_fn" -nt "$unit" ]; then - scripts/wasm/check_unit_wasm.py "$dest_dir/$wasm_fn" - skipped=$((skipped + 1)) - else - scripts/compile_wasm_unit "$src_dir" "$dest_dir" "$unit" "$pp_fn" "$wasm_fn" - count=$((count + 1)) - fi - checked=$((checked + 1)) -done - -if [ "$checked" -lt "$MIN_UNITS" ]; then - echo "checked only $checked wasm units, expected at least $MIN_UNITS" >&2 - exit 1 -fi - -echo "W2 batch wasm units: checked=$checked compiled=$count reused=$skipped" diff --git a/scripts/wasm/build_w3_driver.sh b/scripts/wasm/build_w3_driver.sh deleted file mode 100644 index db27714..0000000 --- a/scripts/wasm/build_w3_driver.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Build the W3 workspace-runtime CLI driver. Run on k-uce. -set -euo pipefail -cd "$(dirname "$0")/../.." - -OUT=${UCE_WASM_OUT:-/tmp/uce/wasm-w3} -WASMTIME_HOME=${WASMTIME_HOME:-/opt/wasmtime} -mkdir -p "$OUT" - -g++ -std=c++20 -O1 -g -w \ - -Isrc/lib -Isrc/wasm \ - -I"$WASMTIME_HOME/include" \ - src/wasm/w3_driver.cpp \ - -L"$WASMTIME_HOME/lib" \ - -Wl,-rpath,"$WASMTIME_HOME/lib" \ - -lwasmtime -lpcre2-8 -lpthread -ldl \ - -o "$OUT/w3_driver" - -ls -lh "$OUT/w3_driver" diff --git a/scripts/wasm/check_unit_wasm.py b/scripts/wasm/check_unit_wasm.py deleted file mode 100755 index 05491fe..0000000 --- a/scripts/wasm/check_unit_wasm.py +++ /dev/null @@ -1,235 +0,0 @@ -#!/usr/bin/env python3 -"""Validate a W2 UCE PIC unit wasm artifact. - -Checks intentionally stay small and explicit: section walk for dylink.0, -uce.abi, imports/exports, plus llvm-nm for allocator definitions. -""" -from __future__ import annotations - -import argparse -import shutil -import subprocess -import sys -from pathlib import Path - - -def read_u32leb(data: bytes, pos: int) -> tuple[int, int]: - result = 0 - shift = 0 - while True: - if pos >= len(data): - raise ValueError("truncated leb128") - b = data[pos] - pos += 1 - result |= (b & 0x7F) << shift - if (b & 0x80) == 0: - return result, pos - shift += 7 - if shift > 35: - raise ValueError("oversized leb128") - - -def read_name(data: bytes, pos: int) -> tuple[str, int]: - n, pos = read_u32leb(data, pos) - end = pos + n - if end > len(data): - raise ValueError("truncated name") - return data[pos:end].decode("utf-8", "replace"), end - - -def walk_sections(data: bytes): - if not data.startswith(b"\0asm\x01\0\0\0"): - raise ValueError("not a wasm v1 module") - pos = 8 - while pos < len(data): - section_id = data[pos] - pos += 1 - size, pos = read_u32leb(data, pos) - end = pos + size - if end > len(data): - raise ValueError("section extends past EOF") - payload = data[pos:end] - yield section_id, payload - pos = end - - -def parse_imports(payload: bytes): - pos = 0 - count, pos = read_u32leb(payload, pos) - imports = [] - for _ in range(count): - module, pos = read_name(payload, pos) - name, pos = read_name(payload, pos) - if pos >= len(payload): - raise ValueError("truncated import kind") - kind = payload[pos] - pos += 1 - # Skip type descriptors. We only need module/name/kind for W2 policy. - if kind == 0: # func type index - _, pos = read_u32leb(payload, pos) - elif kind == 1: # table - if pos >= len(payload): raise ValueError("truncated table import") - pos += 1 - flags, pos = read_u32leb(payload, pos) - _, pos = read_u32leb(payload, pos) - if flags & 1: _, pos = read_u32leb(payload, pos) - elif kind == 2: # memory - flags, pos = read_u32leb(payload, pos) - _, pos = read_u32leb(payload, pos) - if flags & 1: _, pos = read_u32leb(payload, pos) - elif kind == 3: # global - pos += 2 - else: - raise ValueError(f"unknown import kind {kind}") - imports.append((module, name, kind)) - return imports - - -def parse_exports(payload: bytes): - pos = 0 - count, pos = read_u32leb(payload, pos) - exports = [] - for _ in range(count): - name, pos = read_name(payload, pos) - if pos >= len(payload): - raise ValueError("truncated export kind") - kind = payload[pos] - pos += 1 - _, pos = read_u32leb(payload, pos) - exports.append((name, kind)) - return exports - - -def collect(path: Path): - data = path.read_bytes() - customs: dict[str, list[bytes]] = {} - imports = [] - exports = [] - for section_id, payload in walk_sections(data): - if section_id == 0: - name, pos = read_name(payload, 0) - customs.setdefault(name, []).append(payload[pos:]) - elif section_id == 2: - imports = parse_imports(payload) - elif section_id == 7: - exports = parse_exports(payload) - return customs, imports, exports - - -def dylink_has_valid_mem_info(payload: bytes) -> bool: - pos = 0 - while pos < len(payload): - subsection_id = payload[pos] - pos += 1 - size, pos = read_u32leb(payload, pos) - end = pos + size - if end > len(payload): - raise ValueError("dylink.0 subsection extends past section") - if subsection_id == 1: - mem_size, p = read_u32leb(payload, pos) - mem_align, p = read_u32leb(payload, p) - table_size, p = read_u32leb(payload, p) - table_align, p = read_u32leb(payload, p) - if p > end: - raise ValueError("truncated dylink.0 mem_info") - return mem_align < 32 and table_align < 32 and mem_size < (1 << 31) and table_size < (1 << 31) - pos = end - return False - - -def defined_symbols(path: Path, llvm_nm: str) -> list[str]: - proc = subprocess.run([llvm_nm, "--defined-only", str(path)], text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if proc.returncode != 0: - # llvm-nm (wasi-sdk) can SIGSEGV on degenerate-but-valid modules — e.g. a - # unit with no exported handlers (`empty.uce`). A toolchain crash is not - # evidence of a forbidden allocator, so skip this defense-in-depth scan - # rather than fail the unit; forbidden allocator *exports* are still - # rejected by the export-section check above. - crashed = proc.returncode < 0 or "Stack dump:" in proc.stderr or "PLEASE submit a bug report" in proc.stderr - if crashed: - return [] - raise RuntimeError(proc.stderr.strip() or "llvm-nm failed") - symbols = [] - for line in proc.stdout.splitlines(): - parts = line.split() - if parts: - symbols.append(parts[-1]) - return symbols - - -def main() -> int: - ap = argparse.ArgumentParser() - ap.add_argument("wasm", type=Path) - ap.add_argument("--abi-version", default="6") - ap.add_argument("--llvm-nm", default=None) - ap.add_argument("--verbose", action="store_true") - args = ap.parse_args() - - try: - customs, imports, exports = collect(args.wasm) - errors = [] - dylink_payloads = customs.get("dylink.0", []) - if not dylink_payloads: - errors.append("missing dylink.0 custom section") - elif not any(dylink_has_valid_mem_info(payload) for payload in dylink_payloads): - errors.append("dylink.0 missing valid mem_info subsection") - abi_payloads = customs.get("uce.abi", []) - if not abi_payloads: - errors.append("missing uce.abi custom section") - else: - abi_text = abi_payloads[-1].decode("utf-8", "replace") - required = ["format=uce-wasm-unit-abi-v1", f"unit_abi_version={args.abi_version}", "toolchain="] - for needle in required: - if needle not in abi_text: - errors.append(f"uce.abi missing {needle!r}") - export_names = {name for name, _ in exports} - forbidden_exports = {"uce_alloc", "uce_free"} - for name in sorted(export_names & forbidden_exports): - errors.append(f"forbidden allocator export {name}") - import_map = {(module, name): kind for module, name, kind in imports} - required_imports = { - ("env", "memory"): 2, - ("env", "__memory_base"): 3, - } - # units without indirect calls / stack spills / table needs - # legitimately omit these; if present, the kind must be right - optional_imports = { - ("env", "__indirect_function_table"): 1, - ("env", "__stack_pointer"): 3, - ("env", "__table_base"): 3, - } - for key, kind in required_imports.items(): - if import_map.get(key) != kind: - errors.append(f"missing required import {key[0]}.{key[1]}") - for key, kind in optional_imports.items(): - if key in import_map and import_map[key] != kind: - errors.append(f"wrong kind for import {key[0]}.{key[1]}") - for module, name, kind in imports: - if module.startswith("wasi_") or module == "wasi_snapshot_preview1": - errors.append(f"forbidden WASI import {module}.{name}") - if module not in {"env", "GOT.mem", "GOT.func"} and not module.startswith("GOT."): - errors.append(f"unexpected import module {module}.{name}") - if module.startswith("GOT.") and kind != 3: - errors.append(f"GOT import is not a global: {module}.{name}") - llvm_nm = args.llvm_nm or shutil.which("llvm-nm") or "/opt/wasi-sdk/bin/llvm-nm" - if Path(llvm_nm).exists(): - bad_prefixes = ("_Znwm", "_Znam", "_ZdlPv", "_ZdaPv", "_ZdlPvm", "_ZdaPvm") - for sym in defined_symbols(args.wasm, llvm_nm): - if sym in {"uce_alloc", "uce_free"} or sym.startswith(bad_prefixes): - errors.append(f"forbidden allocator definition {sym}") - else: - errors.append("llvm-nm not found; cannot verify allocator definitions") - if errors: - for e in errors: - print(f"ERROR: {e}", file=sys.stderr) - return 1 - if args.verbose: - print(f"UCE W2 unit check PASS: {args.wasm}") - return 0 - except Exception as exc: - print(f"ERROR: {exc}", file=sys.stderr) - return 1 - - -if __name__ == "__main__": - raise SystemExit(main()) diff --git a/scripts/wasm/run_w5.sh b/scripts/wasm/run_w5.sh deleted file mode 100755 index bc75453..0000000 --- a/scripts/wasm/run_w5.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Retired W5 parity/performance gate. -# -# W7e removed the config-selectable native backend and all native unit -# execution. There is no longer a valid WASM_BACKEND_ENABLED=0 baseline to -# switch to here; doing so would only create a misleading service state. -set -euo pipefail -cat >&2 <<'EOF' -run_w5.sh is retired: UCE unit execution is wasm-only after W7e. -Use the supported regression gate instead: - - bash scripts/build_linux.sh && systemctl restart uce.service && sleep 3 \ - && bash scripts/run_cli_tests.sh --include-wasm-kill - -For performance comparisons, use tests/wasm_benchmark.py against the current -wasm backend; native-baseline artifacts under docs/wasm-baselines are historical -only. -EOF -exit 2 diff --git a/site/info/index.uce b/site/info/index.uce index eb16304..e3ac28c 100644 --- a/site/info/index.uce +++ b/site/info/index.uce @@ -210,7 +210,7 @@ RENDER(Request& context)