update clang+llvm, remove darling, update cctools, update Rust

Author: Marc-André Moreau

.github/workflows/cctools-prebuilt.yml

@@ -29,6 +29,10 @@ jobs:
           cd xar/xar
           ./autogen.sh
           ./configure --prefix=/tmp/cctools
+          make
+          make install
+          rm /tmp/cctools/lib/libxar.la
+          mv $(readlink -f /tmp/cctools/lib/libxar.so) /tmp/cctools/lib/libxar.so
           cd ..
 
       - name: Build libtapi
@@ -37,8 +41,7 @@ jobs:
           cd apple-libtapi
           INSTALLPREFIX=/tmp/cctools ./build.sh
           ./install.sh
-          rm /tmp/cctools/lib/libtapi.so
-          mv /tmp/cctools/lib/libtapi.so.8svn /tmp/cctools/lib/libtapi.so
+          mv $(readlink -f /tmp/cctools/lib/libtapi.so) /tmp/cctools/lib/libtapi.so
           cd ..
 
       - name: Build cctools

.github/workflows/darling-prebuilt.yml

@@ -5,7 +5,7 @@ on:
       version:
         description: 'release version'
         required: true
-        default: '2023.1.0'
+        default: '2023.3.0'
       llvm_run_id:
         description: 'llvm workflow run id'
         default: "latest"
@@ -22,10 +22,6 @@ on:
         description: 'cctools workflow run id'
         default: "latest"
         required: true
-      darling_run_id:
-        description: 'darling workflow run id'
-        default: "latest"
-        required: true
       dry-run:
         description: 'dry run (skip release)'
         required: true
@@ -107,22 +103,6 @@ jobs:
           Write-Host "Downloading run $RunId ($Workflow)"
           & gh run download -R $Repository $RunId
 
-      - name: Download darling
-        shell: pwsh
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          $Workflow = "darling prebuilt"
-          $Repository = $Env:GITHUB_REPOSITORY
-          $RunId = '${{ github.event.inputs.darling_run_id }}'
-          if ($RunId -eq 'latest') {
-            $RunId = $(gh run list -R $Repository -w $Workflow --json 'status,databaseId,conclusion') |
-              ConvertFrom-Json | Where-Object { ($_.status -eq 'completed') -and ($_.conclusion -eq 'success') } |
-              Select-Object -First 1 -ExpandProperty databaseId
-          }
-          Write-Host "Downloading run $RunId ($Workflow)"
-          & gh run download -R $Repository $RunId
-
       - name: Create GitHub Release
         shell: pwsh
         env:

.github/workflows/github-release.yml

@@ -45,7 +45,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install ninja
-          echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV
 
       - name: Configure Linux runner
         if: runner.os == 'Linux'

.github/workflows/halide-prebuilt.yml

@@ -9,13 +9,13 @@ jobs:
       matrix:
         arch: [ x86_64, aarch64 ]
         os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
-        version: [ 12.0.1, 14.0.6 ]
+        version: [ 14.0.6, 16.0.6 ]
 
         include:
-          - version: 12.0.1
-            branch: release/12.x
           - version: 14.0.6
             branch: release/14.x
+          - version: 16.0.6
+            branch: release/16.x
 
           - os: windows
             runner: windows-2022
@@ -49,7 +49,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install ninja
-          echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV
 
       - name: Configure Linux runner
         if: runner.os == 'Linux'
@@ -62,7 +62,7 @@ jobs:
           sudo apt install libxml2-dev
           mkdir libxml2-dev-arm64 && cd libxml2-dev-arm64
           $LibXmlDebFile = if ($(lsb_release -rs) -eq '20.04') {
-            "libxml2-dev_2.9.10+dfsg-5ubuntu0.20.04.5_arm64.deb"
+            "libxml2-dev_2.9.10+dfsg-5ubuntu0.20.04.6_arm64.deb"
           } else {
             "libxml2-dev_2.9.13+dfsg-1build1_arm64.deb"
           }
@@ -90,11 +90,14 @@ jobs:
       - name: Patch LLVM
         shell: pwsh
         run: |
