Merge from 'main' to 'sycl-web' (311 commits)

  CONFLICT (content): Merge conflict in llvm/include/llvm/IR/IntrinsicInst.h

Author: maarquitos14

.ci/generate-buildkite-pipeline-premerge

@@ -238,9 +238,9 @@ if [[ "${linux_projects}" != "" ]]; then
   cat <<EOF
 - label: ':linux: Linux x64'
   artifact_paths:
-  - artifacts/**/*
+  - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/monolithic-linux/test-results.xml'
+  - 'build/test-results.xml'
   agents: ${LINUX_AGENTS}
   retry:
     automatic:
@@ -261,9 +261,9 @@ if [[ "${windows_projects}" != "" ]]; then
   cat <<EOF
 - label: ':windows: Windows x64'
   artifact_paths:
-  - artifacts/**/*
+  - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/monolithic-windows/test-results.xml'
+  - 'build/test-results.xml'
   agents: ${WINDOWS_AGENTS}
   retry:
     automatic:
@@ -290,7 +290,7 @@ if [[ -n "${ph_target_phid:-}" ]]; then
 - label: ':phabricator: update build status on Phabricator'
   agents: ${SERVICE_AGENTS}
   artifact_paths:
-  - artifacts/**/*
+  - 'artifacts/**/*'
   commands:
   - export SRC=\$\${BUILDKITE_BUILD_PATH}/llvm-premerge-checks
   - rm -rf \$\${SRC}

.ci/generate-buildkite-pipeline-scheduled

@@ -14,6 +14,18 @@
 # See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
 #
 
+set -eu
+set -o pipefail
+
+# Filter rules for generic windows tests
+: ${WINDOWS_AGENTS:='{"queue": "windows"}'}
+# Filter rules for generic linux tests
+: ${LINUX_AGENTS:='{"queue": "linux"}'}
+# Set by buildkite
+: ${BUILDKITE_MESSAGE:=}
+: ${BUILDKITE_COMMIT:=}
+: ${BUILDKITE_BRANCH:=}
+
 cat <<EOF
 steps:
   - trigger: "libcxx-ci"
@@ -28,42 +40,42 @@ steps:
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
 
-  - label: ':linux: x64 Debian'
+  - label: ':linux: Linux x64'
     artifact_paths:
-      - '*_result.json'
-      - 'build/monolithic-linux/test-results.xml'
-    agents:
-      queue: 'linux'
+    - 'artifacts/**/*'
+    - '*_result.json'
+    - 'build/test-results.xml'
+    agents: ${LINUX_AGENTS}
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
-        - exit_status: 255
-          limit: 2 # Forced agent shutdown
+        - exit_status: 255 # Forced agent shutdown
+          limit: 2
     timeout_in_minutes: 120
     env:
       CC: 'clang'
       CXX: 'clang++'
     commands:
-      - './.ci/monolithic-linux.sh "bolt;clang-tools-extra;compiler-rt;flang;libc;libclc;lld;llvm;mlir;polly;pstl" "check-all"'
+    - ./.ci/monolithic-linux.sh "bolt;clang;clang-tools-extra;compiler-rt;flang;libc;libclc;lld;llvm;mlir;polly;pstl" "check-all"
 
-  - label: ':windows: x64 Windows'
+  - label: ':windows: Windows x64'
     artifact_paths:
-      - '*_result.json'
-      - 'build/monolithic-windows/test-results.xml'
-    agents:
-      queue: 'windows'
+    - 'artifacts/**/*'
+    - '*_result.json'
+    - 'build/test-results.xml'
+    agents: ${WINDOWS_AGENTS}
     retry:
       automatic:
         - exit_status: -1  # Agent was lost
           limit: 2
-        - exit_status: 255
-          limit: 2 # Forced agent shutdown
+        - exit_status: 255 # Forced agent shutdown
+          limit: 2
     timeout_in_minutes: 150
     env:
       CC: 'cl'
       CXX: 'cl'
       LD: 'link'
     commands:
-      - 'C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64'
-      - 'bash .ci/monolithic-windows.sh "clang-tools-extra;flang;libclc;lld;llvm;mlir;polly;pstl" "check-all"'
+    - C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64
+    - bash .ci/monolithic-windows.sh "clang;clang-tools-extra;flang;libclc;lld;llvm;mlir;polly;pstl" "check-all"

.ci/monolithic-linux.sh

@@ -17,14 +17,19 @@ set -ex
 set -o pipefail
 
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
-BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build/monolithic-linux}"
-
+BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
 rm -rf ${BUILD_DIR}
 
 ccache --zero-stats
-ccache --show-config
+
+if [[ -n "${CLEAR_CACHE:-}" ]]; then
+  echo "clearing cache"
+  ccache --clear
+fi
+
 function show-stats {
-  ccache --print-stats
+  mkdir -p artifacts
+  ccache --print-stats > artifacts/ccache_stats.txt
 }
 trap show-stats EXIT
 
@@ -47,4 +52,5 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D LLVM_CCACHE_BUILD=ON
 
 echo "--- ninja"
