Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

14 changes: 7 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
Expand All @@ -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
ENV PATH=/workspace/llvm-project-21.1.8.src/build/bin:$PATH
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
entrypoint: ["/workspace/ASPIS/aspis.sh", "--llvm-bin", "/workspace/llvm-project-21.1.8.src/build/bin"]
2 changes: 1 addition & 1 deletion testing/config/llvm.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#llvm_bin = "<path/to/your/llvm/bin>"
llvm_bin = "/mnt/build/bin/"
llvm_bin = "/mnt/build/bin/"