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

Author: againull

.github/workflows/sycl-post-commit.yml

@@ -20,8 +20,11 @@ on:
     - ./devops/actions/cached_checkout
 
 concurrency:
-  #  Cancel a currently running workflow from the same PR or commit hash.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  # Cancel a currently running workflow from the same PR or commit hash.
+  # We need to use the user's branch name (which is in different variables
+  # for pull request events and push events) so that making a PR from a
+  # sycl-devops-pr branch doesn't cause two postcommit runs.
+  group: "${{ github.actor }}-${{ github.head_ref || github.ref_name }}"
   cancel-in-progress: true
 
 permissions: read-all

clang/lib/Sema/SemaAccess.cpp

@@ -301,6 +301,7 @@ static AccessResult IsDerivedFromInclusive(const CXXRecordDecl *Derived,
                                            const CXXRecordDecl *Target) {
   assert(Derived->getCanonicalDecl() == Derived);
   assert(Target->getCanonicalDecl() == Target);
+  assert(Derived->getDefinition() && "Expecting a complete type");
 
   if (Derived == Target) return AR_accessible;
 
@@ -776,6 +777,8 @@ static AccessResult HasAccess(Sema &S,
     // [B3] and [M3]
     } else {
       assert(Access == AS_protected);
+      if (!ECRecord->getDefinition())
+        continue;
       switch (IsDerivedFromInclusive(ECRecord, NamingClass)) {
       case AR_accessible: break;
       case AR_inaccessible: continue;

clang/test/SemaSYCL/attr-add-ir-attributes.cpp

@@ -991,3 +991,16 @@ struct __attribute__((sycl_special_class)) InvalidSpecialClassStruct32 {
 struct [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] InvalidKernelParameterSubjectStruct;     // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
 [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] void InvalidKernelParameterSubjectFunction() {} // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
 [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] int InvalidKernelParameterSubjectVar;           // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
+
+struct A {
+  protected:
+  static constexpr const char *ir_attribute_name = ""; // expected-note {{declared protected here}}
+  static constexpr auto ir_attribute_value = nullptr;  // expected-note {{declared protected here}}
+};
+
+template <typename Ts>
+struct [[__sycl_detail__::add_ir_attributes_global_variable(
+             Ts::ir_attribute_name, Ts::ir_attribute_value)]] B {  // expected-error {{'ir_attribute_name' is a protected member of 'A'}} // expected-error {{'ir_attribute_value' is a protected member of 'A'}}
+};
+
+B<A> v; // expected-note {{in instantiation of template class 'B<A>' requested here}}

clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp

@@ -1359,6 +1359,9 @@ class BinaryWrapper {
     ObjcopyPath = *ObjcopyPathOrErr;
   }
 
+  BinaryWrapper(const BinaryWrapper &BW) = delete;
+  BinaryWrapper &operator=(const BinaryWrapper &BW) = delete;
+
   ~BinaryWrapper() {
     if (TempFiles.empty())
       return;

devops/scripts/install_drivers.sh

@@ -143,7 +143,9 @@ InstallIGFX () {
     echo "Download IGC dev git hash $IGC_DEV_VER"
     get_pre_release_igfx $IGC_DEV_URL $IGC_DEV_VER
     echo "Install IGC dev git hash $IGC_DEV_VER"
-    dpkg -i *.deb
+    # New dev IGC packaged iga64 conflicting with iga64 from intel-igc-media
+    # force overwrite to workaround it first.
+    dpkg -i --force-overwrite *.deb
     echo "Install libopencl-clang"
     # Workaround only, will download deb and install with dpkg once fixed.
     cp -d libopencl-clang.so.14*  /usr/local/lib/

sycl/cmake/modules/UnifiedRuntimeTag.cmake

@@ -1,10 +1,7 @@
-# commit 3e1a0ea44842b10cfdc0e1e98af2eee8fcd8e937 (HEAD -> main)
-# Author: Artur Gainullin <[email protected]>
-# Date:   Wed Nov 6 16:05:50 2024 -0800
-#
-#     [L0] Fix binary sizes and binaries returned by urProgramGetInfo
-#
-#     Currently urProgramGetInfo will return UR_INVALID_PROGRAM is program is
-#     compiled only for a subset of associated devices, i.e. not all devices
-#     have level zero module and binaries. This PR fixes this behaviour.
-set(UNIFIED_RUNTIME_TAG 3e1a0ea44842b10cfdc0e1e98af2eee8fcd8e937)
+# commit 3a5b23c8b475712f9107c1d5ab41f27a1465578e
+# Merge: f9f71f17 1696524d
+# Author: Piotr Balcer <[email protected]>
+# Date:   Thu Nov 14 14:38:05 2024 +0100
+#    Merge pull request #2253 from pbalcer/low-power-events   
+#    add low-power events experimental extension spec
+set(UNIFIED_RUNTIME_TAG 3a5b23c8b475712f9107c1d5ab41f27a1465578e)

sycl/include/sycl/ext/intel/esimd/memory_properties.hpp

@@ -77,8 +77,8 @@ class properties
 // Deduction guides
 template <typename... PropertyValueTs>
 properties(PropertyValueTs... props)
-    -> properties<typename sycl::ext::oneapi::experimental::detail::Sorted<
-        PropertyValueTs...>::type>;
+    -> properties<typename sycl::ext::oneapi::experimental::detail::
+                      properties_sorter<PropertyValueTs...>::type>;
 #endif
 
 /// The 'alignment' property is used to specify the alignment of memory
@@ -238,13 +238,17 @@ template <typename PropertyListT> struct remove_alignment_property {
 };
 template <size_t Alignment, typename... LastTs>
 struct remove_alignment_property<
-    properties<std::tuple<alignment_key::value_t<Alignment>, LastTs...>>> {
-  using type = properties<std::tuple<LastTs...>>;
+    properties<oneapi::experimental::detail::properties_type_list<
+        alignment_key::value_t<Alignment>, LastTs...>>> {
+  using type =
+      properties<oneapi::experimental::detail::properties_type_list<LastTs...>>;
 };
 template <typename FirstT, size_t Alignment, typename... LastTs>
-struct remove_alignment_property<properties<
-    std::tuple<FirstT, alignment_key::value_t<Alignment>, LastTs...>>> {
-  using type = properties<std::tuple<FirstT, LastTs...>>;
+struct remove_alignment_property<
+    properties<oneapi::experimental::detail::properties_type_list<
+        FirstT, alignment_key::value_t<Alignment>, LastTs...>>> {
+  using type = properties<
+      oneapi::experimental::detail::properties_type_list<FirstT, LastTs...>>;
 };
 template <typename PropertyListT>
 using remove_alignment_property_t =
@@ -323,8 +327,11 @@ struct property_value<__ESIMD_NS::cache_hint_L3_key,
 
 // Declare that esimd::properties is a property_list.
 template <typename... PropertyValueTs>
-struct is_property_list<__ESIMD_NS::properties<std::tuple<PropertyValueTs...>>>
-    : is_property_list<properties<std::tuple<PropertyValueTs...>>> {};
+struct is_property_list<__ESIMD_NS::properties<
+    oneapi::experimental::detail::properties_type_list<PropertyValueTs...>>>
+    : is_property_list<
+          properties<oneapi::experimental::detail::properties_type_list<
+              PropertyValueTs...>>> {};
 
 namespace detail {
 // We do not override the class ConflictingProperties for cache_hint properties

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

@@ -66,7 +66,8 @@ annotated_arg(T, Args...)
     -> annotated_arg<T, typename detail::DeducedProperties<Args...>::type>;
 
 template <typename T, typename old, typename... ArgT>
-annotated_arg(annotated_arg<T, old>, properties<std::tuple<ArgT...>>)
+annotated_arg(annotated_arg<T, old>,
+              properties<detail::properties_type_list<ArgT...>>)
     -> annotated_arg<
         T, detail::merged_properties_t<old, detail::properties_t<ArgT...>>>;
 

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

@@ -54,15 +54,10 @@ template <typename... Ts>
 using contains_alignment =
     detail::ContainsProperty<alignment_key, std::tuple<Ts...>>;
 
-// properties filter
-template <typename property_list, template <class...> typename filter>
-using PropertiesFilter =
-    sycl::detail::boost::mp11::mp_copy_if<property_list, filter>;
-
 // filter properties that are applied on annotations
-template <typename... Props>
-using annotation_filter = properties<
-    PropertiesFilter<std::tuple<Props...>, propagateToPtrAnnotation>>;
+template <typename PropertyListTy>
+using annotation_filter = decltype(filter_properties<propagateToPtrAnnotation>(
+    std::declval<PropertyListTy>()));
 } // namespace detail
 
 template <typename I, typename P> struct annotationHelper {};
@@ -107,8 +102,8 @@ class annotated_ref<T, detail::properties_t<Props...>> {
   // implicit conversion with annotaion
   operator T() const {
 #ifdef __SYCL_DEVICE_ONLY__
-    return annotationHelper<T, detail::annotation_filter<Props...>>::load(
-        m_Ptr);
+    return annotationHelper<
+        T, detail::annotation_filter<property_list_t>>::load(m_Ptr);
 #else
     return *m_Ptr;
 #endif
@@ -118,8 +113,8 @@ class annotated_ref<T, detail::properties_t<Props...>> {
   template <class O, typename = std::enable_if_t<!detail::is_ann_ref_v<O>>>
   T operator=(O &&Obj) const {
 #ifdef __SYCL_DEVICE_ONLY__
-    return annotationHelper<T, detail::annotation_filter<Props...>>::store(
-        m_Ptr, Obj);
+    return annotationHelper<
+        T, detail::annotation_filter<property_list_t>>::store(m_Ptr, Obj);
 #else
     return *m_Ptr = std::forward<O>(Obj);
 #endif
@@ -245,7 +240,8 @@ annotated_ptr(T *, Args...)
     -> annotated_ptr<T, typename detail::DeducedProperties<Args...>::type>;
 
 template <typename T, typename old, typename... ArgT>
-annotated_ptr(annotated_ptr<T, old>, properties<std::tuple<ArgT...>>)
+annotated_ptr(annotated_ptr<T, old>,
+              properties<detail::properties_type_list<ArgT...>>)
     -> annotated_ptr<
         T, detail::merged_properties_t<old, detail::properties_t<ArgT...>>>;
 #endif // __cpp_deduction_guides
@@ -383,8 +379,8 @@ __SYCL_TYPE(annotated_ptr) annotated_ptr<T, detail::properties_t<Props...>> {
 
   T *get() const noexcept {
 #ifdef __SYCL_DEVICE_ONLY__
-    return annotationHelper<T, detail::annotation_filter<Props...>>::annotate(
-        m_Ptr);
+    return annotationHelper<
+        T, detail::annotation_filter<property_list_t>>::annotate(m_Ptr);
 #else
     return m_Ptr;
 #endif

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

@@ -77,7 +77,7 @@ class __SYCL_SPECIAL_CLASS __SYCL_TYPE(work_group_memory) work_group_memory
   void __init(decoratedPtr ptr) { this->ptr = ptr; }
 #endif
 private:
-  decoratedPtr ptr;
+  decoratedPtr ptr = nullptr;
 };
 } // namespace ext::oneapi::experimental
 } // namespace _V1