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

Author: sys-ce-bb

sycl/include/sycl/ext/intel/esimd/detail/atomic_intrin.hpp

@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include <sycl/ext/intel/esimd/detail/atomic_intrin.hpp>
 #include <sycl/ext/intel/esimd/detail/defines_elementary.hpp>
 #include <sycl/ext/intel/esimd/detail/memory_intrin.hpp>
 

sycl/include/sycl/ext/intel/experimental/esimd/detail/memory_intrin.hpp

@@ -10,6 +10,7 @@
 
 #include <sycl/detail/defines.hpp>
 #include <sycl/ext/intel/experimental/fpga_annotated_properties.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr_properties.hpp>
 #include <sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp>
 #include <sycl/ext/oneapi/properties/properties.hpp>
 #include <sycl/ext/oneapi/properties/property.hpp>

sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp

@@ -0,0 +1,71 @@
+//==-- annotated_ptr_properties.hpp - Specific properties of annotated_ptr
+//--==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include <sycl/ext/oneapi/properties/properties.hpp> // for properties_t
+#include <sycl/usm/usm_enums.hpp>
+
+#include <type_traits> // for false_type, con...
+#include <utility>     // for declval
+
+namespace sycl {
+inline namespace _V1 {
+namespace ext {
+namespace oneapi {
+namespace experimental {
+
+template <typename T, typename PropertyListT> class annotated_ptr;
+
+struct usm_kind_key {
+  template <sycl::usm::alloc Kind>
+  using value_t =
+      property_value<usm_kind_key,
+                     std::integral_constant<sycl::usm::alloc, Kind>>;
+};
+
+template <sycl::usm::alloc Kind>
+inline constexpr usm_kind_key::value_t<Kind> usm_kind;
+inline constexpr usm_kind_key::value_t<sycl::usm::alloc::device>
+    usm_kind_device;
+inline constexpr usm_kind_key::value_t<sycl::usm::alloc::host> usm_kind_host;
+inline constexpr usm_kind_key::value_t<sycl::usm::alloc::shared>
+    usm_kind_shared;
+
+template <> struct is_property_key<usm_kind_key> : std::true_type {};
+
+template <typename T, sycl::usm::alloc Kind>
+struct is_valid_property<T, usm_kind_key::value_t<Kind>>
+    : std::bool_constant<std::is_pointer<T>::value> {};
+
+template <typename T, typename PropertyListT>
+struct is_property_key_of<usm_kind_key, annotated_ptr<T, PropertyListT>>
+    : std::true_type {};
+
+namespace detail {
+
+template <> struct PropertyToKind<usm_kind_key> {
+  static constexpr PropKind Kind = PropKind::UsmKind;
+};
+
+template <> struct IsCompileTimeProperty<usm_kind_key> : std::true_type {};
+
+template <sycl::usm::alloc Kind>
+struct PropertyMetaInfo<usm_kind_key::value_t<Kind>> {
+  static constexpr const char *name = "sycl-usm-kind";
+  static constexpr sycl::usm::alloc value = Kind;
+};
+
+} // namespace detail
+
+} // namespace experimental
+} // namespace oneapi
+} // namespace ext
+} // namespace _V1
+} // namespace sycl