Merge pull request #66 from upstat-io/dev

build: make LLVM hard requirement, simplify build tooling

Author: elucidsoft

.cargo/config.toml

@@ -5,44 +5,19 @@
 LLVM_SYS_170_PREFIX = "/usr/lib/llvm-17"
 
 [alias]
-# Run Ori language tests (all tests in tests/ directory)
+# Ori language tests
 st = "run -p oric --bin ori -- test tests/"
-
-# Run Ori tests with verbose output
 stv = "run -p oric --bin ori -- test --verbose"
-
-# Run Ori tests with filter (usage: cargo stf map)
 stf = "run -p oric --bin ori -- test --filter"
 
-# Run all Rust unit tests across the workspace (excludes ori_llvm — needs LLVM 17)
-t = "test --workspace --exclude ori_llvm"
-
-# Run Rust tests with output shown
-tv = "test --workspace --exclude ori_llvm -- --nocapture"
-
-# Run tests for a specific crate (usage: cargo tc ori_parse)
+# Rust unit tests (all crates including ori_llvm)
+t = "test --workspace"
+tv = "test --workspace -- --nocapture"
 tc = "test -p"
 
-# Check all crates (excludes ori_llvm — needs LLVM 17)
-c = "check --workspace --exclude ori_llvm"
-
-# Build all crates (excludes ori_llvm — needs LLVM 17)
-b = "build --workspace --exclude ori_llvm"
-
-# Clippy on all crates (excludes ori_llvm — needs LLVM 17; use `cargo cll` for LLVM)
-cl = "clippy --workspace --exclude ori_llvm --all-targets -- -D warnings"
-
-# LLVM crates (ori_llvm, ori_rt) are excluded from workspace.
-# LLVM 17 path is configured via LLVM_SYS_170_PREFIX above.
-# `cargo b` (workspace build) does NOT include LLVM — use `bl`/`blr` for LLVM builds.
-# `bl`/`blr` build oric with --features llvm plus ori_rt (needed for AOT linking).
-
-# Build oric + runtime with LLVM feature (local LLVM required)
-bl = "build -p oric -p ori_rt --features llvm"
-blr = "build -p oric -p ori_rt --features llvm --release"
-
-# Run oric with LLVM feature
-rl = "run -p oric --features llvm --bin ori --"
+# Build / check / lint (all crates including ori_llvm)
+c = "check --workspace"
+b = "build --workspace"
+cl = "clippy --workspace --all-targets -- -D warnings"
 
-# Clippy on LLVM crate
-cll = "clippy -p ori_llvm --all-targets -- -D warnings"
+# LLVM 17 is a default feature of oric. All commands include LLVM.

.github/workflows/ci.yml

@@ -43,16 +43,28 @@ jobs:
     name: Clippy
     if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
+
+      - name: Install LLVM 17
+        run: |
+          curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
+          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends llvm-17 llvm-17-dev libpolly-17-dev clang-17 lld-17
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
       - uses: Swatinem/rust-cache@v2
         with:
           key: clippy
-      - run: cargo clippy --workspace --exclude ori_llvm --all-targets -- -D warnings
+      - run: cargo clippy --workspace --all-targets -- -D warnings
+        env:
+          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
 
   # Main test suite
   test:
@@ -62,25 +74,39 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
+
+      - name: Install LLVM 17
+        run: |
+          curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
+          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends llvm-17 llvm-17-dev libpolly-17-dev clang-17 lld-17
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           key: test
 
       - name: Build
-        run: cargo build --workspace --exclude ori_llvm
+        run: cargo build --workspace
+        env:
+          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
 
       - name: Rust unit tests
         id: rust-tests
         continue-on-error: true
         run: |
           set -o pipefail
-          cargo test --workspace --exclude ori_llvm 2>&1 | tee rust-test-output.txt
+          cargo test --workspace 2>&1 | tee rust-test-output.txt
           # Sum all "X passed" counts from "test result:" lines
           RUST_TESTS=$(grep -oE '[0-9]+ passed' rust-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           RUST_FAILED=$(grep -oE '[0-9]+ failed' rust-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           echo "RUST_TESTS=$RUST_TESTS" >> $GITHUB_ENV
           echo "RUST_FAILED=$RUST_FAILED" >> $GITHUB_ENV
+        env:
+          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
 
       - name: Ori language tests
         id: ori-tests
@@ -93,6 +119,8 @@ jobs:
           ORI_FAILED=$(grep -oE '[0-9]+ failed' ori-test-output.txt | grep -oE '^[0-9]+' | tail -1 || echo "0")
           echo "ORI_TESTS=$ORI_TESTS" >> $GITHUB_ENV
           echo "ORI_FAILED=$ORI_FAILED" >> $GITHUB_ENV
+        env:
+          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
 
       - name: Ori runtime tests
         id: rt-tests
@@ -163,104 +191,48 @@ jobs:
     name: ${{ matrix.os }}
     needs: [format, clippy]  # Don't waste CI time if basics fail
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
+    timeout-minutes: 7
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.os }}
-
-      - name: Build
-        run: cargo build --workspace --exclude ori_llvm
-
-      - name: Rust unit tests
-        run: cargo test --workspace --exclude ori_llvm
 
