Merge branch 'sycl' into run-device-global-hip

Author: hdelan

.ci/monolithic-linux.sh

@@ -45,7 +45,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml" \
+      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
       -D LLVM_ENABLE_LLD=ON \
       -D CMAKE_CXX_FLAGS=-gmlt \
       -D BOLT_CLANG_EXE=/usr/bin/clang \

.ci/monolithic-windows.sh

@@ -45,7 +45,7 @@ cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml" \
+      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --timeout=1200 --time-tests" \
       -D COMPILER_RT_BUILD_ORC=OFF \
       -D CMAKE_C_COMPILER_LAUNCHER=sccache \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \

.git-blame-ignore-revs

@@ -70,3 +70,6 @@ f6d557ee34b6bbdb1dc32f29e34b4a4a8ad35e81
 
 # [libc++] Replace uses of _VSTD:: by std:: (#74331)
 77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c
+
+# [libc++] Format the code base (#74334)
+9783f28cbb155e4a8d49c12e1c60ce14dcfaf0c7

.gitattributes

@@ -1 +1,143 @@
 .github/CODEOWNERS merge=ours
+libcxx/src/**/*.cpp     merge=libcxx-reformat
+libcxx/include/**/*.h   merge=libcxx-reformat
+
+# Explicitly handle files with no extension
+libcxx/include/__availability               merge=libcxx-reformat
+libcxx/include/__bit_reference              merge=libcxx-reformat
+libcxx/include/__config                     merge=libcxx-reformat
+libcxx/include/__hash_table                 merge=libcxx-reformat
+libcxx/include/__locale                     merge=libcxx-reformat
+libcxx/include/__node_handle                merge=libcxx-reformat
+libcxx/include/__split_buffer               merge=libcxx-reformat
+libcxx/include/__std_clang_module           merge=libcxx-reformat
+libcxx/include/__threading_support          merge=libcxx-reformat
+libcxx/include/__tree                       merge=libcxx-reformat
+libcxx/include/__verbose_abort              merge=libcxx-reformat
+libcxx/include/algorithm                    merge=libcxx-reformat
+libcxx/include/any                          merge=libcxx-reformat
+libcxx/include/array                        merge=libcxx-reformat
+libcxx/include/atomic                       merge=libcxx-reformat
+libcxx/include/barrier                      merge=libcxx-reformat
+libcxx/include/bit                          merge=libcxx-reformat
+libcxx/include/bitset                       merge=libcxx-reformat
+libcxx/include/cassert                      merge=libcxx-reformat
+libcxx/include/ccomplex                     merge=libcxx-reformat
+libcxx/include/cctype                       merge=libcxx-reformat
+libcxx/include/cerrno                       merge=libcxx-reformat
+libcxx/include/cfenv                        merge=libcxx-reformat
+libcxx/include/cfloat                       merge=libcxx-reformat
+libcxx/include/charconv                     merge=libcxx-reformat
+libcxx/include/chrono                       merge=libcxx-reformat
+libcxx/include/cinttypes                    merge=libcxx-reformat
+libcxx/include/ciso646                      merge=libcxx-reformat
+libcxx/include/climits                      merge=libcxx-reformat
+libcxx/include/clocale                      merge=libcxx-reformat
+libcxx/include/cmath                        merge=libcxx-reformat
+libcxx/include/codecvt                      merge=libcxx-reformat
+libcxx/include/compare                      merge=libcxx-reformat
+libcxx/include/complex                      merge=libcxx-reformat
+libcxx/include/concepts                     merge=libcxx-reformat
+libcxx/include/condition_variable           merge=libcxx-reformat
+libcxx/include/coroutine                    merge=libcxx-reformat
+libcxx/include/csetjmp                      merge=libcxx-reformat
+libcxx/include/csignal                      merge=libcxx-reformat
+libcxx/include/cstdarg                      merge=libcxx-reformat
+libcxx/include/cstdbool                     merge=libcxx-reformat
+libcxx/include/cstddef                      merge=libcxx-reformat
+libcxx/include/cstdint                      merge=libcxx-reformat
+libcxx/include/cstdio                       merge=libcxx-reformat
+libcxx/include/cstdlib                      merge=libcxx-reformat
+libcxx/include/cstring                      merge=libcxx-reformat
+libcxx/include/ctgmath                      merge=libcxx-reformat
+libcxx/include/ctime                        merge=libcxx-reformat
+libcxx/include/cuchar                       merge=libcxx-reformat
+libcxx/include/cwchar                       merge=libcxx-reformat
+libcxx/include/cwctype                      merge=libcxx-reformat
+libcxx/include/deque                        merge=libcxx-reformat
+libcxx/include/exception                    merge=libcxx-reformat
+libcxx/include/execution                    merge=libcxx-reformat
+libcxx/include/expected                     merge=libcxx-reformat
+libcxx/include/experimental/__config        merge=libcxx-reformat
+libcxx/include/experimental/__memory        merge=libcxx-reformat
+libcxx/include/experimental/deque           merge=libcxx-reformat
+libcxx/include/experimental/forward_list    merge=libcxx-reformat
+libcxx/include/experimental/iterator        merge=libcxx-reformat
+libcxx/include/experimental/list            merge=libcxx-reformat
+libcxx/include/experimental/map             merge=libcxx-reformat
+libcxx/include/experimental/memory          merge=libcxx-reformat
+libcxx/include/experimental/memory_resource merge=libcxx-reformat
+libcxx/include/experimental/propagate_const merge=libcxx-reformat
+libcxx/include/experimental/regex           merge=libcxx-reformat
+libcxx/include/experimental/set             merge=libcxx-reformat
+libcxx/include/experimental/simd            merge=libcxx-reformat
+libcxx/include/experimental/string          merge=libcxx-reformat
+libcxx/include/experimental/type_traits     merge=libcxx-reformat
+libcxx/include/experimental/unordered_map   merge=libcxx-reformat
+libcxx/include/experimental/unordered_set   merge=libcxx-reformat
+libcxx/include/experimental/utility         merge=libcxx-reformat
+libcxx/include/experimental/vector          merge=libcxx-reformat
+libcxx/include/ext/__hash                   merge=libcxx-reformat
+libcxx/include/ext/hash_map                 merge=libcxx-reformat
+libcxx/include/ext/hash_set                 merge=libcxx-reformat
+libcxx/include/filesystem                   merge=libcxx-reformat
+libcxx/include/format                       merge=libcxx-reformat
+libcxx/include/forward_list                 merge=libcxx-reformat
+libcxx/include/fstream                      merge=libcxx-reformat
+libcxx/include/functional                   merge=libcxx-reformat
+libcxx/include/future                       merge=libcxx-reformat
+libcxx/include/initializer_list             merge=libcxx-reformat
+libcxx/include/iomanip                      merge=libcxx-reformat
+libcxx/include/ios                          merge=libcxx-reformat
+libcxx/include/iosfwd                       merge=libcxx-reformat
+libcxx/include/iostream                     merge=libcxx-reformat
+libcxx/include/istream                      merge=libcxx-reformat
+libcxx/include/iterator                     merge=libcxx-reformat
+libcxx/include/latch                        merge=libcxx-reformat
+libcxx/include/limits                       merge=libcxx-reformat
+libcxx/include/list                         merge=libcxx-reformat
+libcxx/include/locale                       merge=libcxx-reformat
+libcxx/include/map                          merge=libcxx-reformat
+libcxx/include/mdspan                       merge=libcxx-reformat
+libcxx/include/memory                       merge=libcxx-reformat
+libcxx/include/memory_resource              merge=libcxx-reformat
+libcxx/include/mutex                        merge=libcxx-reformat
+libcxx/include/new                          merge=libcxx-reformat
+libcxx/include/numbers                      merge=libcxx-reformat
+libcxx/include/numeric                      merge=libcxx-reformat
+libcxx/include/optional                     merge=libcxx-reformat
+libcxx/include/ostream                      merge=libcxx-reformat
+libcxx/include/print                        merge=libcxx-reformat
+libcxx/include/queue                        merge=libcxx-reformat
+libcxx/include/random                       merge=libcxx-reformat
+libcxx/include/ranges                       merge=libcxx-reformat
+libcxx/include/ratio                        merge=libcxx-reformat
+libcxx/include/regex                        merge=libcxx-reformat
+libcxx/include/scoped_allocator             merge=libcxx-reformat
+libcxx/include/semaphore                    merge=libcxx-reformat
+libcxx/include/set                          merge=libcxx-reformat
+libcxx/include/shared_mutex                 merge=libcxx-reformat
+libcxx/include/source_location              merge=libcxx-reformat
+libcxx/include/span                         merge=libcxx-reformat
+libcxx/include/sstream                      merge=libcxx-reformat
+libcxx/include/stack                        merge=libcxx-reformat
+libcxx/include/stdexcept                    merge=libcxx-reformat
+libcxx/include/stop_token                   merge=libcxx-reformat
+libcxx/include/streambuf                    merge=libcxx-reformat
+libcxx/include/string                       merge=libcxx-reformat
+libcxx/include/string_view                  merge=libcxx-reformat
+libcxx/include/strstream                    merge=libcxx-reformat
+libcxx/include/syncstream                   merge=libcxx-reformat
+libcxx/include/system_error                 merge=libcxx-reformat
+libcxx/include/thread                       merge=libcxx-reformat
+libcxx/include/tuple                        merge=libcxx-reformat
+libcxx/include/type_traits                  merge=libcxx-reformat
+libcxx/include/typeindex                    merge=libcxx-reformat
+libcxx/include/typeinfo                     merge=libcxx-reformat
+libcxx/include/unordered_map                merge=libcxx-reformat
+libcxx/include/unordered_set                merge=libcxx-reformat
+libcxx/include/utility                      merge=libcxx-reformat
+libcxx/include/valarray                     merge=libcxx-reformat
+libcxx/include/variant                      merge=libcxx-reformat
+libcxx/include/vector                       merge=libcxx-reformat
+libcxx/include/version                      merge=libcxx-reformat

