LLVM 16 (#1013)

Co-authored-by: Eric Kilmer <[email protected]>
Co-authored-by: Peter Goodman <[email protected]>

Author: 3 people

.github/workflows/vcpkg_ci_amd64.yml

@@ -27,6 +27,10 @@ on:
     branches:
       - 'master'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -37,7 +41,7 @@ jobs:
         image:
           - { name: 'ubuntu', tag: '20.04' }
           - { name: 'ubuntu', tag: '22.04' }
-        llvm: [ 'llvm-15', 'llvm-15[pasta]' ]
+        llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
 
     container:
       image: docker.pkg.github.com/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}:${{ matrix.image.tag }}
@@ -66,6 +70,7 @@ jobs:
       - name: Get commit message
         shell: bash
         run: |
+          git config --global --add safe.directory /__w/cxx-common/cxx-common
           echo 'COMMIT_MESSAGE<<EOF' >> "$GITHUB_ENV"
           if   [[ '${{ github.event_name }}' == 'push' ]]; then
             echo "$(git log --format=%B -n 1 HEAD)" >> "$GITHUB_ENV"

.github/workflows/vcpkg_ci_mac.yml

@@ -26,14 +26,18 @@ on:
     branches:
       - 'master'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         os:
-          - { runner: 'macos-11', xcode: '13.0' }
-        llvm: [ 'llvm-15', 'llvm-15[pasta]' ]
+          - { runner: 'macos-12', xcode: '14.2' }
+        llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
         target_arch: [ 'x64', 'arm64' ]
 
     runs-on: ${{ matrix.os.runner }}
@@ -106,6 +110,11 @@ jobs:
           name: ${{ env.ARTIFACT_NAME }}_logs
           path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log
 
+      - name: 'Adhoc codesign'
+        shell: 'bash'
+        run: |
+          find ./${{ env.ARTIFACT_NAME }} \( -path '**/bin/*' -or -path '**/libexec/*' -or -path '**/tools/*'  \) -type f -perm +111 -exec codesign --force -s - \{\} \;
+
       - name: 'Export Packages'
         if: contains(env.COMMIT_MESSAGE, 'debug artifacts') || github.event.release
         shell: 'bash'
@@ -191,7 +200,7 @@ jobs:
       - name: 'Remill build'
         shell: 'bash'
         working-directory: remill
-        if: matrix.target_arch == 'x64'
+        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -207,15 +216,15 @@ jobs:
       - name: 'Remill test'
         shell: 'bash'
         working-directory: remill/build
-        if: matrix.target_arch == 'x64'
+        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
         run: |
           # Only run test on x64
           env CTEST_OUTPUT_ON_FAILURE=1 ctest .
 
       - name: 'Anvill build'
         shell: 'bash'
         working-directory: anvill
-        if: matrix.target_arch == 'x64'
+        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -232,12 +241,12 @@ jobs:
             -S . -B build
           cmake --build build
           cmake --install build
+
       #- name: 'Anvill test'
       #  shell: 'bash'
       #  working-directory: anvill/build
-      #  if: matrix.target_arch == 'x64'
+      #  if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
       #  run: |
-      #    # Only run test on x64
       #    ./install/bin/anvill-decompile-json -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir
 
       - name: Cache cleanup and reporting

.github/workflows/vcpkg_ci_windows.yml

@@ -29,13 +29,18 @@ on:
     branches:
       - 'master'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         llvm: [
-          'llvm-15'
+          'llvm-15',
+          'llvm-16'
           ]
 
     runs-on: ['self-hosted', 'Windows', 'X64']

.github/workflows/vcpkg_docker_amd64.yml

@@ -15,6 +15,9 @@ on:
       - 'docker/**'
       - '.github/workflows/vcpkg_docker_amd64.yml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:

README.md

@@ -49,7 +49,7 @@ Passing `--export-dir <DIR>` to the `./build_dependencies.sh` script, you can in
 ./build_dependencies.sh --export-dir vcpkg-llvm-15-install llvm-15
 ```
 
-will build all of the dependencies listed in `dependencies.txt` _and_ LLVM 14 and install into a local directory named `vcpkg-llvm-15-install`.
+will build all of the dependencies listed in `dependencies.txt` _and_ LLVM 15 and install into a local directory named `vcpkg-llvm-15-install`.
 
 Furthermore, you are able to install additional dependencies into an existing exported directory created by this script by setting the `--export-dir <path>` to the same path:
 
@@ -163,4 +163,4 @@ This command will do similar things as the above command, except it will `remove
 
 This repo is under the Apache-2.0 LICENSE, unless where specified. See below.
 
-The LLVM version port directories (ports/llvm-{14,15}) were initially copied from the upstream [vcpkg](https://github.com/microsoft/vcpkg) repo as a starting point. Eventually, we plan to submit the relevant patches for upstream when we have thoroughly tested these changes. More info can be found in the respective `LICENSE` and `NOTICE` files in those directories.
+The LLVM version port directories (ports/llvm-{15,16}) were initially copied from the upstream [vcpkg](https://github.com/microsoft/vcpkg) repo as a starting point. Eventually, we plan to submit the relevant patches for upstream when we have thoroughly tested these changes. More info can be found in the respective `LICENSE` and `NOTICE` files in those directories.

ports/llvm-16/0001-Fix-install-paths.patch

@@ -0,0 +1,10 @@
+diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt
+index 22d818eea72d..75aacc4468d4 100644
+--- a/openmp/tools/Modules/CMakeLists.txt
++++ b/openmp/tools/Modules/CMakeLists.txt
+@@ -12,4 +12,4 @@
+ 
+ 
+ install(FILES "FindOpenMPTarget.cmake"
+-              DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp")
++              DESTINATION "share/openmp")

ports/llvm-16/0006-Fix-libffi.patch

@@ -0,0 +1,16 @@
+ llvm/cmake/modules/FindFFI.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake
+index b0d859af8959..a756d0c8fdb0 100644
+--- a/llvm/cmake/modules/FindFFI.cmake
++++ b/llvm/cmake/modules/FindFFI.cmake
+@@ -34,7 +34,7 @@ else()
+   endif()
+ endif()
+ 
+-find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR})
++find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR})
+ 
+ if(FFI_LIBRARIES)
+   include(CMakePushCheckState)

