Upgrade to LLVM 21

banach-space · banach-space · commit a62756e265d2 · 2025-09-21T11:35:39.000+01:00
diff --git a/.github/workflows/apple-silicon-llvm-from-sources.yml b/.github/workflows/apple-silicon-llvm-from-sources.yml
@@ -21,7 +21,7 @@ jobs:
           echo "${GITHUB_WORKSPACE}/ninja" >> $GITHUB_PATH
       - name: Clone llvm-project
         run: |
-          git clone --depth 1 --single-branch --branch release/20.x https://github.com/llvm/llvm-project
+          git clone --depth 1 --single-branch --branch release/21.x https://github.com/llvm/llvm-project
       - name: Build LLVM
         run: |
           cd llvm-project
diff --git a/.github/workflows/apple-silicon.yml b/.github/workflows/apple-silicon.yml
@@ -27,18 +27,18 @@ jobs:
       - name: Install Dependencies
         run: |
           brew update
-          brew install llvm@20
+          brew install llvm@21
           brew install lit
       - name: Build HelloWorld
         run: |
           cd HelloWorld
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/opt/homebrew/opt/llvm@20/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/opt/homebrew/opt/llvm@21/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
       - name: Build llvm-tutor + run tests
         run: |
           cd $GITHUB_WORKSPACE
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/opt/homebrew/opt/llvm@20/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/opt/homebrew/opt/llvm@21/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
           lit test/
diff --git a/.github/workflows/docker-archlinux.yml b/.github/workflows/docker-archlinux.yml
@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build the Docker image
-        run: docker build . --file Dockerfile_archlinux --tag llvm-tutor:llvm-20
+        run: docker build . --file Dockerfile_archlinux --tag llvm-tutor:llvm-21
diff --git a/.github/workflows/docker-fedora.yml b/.github/workflows/docker-fedora.yml
@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build the Docker image
-        run: docker build . --file Dockerfile_fedora --tag llvm-tutor:llvm-20
+        run: docker build . --file Dockerfile_fedora --tag llvm-tutor:llvm-21
diff --git a/.github/workflows/docker-ubuntu.yml b/.github/workflows/docker-ubuntu.yml
@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build the Docker image
-        run: docker build . --file Dockerfile_ubuntu --tag llvm-tutor:llvm-20
+        run: docker build . --file Dockerfile_ubuntu --tag llvm-tutor:llvm-21
diff --git a/.github/workflows/docker-ubunut-apt.yml b/.github/workflows/docker-ubunut-apt.yml
@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build the Docker image
-        run: docker build . --file Dockerfile_ubuntu_apt --tag llvm-tutor:llvm-20
+        run: docker build . --file Dockerfile_ubuntu_apt --tag llvm-tutor:llvm-21
diff --git a/.github/workflows/x86-ubuntu-llvm-from-sources-static.yml b/.github/workflows/x86-ubuntu-llvm-from-sources-static.yml
@@ -21,7 +21,7 @@ jobs:
           echo "${GITHUB_WORKSPACE}/ninja" >> $GITHUB_PATH
       - name: Clone llvm-project
         run: |
-          git clone --depth 1 --single-branch --branch release/20.x https://github.com/llvm/llvm-project
+          git clone --depth 1 --single-branch --branch release/21.x https://github.com/llvm/llvm-project
           cd llvm-project
       - name: Register MBAAdd statically
         run: |
diff --git a/.github/workflows/x86-ubuntu-llvm-from-sources.yml b/.github/workflows/x86-ubuntu-llvm-from-sources.yml
@@ -23,7 +23,7 @@ jobs:
           echo "${GITHUB_WORKSPACE}/ninja" >> $GITHUB_PATH
       - name: Clone llvm-project
         run: |
-          git clone --depth 10 --single-branch --branch release/20.x https://github.com/llvm/llvm-project
+          git clone --depth 10 --single-branch --branch release/21.x https://github.com/llvm/llvm-project
       - name: Build LLVM
         run: |
           cd llvm-project
diff --git a/.github/workflows/x86-ubuntu.yml b/.github/workflows/x86-ubuntu.yml
@@ -25,9 +25,9 @@ jobs:
           CXX: ${{ matrix.compiler.CXX }}
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main"
+          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main"
           sudo apt-get update
-          sudo apt-get install -y llvm-20 llvm-20-dev llvm-20-tools clang-20
+          sudo apt-get install -y llvm-21 llvm-21-dev llvm-21-tools clang-21
           sudo apt-get install python3-setuptools
           sudo pip3 install lit
       - name: Build HelloWorld
@@ -37,12 +37,12 @@ jobs:
         run: |
           cd HelloWorld
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-20/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-21/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
       - name: Build llvm-tutor + run tests
         run: |
           cd $GITHUB_WORKSPACE
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-20/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-21/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
           lit -va test/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,8 +52,8 @@ list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
 find_package(LLVM CONFIG)
 
 # We defer the version checking to this statement