.github/workflows/README.md

@@ -1 +1 @@
-Github action workflows should be stored in this directrory.
+Github action workflows should be stored in this directory.

.github/workflows/build-ci-container.yml

@@ -0,0 +1,60 @@
+
+name: Build CI Container
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/build-ci-container.yml
+      - '.github/workflows/containers/github-action-ci/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .github/workflows/build-ci-container.yml
+      - '.github/workflows/containers/github-action-ci/**'
+
+jobs:
+  build-ci-container:
+    if: github.repository_owner == 'llvm'
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Write Variables
+        id: vars
+        run: |
+          tag=`date +%s`
+          container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/ci-ubuntu-22.04"
+          echo "container-name=$container_name" >> $GITHUB_OUTPUT
+          echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
+
+      - name: Checkout LLVM
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/workflows/containers/github-action-ci/
+
+      - name: Build Container
+        working-directory: ./.github/workflows/containers/github-action-ci/
+        run: |
+          podman build -t ${{ steps.vars.outputs.container-name-tag }} .
+          podman tag ${{ steps.vars.outputs.container-name-tag }} ${{ steps.vars.outputs.container-name }}:latest
+
+      - name: Test Container
+        run: |
+          for image in ${{ steps.vars.outputs.container-name-tag }} ${{  steps.vars.outputs.container-name }}; do
+            podman run --rm -it $image /usr/bin/bash -x -c 'printf '\''#include <iostream>\nint main(int argc, char **argv) { std::cout << "Hello\\n"; }'\'' | clang++ -x c++ - && ./a.out | grep Hello'
+          done
+
+      - name: Push Container
+        if: github.event_name == 'push'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          podman login -u ${{ github.actor }} -p $GITHUB_TOKEN ghcr.io
+          podman push ${{ steps.vars.outputs.container-name-tag }}
+          podman push ${{ steps.vars.outputs.container-name }}:latest

