Merge branch 'sycl' into fabio/graph_micro_optimizations

Author: reble

.github/workflows/coverity.yml

@@ -46,8 +46,7 @@ jobs:
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
           -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
           --ci-defaults --hip --cuda \
-          -DNATIVECPU_USE_OCK=Off \
-          -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
+          -DNATIVECPU_USE_OCK=Off
 
     - name: Build with coverity
       run: $GITHUB_WORKSPACE/cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build $GITHUB_WORKSPACE/build --target sycl-toolchain

.github/workflows/sycl-detect-changes.yml

@@ -54,6 +54,7 @@ jobs:
               - *libclc
               - 'sycl/*'
               - 'sycl/!(test-e2e|doc)/**'
+              - 'libdevice/**'
             ci:
               - .github/workflows/**
               # devops/* contains config files, including drivers versions.

.github/workflows/sycl-linux-build.yml

@@ -1,5 +1,9 @@
 name: Reusable SYCL Linux build workflow
 
+defaults:
+  run:
+    shell: bash
+
 on:
   workflow_call:
     inputs:
@@ -42,7 +46,7 @@ on:
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
-        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
         required: false
       retention-days:
         description: 'Artifacts retention period'
@@ -70,7 +74,7 @@ on:
         type: choice
         options:
           - "[]"
-          - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+          - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
       build_image:
         type: choice
         options:
@@ -177,21 +181,29 @@ jobs:
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DLLVM_INSTALL_UTILS=ON \
-          -DNATIVECPU_USE_OCK=Off \
-          -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
+          -DNATIVECPU_USE_OCK=Off
     - name: Compile
       id: build
       # Emulate default value for manual dispatch as we've run out of available arguments.
       run: cmake --build $GITHUB_WORKSPACE/build --target ${{ inputs.build_target || 'sycl-toolchain' }}
     - name: check-llvm
       if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
+        if [[ "${{ inputs.build_configure_extra_args }}" == *"--use-libcxx"* ]]; then
+          # https://github.com/llvm/llvm-project/issues/59429
+          export LIT_FILTER_OUT="ExecutionEngine/MCJIT"
+        fi
+
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm
     - name: check-clang
       if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         # Can we move this to Dockerfile? Hopefully, noop on Windows.
         export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
+        if [[ "${{ inputs.build_configure_extra_args }}" == *"--use-libcxx"* ]]; then
+          # https://github.com/llvm/llvm-project/issues/59428
+          export LIT_FILTER_OUT="(E|e)xception"
+        fi
         cmake --build $GITHUB_WORKSPACE/build --target check-clang
     - name: check-sycl
       if: always() && !cancelled() && contains(inputs.changes, 'sycl')
@@ -218,7 +230,7 @@ jobs:
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libclc
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
     - name: Check E2E test requirements
@@ -281,7 +293,6 @@ jobs:
 
     - name: Source OneAPI TBB vars.sh
       if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}
-      shell: bash
       run: |
         # https://github.com/actions/runner/issues/1964 prevents us from using
         # the ENTRYPOINT in the image.

.github/workflows/sycl-nightly.yml

@@ -51,6 +51,20 @@ jobs:
 
       artifact_archive_name: sycl_linux_oneapi.tar.zst
 
+  ubuntu2404_libcxx_build:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl-linux-build.yml
+    secrets: inherit
+    with:
+      build_cache_root: "/__w/"
+      build_cache_suffix: libcxx
+      build_artifact_suffix: libcxx
+      build_configure_extra_args: --use-libcxx -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=OFF
+      cc: clang-18
+      cxx: clang++-18
+
+      artifact_archive_name: sycl_linux_libcxx.tar.zst
+
   ubuntu2204_test:
     needs: [ubuntu2204_build]
     if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}

.github/workflows/sycl-rel-container.yaml

@@ -0,0 +1,36 @@
+name: CI sycl-rel container
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - 'devops/actions/build_container/**'
+      - 'devops/containers/release_build.DockerFile'
+      - 'devops/scripts/create-sycl-user.sh'
+      - '.github/workflows/sycl-rel-container.yaml'
+
+permissions: read-all
+
+jobs:
+  build_and_push_images:
+    if: github.repository == 'intel/llvm'
+    name: Build and Push Docker Images
+    runs-on: [Linux, build]
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: devops
+
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: release_build
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/release_build:latest-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/release_build:latest

.github/workflows/sycl-windows-build.yml

@@ -17,7 +17,7 @@ on:
       changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
-        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+        default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
         required: false
       ref:
         type: string
@@ -54,7 +54,7 @@ on:
         options:
           - "[]"
           - '[sycl]'
-          - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
+          - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
       build_cache_suffix:
         type: choice
         options:
@@ -146,8 +146,7 @@ jobs:
           "-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ^
           -DCMAKE_C_COMPILER_LAUNCHER=ccache ^
-          -DLLVM_INSTALL_UTILS=ON ^
-          -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=SPIRV
+          -DLLVM_INSTALL_UTILS=ON
     - name: Build
       id: build
       shell: bash
@@ -180,7 +179,7 @@ jobs:
       run: |
         cmake --build build --target check-xptifw
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         cmake --build build --target check-libdevice
     - name: Generate/diff new ABI symbols

buildbot/configure.py

@@ -46,7 +46,7 @@ def do_configure(args, passthrough_args):
     xptifw_dir = os.path.join(abs_src_dir, "xptifw")
     libdevice_dir = os.path.join(abs_src_dir, "libdevice")
     jit_dir = os.path.join(abs_src_dir, "sycl-jit")
-    llvm_targets_to_build = args.host_target
+    llvm_targets_to_build = args.host_target + ";SPIRV"
     llvm_enable_projects = "clang;" + llvm_external_projects
     libclc_build_native = "OFF"
     libclc_targets_to_build = ""

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -210,11 +210,6 @@ const char *SYCLInstallationDetector::findLibspirvPath(
 void SYCLInstallationDetector::addLibspirvLinkArgs(
     const llvm::Triple &DeviceTriple, const llvm::opt::ArgList &DriverArgs,
     const llvm::Triple &HostTriple, llvm::opt::ArgStringList &CC1Args) const {
-  DriverArgs.claimAllArgs(options::OPT_fno_sycl_libspirv);
-
-  if (D.offloadDeviceOnly())
-    return;
-
   if (DriverArgs.hasArg(options::OPT_fno_sycl_libspirv)) {
     // -fno-sycl-libspirv flag is reserved for very unusual cases where the
     // libspirv library is not linked when required by the device: so output

clang/test/Driver/sycl-libspirv-toolchain.cpp

@@ -21,8 +21,7 @@
 //
 // RUN: %clang -### -fsycl -fsycl-device-only -fsycl-targets=nvptx64-nvidia-cuda -nocudalib %s 2>&1 \
 // RUN: | FileCheck %s --check-prefixes=CHECK-DEVICE-ONLY
-// CHECK-DEVICE-ONLY: "-cc1"{{.*}} "-fsycl-is-device"
-// CHECK-DEVICE-ONLY-NOT: "-mlink-builtin-bitcode" "{{.*}}.libspirv-{{.*}}.bc"
+// CHECK-DEVICE-ONLY: "-cc1"{{.*}} "-fsycl-is-device"{{.*}} "-mlink-builtin-bitcode" "{{.*[\\/]}}remangled-{{.*}}.libspirv-nvptx64-nvidia-cuda.bc"
 //
 // Only link libspirv in SYCL language mode, `-fno-sycl-libspirv` should result in a warning
 // RUN: %clang -### -x cu -fno-sycl-libspirv -nocudainc -nocudalib %s 2>&1 | FileCheck %s --check-prefixes=CHECK-CUDA

clang/test/Driver/sycl-linker-wrapper.cpp

@@ -206,7 +206,7 @@
 // -------
 // Generate .o file as linker wrapper input.
 //
-// RUN: %clang %s -fsycl -fsycl-targets=native_cpu -c --offload-new-driver -o %t6.o
+// RUN: %clang %s -fsycl -fsycl-targets=native_cpu -c --offload-new-driver -fno-sycl-libspirv -o %t6.o
 //
 // RUN: clang-linker-wrapper "--host-triple=x86_64-unknown-linux-gnu" "-sycl-device-library-location=%S/Inputs/native_cpu" "--sycl-post-link-options=SYCL_POST_LINK_OPTIONS" "--linker-path=/usr/bin/ld" "--" HOST_LINKER_FLAGS "-dynamic-linker" HOST_DYN_LIB "-o" "a.out" %t6.o --dry-run 2>&1 | FileCheck -check-prefix=CHK-CMDS-NATIVE-CPU %s
 // CHK-CMDS-NATIVE-CPU: "{{.*}}/spirv-to-ir-wrapper" {{.*}} --llvm-spirv-opts --spirv-preserve-auxdata --spirv-target-env=SPV-IR --spirv-builtin-format=global