Update to LLVM 15

* `-analyze` was removed from `opt` in https://reviews.llvm.org/D122420. All affected tests in llvm-tutor are updated accordingly (the corresponding `RUN` lines are removed). * Starting with LLVM 15, Homebrew LLVM packages are built with `LLVM_ENABLE_LTO=ON`. This affects how `static` is linked when using Homebrew packages. See https://github.com/orgs/Homebrew/discussions/3666 and #75 for a complete discussion. * Introduced opaque pointers in tests. * Remove some references to the legacy PM, update examples to the new PM. Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
banach-space · Sep 27, 2022 · af9d193 · af9d193
1 parent 43344cf
commit af9d193
Show file tree

Hide file tree

Showing 27 changed files with 175 additions and 199 deletions.
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-14
+        run: docker build . --file Dockerfile_archlinux --tag llvm-tutor:llvm-15
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-14
+        run: docker build . --file Dockerfile_fedora --tag llvm-tutor:llvm-15
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-14
+        run: docker build . --file Dockerfile_ubuntu --tag llvm-tutor:llvm-15
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-14
+        run: docker build . --file Dockerfile_ubuntu_apt --tag llvm-tutor:llvm-15
diff --git a/.github/workflows/x86-darwin-llvm-from-sources.yml b/.github/workflows/x86-darwin-llvm-from-sources.yml
@@ -21,17 +21,18 @@ jobs:
           echo "${GITHUB_WORKSPACE}/ninja" >> $GITHUB_PATH
       - name: Clone llvm-project
         run: |
-          git clone --depth 1 --single-branch --branch release/14.x https://github.com/llvm/llvm-project
+          git clone --depth 1 --single-branch --branch release/15.x https://github.com/llvm/llvm-project
       - name: Build LLVM
         run: |
           cd llvm-project
           mkdir build && cd build
           cmake -G Ninja \
             -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang" \
             -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_OPTIMIZED_TABLEGEN=ON \
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
             ../llvm
           # Note that only the required tools are built
-          ninja clang opt lli not FileCheck
+          ninja clang opt lli not FileCheck LLVM
       - name: Install lit
         run: |
           sudo pip3 install lit

diff --git a/.github/workflows/x86-darwin.yml b/.github/workflows/x86-darwin.yml
@@ -19,18 +19,18 @@ jobs:
       - name: Install Dependencies
         run: |
           brew update
-          brew install llvm@14
+          brew install llvm@15
           pip3 install lit
       - name: Build HelloWorld
         run: |
           cd HelloWorld
           mkdir build && cd build
-          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm@14/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm@15/" -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/local/opt/llvm@14/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/local/opt/llvm@15/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
           lit test/
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/14.x https://github.com/llvm/llvm-project
+          git clone --depth 1 --single-branch --branch release/15.x https://github.com/llvm/llvm-project
           cd llvm-project
       - name: Register MBAAdd statically
         run: |
@@ -34,6 +34,7 @@ jobs:
           cmake -G Ninja \
             -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang" \
             -DLLVM_TARGETS_TO_BUILD="host" -DLLVM_OPTIMIZED_TABLEGEN=ON \
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
             -DLLVM_BUILD_EXAMPLES=On -DLLVM_MBASUB_LINK_INTO_TOOLS=On \
             ../llvm
           # Note that only the required tools are built

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/14.x https://github.com/llvm/llvm-project
+          git clone --depth 10 --single-branch --branch release/15.x https://github.com/llvm/llvm-project
       - name: Build LLVM
         run: |
           cd llvm-project
@@ -32,9 +32,10 @@ jobs:
           cmake -G Ninja \
             -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang" \
             -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_OPTIMIZED_TABLEGEN=ON \
-            -DBUILD_SHARED_LIBS=On ../llvm
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
+            ../llvm
           # Note that only the required tools are built
-          ninja clang opt lli not FileCheck
+          ninja clang opt lli not FileCheck LLVM
       - name: Install lit
         run: |
           sudo apt-get install python3-setuptools

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-14 main"
+          sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
           sudo apt-get update
-          sudo apt-get install -y llvm-14 llvm-14-dev llvm-14-tools clang-14
+          sudo apt-get install -y llvm-15 llvm-15-dev llvm-15-tools clang-15
           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-14/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-15/" -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-14/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
+          cmake -DLT_LLVM_INSTALL_DIR="/usr/lib/llvm-15/" -DCMAKE_BUILD_TYPE=${{ matrix.type }} ../
           make -j2
           lit -va test/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,11 +46,11 @@ endif()
 # `find_package(llvm)`. So there's no need to add it here.
 list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
 
-find_package(LLVM 14 REQUIRED CONFIG)
+find_package(LLVM 15 REQUIRED CONFIG)
 
 # Another sanity check
-if(NOT "14" VERSION_EQUAL "${LLVM_VERSION_MAJOR}")
-  message(FATAL_ERROR "Found LLVM ${LLVM_VERSION_MAJOR}, but need LLVM 14")
+if(NOT "15" VERSION_EQUAL "${LLVM_VERSION_MAJOR}")
+  message(FATAL_ERROR "Found LLVM ${LLVM_VERSION_MAJOR}, but need LLVM 15")
 endif()
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
@@ -72,7 +72,7 @@ add_definitions(${LLVM_DEFINITIONS})
 # 3. LLVM-TUTOR BUILD CONFIGURATION
 #===============================================================================
 # Use the same C++ standard as LLVM does
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
 
 # Build type
 if (NOT CMAKE_BUILD_TYPE)
@@ -82,7 +82,7 @@ endif()
 
 # Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall\
-    -fdiagnostics-color=always")
+  -fdiagnostics-color=always")
 
 # LLVM is normally built without RTTI. Be consistent with that.
 if(NOT LLVM_ENABLE_RTTI)

diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LT_LLVM_INSTALL_DIR "" CACHE PATH "LLVM installation directory")
 list(APPEND CMAKE_PREFIX_PATH "${LT_LLVM_INSTALL_DIR}/lib/cmake/llvm/")
 
 # FIXME: This is a warkaround for #25. Remove once resolved and use
-find_package(LLVM 14 REQUIRED CONFIG)
+find_package(LLVM 15 REQUIRED CONFIG)
 
 # HelloWorld includes headers from LLVM - update the include paths accordingly
 include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
@@ -21,7 +21,7 @@ include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
 # 2. LLVM-TUTOR BUILD CONFIGURATION
 #===============================================================================
 # Use the same C++ standard as LLVM does
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
 
 # LLVM is normally built without RTTI. Be consistent with that.
 if(NOT LLVM_ENABLE_RTTI)