.github/workflows/containers/github-action-ci/Dockerfile

@@ -0,0 +1,48 @@
+FROM docker.io/library/ubuntu:22.04 as base
+ENV LLVM_SYSROOT=/opt/llvm/
+
+FROM base as toolchain
+ENV LLVM_MAJOR=17
+ENV LLVM_VERSION=${LLVM_MAJOR}.0.6
+ENV LLVM_DIRNAME=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-22.04
+ENV LLVM_FILENAME=${LLVM_DIRNAME}.tar.xz
+
+RUN apt-get update && \
+    apt-get install -y \
+    curl \
+    xz-utils
+
+RUN mkdir -p $LLVM_SYSROOT/bin/ $LLVM_SYSROOT/lib/
+
+RUN curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/$LLVM_FILENAME
+
+RUN tar -C $LLVM_SYSROOT --strip-components=1 -xJf $LLVM_FILENAME \
+    $LLVM_DIRNAME/bin/clang \
+    $LLVM_DIRNAME/bin/clang++ \
+    $LLVM_DIRNAME/bin/clang-cl \
+    $LLVM_DIRNAME/bin/clang-$LLVM_MAJOR \
+    $LLVM_DIRNAME/bin/lld \
+    $LLVM_DIRNAME/bin/ld.lld \
+    $LLVM_DIRNAME/lib/clang/
+
+
+FROM base
+
+COPY --from=toolchain $LLVM_SYSROOT $LLVM_SYSROOT
+
+# Need to install curl for hendrikmuhs/ccache-action
+# Need nodejs for some of the GitHub actions.
+# Need perl-modules for clang analyzer tests.
+RUN apt-get update && \
+    apt-get install -y \
+    binutils \
+    cmake \
+    curl \
+    libstdc++-11-dev \
+    ninja-build \
+    nodejs \
+    perl-modules \
+    python3-psutil
+
+ENV LLVM_SYSROOT=$LLVM_SYSROOT
+ENV PATH=${LLVM_SYSROOT}/bin:${PATH}