-if("${LLVM_VERSION_MAJOR}" VERSION_LESS 20)
-  message(FATAL_ERROR "Found LLVM ${LLVM_VERSION_MAJOR}, but need LLVM 20 or above")
+if("${LLVM_VERSION_MAJOR}" VERSION_LESS 21)
+  message(FATAL_ERROR "Found LLVM ${LLVM_VERSION_MAJOR}, but need LLVM 21 or above")
 endif()
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
diff --git a/Dockerfile_fedora b/Dockerfile_fedora
@@ -5,8 +5,8 @@
 # USAGE:
 # ```bash
 # wget https://raw.githubusercontent.com/banach-space/llvm-tutor/main/Dockerfile_fedora
-# docker build -t=llvm-tutor:llvm-20 .
-# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-20 /bin/bash
+# docker build -t=llvm-tutor:llvm-21 .
+# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-21 /bin/bash
 # ```
 # =============================================================================
 
diff --git a/Dockerfile_ubuntu b/Dockerfile_ubuntu
@@ -6,8 +6,8 @@
 # USAGE:
 # ```bash
 # wget https://raw.githubusercontent.com/banach-space/llvm-tutor/main/Dockerfile_ubuntu
-# docker build -t=llvm-tutor:llvm-20 .
-# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-20 /bin/bash
+# docker build -t=llvm-tutor:llvm-21 .
+# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-21 /bin/bash
 # ```
 # =============================================================================
 
@@ -31,7 +31,7 @@ RUN pip3 install lit
 # reason, we need to add `-DLLVM_INSTALL_UTILS=ON` CMake flag when building
 # LLVM.
 ENV LLVM_DIR /opt/llvm
-RUN git clone --branch release/20.x --depth 1 https://github.com/llvm/llvm-project \
+RUN git clone --branch release/21.x --depth 1 https://github.com/llvm/llvm-project \
     && mkdir -p $LLVM_DIR \
     && mkdir -p llvm-project/build \
     && cd llvm-project/build \
diff --git a/Dockerfile_ubuntu_apt b/Dockerfile_ubuntu_apt
@@ -6,14 +6,14 @@
 # USAGE:
 # ```bash
 # wget https://raw.githubusercontent.com/banach-space/llvm-tutor/main/Dockerfile_ubuntu_apt
-# docker build -t=llvm-tutor:llvm-20 .
-# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-20 /bin/bash
+# docker build -t=llvm-tutor:llvm-21 .
+# docker run --rm -it --hostname=llvm-tutor llvm-tutor:llvm-21 /bin/bash
 # ```
 # =============================================================================
 
 FROM ubuntu:22.04
 
-ENV LLVM_DIR /usr/lib/llvm-20/
+ENV LLVM_DIR /usr/lib/llvm-21/
 ENV TUTOR_DIR /llvm-tutor
 
 # 1. INSTALL DEPENDENCIES
@@ -35,9 +35,9 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-RUN apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main"
+RUN apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-21 main"
 RUN apt-get update
-RUN apt-get install -y llvm-20 llvm-20-dev llvm-20-tools clang-20
+RUN apt-get install -y llvm-21 llvm-21-dev llvm-21-tools clang-21
 RUN apt-get install -y python3-setuptools
 
 # 2. INSTALL LIT
@@ -51,8 +51,8 @@ RUN mkdir -p $TUTOR_DIR/hello-world-build \
     && cd $TUTOR_DIR/hello-world-build \
     && cmake -G Ninja -DLT_LLVM_INSTALL_DIR=$LLVM_DIR ../HelloWorld \
     && ninja
-RUN cd $TUTOR_DIR/hello-world-build && /usr/bin/clang-20 -S -O1 -emit-llvm ../inputs/input_for_hello.c -o input_for_hello.ll
-RUN cd $TUTOR_DIR/hello-world-build && /usr/bin/opt-20 -load-pass-plugin ./libHelloWorld.so -passes=hello-world -disable-output input_for_hello.ll 2>&1 | grep "(llvm-tutor) Hello from: foo"
+RUN cd $TUTOR_DIR/hello-world-build && /usr/bin/clang-21 -S -O1 -emit-llvm ../inputs/input_for_hello.c -o input_for_hello.ll
+RUN cd $TUTOR_DIR/hello-world-build && /usr/bin/opt-21 -load-pass-plugin ./libHelloWorld.so -passes=hello-world -disable-output input_for_hello.ll 2>&1 | grep "(llvm-tutor) Hello from: foo"
 
 # 5. BUILD AND RUN LLVM-TUTOR
 RUN mkdir -p $TUTOR_DIR/build \
diff --git a/README.md b/README.md
diff --git a/lib/DynamicCallCounter.cpp b/lib/DynamicCallCounter.cpp
diff --git a/lib/InjectFuncCall.cpp b/lib/InjectFuncCall.cpp
diff --git a/test/DynamicCallCounterTest2.ll b/test/DynamicCallCounterTest2.ll
diff --git a/test/inject_func_call.ll b/test/inject_func_call.ll
