[SYCL] Remove incorrect property traits for image_accessor (#7176)

That class is sycl::detail::image_accessor, not visible in public SYCL APIs yet we confused it thinking it's sycl::image_accessor. In reality it's used in the implementation of sycl::accessor specialization for access::target::image so the properties are covered by property traits for sycl::accessor.
intel · Oct 25, 2022 · 93d747f · 93d747f
1 parent bd03e0d
commit 93d747f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 36 deletions.
diff --git a/sycl/include/sycl/properties/accessor_properties.hpp b/sycl/include/sycl/properties/accessor_properties.hpp
@@ -118,9 +118,6 @@ template <typename DataT, int Dimensions, access::mode AccessMode,
           access::target AccessTarget, access::placeholder IsPlaceholder,
           typename PropertyListT>
 class accessor;
-template <typename DataT, int Dimensions, access::mode AccessMode,
-          access::target AccessTarget, access::placeholder IsPlaceholder>
-class image_accessor;
 template <typename DataT, int Dimensions, access::mode AccessMode>
 class host_accessor;
 
@@ -168,19 +165,6 @@ struct is_property_of<ext::intel::property::buffer_location,
                                IsPlaceholder, PropertyListT>> : std::true_type {
 };
 
-template <typename DataT, int Dimensions, access::mode AccessMode,
-          access::target AccessTarget, access::placeholder IsPlaceholder>
-struct is_property_of<
-    property::noinit,
-    image_accessor<DataT, Dimensions, AccessMode, AccessTarget, IsPlaceholder>>
-    : std::true_type {};
-template <typename DataT, int Dimensions, access::mode AccessMode,
-          access::target AccessTarget, access::placeholder IsPlaceholder>
-struct is_property_of<
-    property::no_init,
-    image_accessor<DataT, Dimensions, AccessMode, AccessTarget, IsPlaceholder>>
-    : std::true_type {};
-
 template <typename DataT, int Dimensions, access::mode AccessMode>
 struct is_property_of<property::noinit,
                       host_accessor<DataT, Dimensions, AccessMode>>

diff --git a/sycl/test/basic_tests/property_traits.cpp b/sycl/test/basic_tests/property_traits.cpp
@@ -107,12 +107,6 @@ int main() {
       accessor<sycl::half, 2, access_mode::write, target::host_buffer,
                access::placeholder::false_t>);
 
-  // Image-accessor is_property_of
-  CHECK_IS_PROPERTY_OF(
-      property::no_init,
-      image_accessor<unsigned long, 2, access_mode::read, target::host_buffer,
-                     access::placeholder::true_t>);
-
   // Host-accessor is_property_of
   CHECK_IS_PROPERTY_OF(property::no_init,
                        host_accessor<unsigned long, 2, access_mode::read>);
@@ -177,10 +171,6 @@ int main() {
 
   // Invalid properties with valid object type
   CHECK_IS_NOT_PROPERTY_OF(NotAProperty, accessor<int, 1>);
-  CHECK_IS_NOT_PROPERTY_OF(
-      NotAProperty,
-      image_accessor<float, 2, access_mode::read, target::host_buffer,
-                     access::placeholder::true_t>);
   CHECK_IS_NOT_PROPERTY_OF(NotAProperty, host_accessor<char, 2>);
   CHECK_IS_NOT_PROPERTY_OF(NotAProperty, buffer<int, 2>);
   CHECK_IS_NOT_PROPERTY_OF(NotAProperty, context);
@@ -249,12 +239,6 @@ int main() {
       accessor<sycl::half, 2, access_mode::write, target::host_buffer,
                access::placeholder::false_t>);
 
-  // Image-accessor is_property_of_v
-  CHECK_IS_PROPERTY_OF_V(
-      property::no_init,
-      image_accessor<unsigned long, 2, access_mode::read, target::host_buffer,
-                     access::placeholder::true_t>);
-
   // Host-accessor is_property_of_v
   CHECK_IS_PROPERTY_OF_V(property::no_init,
                          host_accessor<unsigned long, 2, access_mode::read>);
@@ -322,10 +306,6 @@ int main() {
 
   // Invalid properties with valid object type
   CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, accessor<int, 1>);
-  CHECK_IS_NOT_PROPERTY_OF_V(
-      NotAProperty,
-      image_accessor<float, 2, access_mode::read, target::host_buffer,
-                     access::placeholder::true_t>);
   CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, host_accessor<char, 2>);
   CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, buffer<int, 2>);
   CHECK_IS_NOT_PROPERTY_OF_V(NotAProperty, context);