-      - name: Ori language tests
-        run: cargo run -p oric --bin ori -- test tests/
-
-  # LLVM backend - not in ci-success `needs`, so failures show red but don't block merges
-  llvm:
-    name: LLVM Backend
-    if: "!startsWith(github.event.head_commit.message, 'chore: release v')"
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
+      - name: Install LLVM 17 (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install llvm@17
+          echo "LLVM_SYS_170_PREFIX=$(brew --prefix llvm@17)" >> $GITHUB_ENV
 
-      - name: Install LLVM 17
+      - name: Install LLVM 17 (Windows)
+        if: runner.os == 'Windows'
         run: |
-          curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
-          echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends llvm-17 llvm-17-dev libpolly-17-dev clang-17 lld-17
-        env:
-          DEBIAN_FRONTEND: noninteractive
+          $LLVM_URL = "https://github.com/upstat-io/llvm-package-windows/releases/download/v17.0.6/LLVM-17.0.6-win64.7z"
+          Write-Host "Downloading LLVM from $LLVM_URL"
+          curl.exe -fLO $LLVM_URL
+          Write-Host "Extracting LLVM to C:\LLVM..."
+          7z x LLVM-17.0.6-win64.7z -oC:\LLVM
+          echo "LLVM_SYS_170_PREFIX=C:\LLVM" >> $env:GITHUB_ENV
+          echo "C:\LLVM\bin" >> $env:GITHUB_PATH
+
+      - name: Set up MSVC environment (Windows)
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
 
       - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy
-
       - uses: Swatinem/rust-cache@v2
         with:
-          key: llvm
-
-      - name: LLVM clippy
-        run: cargo clippy -p ori_llvm --all-targets -- -D warnings
-        env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
-
-      - name: LLVM tests
-        id: llvm-tests
-        continue-on-error: true
-        run: |
-          set -o pipefail
-          cargo build -p oric -p ori_rt --features llvm -q
-          cargo test -p ori_rt 2>&1 | tee rt-llvm-output.txt
-          cargo test -p ori_llvm 2>&1 | tee llvm-test-output.txt
-          # Sum all "X passed" counts from test output
-          LLVM_TESTS=$(cat rt-llvm-output.txt llvm-test-output.txt | grep -oE '[0-9]+ passed' | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
-          LLVM_FAILED=$(cat rt-llvm-output.txt llvm-test-output.txt | grep -oE '[0-9]+ failed' | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
-          echo "LLVM_TESTS=$LLVM_TESTS" >> $GITHUB_ENV
-          echo "LLVM_FAILED=$LLVM_FAILED" >> $GITHUB_ENV
-        env:
-          LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
+          key: ${{ matrix.os }}
 
-      - name: Save LLVM test results
-        if: always()
-        run: |
-          LLVM_P=${LLVM_TESTS:-0}
-          LLVM_F=${LLVM_FAILED:-0}
-          OVERALL="passed"
-          if [ "$LLVM_F" -gt 0 ]; then OVERALL="failed"; fi
-          cat > llvm-test-results.json << EOF
-          {
-            "timestamp": "$(date -u +%Y-%m-%dT%H:%M:%SZ)",
-            "overall": "$OVERALL",
-            "suites": [
-              { "name": "Rust unit tests (ori_llvm)", "passed": $LLVM_P, "failed": $LLVM_F, "skipped": 0, "lcfail": null }
-            ],
-            "totals": { "passed": $LLVM_P, "failed": $LLVM_F, "skipped": 0, "lcfail": 0 }
-          }
-          EOF
-          cat llvm-test-results.json
+      - name: Build (all crates incl. LLVM)
+        run: cargo build --workspace
 
-      - name: Upload LLVM test results
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: llvm-test-results
-          path: llvm-test-results.json
-          retention-days: 90
+      - name: Rust unit tests (excl. LLVM AOT — tested on Linux)
+        run: cargo test --workspace --exclude ori_llvm
 
-      - name: Fail if LLVM tests failed
-        if: steps.llvm-tests.outcome == 'failure'
-        run: exit 1
+      - name: Ori language tests
+        run: cargo run -p oric --bin ori -- test tests/
 
   # Single status check for branch protection
   ci-success:

.github/workflows/deploy-website.yml

@@ -48,45 +48,12 @@ jobs:
           if_no_artifact_found: warn
         continue-on-error: true
 
-      - name: Fetch LLVM test results from CI
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          workflow: ci.yml
-          branch: master
-          name: llvm-test-results
-          path: website/public
-          run_id: ${{ github.event.workflow_run.id }}
-          if_no_artifact_found: warn
-        continue-on-error: true
-
-      - name: Merge test results
+      - name: Validate test results
         run: |
           cd website/public
-          # Create default if missing
           if [ ! -f test-results.json ]; then
             echo '{"timestamp":"","overall":"unknown","suites":[],"totals":{"passed":0,"failed":0,"skipped":0,"lcfail":0}}' > test-results.json
           fi
-          # Merge LLVM suites into main results if artifact was downloaded
-          if [ -f llvm-test-results.json ]; then
-            # Concatenate suites arrays and recompute totals + overall
-            jq -s '
-              {
-                timestamp: (if .[1].timestamp > .[0].timestamp then .[1].timestamp else .[0].timestamp end),
-                overall: (if ([.[].suites[].failed // 0] | add) > 0 then "failed" else "passed" end),
-                suites: ([.[].suites] | add),
-                totals: {
-                  passed: ([.[].suites[] | .passed // 0] | add),
-                  failed: ([.[].suites[] | .failed // 0] | add),
-                  skipped: ([.[].suites[] | .skipped // 0] | add),
-                  lcfail: ([.[].suites[] | .lcfail // 0] | add)
-                }
-              }
-            ' test-results.json llvm-test-results.json > combined-test-results.json
-            mv combined-test-results.json test-results.json
-            rm -f llvm-test-results.json
-          else
-            echo "LLVM test results artifact not found, preserving existing data"
-          fi
           echo "Test results:"
           cat test-results.json
 

.github/workflows/release.yml

@@ -91,7 +91,7 @@ jobs:
       - name: Build with LLVM
         run: |
           docker run --rm -v ${{ github.workspace }}:/workspace ori-llvm:latest \
-            sh -c "cargo build --release --features llvm -p oric && strip /workspace/target/release/ori"
+            sh -c "cargo build --release -p oric && strip /workspace/target/release/ori"
 
       - name: Package
         run: |
@@ -157,7 +157,7 @@ jobs:
           targets: ${{ matrix.target }}
 
       - name: Build with LLVM
-        run: cargo build --release --features llvm -p oric --target ${{ matrix.target }}
+        run: cargo build --release -p oric --target ${{ matrix.target }}
 
       - name: Package
         run: |
@@ -228,7 +228,7 @@ jobs:
           targets: x86_64-pc-windows-msvc
 
       - name: Build with LLVM
-        run: cargo build --release --features llvm -p oric --target x86_64-pc-windows-msvc
+        run: cargo build --release -p oric --target x86_64-pc-windows-msvc
 
       - name: Package
         run: |

Cargo.toml

@@ -18,8 +18,7 @@ members = [
     "compiler/ori_llvm",
     "compiler/ori_rt",
 ]
-# Default members exclude LLVM crates (require LLVM 17 system libraries).
-# Bare `cargo check`/`cargo test` skip them; use `-p ori_llvm` or `cargo bl` explicitly.
+# All crates including ori_llvm are in default-members; LLVM 17 is required for oric builds.
 default-members = [
     "compiler/ori_ir",
     "compiler/ori_diagnostic",
@@ -35,6 +34,7 @@ default-members = [
     "compiler/ori_compiler",
     "compiler/ori_stack",
     "compiler/oric",
+    "compiler/ori_llvm",
     "compiler/ori_rt",
 ]
 # Excluded crates (not part of workspace at all):

build-all.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
-# Build ALL Rust code: workspace and LLVM crate
+# Build ALL Rust code: workspace including LLVM crate
 # Usage: ./build-all
-
 set -e
 
 echo "=== Building workspace ==="
-cargo b
-
-echo ""
-echo "=== Building LLVM crate ==="
-./llvm-build.sh
+cargo build --workspace
 
 echo ""
 echo "=== All builds complete ==="