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

Author: iclsrc

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

@@ -22,6 +22,7 @@ on:
     - '.github/workflows/sycl-macos-*.yml'
     - '.github/workflows/sycl-nightly.yml'
     - '.github/workflows/sycl-rel-nightly.yml'
+    - '.github/workflows/sycl-rel-nightly-launch.yml'
     - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
@@ -120,7 +121,7 @@ jobs:
           - name: Intel Battlemage Graphics
             runner: '["Linux", "bmg"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-            target_devices: level_zero:gpu
+            target_devices: level_zero:gpu;level_zero_v2:gpu
           - name: SPIR-V Backend / Intel Battlemage Graphics
             runner: '["Linux", "bmg"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN

.github/workflows/sycl-nightly.yml

@@ -333,7 +333,7 @@ jobs:
           echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
         fi
     - name: Upload binaries
-      uses: softprops/[email protected].0
+      uses: softprops/[email protected].2
       with:
         files: |
           sycl_linux.tar.gz

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

@@ -4,16 +4,20 @@
 
 name: Scheduled sycl-rel-nightly launch
 
+permissions: read-all
+
 on:
-  schedule:
-    # The sycl-rel-nightly.yml workflow file on the sycl-rel-6_2 branch is most
-    # likely stale. Do not schedule before it's updated.
+  # The sycl-rel-nightly.yml workflow file on the sycl-rel-6_2 branch is most
+  # likely stale. Do not schedule before it's updated.
+  # schedule:
     # - cron: '0 3 * * *'
   workflow_dispatch:
 
 jobs:
   launch:
     if: github.repository == 'intel/llvm'
+    permissions:
+      actions: write
     runs-on: ubuntu-latest
     steps:
       - name: Launch

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

@@ -21,6 +21,7 @@ on:
     - '.github/workflows/sycl-macos-*.yml'
     - '.github/workflows/sycl-nightly.yml'
     - '.github/workflows/sycl-rel-nightly.yml'
+    - '.github/workflows/sycl-rel-nightly-launch.yml'
     - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'

sycl/cmake/modules/FetchEmhash.cmake

