From 8e3f1a3f4e0d3d7a4311d47780094701913fa9fd Mon Sep 17 00:00:00 2001
From: Emilio Corigliano <emilio.corigliano@polimi.it>
Date: Wed, 25 Feb 2026 18:22:22 +0100
Subject: [PATCH] fix(pipeline): fix pipeline after bump to LLVM 21

---
 .github/workflows/main.yml |  6 ++++--
 docker/Dockerfile          | 14 +++++++-------
 docker/docker-compose.yml  |  2 +-
 testing/config/llvm.toml   |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cb1a920..7f2129c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
         if: steps.llvm-cache.outputs.cache-hit != 'true'
         with:
           repository: llvm/llvm-project
-          ref: llvmorg-16.0.6
+          ref: llvmorg-21.1.8
           path: llvm-project
       - name: Compiling LLVM
         if: steps.llvm-cache.outputs.cache-hit != 'true'
@@ -65,5 +65,7 @@ jobs:
         shell: bash
         working-directory: ./ASPIS/testing
         run: |
-           pytest test.py
+           pytest test.py --tests-file config/tests.toml
+           pytest test.py --tests-file config/racfed+eddi.toml
+           pytest test.py --tests-file config/racfed.toml
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f79ae01..50d2b14 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,11 +21,11 @@ RUN apt-get update && apt-get install -y \
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 \
     && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
 
-# ==== Download LLVM 16.0.6
+# ==== Download LLVM 21.1.8
 WORKDIR /workspace/
 
-RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz \
-    && tar -xf llvm-project-16.0.6.src.tar.xz 
+RUN wget https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/llvm-project-21.1.8.src.tar.xz \
+    && tar -xf llvm-project-21.1.8.src.tar.xz 
 
 # Download and install CMake 3.22.1
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-x86_64.tar.gz \
@@ -44,14 +44,14 @@ RUN wget https://apt.llvm.org/llvm.sh  \
 
 # LLVM CMAKE CONFIG 
 
-WORKDIR /workspace/llvm-project-16.0.6.src
+WORKDIR /workspace/llvm-project-21.1.8.src
 
 RUN mkdir build \
     && cd build \
     && cmake -S ../llvm -B . -G "Ninja" -DCMAKE_BUILD_TYPE=Debug -DLLVM_ENABLE_PROJECTS='clang' -DLLVM_INSTALL_UTILS=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_OPTIMIZED_TABLEGEN=ON -DLLVM_INCLUDE_EwebXAMPLES=OFF -DLLVM_USE_LINKER=NO  -DCMAKE_C_COMPILER=clang-16 -DCMAKE_CXX_COMPILER=clang++-16 -DLLVM_ENABLE_RTTI=OFF -DLLVM_ENABLE_EH=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_CROSSCOMPILING=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
     && ninja -j10
 
-RUN export PATH=/home/ubuntu/llvm-project-16.0.6.src/build/bin:$PATH
+RUN export PATH=/home/ubuntu/llvm-project-21.1.8.src/build/bin:$PATH
 
 # Install ASPIS
 WORKDIR /workspace/
@@ -62,11 +62,11 @@ ENV CXX=''
 RUN git clone https://github.com/HEAPLab/ASPIS.git \
     && cd ASPIS \
     && mkdir build \
-    && cmake -B build -DLLVM_DIR=/workspace/llvm-project-16.0.6.src/build/lib/cmake/llvm \
+    && cmake -B build -DLLVM_DIR=/workspace/llvm-project-21.1.8.src/build/lib/cmake/llvm \
     && cmake --build build
 
 # Set the working directory to where ASPIS is located
 WORKDIR /workspace/ASPIS
 
 # Export path to add llvm binaries
-ENV PATH=/workspace/llvm-project-16.0.6.src/build/bin:$PATH
\ No newline at end of file
+ENV PATH=/workspace/llvm-project-21.1.8.src/build/bin:$PATH
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e00679a..851b01a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,4 +4,4 @@ services:
     container_name: aspis_runner
     volumes:
       - .././testing/tests/:/workspace/ASPIS/tmp/
-    entrypoint: ["/workspace/ASPIS/aspis.sh", "--llvm-bin", "/workspace/llvm-project-16.0.6.src/build/bin"]
\ No newline at end of file
+    entrypoint: ["/workspace/ASPIS/aspis.sh", "--llvm-bin", "/workspace/llvm-project-21.1.8.src/build/bin"]
\ No newline at end of file
diff --git a/testing/config/llvm.toml b/testing/config/llvm.toml
index eed5e4f..0a61754 100644
--- a/testing/config/llvm.toml
+++ b/testing/config/llvm.toml
@@ -1,2 +1,2 @@
 #llvm_bin = "<path/to/your/llvm/bin>"
-llvm_bin = "/mnt/build/bin/"
+llvm_bin = "/mnt/build/bin/"
\ No newline at end of file