-          if ('${{matrix.version}}' -eq '12.0.1') {
-            git -C llvm-project apply ../llvm-prebuilt/patches/llvm-12-add-lld-install-targets.patch
-          } else {
+          if ('${{matrix.version}}' -eq '14.0.6') {
             git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-add-lld-install-targets.patch
+            git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-add-llvm-name-prefix-to-llc-lli-opt-tools.patch
             git -C llvm-project apply ../llvm-prebuilt/patches/llvm-14-force-disable-clang-ast-introspection.patch
+          } else {
+            git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-add-lld-install-targets.patch
+            git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-add-llvm-name-prefix-to-llc-lli-opt-tools.patch
+            git -C llvm-project apply ../llvm-prebuilt/patches/llvm-16-force-disable-clang-ast-introspection.patch
           }
 
       - name: Enable Windows host environment
@@ -104,17 +107,22 @@ jobs:
           arch: amd64
 
       - name: Configure LLVM host tools
-        run: "cmake -G Ninja -S llvm-project/llvm -B llvm-host
-                    -DCMAKE_BUILD_TYPE=Release
-                    -DLLVM_ENABLE_PROJECTS=clang
-                    -Wno-dev"
+        shell: pwsh
+        run: |
+          cmake -G Ninja -S llvm-project/llvm -B llvm-host `
+            -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" `
+            -DCMAKE_BUILD_TYPE=Release -Wno-dev
 
       - name: Build LLVM host tools
         shell: pwsh
         run: |
           cmake --build llvm-host --target llvm-tblgen clang-tblgen llvm-config
+          if ('${{matrix.version}}' -eq '16.0.6') {
+            cmake --build llvm-host --target clang-tidy-confusable-chars-gen clang-pseudo-gen
+          }
           $HostBinPath = "$Env:GITHUB_WORKSPACE/llvm-host/bin"
           $ExeExt = if ($IsWindows) { ".exe" } else { "" }
+          echo "LLVM_NATIVE_TOOL_DIR=$HostBinPath" >> $Env:GITHUB_ENV
           echo "LLVM_TABLEGEN=$HostBinPath/llvm-tblgen$ExeExt" >> $Env:GITHUB_ENV
           echo "CLANG_TABLEGEN=$HostBinPath/clang-tblgen$ExeExt" >> $Env:GITHUB_ENV
           echo "LLVM_CONFIG_PATH=$HostBinPath/llvm-config$ExeExt" >> $Env:GITHUB_ENV

.github/workflows/llvm-prebuilt.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         arch: [ x86_64 ]
         os: [ windows, macos, ubuntu-20.04, ubuntu-22.04 ]
-        version: [ 1.64.0 ]
+        version: [ 1.73.0 ]
 
         include:
           - os: windows
@@ -35,7 +35,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install ninja
-          echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
+          echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV
 
       - name: Configure Linux runner
         if: runner.os == 'Linux'
@@ -137,7 +137,6 @@ jobs:
       - name: Patch Rust
         shell: pwsh
         run: |
-          git -C rust apply ../llvm-prebuilt/patches/rust-${{matrix.version}}-allow-dynamic-linking-for-ios-targets.patch
           git -C rust apply ../llvm-prebuilt/patches/rust-${{matrix.version}}-disable-filecheck-tool-sanity-checks.patch
           if ($IsWindows) {
             git -C rust apply ../llvm-prebuilt/patches/rust-${{matrix.version}}-force-windows-msvc-dynamic-runtime-linking.patch

.github/workflows/rust-prebuilt.yml

@@ -3,6 +3,11 @@ if(DEFINED ENV{CMAKE_INSTALL_PREFIX})
     set(CMAKE_INSTALL_PREFIX $ENV{CMAKE_INSTALL_PREFIX} CACHE FILEPATH "")
 endif()
 
+if(DEFINED ENV{LLVM_NATIVE_TOOL_DIR})
+    set(LLVM_NATIVE_TOOL_DIR $ENV{LLVM_NATIVE_TOOL_DIR} CACHE FILEPATH "")
+    message(STATUS "LLVM_NATIVE_TOOL_DIR: ${LLVM_NATIVE_TOOL_DIR}")
+endif()
+
 if(DEFINED ENV{CLANG_TABLEGEN})
     set(CLANG_TABLEGEN $ENV{CLANG_TABLEGEN} CACHE FILEPATH "")
     message(STATUS "CLANG_TABLEGEN: ${CLANG_TABLEGEN}")
@@ -55,6 +60,7 @@ set(LLVM_ENABLE_DIA_SDK OFF CACHE BOOL "")
 set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "")
 set(LLVM_ENABLE_LIBXML2 ON CACHE BOOL "")
 set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "")