@@ -6,6 +6,7 @@ find_file(EMHASH_SYS_LOC "hash_table8.hpp" PATH_SUFFIXES "emhash")
 if(NOT EMHASH_SYS_LOC)
   set(EMHASH_REPO https://github.com/ktprime/emhash)
   message(STATUS "Will fetch emhash from ${EMHASH_REPO}")
+  include(FetchContent)
   FetchContent_Declare(emhash
     GIT_REPOSITORY    ${EMHASH_REPO}
     GIT_TAG           3ba9abdfdc2e0430fcc2fd8993cad31945b6a02b

sycl/include/sycl/detail/info_desc_helpers.hpp

@@ -62,24 +62,6 @@ template <typename T> struct is_backend_info_desc : std::false_type {};
 #include <sycl/info/event_profiling_traits.def>
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-template <typename Param> struct IsSubGroupInfo : std::false_type {};
-template <>
-struct IsSubGroupInfo<info::kernel_device_specific::max_num_sub_groups>
-    : std::true_type {};
-template <>
-struct IsSubGroupInfo<info::kernel_device_specific::compile_num_sub_groups>
-    : std::true_type {};
-template <>
-struct IsSubGroupInfo<info::kernel_device_specific::max_sub_group_size>
-    : std::true_type {};
-template <>
-struct IsSubGroupInfo<info::kernel_device_specific::compile_sub_group_size>
-    : std::true_type {};
-template <typename Param> struct IsKernelInfo : std::false_type {};
-template <>
-struct IsKernelInfo<info::kernel_device_specific::ext_codeplay_num_regs>
-    : std::true_type {};
-
 #define __SYCL_PARAM_TRAITS_SPEC(DescType, Desc, ReturnT, UrCode)              \
   template <>                                                                  \
   struct is_##DescType##_info_desc<info::DescType::Desc> : std::true_type {    \

sycl/include/sycl/detail/string_view.hpp

@@ -27,10 +27,10 @@ class string_view {
 #endif
 
 public:
-  string_view() noexcept = default;
-  string_view(const string_view &strn) noexcept = default;
-  string_view(string_view &&strn) noexcept = default;
-  string_view(std::string_view strn) noexcept
+  constexpr string_view() noexcept = default;
+  constexpr string_view(const string_view &strn) noexcept = default;
+  constexpr string_view(string_view &&strn) noexcept = default;
+  constexpr string_view(std::string_view strn) noexcept
       : str(strn.data())
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
         ,
@@ -47,10 +47,10 @@ class string_view {
   {
   }
 
-  string_view &operator=(string_view &&strn) noexcept = default;
+  constexpr string_view &operator=(string_view &&strn) noexcept = default;
   string_view &operator=(const string_view &strn) noexcept = default;
 
-  string_view &operator=(std::string_view strn) noexcept {
+  constexpr string_view &operator=(std::string_view strn) noexcept {
     str = strn.data();
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
     len = strn.size();
@@ -66,9 +66,9 @@ class string_view {
     return *this;
   }
 
-  const char *data() const noexcept { return str ? str : ""; }
+  constexpr const char *data() const noexcept { return str ? str : ""; }
 
-  explicit operator std::string_view() const noexcept {
+  constexpr explicit operator std::string_view() const noexcept {
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
     return std::string_view(str, len);
 #else
@@ -77,31 +77,39 @@ class string_view {
   }
 
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
-  friend bool operator==(string_view lhs, std::string_view rhs) noexcept {
+  friend constexpr bool operator==(string_view lhs,
+                                   std::string_view rhs) noexcept {
     return rhs == std::string_view(lhs);
   }
-  friend bool operator==(std::string_view lhs, string_view rhs) noexcept {
+  friend constexpr bool operator==(std::string_view lhs,
+                                   string_view rhs) noexcept {
     return lhs == std::string_view(rhs);
   }
 
-  friend bool operator!=(string_view lhs, std::string_view rhs) noexcept {
+  friend constexpr bool operator!=(string_view lhs,
+                                   std::string_view rhs) noexcept {
     return rhs != std::string_view(lhs);
   }
-  friend bool operator!=(std::string_view lhs, string_view rhs) noexcept {
+  friend constexpr bool operator!=(std::string_view lhs,
+                                   string_view rhs) noexcept {
     return lhs != std::string_view(rhs);
   }
 #else
-  friend bool operator==(string_view lhs, std::string_view rhs) noexcept {
+  friend constexpr bool operator==(string_view lhs,
+                                   std::string_view rhs) noexcept {
     return rhs == lhs.data();
   }
-  friend bool operator==(std::string_view lhs, string_view rhs) noexcept {
+  friend constexpr bool operator==(std::string_view lhs,
+                                   string_view rhs) noexcept {
     return lhs == rhs.data();
   }
 
-  friend bool operator!=(string_view lhs, std::string_view rhs) noexcept {
+  friend constexpr bool operator!=(string_view lhs,
+                                   std::string_view rhs) noexcept {
     return rhs != lhs.data();
   }
-  friend bool operator!=(std::string_view lhs, string_view rhs) noexcept {
+  friend constexpr bool operator!=(std::string_view lhs,
+                                   string_view rhs) noexcept {
     return lhs != rhs.data();
   }
 #endif

sycl/include/sycl/device.hpp

@@ -208,10 +208,6 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
   /// Queries this SYCL device for information requested by the template
   /// parameter param
   ///
-  /// Specializations of info::param_traits must be defined in accordance with
-  /// the info parameters in Table 4.20 of SYCL Spec to facilitate returning the
-  /// type associated with the param parameter.
-  ///
   /// \return device info of type described in Table 4.20.
   template <typename Param>
   typename detail::is_device_info_desc<Param>::return_type get_info() const {

sycl/include/sycl/handler.hpp

@@ -349,6 +349,16 @@ class RoundedRangeKernel {
       KernelFunc(item);
     }
   }
+
+  // Copy the properties_tag getter from the original kernel to propagate
+  // property(s)
+  template <
+      typename T = KernelType,
+      typename = std::enable_if_t<ext::oneapi::experimental::detail::
+                                      HasKernelPropertiesGetMethod<T>::value>>
+  auto get(ext::oneapi::experimental::properties_tag) const {
+    return KernelFunc.get(ext::oneapi::experimental::properties_tag{});
+  }
 };
 
 template <typename TransformedArgType, int Dims, typename KernelType>
@@ -364,6 +374,16 @@ class RoundedRangeKernelWithKH {
       KernelFunc(item, KH);
     }
   }
+
+  // Copy the properties_tag getter from the original kernel to propagate
+  // property(s)
+  template <
+      typename T = KernelType,
+      typename = std::enable_if_t<ext::oneapi::experimental::detail::
+                                      HasKernelPropertiesGetMethod<T>::value>>
+  auto get(ext::oneapi::experimental::properties_tag) const {
+    return KernelFunc.get(ext::oneapi::experimental::properties_tag{});
+  }
 };
 
 using std::enable_if_t;
@@ -1293,8 +1313,8 @@ class __SYCL_EXPORT handler {
       KernelWrapper<WrapAs::parallel_for, KName, decltype(Wrapper),
                     TransformedArgType, PropertiesT>::wrap(this, Wrapper);
 #ifndef __SYCL_DEVICE_ONLY__
-      verifyUsedKernelBundleInternal(
-          detail::string_view{detail::getKernelName<NameT>()});
+      constexpr detail::string_view Name{detail::getKernelName<NameT>()};
+      verifyUsedKernelBundleInternal(Name);
       // We are executing over the rounded range, but there are still
       // items/ids that are are constructed in ther range rounded
       // kernel use items/ids in the user range, which means that
@@ -1318,9 +1338,9 @@ class __SYCL_EXPORT handler {
       KernelWrapper<WrapAs::parallel_for, NameT, KernelType, TransformedArgType,
                     PropertiesT>::wrap(this, KernelFunc);
 #ifndef __SYCL_DEVICE_ONLY__
-      constexpr std::string_view Name{detail::getKernelName<NameT>()};
+      constexpr detail::string_view Name{detail::getKernelName<NameT>()};
 
-      verifyUsedKernelBundleInternal(detail::string_view{Name});
+      verifyUsedKernelBundleInternal(Name);
       processProperties<detail::isKernelESIMD<NameT>(), PropertiesT>(Props);
       detail::checkValueRange<Dims>(UserRange);
       setNDRangeDescriptor(std::move(UserRange));
@@ -1611,8 +1631,8 @@ class __SYCL_EXPORT handler {
       throwOnKernelParameterMisuse<KernelName, KernelType>();
     }
     throwIfActionIsCreated();
-    verifyUsedKernelBundleInternal(
-        detail::string_view{detail::getKernelName<NameT>()});
+    constexpr detail::string_view Name{detail::getKernelName<NameT>()};
+    verifyUsedKernelBundleInternal(Name);
     setType(detail::CGType::Kernel);
 
     detail::checkValueRange<Dims>(params...);
@@ -1655,8 +1675,8 @@ class __SYCL_EXPORT handler {
     // Ignore any set kernel bundles and use the one associated with the
     // kernel.
     setHandlerKernelBundle(Kernel);
-    verifyUsedKernelBundleInternal(
-        detail::string_view{detail::getKernelName<NameT>()});
+    constexpr detail::string_view Name{detail::getKernelName<NameT>()};
+    verifyUsedKernelBundleInternal(Name);
     setType(detail::CGType::Kernel);
 
     detail::checkValueRange<Dims>(params...);
@@ -2108,8 +2128,8 @@ class __SYCL_EXPORT handler {
     kernel_single_task<NameT>(KernelFunc);
 #ifndef __SYCL_DEVICE_ONLY__
     throwIfActionIsCreated();
-    verifyUsedKernelBundleInternal(
-        detail::string_view{detail::getKernelName<NameT>()});
+    constexpr detail::string_view Name{detail::getKernelName<NameT>()};
+    verifyUsedKernelBundleInternal(Name);
     // No need to check if range is out of INT_MAX limits as it's compile-time
     // known constant
     setNDRangeDescriptor(range<1>{1});

sycl/include/sycl/info/info_desc.hpp

@@ -74,24 +74,6 @@ enum class partition_property : intptr_t {
   ext_intel_partition_by_cslice = UR_DEVICE_PARTITION_BY_CSLICE
 };
 
-// FIXME: maybe this should live elsewhere, maybe it should be implemented
-// differently
-inline partition_property
-ConvertPartitionProperty(const ur_device_partition_t &Partition) {
-  switch (Partition) {
-  case UR_DEVICE_PARTITION_EQUALLY:
-    return partition_property::partition_equally;
-  case UR_DEVICE_PARTITION_BY_COUNTS:
-    return partition_property::partition_by_counts;
-  case UR_DEVICE_PARTITION_BY_AFFINITY_DOMAIN:
-    return partition_property::partition_by_affinity_domain;
-  case UR_DEVICE_PARTITION_BY_CSLICE:
-    return partition_property::ext_intel_partition_by_cslice;
-  default:
-    return partition_property::no_partition;
-  }
-}
-
 enum class partition_affinity_domain : intptr_t {
   not_applicable = 0,
   numa = UR_DEVICE_AFFINITY_DOMAIN_FLAG_NUMA,
@@ -102,24 +84,6 @@ enum class partition_affinity_domain : intptr_t {
   next_partitionable = UR_DEVICE_AFFINITY_DOMAIN_FLAG_NEXT_PARTITIONABLE
 };
 
-inline partition_affinity_domain
-ConvertAffinityDomain(const ur_device_affinity_domain_flags_t Domain) {
-  switch (Domain) {
-  case UR_DEVICE_AFFINITY_DOMAIN_FLAG_NUMA:
-    return partition_affinity_domain::numa;
-  case UR_DEVICE_AFFINITY_DOMAIN_FLAG_L1_CACHE:
-    return partition_affinity_domain::L1_cache;
-  case UR_DEVICE_AFFINITY_DOMAIN_FLAG_L2_CACHE:
-    return partition_affinity_domain::L2_cache;
-  case UR_DEVICE_AFFINITY_DOMAIN_FLAG_L3_CACHE:
-    return partition_affinity_domain::L3_cache;
-  case UR_DEVICE_AFFINITY_DOMAIN_FLAG_L4_CACHE:
-    return partition_affinity_domain::L4_cache;
-  default:
-    return info::partition_affinity_domain::not_applicable;
-  }
-}
-
 enum class local_mem_type : int { none, local, global };
 
 enum class fp_config : uint32_t {
@@ -141,12 +105,6 @@ enum class execution_capability : unsigned int {
 };
 
 namespace device {
-// TODO implement the following SYCL 2020 device info descriptors:
-// atomic_fence_order_capabilities, atomic_fence_scope_capabilities, aspects,
-// il_version.
-
-struct atomic_fence_order_capabilities;
-struct atomic_fence_scope_capabilities;
 
 #define __SYCL_PARAM_TRAITS_DEPRECATED(Desc, Message)                          \
   struct __SYCL2020_DEPRECATED(Message) Desc;
@@ -203,17 +161,6 @@ namespace event_profiling {
 } // namespace event_profiling
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-// Provide an alias to the return type for each of the info parameters
-template <typename T, T param> class param_traits {};
-
-template <typename T, T param> struct compatibility_param_traits {};
-
-#define __SYCL_PARAM_TRAITS_SPEC(param_type, param, ret_type)                  \
-  template <> class param_traits<param_type, param_type::param> {              \
-  public:                                                                      \
-    using return_type = ret_type;                                              \
-  };
-#undef __SYCL_PARAM_TRAITS_SPEC
 } // namespace info
 
 #define __SYCL_PARAM_TRAITS_SPEC(Namespace, DescType, Desc, ReturnT, UrCode)   \

sycl/source/detail/buffer_impl.cpp

@@ -21,7 +21,7 @@ namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 uint8_t GBufferStreamID;
 #endif
-void *buffer_impl::allocateMem(ContextImplPtr Context, bool InitFromUserData,
+void *buffer_impl::allocateMem(context_impl *Context, bool InitFromUserData,
                                void *HostPtr,
                                ur_event_handle_t &OutEventToWait) {
   bool HostPtrReadOnly = false;
@@ -30,9 +30,9 @@ void *buffer_impl::allocateMem(ContextImplPtr Context, bool InitFromUserData,
          "Internal error. Allocating memory on the host "
          "while having use_host_ptr property");
   return MemoryManager::allocateMemBuffer(
-      std::move(Context), this, HostPtr, HostPtrReadOnly,
-      BaseT::getSizeInBytes(), BaseT::MInteropEvent, BaseT::MInteropContext,
-      MProps, OutEventToWait);
+      Context, this, HostPtr, HostPtrReadOnly, BaseT::getSizeInBytes(),
+      BaseT::MInteropEvent, BaseT::MInteropContext.get(), MProps,
+      OutEventToWait);
 }
 void buffer_impl::constructorNotification(const detail::code_location &CodeLoc,
                                           void *UserObj, const void *HostObj,

sycl/source/detail/buffer_impl.hpp

@@ -129,8 +129,8 @@ class buffer_impl final : public SYCLMemObjT {
       : BaseT(MemObject, SyclContext, OwnNativeHandle,
               std::move(AvailableEvent), std::move(Allocator)) {}
 
-  void *allocateMem(ContextImplPtr Context, bool InitFromUserData,
-                    void *HostPtr, ur_event_handle_t &OutEventToWait) override;
+  void *allocateMem(context_impl *Context, bool InitFromUserData, void *HostPtr,
+                    ur_event_handle_t &OutEventToWait) override;
   void constructorNotification(const detail::code_location &CodeLoc,
                                void *UserObj, const void *HostObj,
                                const void *Type, uint32_t Dim,