-ninja -C ${BUILD_DIR} ${targets}
+# Targets are not escaped as they are passed as separate arguments.
+ninja -C "${BUILD_DIR}" ${targets}

.ci/monolithic-windows.sh

@@ -17,13 +17,19 @@ set -ex
 set -o pipefail
 
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
-BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build/monolithic-windows}"
+BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
 
 rm -rf ${BUILD_DIR}
 
+if [[ -n "${CLEAR_CACHE:-}" ]]; then
+  echo "clearing sccache"
+  rm -rf "$SCCACHE_DIR"
+fi
+
 sccache --zero-stats
 function show-stats {
-  sccache --show-stats
+  mkdir -p artifacts
+  sccache --show-stats >> artifacts/sccache_stats.txt
 }
 trap show-stats EXIT
 
@@ -45,4 +51,5 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache
 
 echo "--- ninja"
-ninja -C ${BUILD_DIR} ${targets}
+# Targets are not escaped as they are passed as separate arguments.
+ninja -C "${BUILD_DIR}" ${targets}

.github/new-prs-labeler.yml

@@ -313,20 +313,13 @@ testing-tools:
   - llvm/utils/update*_test_checks.py
 
 debuginfo:
-  - llvm/include/llvm/DebugInfo/**
-  - llvm/lib/DebugInfo/**
-  - llvm/tools/dsymutil/**
-  - llvm/tools/llvm-debuginfo-analyzer/**
-  - llvm/tools/llvm-dwarfdump/**
-  - llvm/tools/llvm-dwarfutil/**
-  - llvm/tools/llvm-dwp/**
-  - llvm/tools/llvm-gsymutil/**
-  - llvm/tools/llvm-pdbutil/**
-  - llvm/tools/llvm-debuginfod/**
-  - llvm/tools/llvm-debuginfod-find/**
-  - llvm/lib/CodeGen/AsmPrinter/**
   - clang/lib/CodeGen/CGDebugInfo.cpp
   - llvm/include/llvm/BinaryFormat/Dwarf.*
+  - llvm/include/llvm/DebugInfo/**
+  - llvm/include/llvm/IR/Debug*.h
+  - llvm/lib/CodeGen/AsmPrinter/**
+  - llvm/lib/DebugInfo/**
+  - llvm/lib/IR/Debug*.cpp
   - llvm/test/DebugInfo/**
   - llvm/test/tools/dsymutil/**
   - llvm/test/tools/llvm-debuginfo-analyzer/**
@@ -337,8 +330,15 @@ debuginfo:
   - llvm/test/tools/llvm-dwp/**
   - llvm/test/tools/llvm-gsymutil/**
   - llvm/test/tools/llvm-pdbuti/**
-  - llvm/lib/IR/Debug*.cpp
-  - llvm/include/llvm/IR/Debug*.h
+  - llvm/tools/dsymutil/**
+  - llvm/tools/llvm-debuginfo-analyzer/**
+  - llvm/tools/llvm-debuginfod/**
+  - llvm/tools/llvm-debuginfod-find/**
+  - llvm/tools/llvm-dwarfdump/**
+  - llvm/tools/llvm-dwarfutil/**
+  - llvm/tools/llvm-dwp/**
+  - llvm/tools/llvm-gsymutil/**
+  - llvm/tools/llvm-pdbutil/**
 
 github:workflow:
   - .github/workflows/**

.github/workflows/clang-tests.yml

@@ -6,7 +6,6 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -15,7 +14,6 @@ on:
       - '.github/workflows/llvm-project-tests.yml'
       - '!llvm/**'
   pull_request:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:

.github/workflows/issue-release-workflow.yml

@@ -39,7 +39,7 @@ jobs:
       contains(github.event.action == 'opened' && github.event.issue.body || github.event.comment.body, '/cherry-pick')
     steps:
       - name: Fetch LLVM sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: llvm/llvm-project
           # GitHub stores the token used for checkout and uses it for pushes
@@ -55,9 +55,9 @@ jobs:
 
       - name: Backport Commits
         run: |
-          printf "$COMMENT_BODY" |
+          printf "%s" "$COMMENT_BODY" |
           ./llvm/utils/git/github-automation.py \
-          --repo $GITHUB_REPOSITORY \
+          --repo "$GITHUB_REPOSITORY" \
           --token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
           release-workflow \
           --issue-number ${{ github.event.issue.number }} \
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: Fetch LLVM sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
 
@@ -84,9 +84,9 @@ jobs:
 
       - name: Create Pull Request
         run: |
-          printf "$COMMENT_BODY" |
+          printf "%s" "$COMMENT_BODY" |
           ./llvm/utils/git/github-automation.py \
-          --repo $GITHUB_REPOSITORY \
+          --repo "$GITHUB_REPOSITORY" \
           --token ${{ secrets.RELEASE_WORKFLOW_PUSH_SECRET }} \
           release-workflow \
           --issue-number ${{ github.event.issue.number }} \

.github/workflows/issue-subscriber.yml

@@ -15,8 +15,8 @@ jobs:
     steps:
       - name: Setup Automation Script
         run: |
-          curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/github-automation.py
-          curl -O -L https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$GITHUB_SHA/llvm/utils/git/requirements.txt
+          curl -O -L https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/"$GITHUB_SHA"/llvm/utils/git/github-automation.py
+          curl -O -L https://raw.githubusercontent.com/"$GITHUB_REPOSITORY"/"$GITHUB_SHA"/llvm/utils/git/requirements.txt
           chmod a+x github-automation.py
           pip install -r requirements.txt
 

.github/workflows/libclang-abi-tests.yml

@@ -6,14 +6,12 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:
       - 'clang/**'
       - '.github/workflows/libclang-abi-tests.yml'
   pull_request:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -41,7 +39,7 @@ jobs:
       LLVM_VERSION_PATCH: ${{ steps.version.outputs.LLVM_VERSION_PATCH }}
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 250
 
@@ -52,32 +50,35 @@ jobs:
       - name: Setup Variables
         id: vars
         run: |
-          minor_version=0
           remote_repo='https://github.com/llvm/llvm-project'
-          if [ ${{ steps.version.outputs.LLVM_VERSION_MINOR }} -ne 0 -o ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
+          if [ ${{ steps.version.outputs.LLVM_VERSION_MINOR }} -ne 0 ] || [ ${{ steps.version.outputs.LLVM_VERSION_PATCH }} -eq 0 ]; then
             major_version=$(( ${{ steps.version.outputs.LLVM_VERSION_MAJOR }} - 1))
             baseline_ref="llvmorg-$major_version.0.0"
 
             # If there is a minor release, we want to use that as the base line.
-            minor_ref=$(git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true)
+            minor_ref=$(git ls-remote --refs -t "$remote_repo" llvmorg-"$major_version".[1-9].[0-9] | tail -n1 | grep -o 'llvmorg-.\+' || true)
             if [ -n "$minor_ref" ]; then
-               baseline_ref=$minor_ref
+               baseline_ref="$minor_ref"
             else
               # Check if we have a release candidate
-              rc_ref=$(git ls-remote --refs -t $remote_repo llvmorg-$major_version.[1-9].[0-9]-rc* | tail -n1 | grep -o 'llvmorg-.\+' || true)
+              rc_ref=$(git ls-remote --refs -t "$remote_repo" llvmorg-"$major_version".[1-9].[0-9]-rc* | tail -n1 | grep -o 'llvmorg-.\+' || true)
               if [ -n "$rc_ref" ]; then
-                baseline_ref=$rc_ref
+                baseline_ref="$rc_ref"
               fi
             fi
-            echo "BASELINE_VERSION_MAJOR=$major_version" >> $GITHUB_OUTPUT
-            echo "BASELINE_REF=$baseline_ref" >> $GITHUB_OUTPUT
-            echo "ABI_HEADERS=clang-c" >> $GITHUB_OUTPUT
-            echo "ABI_LIBS=libclang.so" >> $GITHUB_OUTPUT
+            {
+              echo "BASELINE_VERSION_MAJOR=$major_version"
+              echo "BASELINE_REF=$baseline_ref"
+              echo "ABI_HEADERS=clang-c"
+              echo "ABI_LIBS=libclang.so"
+            } >> "$GITHUB_OUTPUT"
           else
-            echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}" >> $GITHUB_OUTPUT
-            echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0" >> $GITHUB_OUTPUT
-            echo "ABI_HEADERS=." >> $GITHUB_OUTPUT
-            echo "ABI_LIBS=libclang.so libclang-cpp.so" >> $GITHUB_OUTPUT
+            {
+              echo "BASELINE_VERSION_MAJOR=${{ steps.version.outputs.LLVM_VERSION_MAJOR }}"
+              echo "BASELINE_REF=llvmorg-${{ steps.version.outputs.LLVM_VERSION_MAJOR }}.0.0"
+              echo "ABI_HEADERS=."
+              echo "ABI_LIBS=libclang.so libclang-cpp.so"
+            } >> "$GITHUB_OUTPUT"
           fi
 
   abi-dump:
@@ -119,7 +120,7 @@ jobs:
       - name: Configure
         run: |
           mkdir install
-          cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX=$(pwd)/install llvm
+          cmake -B build -S llvm -G Ninja -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Debug -DLLVM_TARGETS_TO_BUILD="" -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_C_FLAGS_DEBUG="-g1 -Og" -DCMAKE_CXX_FLAGS_DEBUG="-g1 -Og" -DCMAKE_INSTALL_PREFIX="$(pwd)"/install llvm
       - name: Build
         run: ninja -C build/ ${{ needs.abi-dump-setup.outputs.ABI_LIBS }} install-clang-headers
       - name: Dump ABI

.github/workflows/libclc-tests.yml

@@ -6,7 +6,6 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -16,7 +15,6 @@ on:
       - '!clang/**'
       - '!llvm/**'
   pull_request:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:

.github/workflows/lld-tests.yml

@@ -6,7 +6,6 @@ permissions:
 on:
   workflow_dispatch:
   push:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths:
@@ -15,7 +14,6 @@ on:
       - '.github/workflows/llvm-project-tests.yml'
       - '!llvm/**'
   pull_request:
-    ignore-forks: true
     branches:
       - 'release/**'
     paths: