feat: LLVM_SYS_180_PREFIX環境変数削除完了！llvm-harness経路でRust LLVMバインディング不要化達成
🚀 Phase 15.5 MIR Call統一革命 - LLVM環境変数削除フェーズ完了 ## ✅ 完了内容 - **条件分岐実装**: llvm-harness(デフォルト)はLLVM_SYS_180_PREFIX不要 - **後方互換性維持**: llvm-inkwell-legacy使用時はLLVM_SYS_180_PREFIX必要 - **全ツール統一**: 12個のビルドスクリプト・テストスクリプトを一括更新 - **ドキュメント更新**: ENV_VARS.mdでLLVM feature選択方法を明記 ## 🛠️ 更新ファイル - **コアビルド**: src/runner/build.rs, tools/build_llvm.sh, build_llvm.sh - **スモークテスト**: tools/llvm_smoke.sh, tools/test/smoke/llvm/ir_phi_empty_check.sh - **CI設定**: .github/workflows/min-gate.yml - **Windows版**: build_llvm_wsl.sh, build_llvm_wsl_msvc.sh (cross-compilation) - **開発ツール**: tools/build_compiler_exe.sh, tools/ny_mir_builder.sh - **ドキュメント**: docs/development/runtime/ENV_VARS.md ## ⚡ 技術的成果 - **環境変数削減**: LLVM_SYS_180_PREFIX → 条件付き使用のみ - **Python LLVM統合**: llvmliteハーネス経路でRust LLVM依存完全除去 - **ビルド簡略化**: デフォルトでllvm-config-18のみ必要 - **動作確認**: tools/llvm_smoke.sh成功 (1648バイト.oファイル生成) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Selfhosting Dev
@ -38,11 +38,18 @@ if ! command -v llvm-config-18 >/dev/null 2>&1; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# 1) Build nyash with LLVM harness
|
||||
echo "[1/4] Building nyash (LLVM harness) ..."
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
cargo build --release -j 24 --features llvm >/dev/null
|
||||
# 1) Build nyash with LLVM backend
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
echo "[1/4] Building nyash (${LLVM_FEATURE}) ..."
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell needs LLVM_SYS_180_PREFIX
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
cargo build --release -j 24 --features "${LLVM_FEATURE}" >/dev/null
|
||||
else
|
||||
# llvm-harness (default) doesn't need LLVM_SYS_180_PREFIX
|
||||
cargo build --release -j 24 --features "${LLVM_FEATURE}" >/dev/null
|
||||
fi
|
||||
|
||||
# 2) Emit + link compiler.nyash → EXE
|
||||
echo "[2/4] Emitting + linking selfhost compiler ..."
|
||||
|
||||
@ -44,12 +44,18 @@ if ! command -v llvm-config-18 >/dev/null 2>&1; then
|
||||
fi
|
||||
|
||||
echo "[1/4] Building nyash (feature selectable) ..."
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
# Select LLVM feature: default harness (llvm), or legacy inkwell when NYASH_LLVM_FEATURE=llvm-inkwell-legacy
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
# Use 24 threads for parallel build
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell需要LLVM_SYS_180_PREFIX
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
CARGO_INCREMENTAL=1 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
else
|
||||
# llvm-harness（デフォルト）はLLVM_SYS_180_PREFIX不要
|
||||
CARGO_INCREMENTAL=1 cargo build --release -j 24 -p nyash-rust --features "$LLVM_FEATURE" >/dev/null
|
||||
fi
|
||||
|
||||
echo "[2/4] Emitting object (.o) via LLVM backend ..."
|
||||
# Default object output path under target/aot_objects
|
||||
@ -100,12 +106,13 @@ if [[ "${NYASH_LLVM_SKIP_EMIT:-0}" != "1" ]]; then
|
||||
esac
|
||||
if [[ "$COMPILER_MODE" == "harness" ]]; then
|
||||
if [[ "${NYASH_LLVM_FEATURE:-llvm}" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy path: do not use harness
|
||||
# Legacy path: do not use harness (LLVM_SYS_180_PREFIX needed)
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
NYASH_LLVM_OBJ_OUT="$OBJ" LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm "$INPUT" >/dev/null || true
|
||||
else
|
||||
# Harness path (Python llvmlite)
|
||||
NYASH_LLVM_OBJ_OUT="$OBJ" NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
# Harness path (Python llvmlite - LLVM_SYS_180_PREFIX不要)
|
||||
NYASH_LLVM_OBJ_OUT="$OBJ" NYASH_LLVM_USE_HARNESS=1 \
|
||||
./target/release/nyash --backend llvm "$INPUT" >/dev/null || true
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -17,10 +17,18 @@ if ! command -v llvm-config-18 >/dev/null 2>&1; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Resolve LLVM 18 prefix once and export for both 180/181 variants used by llvm-sys
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
export LLVM_SYS_181_PREFIX="${_LLVMPREFIX}"
|
||||
export LLVM_SYS_180_PREFIX="${_LLVMPREFIX}"
|
||||
# Conditional LLVM prefix setup based on feature
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell needs LLVM_SYS_180_PREFIX
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
export LLVM_SYS_181_PREFIX="${_LLVMPREFIX}"
|
||||
export LLVM_SYS_180_PREFIX="${_LLVMPREFIX}"
|
||||
echo "[llvm-smoke] Using legacy inkwell with LLVM_SYS_180_PREFIX=${_LLVMPREFIX}" >&2
|
||||
else
|
||||
# llvm-harness (default) doesn't need LLVM_SYS_180_PREFIX
|
||||
echo "[llvm-smoke] Using llvm-harness (LLVM_SYS_180_PREFIX not required)" >&2
|
||||
fi
|
||||
|
||||
# --- AOT smoke: apps/ny-llvm-bitops (bitwise & shift operations) ---
|
||||
if [[ "${NYASH_LLVM_BITOPS_SMOKE:-0}" == "1" ]]; then
|
||||
@ -41,9 +49,8 @@ else
|
||||
echo "[llvm-smoke] skipping ny-llvm-bitops (set NYASH_LLVM_BITOPS_SMOKE=1 to enable)" >&2
|
||||
fi
|
||||
|
||||
echo "[llvm-smoke] building nyash (${MODE}, feature=llvm)..." >&2
|
||||
# Support both llvm-sys 180/181 by exporting both prefixes to the same value
|
||||
cargo build -q ${MODE:+--${MODE}} --features llvm
|
||||
echo "[llvm-smoke] building nyash (${MODE}, feature=${LLVM_FEATURE})..." >&2
|
||||
cargo build -q ${MODE:+--${MODE}} --features "${LLVM_FEATURE}"
|
||||
|
||||
echo "[llvm-smoke] running --backend llvm on examples/llvm11_core_smoke.nyash ..." >&2
|
||||
rm -f "$OBJ"
|
||||
|
||||
@ -56,9 +56,16 @@ if ! command -v llvm-config-18 >/dev/null 2>&1; then
|
||||
fi
|
||||
|
||||
# Build nyash + NyRT as needed
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
cargo build --release -j 24 --features llvm >/dev/null
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell needs LLVM_SYS_180_PREFIX
|
||||
_LLVMPREFIX=$(llvm-config-18 --prefix)
|
||||
LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
cargo build --release -j 24 --features "${LLVM_FEATURE}" >/dev/null
|
||||
else
|
||||
# llvm-harness (default) doesn't need LLVM_SYS_180_PREFIX
|
||||
cargo build --release -j 24 --features "${LLVM_FEATURE}" >/dev/null
|
||||
fi
|
||||
if [[ "$EMIT" == "exe" ]]; then
|
||||
(cd crates/nyrt && cargo build --release -j 24 >/dev/null)
|
||||
fi
|
||||
@ -88,8 +95,13 @@ case "$EMIT" in
|
||||
export NYASH_LLVM_DUMP_LL=1
|
||||
export NYASH_LLVM_LL_OUT="$OUT"
|
||||
if [[ "$VERIFY" == "1" ]]; then export NYASH_LLVM_VERIFY=1; fi
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
else
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
fi
|
||||
if [[ ! -f "$OUT" ]]; then echo "error: failed to produce $OUT" >&2; exit 4; fi
|
||||
[[ "$QUIET" == "0" ]] && echo "OK ll:$OUT"
|
||||
;;
|
||||
@ -97,8 +109,13 @@ case "$EMIT" in
|
||||
export NYASH_LLVM_OBJ_OUT="$OUT"
|
||||
if [[ "$VERIFY" == "1" ]]; then export NYASH_LLVM_VERIFY=1; fi
|
||||
rm -f "$OUT"
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
else
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
fi
|
||||
if [[ ! -f "$OUT" ]]; then echo "error: failed to produce $OUT" >&2; exit 4; fi
|
||||
[[ "$QUIET" == "0" ]] && echo "OK obj:$OUT"
|
||||
;;
|
||||
@ -108,8 +125,13 @@ case "$EMIT" in
|
||||
export NYASH_LLVM_OBJ_OUT="$OBJ"
|
||||
if [[ "$VERIFY" == "1" ]]; then export NYASH_LLVM_VERIFY=1; fi
|
||||
rm -f "$OBJ"
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 LLVM_SYS_181_PREFIX="${_LLVMPREFIX}" LLVM_SYS_180_PREFIX="${_LLVMPREFIX}" \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
else
|
||||
cat "$IN_FILE" | NYASH_LLVM_USE_HARNESS=1 \
|
||||
./target/release/nyash --backend llvm --ny-parser-pipe >/dev/null || true
|
||||
fi
|
||||
if [[ ! -f "$OBJ" ]]; then echo "error: failed to produce object $OBJ" >&2; exit 4; fi
|
||||
# Link with NyRT
|
||||
NYRT_BASE=${NYRT_DIR:-"$PWD/crates/nyrt"}
|
||||
|
||||
@ -7,11 +7,18 @@ set -euo pipefail
|
||||
SCRIPT=${1:-apps/tests/loop_if_phi.nyash}
|
||||
|
||||
echo "[phi-empty-check] building nyash (llvm features)" >&2
|
||||
LLVM_PREFIX=${LLVM_SYS_180_PREFIX:-$(command -v llvm-config-18 >/dev/null 2>&1 && llvm-config-18 --prefix || true)}
|
||||
if [[ -n "${LLVM_PREFIX}" ]]; then
|
||||
LLVM_SYS_180_PREFIX="${LLVM_PREFIX}" cargo build --release --features llvm >/dev/null
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" ]]; then
|
||||
# Legacy inkwell needs LLVM_SYS_180_PREFIX
|
||||
LLVM_PREFIX=${LLVM_SYS_180_PREFIX:-$(command -v llvm-config-18 >/dev/null 2>&1 && llvm-config-18 --prefix || true)}
|
||||
if [[ -n "${LLVM_PREFIX}" ]]; then
|
||||
LLVM_SYS_180_PREFIX="${LLVM_PREFIX}" cargo build --release --features "${LLVM_FEATURE}" >/dev/null
|
||||
else
|
||||
cargo build --release --features "${LLVM_FEATURE}" >/dev/null
|
||||
fi
|
||||
else
|
||||
cargo build --release --features llvm >/dev/null
|
||||
# llvm-harness (default) doesn't need LLVM_SYS_180_PREFIX
|
||||
cargo build --release --features "${LLVM_FEATURE}" >/dev/null
|
||||
fi
|
||||
|
||||
IR_OUT=tmp/nyash_harness.ll
|
||||
|
||||
@ -6,9 +6,16 @@ source "$ROOT/tools/test/lib/shlib.sh"
|
||||
|
||||
build_nyash_release
|
||||
|
||||
# Skip when LLVM toolchain is not available (either llvm-config-18 or LLVM_SYS_180_PREFIX)
|
||||
if ! command -v llvm-config-18 >/dev/null 2>&1 && [[ -z "${LLVM_SYS_180_PREFIX:-}" ]]; then
|
||||
echo "[SKIP] selfhost M2 minimal: LLVM18 not available"; exit 0
|
||||
# Skip when LLVM toolchain is not available
|
||||
if ! command -v llvm-config-18 >/dev/null 2>&1; then
|
||||
# For llvm-harness (default), we only need llvm-config-18
|
||||
# For llvm-inkwell-legacy, we also need LLVM_SYS_180_PREFIX
|
||||
LLVM_FEATURE=${NYASH_LLVM_FEATURE:-llvm}
|
||||
if [[ "$LLVM_FEATURE" == "llvm-inkwell-legacy" && -z "${LLVM_SYS_180_PREFIX:-}" ]]; then
|
||||
echo "[SKIP] selfhost M2 minimal: LLVM18 not available for legacy inkwell"; exit 0
|
||||
elif [[ "$LLVM_FEATURE" != "llvm-inkwell-legacy" ]]; then
|
||||
echo "[SKIP] selfhost M2 minimal: llvm-config-18 not available"; exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
build_ny_llvmc || { echo "[SKIP] selfhost M2 minimal: ny-llvmc not built"; exit 0; }
|
||||
|
||||
Reference in New Issue
Block a user