Merge from 'sycl' to 'sycl-web' (2 commits)

  CONFLICT (content): Merge conflict in libclc/cmake/modules/AddLibclc.cmake

Author: iclsrc

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

@@ -1,5 +1,9 @@
 name: Reusable SYCL Linux build workflow
 
+defaults:
+  run:
+    shell: bash
+
 on:
   workflow_call:
     inputs:
@@ -185,12 +189,21 @@ jobs:
     - 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')
@@ -280,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' }}

libclc/cmake/modules/AddLibclc.cmake

@@ -467,7 +467,11 @@ function(add_libclc_builtin_set)
           --char-signedness=${signedness}
           --input-ir=${libclc_builtins_lib}
           ${dummy_in}
+<<<<<<< HEAD
           DEPENDS ${libclc_builtins_lib} ${libclc-remangler_target} ${dummy_in})
+=======
+          DEPENDS prepare-${obj_suffix} ${builtins_lib} ${libclc-remangler_target} ${dummy_in})
+>>>>>>> c5e4215967b550536f92bcd72aded469ed92f2c7
         add_custom_target( "remangled-${long_width}-${signedness}_char.${obj_suffix_mangled}" ALL
           DEPENDS "${builtins_remangle_path}" "${dummy_in}")
         set_target_properties("remangled-${long_width}-${signedness}_char.${obj_suffix_mangled}"

sycl/unittests/misc/CMakeLists.txt

@@ -1,8 +1,11 @@
 set(sycl_lib_dir $<TARGET_FILE_DIR:sycl>)
 add_definitions(-DSYCL_LIB_DIR="${sycl_lib_dir}")
+# https://github.com/intel/llvm/issues/19626
+if(NOT LLVM_LIBCXX_USED)
 add_sycl_unittest(MiscTests SHARED
   CircularBuffer.cpp
   OsUtils.cpp
   PropertyUtils.cpp
 )
+endif()
 add_subdirectory(LinkGraph)