Add LLVM toolchain support to CI and build system

G36maid · G36maid · commit e792176125e9 · 2025-07-07T14:56:06.000+08:00
Remove test-summary job from CI workflow

Update toolchain URLs and add CI test summary job

Remove test64 argument from QEMU test script in CI

Refactor toolchain URLs and add LLVM fallback in CI workflow

Set CROSS_COMPILE to riscv32-unknown-elf- in CI setup

Add AR=llvm-ar to LLVM toolchain environment setup

Refactor toolchain URL to use TOOLCHAIN_OS variable

Refactor RISC-V toolchain selection and defaults

Run CI on all branches and pull requests

Add __maybe_unused macro for unused attribute

Use GNU ar instead of llvm-ar for LLVM toolchain

Update toolchain version to verified

Detect Clang toolchain in RISC-V build script
diff --git a/.ci/run-qemu-tests.sh b/.ci/run-qemu-tests.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-export CROSS_COMPILE=${CROSS_COMPILE:-riscv32-unknown-elf-}
 
 # Check if at least one app is provided
 if [ $# -eq 0 ]; then
@@ -11,19 +10,21 @@ fi
 
 APPS="$@"
 TIMEOUT=10
+TOOLCHAIN_TYPE=${TOOLCHAIN_TYPE:-gnu}
 
 echo "[+] Will run apps: $APPS"
+echo "[+] Using toolchain: $TOOLCHAIN_TYPE"
 echo ""
 
 # Loop through each app
 for app in $APPS; do
-    echo "=== Running $app ==="
+    echo "=== Running $app ($TOOLCHAIN_TYPE) ==="
 
     # Build the app
-    echo "[+] Building $app..."
+    echo "[+] Building $app with $TOOLCHAIN_TYPE toolchain..."
     make clean >/dev/null 2>&1
-    if ! make "$app" >/dev/null 2>&1; then
-        echo "[!] Failed to build $app"
+    if ! make "$app" TOOLCHAIN_TYPE="$TOOLCHAIN_TYPE" >/dev/null 2>&1; then
+        echo "[!] Failed to build $app with $TOOLCHAIN_TYPE"
         echo ""
         continue
     fi
@@ -46,4 +47,4 @@ for app in $APPS; do
     echo ""
 done
 
-echo "[+] All apps tested"
+echo "[+] All apps tested with $TOOLCHAIN_TYPE toolchain"
diff --git a/.ci/setup-toolchain.sh b/.ci/setup-toolchain.sh
@@ -1,11 +1,60 @@
 #!/bin/bash
 set -e
 
-URL="https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.06.13/riscv32-elf-ubuntu-22.04-gcc-nightly-2025.06.13-nightly.tar.xz"
+# Default to GNU if no toolchain specified
+TOOLCHAIN_TYPE=${1:-gnu}
 
-echo "[+] Downloading RISC-V GNU toolchain..."
-wget "$URL"
-tar -xf "$(basename "$URL")"
+TOOLCHAIN_REPO=https://github.com/riscv-collab/riscv-gnu-toolchain
+TOOLCHAIN_VERSION=2025.05.30
+TOOLCHAIN_OS=ubuntu-24.04
 
-echo "[+] Exporting toolchain path..."
-echo "$PWD/riscv/bin" >> "$GITHUB_PATH"
+setup_gnu_toolchain() {
+    echo "[+] Setting up GNU RISC-V toolchain..."
+
+    local URL="${TOOLCHAIN_REPO}/releases/download/${TOOLCHAIN_VERSION}/riscv32-elf-${TOOLCHAIN_OS}-gcc-nightly-${TOOLCHAIN_VERSION}-nightly.tar.xz"
+
+    echo "[+] Downloading RISC-V GNU toolchain..."
+    wget -q "$URL"
+    tar -xf "$(basename "$URL")"
+
+    echo "[+] Exporting GNU toolchain path..."
+    echo "$PWD/riscv/bin" >> "$GITHUB_PATH"
+
+    # Set cross-compile prefix for GNU
+    echo "CROSS_COMPILE=riscv32-unknown-elf-" >> "$GITHUB_ENV"
+    echo "TOOLCHAIN_TYPE=gnu" >> "$GITHUB_ENV"
+}
+
+setup_llvm_toolchain() {
+    echo "[+] Setting up LLVM RISC-V toolchain..."
+
+    # upstream URL for LLVM toolchainzz2
+    local URL="${TOOLCHAIN_REPO}/releases/download/${TOOLCHAIN_VERSION}/riscv32-elf-${TOOLCHAIN_OS}-llvm-nightly-${TOOLCHAIN_VERSION}-nightly.tar.xz"
+
+    echo "[+] Downloading RISC-V LLVM toolchain..."
+    wget -q "$URL"
+    tar -xf "$(basename "$URL")"
+
+    echo "[+] Exporting LLVM toolchain path..."
+    echo "$PWD/riscv/bin" >> "$GITHUB_PATH"
+
+    # Set cross-compile prefix for LLVM
+    echo "CROSS_COMPILE=riscv32-unknown-elf-" >> "$GITHUB_ENV"
+    echo "TOOLCHAIN_TYPE=llvm" >> "$GITHUB_ENV"
+}
+
+case "$TOOLCHAIN_TYPE" in
+    "gnu")
+        setup_gnu_toolchain
+        ;;
+    "llvm")
+        setup_llvm_toolchain
+        ;;
+    *)
+        echo "Error: Unknown toolchain type '$TOOLCHAIN_TYPE'"
+        echo "Usage: $0 [gnu|llvm]"
+        exit 1
+        ;;
+esac
+
+echo "[+] Toolchain setup complete: $TOOLCHAIN_TYPE"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,58 +2,84 @@ name: Linmo CI
 
 on:
   push:
-    branches: [main, ci]
   pull_request:
-    branches: [main, ci]
 
 jobs:
-  basic-tests:
+  matrix-tests:
     runs-on: ubuntu-24.04
-    name: Basic Tests
+    name: Test on ${{ matrix.toolchain }} toolchain
+
+    strategy:
+      fail-fast: false
+      matrix:
+        toolchain: [gnu, llvm]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Install base dependencies
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential qemu-system-riscv32 wget
 
-      - name: Setup RISC-V Toolchain
-        run: .ci/setup-toolchain.sh
+      - name: Setup ${{ matrix.toolchain }} toolchain
+        run: .ci/setup-toolchain.sh ${{ matrix.toolchain }}
 
       - name: Verify toolchain installation
         run: |
-          riscv32-unknown-elf-gcc --version
+          if [ "${{ matrix.toolchain }}" = "gnu" ]; then
+            riscv32-unknown-elf-gcc --version
+          else
+            # LLVM toolchain fallback: try system llvm-objdump
+            riscv32-unknown-elf-clang --version || clang --version
+            riscv32-unknown-elf-llvm-objdump --version || llvm-objdump --version
+          fi
           qemu-system-riscv32 --version
-        env:
-          CROSS_COMPILE: riscv32-unknown-elf-
 
       - name: Build Kernel
         run: |
           make clean
           make
         env:
-          CROSS_COMPILE: riscv32-unknown-elf-
+          TOOLCHAIN_TYPE: ${{ matrix.toolchain }}
 
       - name: Run Basic Apps
         id: test
         run: |
-          output=$(.ci/run-qemu-tests.sh cpubench test64)
+          output=$(.ci/run-qemu-tests.sh cpubench )
           echo "TEST_OUTPUT<<EOF" >> $GITHUB_OUTPUT
           echo "$output" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
+        env:
+          TOOLCHAIN_TYPE: ${{ matrix.toolchain }}
 
       - name: Comment PR with results
         if: github.event_name == 'pull_request'
         uses: actions/github-script@v7
         with:
           script: |
             const output = `${{ steps.test.outputs.TEST_OUTPUT }}`;
