[SYCL] Move image-related code accessor.hpp -> accessor_image.hpp (#13754)

Author: aelovikov-intel

sycl/include/sycl/accessor.hpp

@@ -38,7 +38,6 @@
 #include <sycl/property_list.hpp>                     // for property_list
 #include <sycl/range.hpp>                             // for range
 #include <sycl/sampler.hpp>                           // for addressing_mode
-#include <sycl/types.hpp>                             // for vec
 
 #include <cstddef>     // for size_t
 #include <functional>  // for hash
@@ -607,45 +606,6 @@ class __SYCL_EXPORT LocalAccessorBaseHost {
 
   LocalAccessorImplPtr impl;
 };
-
-template <int Dim, typename T> struct IsValidCoordDataT;
-template <typename T> struct IsValidCoordDataT<1, T> {
-  constexpr static bool value = detail::is_contained<
-      T, detail::type_list<opencl::cl_int, opencl::cl_float>>::type::value;
-};
-template <typename T> struct IsValidCoordDataT<2, T> {
-  constexpr static bool value = detail::is_contained<
-      T, detail::type_list<vec<opencl::cl_int, 2>,
-                           vec<opencl::cl_float, 2>>>::type::value;
-};
-template <typename T> struct IsValidCoordDataT<3, T> {
-  constexpr static bool value = detail::is_contained<
-      T, detail::type_list<vec<opencl::cl_int, 4>,
-                           vec<opencl::cl_float, 4>>>::type::value;
-};
-
-template <int Dim, typename T> struct IsValidUnsampledCoord2020DataT;
-template <typename T> struct IsValidUnsampledCoord2020DataT<1, T> {
-  constexpr static bool value = std::is_same_v<T, int>;
-};
-template <typename T> struct IsValidUnsampledCoord2020DataT<2, T> {
-  constexpr static bool value = std::is_same_v<T, int2>;
-};
-template <typename T> struct IsValidUnsampledCoord2020DataT<3, T> {
-  constexpr static bool value = std::is_same_v<T, int4>;
-};
-
-template <int Dim, typename T> struct IsValidSampledCoord2020DataT;
-template <typename T> struct IsValidSampledCoord2020DataT<1, T> {
-  constexpr static bool value = std::is_same_v<T, float>;
-};
-template <typename T> struct IsValidSampledCoord2020DataT<2, T> {
-  constexpr static bool value = std::is_same_v<T, float2>;
-};
-template <typename T> struct IsValidSampledCoord2020DataT<3, T> {
-  constexpr static bool value = std::is_same_v<T, float4>;
-};
-
 } // namespace detail
 
 /// Buffer accessor.

sycl/include/sycl/accessor_image.hpp

@@ -12,6 +12,44 @@
 namespace sycl {
 inline namespace _V1 {
 namespace detail {
+template <int Dim, typename T> struct IsValidCoordDataT;
+template <typename T> struct IsValidCoordDataT<1, T> {
+  constexpr static bool value = detail::is_contained<
+      T, detail::type_list<opencl::cl_int, opencl::cl_float>>::type::value;
+};
+template <typename T> struct IsValidCoordDataT<2, T> {
+  constexpr static bool value = detail::is_contained<
+      T, detail::type_list<vec<opencl::cl_int, 2>,
+                           vec<opencl::cl_float, 2>>>::type::value;
+};
+template <typename T> struct IsValidCoordDataT<3, T> {
+  constexpr static bool value = detail::is_contained<
+      T, detail::type_list<vec<opencl::cl_int, 4>,
+                           vec<opencl::cl_float, 4>>>::type::value;
+};
+
+template <int Dim, typename T> struct IsValidUnsampledCoord2020DataT;
+template <typename T> struct IsValidUnsampledCoord2020DataT<1, T> {
+  constexpr static bool value = std::is_same_v<T, int>;
+};
+template <typename T> struct IsValidUnsampledCoord2020DataT<2, T> {
+  constexpr static bool value = std::is_same_v<T, int2>;
+};
+template <typename T> struct IsValidUnsampledCoord2020DataT<3, T> {
+  constexpr static bool value = std::is_same_v<T, int4>;
+};
+
+template <int Dim, typename T> struct IsValidSampledCoord2020DataT;
+template <typename T> struct IsValidSampledCoord2020DataT<1, T> {
+  constexpr static bool value = std::is_same_v<T, float>;
+};
+template <typename T> struct IsValidSampledCoord2020DataT<2, T> {
+  constexpr static bool value = std::is_same_v<T, float2>;
+};
+template <typename T> struct IsValidSampledCoord2020DataT<3, T> {
+  constexpr static bool value = std::is_same_v<T, float4>;
+};
+
 void __SYCL_EXPORT unsampledImageConstructorNotification(
     void *ImageObj, void *AccessorObj,
     const std::optional<image_target> &Target, access::mode Mode,

sycl/test/include_deps/sycl_accessor.hpp.cpp

@@ -117,10 +117,4 @@
 // CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/buffer_properties.hpp
 // CHECK-NEXT: sampler.hpp
-// CHECK-NEXT: types.hpp
-// CHECK-NEXT: marray.hpp
-// CHECK-NEXT: vector.hpp
-// CHECK-NEXT: detail/memcpy.hpp
-// CHECK-NEXT: detail/vector_convert.hpp
-// CHECK-NEXT: swizzles.def
 // CHECK-EMPTY:

sycl/test/include_deps/sycl_detail_core.hpp.cpp

@@ -118,12 +118,6 @@
 // CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/buffer_properties.hpp
 // CHECK-NEXT: sampler.hpp
-// CHECK-NEXT: types.hpp
-// CHECK-NEXT: marray.hpp
-// CHECK-NEXT: vector.hpp
-// CHECK-NEXT: detail/memcpy.hpp
-// CHECK-NEXT: detail/vector_convert.hpp
-// CHECK-NEXT: swizzles.def
 // CHECK-NEXT: queue.hpp
 // CHECK-NEXT: detail/assert_happened.hpp
 // CHECK-NEXT: detail/cg_types.hpp
@@ -140,6 +134,12 @@
 // CHECK-NEXT: exception_list.hpp
 // CHECK-NEXT: image.hpp
 // CHECK-NEXT: detail/backend_traits.hpp
+// CHECK-NEXT: types.hpp
+// CHECK-NEXT: marray.hpp
+// CHECK-NEXT: vector.hpp
+// CHECK-NEXT: detail/memcpy.hpp
+// CHECK-NEXT: detail/vector_convert.hpp
+// CHECK-NEXT: swizzles.def
 // CHECK-NEXT: kernel_handler.hpp
 // CHECK-NEXT: nd_item.hpp
 // CHECK-NEXT: nd_range.hpp