Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown

Author: jsji

.github/CODEOWNERS

@@ -36,10 +36,8 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
 # Unified Runtime
 unified-runtime/ @intel/unified-runtime-reviewers
-# TODO: Use specific UR Level Zero adapter team
-unified-runtime/*/adapters/level_zero/ @intel/unified-runtime-reviewers
-# TODO: Use specific UR OpenCL adapter team
-unified-runtime/*/adapters/opencl/ @intel/unified-runtime-reviewers
+unified-runtime/*/adapters/level_zero/ @intel/unified-runtime-reviewers-level-zero
+unified-runtime/*/adapters/opencl/ @intel/unified-runtime-reviewers-opencl
 unified-runtime/*/adapters/cuda/  @intel/llvm-reviewers-cuda
 unified-runtime/*/adapters/hip/  @intel/llvm-reviewers-cuda
 unified-runtime/*/adapters/native_cpu/ @intel/dpcpp-nativecpu-reviewers

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

@@ -82,6 +82,8 @@ jobs:
             ur:
               - 'unified-runtime/**'
               - .github/workflows/ur-*
+            ur_cuda_adapter:
+              - 'unified-runtime/source/adapters/cuda/**'
 
       - name: Set output
         id: result
@@ -92,7 +94,7 @@ jobs:
               return '${{ steps.changes.outputs.changes }}';
             }
             // Treat everything as changed for huge PRs.
-            return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur"];
+            return ["llvm", "llvm_spirv", "clang", "sycl_jit", "xptifw", "libclc", "sycl", "ci", "esimd", "ur", "ur_cuda_adapter"];
 
       - run: echo '${{ steps.result.outputs.result }}'
 

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

@@ -46,7 +46,10 @@ on:
         default: 3
       e2e_binaries_artifact:
         type: string
-        required: False
+        required: false
+      pack_release:
+        type: string
+        required: false
 
     outputs:
       build_conclusion:
@@ -100,6 +103,10 @@ on:
         options:
           - 3
 
+      pack_release:
+        type: string
+        required: false
+
 permissions: read-all
 
 jobs:
@@ -215,11 +222,26 @@ jobs:
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         LIT_OPTS="--allow-empty-runs" LIT_FILTER="e2e_test_requirements" cmake --build $GITHUB_WORKSPACE/build --target check-sycl
-    - name: Install
+    - name: Install sycl-toolchain
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
-      # TODO replace utility installation with a single CMake target
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain
+
+    - name: Pack toolchain release
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
+      run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/build/install .
+    - name: Upload toolchain release
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && inputs.pack_release == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: sycl_linux_release
+        path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
+        retention-days: ${{ inputs.retention-days }}
+
+    - name: Install utilities
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
+      # TODO replace utility installation with a single CMake target
+      run: |
         cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install
         cmake --build $GITHUB_WORKSPACE/build --target utils/count/install
         cmake --build $GITHUB_WORKSPACE/build --target utils/not/install

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

@@ -25,6 +25,11 @@ on:
     - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
+    - 'unified-runtime/examples/**'
+    - 'unified-runtime/scripts/**'
+    - 'unified-runtime/test/**'
+    - 'unified-runtime/third_party/**'
+    - 'unified-runtime/tools/**'
 
 concurrency:
   #  Cancel a currently running workflow from the same PR, branch or tag.
@@ -53,6 +58,22 @@ jobs:
       changes: ${{ needs.detect_changes.outputs.filters }}
       e2e_binaries_artifact: sycl_e2e_bin_default
 
+  # If a PR changes CUDA adapter, run the build on Ubuntu 22.04 as well.
+  # Ubuntu 22.04 container has CUDA 12.1 installed while Ubuntu 24.0 image
+  # has CUDA 12.6.1 installed.
+  # The idea is to ensure that the code works with both CUDA versions.
+  build_ubuntu2204:
+    needs: [detect_changes]
+    if: always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur_cuda_adapter')
+    uses: ./.github/workflows/sycl-linux-build.yml
+    with:
+      build_ref: ${{ github.sha }}
+      build_cache_root: "/__w/"
+      build_artifact_suffix: "default"
+      build_cache_suffix: "default"
+      build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
+      changes: ${{ needs.detect_changes.outputs.filters }}
+
   run_prebuilt_e2e_tests:
     needs: [build, detect_changes]
     if: ${{ always() && !cancelled() && needs.build.outputs.build_conclusion == 'success' }}

.github/workflows/sycl-rel-nightly.yml

@@ -214,7 +214,7 @@ jobs:
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
-      repo_ref: ${{ github.sha }}
+      repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0'  }}
       devops_ref: sycl
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

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

@@ -24,6 +24,11 @@ on:
     - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
+    - 'unified-runtime/examples/**'
+    - 'unified-runtime/scripts/**'
+    - 'unified-runtime/test/**'
+    - 'unified-runtime/third_party/**'
+    - 'unified-runtime/tools/**'
 
 permissions: read-all
 

devops/scripts/benchmarks/options.py

@@ -40,7 +40,7 @@ class Options:
     build_compute_runtime: bool = False
     extra_ld_libraries: list[str] = field(default_factory=list)
     extra_env_vars: dict = field(default_factory=dict)
-    compute_runtime_tag: str = "25.05.32567.18"
+    compute_runtime_tag: str = "25.09.32961.7"
     build_igc: bool = False
     current_run_name: str = "This PR"
     preset: str = "Full"

sycl/include/sycl/detail/type_traits.hpp

@@ -24,10 +24,6 @@ template <class T> struct is_fixed_size_group : std::false_type {};
 
 template <class T>
 inline constexpr bool is_fixed_size_group_v = is_fixed_size_group<T>::value;
-
-template <typename VecT, typename OperationLeftT, typename OperationRightT,
-          template <typename> class OperationCurrentT, int... Indexes>
-class SwizzleOp;
 } // namespace detail
 
 template <int Dimensions> class group;
@@ -154,12 +150,20 @@ template <typename T, size_t N> struct get_elem_type_unqual<marray<T, N>> {
 template <typename T, int N> struct get_elem_type_unqual<vec<T, N>> {
   using type = T;
 };
+#if __SYCL_USE_LIBSYCL8_VEC_IMPL
 template <typename VecT, typename OperationLeftT, typename OperationRightT,
           template <typename> class OperationCurrentT, int... Indexes>
 struct get_elem_type_unqual<SwizzleOp<VecT, OperationLeftT, OperationRightT,
                                OperationCurrentT, Indexes...>> {
   using type = typename get_elem_type_unqual<std::remove_cv_t<VecT>>::type;
 };
+#else
+template <bool IsConstVec, typename DataT, int VecSize, int... Indexes>
+struct get_elem_type_unqual<detail::hide_swizzle_from_adl::Swizzle<
+    IsConstVec, DataT, VecSize, Indexes...>> {
+  using type = DataT;
+};
+#endif
 
 template <typename ElementType, access::address_space Space,
           access::decorated DecorateAddress>

sycl/include/sycl/detail/type_traits/vec_marray_traits.hpp

@@ -32,22 +32,37 @@ template <typename DataT, int NumElements> class __SYCL_EBO vec;
 template <typename DataT, std::size_t N> class marray;
 
 namespace detail {
+#if __SYCL_USE_LIBSYCL8_VEC_IMPL
 template <typename VecT, typename OperationLeftT, typename OperationRightT,
           template <typename> class OperationCurrentT, int... Indexes>
 class SwizzleOp;
+#else
+namespace hide_swizzle_from_adl {
+template <bool IsConstVec, typename DataT, int VecSize, int... Indexes>
+class __SYCL_EBO Swizzle;
+}
+#endif
 
 // Utility for converting a swizzle to a vector or preserve the type if it isn't
 // a swizzle.
 template <typename T> struct simplify_if_swizzle {
   using type = T;
 };
 
+#if __SYCL_USE_LIBSYCL8_VEC_IMPL
 template <typename VecT, typename OperationLeftT, typename OperationRightT,
           template <typename> class OperationCurrentT, int... Indexes>
 struct simplify_if_swizzle<SwizzleOp<VecT, OperationLeftT, OperationRightT,
                                      OperationCurrentT, Indexes...>> {
   using type = vec<typename VecT::element_type, sizeof...(Indexes)>;
 };
+#else
+template <bool IsConstVec, typename DataT, int VecSize, int... Indexes>
+struct simplify_if_swizzle<detail::hide_swizzle_from_adl::Swizzle<
+    IsConstVec, DataT, VecSize, Indexes...>> {
+  using type = vec<DataT, sizeof...(Indexes)>;
+};
+#endif
 
 template <typename T>
 using simplify_if_swizzle_t = typename simplify_if_swizzle<T>::type;
@@ -79,10 +94,17 @@ inline constexpr bool is_valid_type_for_ext_vector_v =
     is_valid_type_for_ext_vector<T>::value;
 
 template <typename> struct is_swizzle : std::false_type {};
+#if __SYCL_USE_LIBSYCL8_VEC_IMPL
 template <typename VecT, typename OperationLeftT, typename OperationRightT,
           template <typename> class OperationCurrentT, int... Indexes>
 struct is_swizzle<SwizzleOp<VecT, OperationLeftT, OperationRightT,
                             OperationCurrentT, Indexes...>> : std::true_type {};
+#else
+template <bool IsConstVec, typename DataT, int VecSize, int... Indexes>
+struct is_swizzle<detail::hide_swizzle_from_adl::Swizzle<IsConstVec, DataT,
+                                                         VecSize, Indexes...>>
+    : std::true_type {};
+#endif
 template <typename T> constexpr bool is_swizzle_v = is_swizzle<T>::value;
 
 template <typename T>
@@ -108,11 +130,18 @@ struct num_elements<T __attribute__((ext_vector_type(N)))>
     : std::integral_constant<std::size_t, N> {};
 #endif
 #endif
+#if __SYCL_USE_LIBSYCL8_VEC_IMPL
 template <typename VecT, typename OperationLeftT, typename OperationRightT,
           template <typename> class OperationCurrentT, int... Indexes>
 struct num_elements<SwizzleOp<VecT, OperationLeftT, OperationRightT,
                               OperationCurrentT, Indexes...>>
     : std::integral_constant<std::size_t, sizeof...(Indexes)> {};
+#else
+template <bool IsConstVec, typename DataT, int VecSize, int... Indexes>
+struct num_elements<detail::hide_swizzle_from_adl::Swizzle<IsConstVec, DataT,
+                                                           VecSize, Indexes...>>
+    : std::integral_constant<std::size_t, sizeof...(Indexes)> {};
+#endif
 
 template <typename T>
 inline constexpr std::size_t num_elements_v = num_elements<T>::value;