.github/workflows/docs.yml

@@ -63,7 +63,7 @@ jobs:
           fetch-depth: 1
       - name: Get subprojects that have doc changes
         id: docs-changed-subprojects
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v41
         with:
           files_yaml: |
             llvm:
@@ -167,4 +167,3 @@ jobs:
         run: |
           cmake -B flang-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;mlir;flang" -DLLVM_ENABLE_SPHINX=ON -DSPHINX_WARNINGS_AS_ERRORS=OFF ./llvm
           TZ=UTC ninja -C flang-build docs-flang-html docs-flang-man
-

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

@@ -0,0 +1,39 @@
+name: Libclang Python Binding Tests
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'clang/bindings/python/**'
+      - 'clang/tools/libclang/**'
+      - 'clang/CMakeList.txt'
+      - '.github/workflows/libclang-python-tests.yml'
+      - '.github/workflows/llvm-project-tests.yml'
+  pull_request:
+    paths:
+      - 'clang/bindings/python/**'
+      - 'clang/tools/libclang/**'
+      - 'clang/CMakeList.txt'
+      - '.github/workflows/libclang-python-tests.yml'
+      - '.github/workflows/llvm-project-tests.yml'
+
+concurrency:
+  # Skip intermediate builds: always.
+  # Cancel intermediate builds: only if it is a pull request build.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  check-clang-python:
+    # Build libclang and then run the libclang Python binding's unit tests.
+    name: Build and run Python unit tests
+    uses: ./.github/workflows/llvm-project-tests.yml
+    with:
+      build_target: check-clang-python
+      projects: clang
+      # There is an issue running on "windows-2019".
+      # See https://github.com/llvm/llvm-project/issues/76601#issuecomment-1873049082.
+      os_list: '["ubuntu-latest"]'

.github/workflows/libcxx-build-and-test.yaml

@@ -161,6 +161,7 @@ jobs:
           'generic-no-unicode',
           'generic-no-wide-characters',
           'generic-no-rtti',
+          'generic-optimized-speed',
           'generic-static',
           'generic-with_llvm_unwinder',
           # TODO Find a better place for the benchmark and bootstrapping builds to live. They're either very expensive
@@ -185,7 +186,7 @@ jobs:
           std_modules: 'OFF'
         # Use a larger machine for MSAN to avoid timeout and memory allocation issues.
         - config: 'generic-msan'
-          machine: libcxx-runners-32-set
+          machine: libcxx-runners-8-set
           std_modules: 'OFF'
     runs-on: ${{ matrix.machine }}
     steps:
@@ -207,4 +208,3 @@ jobs:
             **/CMakeError.log
             **/CMakeOutput.log
             **/crash_diagnostics/*
-  

.github/workflows/llvm-project-tests.yml

@@ -87,7 +87,7 @@ jobs:
           # enough cache space for all the tests to run at once and still
           # fit under the 10 GB limit.
           max-size: 500M
-          key: sccache-${{ matrix.os }}
+          key: ${{ matrix.os }}
           variant: sccache
       - name: Build and Test
         uses: llvm/actions/build-test-llvm-project@main

.github/workflows/pr-code-format.yml

@@ -6,7 +6,7 @@ permissions:
 jobs:
   code_formatter:
     runs-on: ubuntu-latest
-    if: github.repository == 'llvm/llvm-project' || github.repository == 'intel/llvm'
+    if: (github.repository == 'llvm/llvm-project' || github.repository == 'intel/llvm') && !contains(github.event.pull_request.labels.*.name, 'disable-lint')
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v39
+        uses: tj-actions/changed-files@v41
         with:
           separator: ","
           skip_initial_fetch: true