ports/llvm-16/0007-Fix-install-bolt.patch

@@ -0,0 +1,21 @@
+ bolt/tools/driver/CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
+index e56be15dbcff..85b078e2e761 100644
+--- a/bolt/tools/driver/CMakeLists.txt
++++ b/bolt/tools/driver/CMakeLists.txt
+@@ -35,13 +35,6 @@ set(BOLT_DEPENDS
+   )
+ 
+ add_custom_target(bolt DEPENDS ${BOLT_DEPENDS})
+-install(PROGRAMS
+-  ${CMAKE_BINARY_DIR}/bin/llvm-bolt
+-  ${CMAKE_BINARY_DIR}/bin/perf2bolt
+-  ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  COMPONENT bolt
+-  )
+ add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
+ set_target_properties(bolt PROPERTIES FOLDER "BOLT")
+ set_target_properties(install-bolt PROPERTIES FOLDER "BOLT")

ports/llvm-16/0020-fix-FindZ3.cmake.patch

@@ -0,0 +1,33 @@
+diff --git a/llvm/cmake/modules/FindZ3.cmake b/llvm/cmake/modules/FindZ3.cmake
+index 118b1eac3b32..455bbf28facc 100644
+--- a/llvm/cmake/modules/FindZ3.cmake
++++ b/llvm/cmake/modules/FindZ3.cmake
+@@ -1,3 +1,22 @@
++# Try first to find Z3 using its upstream cmake files (included in newer version)
++# unless the user has provided a hint that would assume skipping the CONFIG
++# option
++if (NOT DEFINED Z3_ROOT AND NOT LLVM_Z3_INSTALL_DIR)
++  find_package(Z3 QUIET CONFIG)
++endif()
++
++# If we found with CONFIG mode, then set up the compatible variables
++if (Z3_FOUND)
++  set(Z3_VERSION "${Z3_VERSION_STRING}")
++  set(Z3_LIBRARIES z3::libz3)
++  get_property(Z3_INCLUDE_DIR
++    TARGET z3::libz3 PROPERTY
++    INTERFACE_INCLUDE_DIRECTORIES
++  )
++  find_package_handle_standard_args(Z3 CONFIG_MODE)
++
++else()
++
+ INCLUDE(CheckCXXSourceRuns)
+ 
+ # Function to check Z3's version
+@@ -123,3 +142,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Z3
+                                   VERSION_VAR Z3_VERSION_STRING)
+ 
+ mark_as_advanced(Z3_INCLUDE_DIR Z3_LIBRARIES)
++
++endif()

ports/llvm-16/0021-fix-find_dependency.patch

@@ -0,0 +1,58 @@
+diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
+index 2d90512bfb06..97aacd6f9c0f 100644
+--- a/llvm/cmake/modules/LLVMConfig.cmake.in
++++ b/llvm/cmake/modules/LLVMConfig.cmake.in
+@@ -51,16 +51,18 @@ set(LLVM_ENABLE_ASSERTIONS @LLVM_ENABLE_ASSERTIONS@)
+
+ set(LLVM_ENABLE_EH @LLVM_ENABLE_EH@)
+
++include(CMakeFindDependencyMacro)
++
+ set(LLVM_ENABLE_FFI @LLVM_ENABLE_FFI@)
+ if(LLVM_ENABLE_FFI)
+-  find_package(FFI)
++  find_dependency(FFI)
+ endif()
+
+ set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@)
+
+ set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@)
+ if(LLVM_ENABLE_TERMINFO)
+-  find_package(Terminfo)
++  find_dependency(Terminfo)
+ endif()
+
+ set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
+@@ -70,25 +72,28 @@ set(LLVM_ENABLE_UNWIND_TABLES @LLVM_ENABLE_UNWIND_TABLES@)
+ set(LLVM_ENABLE_ZLIB @LLVM_ENABLE_ZLIB@)
+ if(LLVM_ENABLE_ZLIB)
+   set(ZLIB_ROOT @ZLIB_ROOT@)
+-  find_package(ZLIB)
++  find_dependency(ZLIB)
+ endif()
+
+ set(LLVM_ENABLE_ZSTD @LLVM_ENABLE_ZSTD@)
+ if(LLVM_ENABLE_ZSTD)
+-  find_package(zstd)
++  find_dependency(zstd)
+ endif()
+
+ set(LLVM_ENABLE_LIBXML2 @LLVM_ENABLE_LIBXML2@)
+ if(LLVM_ENABLE_LIBXML2)
+-  find_package(LibXml2)
++  find_dependency(LibXml2)
+ endif()
+
+ set(LLVM_ENABLE_CURL @LLVM_ENABLE_CURL@)
+ if(LLVM_ENABLE_CURL)
+-  find_package(CURL)
++  find_dependency(CURL)
+ endif()
+
+ set(LLVM_WITH_Z3 @LLVM_WITH_Z3@)
++if(LLVM_WITH_Z3)
++  find_dependency(Z3 4.7.1)
++endif()
+
+ set(LLVM_ENABLE_DIA_SDK @LLVM_ENABLE_DIA_SDK@)
+