+set(LLVM_ENABLE_ZSTD OFF CACHE BOOL "")
 set(LLVM_ENABLE_UNWIND_TABLES OFF CACHE BOOL "")
 set(LLVM_ENABLE_Z3_SOLVER OFF CACHE BOOL "")
 set(LLVM_ENABLE_RTTI ON CACHE BOOL "")
@@ -94,6 +100,9 @@ set(LLVM_BINUTILS_COMPONENTS
     CACHE STRING "")
 
 set(LLVM_TOOLCHAIN_TOOLS
+    llc
+    lli
+    opt
     dsymutil
     llvm-as
     llvm-cat

cmake/llvm-distribution.cmake

@@ -0,0 +1,25 @@
+From 00b2a9f9232285bcab3af7b2190fac2361952a89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
+Date: Tue, 18 Oct 2022 17:20:18 -0400
+Subject: [PATCH] add llvm name prefix to llc,lli,opt tools
+
+---
+ llvm/tools/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt
+index 770e46c4806f..a7c8bb058624 100644
+--- a/llvm/tools/CMakeLists.txt
++++ b/llvm/tools/CMakeLists.txt
+@@ -53,3 +53,7 @@ foreach(p ${LLVM_EXTERNAL_PROJECTS})
+ endforeach(p)
+ 
+ set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)
++
++set_target_properties(llc PROPERTIES OUTPUT_NAME "llvm-llc")
++set_target_properties(lli PROPERTIES OUTPUT_NAME "llvm-lli")
++set_target_properties(opt PROPERTIES OUTPUT_NAME "llvm-opt")
+\ No newline at end of file
+-- 
+2.25.1
+

patches/llvm-14-add-llvm-name-prefix-to-llc-lli-opt-tools.patch

@@ -1,38 +1,38 @@
-From ef2e03b4ce1244c71fd6fdf918285c948d32a54c Mon Sep 17 00:00:00 2001
+From 6fbd9ec3d6c33a6ea0092aa197e40008e97c12e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <[email protected]>
-Date: Wed, 8 Sep 2021 08:49:13 -0400
-Subject: [PATCH] add lld install targets
+Date: Thu, 2 Nov 2023 10:02:08 -0400
+Subject: [PATCH] [PATCH] add lld install targets
 
 ---
  lld/CMakeLists.txt             | 32 ++++++++++++++++++++++++++++++++
  lld/cmake/modules/AddLLD.cmake |  2 +-
  2 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt
-index 2e99564f4..9f72266b3 100644
+index 3d6225646fe6..f9a9aa4aedf2 100644
 --- a/lld/CMakeLists.txt
 +++ b/lld/CMakeLists.txt
-@@ -189,9 +189,19 @@ include_directories(BEFORE
+@@ -195,9 +195,19 @@ include_directories(BEFORE
  if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
    install(DIRECTORY include/
-     DESTINATION include
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 +    COMPONENT lld-headers
      FILES_MATCHING
      PATTERN "*.h"
      )
 +
-+  add_custom_target(lld-headers)
-+  set_target_properties(lld-headers PROPERTIES FOLDER "Misc")
++    add_custom_target(lld-headers)
++    set_target_properties(lld-headers PROPERTIES FOLDER "Misc")
 +
-+  if(NOT LLVM_ENABLE_IDE)
-+    add_llvm_install_targets(install-lld-headers
-+                            DEPENDS lld-headers
-+                            COMPONENT lld-headers)
-+  endif()
++    if(NOT LLVM_ENABLE_IDE)
++      add_llvm_install_targets(install-lld-headers
++                              DEPENDS lld-headers
++                              COMPONENT lld-headers)
++    endif()
  endif()
 
  add_subdirectory(Common)
-@@ -210,4 +220,26 @@ add_subdirectory(MachO)
+@@ -214,4 +224,26 @@ add_subdirectory(MachO)
  add_subdirectory(MinGW)
  add_subdirectory(wasm)
 
@@ -60,12 +60,12 @@ index 2e99564f4..9f72266b3 100644
 +
  add_subdirectory(cmake/modules)
 diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
-index 9883475d1..b2f597191 100644
+index d3924f7243d4..e34a8631ae62 100644
 --- a/lld/cmake/modules/AddLLD.cmake
 +++ b/lld/cmake/modules/AddLLD.cmake
-@@ -21,7 +21,7 @@ macro(add_lld_library name)
+@@ -22,7 +22,7 @@ macro(add_lld_library name)
        ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-       RUNTIME DESTINATION bin)
+       RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 -    if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
 +    if (NOT CMAKE_CONFIGURATION_TYPES)