406a8c303c
Builds on the source-built-RTL link path. Two correctness fixes plus the fixpoint-script migration that takes the self-host pipeline off blaise_rtl.a. 1. Symbol-based dedup. A program that uses an RTL unit (e.g. `uses classes` pulls runtime.arc) compiles that unit into its own object cache, so EnsureRTLObjects must not supply a second copy or the link double-defines it. The dedup now compares the DEFINED symbols of the caller's objects against each RTL object (via the ELF reader) and skips one only when fully redundant — matching the old archive's member selection. An earlier filename-only check wrongly suppressed the real bare-symbol provider when a same-named but differently-mangled stale object was present. 2. Race-free build. EnsureRTLObjects now builds into a per-process private directory (rtl/build-<pid>/) and atomically renames each finished object into the shared cache. Parallel builders (e.g. e2e suites warming a cold cache) no longer corrupt each other: a reader never sees a half-written object, and two builders just publish identical results. The private dir is cleaned up afterwards. getpid/rmdir are declared directly rather than via GRtlPlatform to avoid a unit-init-order crash in the driver. 3. Fixpoint scripts off the archive. New scripts/build-rtl-objects.sh builds the RTL from source (the script-level equivalent of EnsureRTLObjects), with --exclude-defined-by so a whole-program --emit-ir/--emit-asm dump (which inlines the RTL units the compiler uses) is not handed a duplicate copy. fixpoint.sh and fixpoint-native.sh link via this helper instead of blaise_rtl.a; fixpoint-native-internal.sh and fixpoint-warmcache.sh no longer copy the archive beside the compiler (the driver source-builds the RTL). All four fixpoints green (FIXPOINT_OK, NATIVE_FIXPOINT_OK, NATIVE_INTERNAL_OK, WARMCACHE_FIXPOINT_OK); full suite green (3829 tests) under QBE- and native-built runners; four cold-cache parallel suite runs pass. The runtime Makefile / ar / make install are still present; removing them is the final Stage-3 step.
146 lines
5 KiB
Bash
Executable file
146 lines
5 KiB
Bash
Executable file
#!/bin/bash
|
|
# Fixpoint test for the Blaise self-hosting check.
|
|
#
|
|
# Uses the most recent release binary as stage-1 (no FPC dependency).
|
|
#
|
|
# Steps:
|
|
# 1. Find stage-1 binary (latest release or explicit $STAGE1).
|
|
# 2. Rebuild + install RTL (cheap when nothing changed).
|
|
# 3. stage-1 -> stage-2 IR.
|
|
# 4. Assemble + link stage-2 binary via QBE + gcc.
|
|
# 5. stage-2 -> stage-3 IR (5-minute timeout).
|
|
# 6. diff stage-2.ssa stage-3.ssa => empty = clean fixpoint.
|
|
#
|
|
# If stage-2 != stage-3 (expected when stage-1 has older codegen),
|
|
# the script automatically builds stage-3, generates stage-4 IR,
|
|
# and checks stage-3 == stage-4 as the true fixpoint.
|
|
|
|
set -e
|
|
|
|
if [ ! -f "compiler/src/main/pascal/Blaise.pas" ]; then
|
|
echo "Run this script from the project root: ./scripts/fixpoint.sh" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Stage-1 binary: honour $STAGE1, otherwise pick the latest release.
|
|
if [ -n "$STAGE1" ]; then
|
|
STAGE1_BIN="$STAGE1"
|
|
elif [ -d releases ]; then
|
|
LATEST=$(ls -d releases/v* 2>/dev/null | sort -V | tail -1)
|
|
STAGE1_BIN="$LATEST/blaise"
|
|
fi
|
|
|
|
if [ ! -x "$STAGE1_BIN" ]; then
|
|
echo "No stage-1 binary found. Set STAGE1=/path/to/blaise or add a release." >&2
|
|
exit 10
|
|
fi
|
|
echo "stage-1: $STAGE1_BIN"
|
|
|
|
# The RTL is built from source (no archive) and linked alongside the assembled
|
|
# compiler IR — exactly what the compiler driver does via EnsureRTLObjects.
|
|
# Because the whole-program --emit-ir dump INLINES the RTL units the compiler
|
|
# uses (runtime.arc via `uses classes`, etc.), the per-stage link below builds
|
|
# the RTL objects with --exclude-defined-by <program object> so the inlined
|
|
# units are not supplied twice. Helper: link_stage <prog.s> <out-binary>.
|
|
ABS_STAGE1=$(readlink -f "$STAGE1_BIN")
|
|
RTL_OBJDIR=/tmp/fp_rtl_obj
|
|
|
|
link_stage() {
|
|
# $1 = assembled program .s, $2 = output binary
|
|
local prog_s="$1" out_bin="$2" prog_o rtl_objs
|
|
prog_o="${prog_s%.s}.o"
|
|
gcc -c -o "$prog_o" "$prog_s" 2>/tmp/fp_cc.err || return 3
|
|
rm -rf "$RTL_OBJDIR"
|
|
rtl_objs=$(scripts/build-rtl-objects.sh "$ABS_STAGE1" "$RTL_OBJDIR" \
|
|
--exclude-defined-by "$prog_o") || return 11
|
|
gcc -o "$out_bin" "$prog_o" $rtl_objs -lm -lpthread 2>/tmp/fp_gcc.err || return 3
|
|
return 0
|
|
}
|
|
|
|
echo "[1/5] (RTL objects are built per-stage during linking)"
|
|
|
|
echo "[2/5] stage-1 -> stage-2 IR"
|
|
"$STAGE1_BIN" --source compiler/src/main/pascal/Blaise.pas \
|
|
--unit-path compiler/src/main/pascal --unit-path runtime/src/main/pascal --unit-path stdlib/src/main/pascal \
|
|
--emit-ir > /tmp/fp_stage2.ssa 2>/tmp/fp_stage2.err
|
|
if [ ! -s /tmp/fp_stage2.ssa ] || head -1 /tmp/fp_stage2.ssa | grep -qi 'error\|exception'; then
|
|
echo "STAGE2_IR_FAIL"
|
|
head -3 /tmp/fp_stage2.ssa
|
|
head -3 /tmp/fp_stage2.err
|
|
exit 1
|
|
fi
|
|
echo " stage-2 IR: $(wc -l < /tmp/fp_stage2.ssa) lines"
|
|
|
|
echo "[3/5] assemble + link stage-2 binary"
|
|
vendor/qbe/qbe -o /tmp/fp_stage2.s /tmp/fp_stage2.ssa 2>/tmp/fp_qbe.err || {
|
|
echo "QBE_FAIL"; cat /tmp/fp_qbe.err; exit 2;
|
|
}
|
|
link_stage /tmp/fp_stage2.s /tmp/fp_blaise2 || {
|
|
echo "GCC_FAIL"; cat /tmp/fp_gcc.err 2>/dev/null; cat /tmp/fp_cc.err 2>/dev/null; exit 3;
|
|
}
|
|
|
|
echo "[4/5] stage-2 -> stage-3 IR (5min timeout)"
|
|
timeout 300 /tmp/fp_blaise2 --source compiler/src/main/pascal/Blaise.pas \
|
|
--unit-path compiler/src/main/pascal --unit-path runtime/src/main/pascal --unit-path stdlib/src/main/pascal \
|
|
--emit-ir > /tmp/fp_stage3.ssa 2>/tmp/fp_stage3.err
|
|
RC=$?
|
|
if [ $RC -eq 124 ]; then
|
|
echo "STAGE3_TIMEOUT"
|
|
exit 4
|
|
elif [ $RC -eq 139 ]; then
|
|
echo "STAGE3_SEGFAULT"
|
|
exit 4
|
|
elif [ $RC -ne 0 ]; then
|
|
echo "STAGE3_FAIL rc=$RC"
|
|
head -3 /tmp/fp_stage3.err
|
|
exit 5
|
|
fi
|
|
echo " stage-3 IR: $(wc -l < /tmp/fp_stage3.ssa) lines"
|
|
|
|
echo "[5/5] compare stage-2 vs stage-3"
|
|
DIFFLINES=$(diff /tmp/fp_stage2.ssa /tmp/fp_stage3.ssa | wc -l)
|
|
if [ $DIFFLINES -eq 0 ]; then
|
|
echo "FIXPOINT_OK"
|
|
exit 0
|
|
fi
|
|
|
|
echo "stage-2 != stage-3 ($DIFFLINES diff lines) — bootstrap gap from older stage-1"
|
|
echo " extending to stage-4 for true fixpoint check..."
|
|
|
|
echo "[+1] assemble + link stage-3 binary"
|
|
vendor/qbe/qbe -o /tmp/fp_stage3.s /tmp/fp_stage3.ssa 2>/tmp/fp_qbe3.err || {
|
|
echo "QBE3_FAIL"; cat /tmp/fp_qbe3.err; exit 2;
|
|
}
|
|
link_stage /tmp/fp_stage3.s /tmp/fp_blaise3 || {
|
|
echo "GCC3_FAIL"; cat /tmp/fp_gcc.err 2>/dev/null; cat /tmp/fp_cc.err 2>/dev/null; exit 3;
|
|
}
|
|
|
|
echo "[+2] stage-3 -> stage-4 IR (5min timeout)"
|
|
timeout 300 /tmp/fp_blaise3 --source compiler/src/main/pascal/Blaise.pas \
|
|
--unit-path compiler/src/main/pascal --unit-path runtime/src/main/pascal --unit-path stdlib/src/main/pascal \
|
|
--emit-ir > /tmp/fp_stage4.ssa 2>/tmp/fp_stage4.err
|
|
RC=$?
|
|
if [ $RC -eq 124 ]; then
|
|
echo "STAGE4_TIMEOUT"
|
|
exit 4
|
|
elif [ $RC -eq 139 ]; then
|
|
echo "STAGE4_SEGFAULT"
|
|
exit 4
|
|
elif [ $RC -ne 0 ]; then
|
|
echo "STAGE4_FAIL rc=$RC"
|
|
head -3 /tmp/fp_stage4.err
|
|
exit 5
|
|
fi
|
|
echo " stage-4 IR: $(wc -l < /tmp/fp_stage4.ssa) lines"
|
|
|
|
echo "[+3] compare stage-3 vs stage-4"
|
|
DIFFLINES=$(diff /tmp/fp_stage3.ssa /tmp/fp_stage4.ssa | wc -l)
|
|
if [ $DIFFLINES -eq 0 ]; then
|
|
echo "FIXPOINT_OK (achieved at stage-3/stage-4)"
|
|
exit 0
|
|
else
|
|
echo "FIXPOINT_DIFF lines=$DIFFLINES"
|
|
diff /tmp/fp_stage3.ssa /tmp/fp_stage4.ssa | head -20
|
|
exit 6
|
|
fi
|