+            const toolchain = `${{ matrix.toolchain }}`.toUpperCase();
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: `## Linmo QEMU App Test Result\n\n\`\`\`\n${output}\n\`\`\`\n\n_This is an automated report from CI._`
+              body: `## Linmo QEMU App Test Result (${toolchain} Toolchain)\n\n\`\`\`\n${output}\n\`\`\`\n\n_This is an automated report from CI._`
             });
+
+  # Optional: Create a summary job that depends on all matrix jobs
+  test-summary:
+    runs-on: ubuntu-24.04
+    needs: matrix-tests
+    if: always()
+
+    steps:
+      - name: Check test results
+        run: |
+          if [ "${{ needs.matrix-tests.result }}" = "success" ]; then
+            echo "✅ All toolchain tests passed!"
+          else
+            echo "❌ Some toolchain tests failed"
+            exit 1
+          fi
diff --git a/arch/riscv/build.mk b/arch/riscv/build.mk
@@ -17,6 +17,10 @@ DEFINES := -DF_CPU=$(F_CLK) \
            -DF_TIMER=$(F_TICK) \
            -include config.h
 
+CROSS_COMPILE ?= riscv32-unknown-elf-
+CC     = $(CROSS_COMPILE)gcc
+CC_IS_CLANG := $(shell $(CC) --version 2>/dev/null | grep -qi clang && echo 1)
+
 # Architecture flags
 ARCH_FLAGS = -march=rv32imzicsr -mabi=ilp32
 
@@ -28,26 +32,30 @@ CFLAGS += -mstrict-align -ffreestanding -nostdlib -fomit-frame-pointer
 CFLAGS += $(INC_DIRS) $(DEFINES) -fdata-sections -ffunction-sections
 
 ifeq ($(CC_IS_CLANG),1)
+ifeq ($(TOOLCHAIN_TYPE),llvm)
     CC    = $(CROSS_COMPILE)clang
     AS    = $(CROSS_COMPILE)clang
     LD    = $(CROSS_COMPILE)ld.lld
     DUMP  = $(CROSS_COMPILE)llvm-objdump -M no-aliases
     READ  = $(CROSS_COMPILE)llvm-readelf
     OBJ   = $(CROSS_COMPILE)llvm-objcopy
     SIZE  = $(CROSS_COMPILE)llvm-size
+    AR    = $(CROSS_COMPILE)ar
 
     CFLAGS += --target=riscv32-unknown-elf
     CFLAGS += -Wno-unused-command-line-argument
     ASFLAGS = --target=riscv32-unknown-elf $(ARCH_FLAGS)
     LDFLAGS = -m elf32lriscv --gc-sections
 else
     CC    = $(CC_DEFAULT)
+    CC    = $(CROSS_COMPILE)gcc
     AS    = $(CROSS_COMPILE)as
     LD    = $(CROSS_COMPILE)ld
     DUMP  = $(CROSS_COMPILE)objdump -Mno-aliases
     READ  = $(CROSS_COMPILE)readelf
     OBJ   = $(CROSS_COMPILE)objcopy
     SIZE  = $(CROSS_COMPILE)size
+    AR    = $(CROSS_COMPILE)ar
 
     ASFLAGS = $(ARCH_FLAGS)
     LDFLAGS = -melf32lriscv --gc-sections
diff --git a/kernel/pipe.c b/kernel/pipe.c
@@ -9,6 +9,8 @@
 #define PIPE_MIN_SIZE 4
 #define PIPE_MAX_SIZE 32768
 
+#define __maybe_unused __attribute__((__unused__))
+
 /* Enhanced validation with comprehensive integrity checks */
 static inline bool pipe_is_valid(const pipe_t *p)
 {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`#define PIPE_MIN_SIZE 4`
`10`	`10`	`#define PIPE_MAX_SIZE 32768`
`11`	`11`
	`12`	`+#define __maybe_unused __attribute__((__unused__))`
	`13`	`+`
`12`	`14`	`/* Enhanced validation with comprehensive integrity checks */`
`13`	`15`	`static inline bool pipe_is_valid(const pipe_t *p)`
`14`	`16`	`{`