[SYCL] Split image accessor code into a separate include (#13500)

... that isn't included from `<sycl/detail/core.hpp>`

Author: aelovikov-intel

sycl/include/sycl/accessor.hpp

@@ -10,6 +10,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/aspects.hpp>
 #include <sycl/atomic.hpp>
 #include <sycl/atomic_fence.hpp>

sycl/include/sycl/accessor_image.hpp

@@ -9,6 +9,7 @@
 #include <detail/queue_impl.hpp>
 #include <detail/sycl_mem_obj_t.hpp>
 #include <sycl/accessor.hpp>
+#include <sycl/accessor_image.hpp>
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/sycl.hpp

@@ -10,6 +10,7 @@
 
 #include <sycl/access/access.hpp>
 #include <sycl/accessor.hpp>
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/export.hpp>
 #include <sycl/id.hpp>
 #include <sycl/property_list.hpp>

sycl/source/accessor.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <sycl/accessor.hpp>
+#include <sycl/accessor_image.hpp>
 #include <sycl/builtins.hpp>
 
 namespace sycl {

sycl/source/detail/accessor_impl.hpp

@@ -16,6 +16,7 @@
 
 #include <cassert>
 #include <iomanip>
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 #if DEBUG_OUTPUT
 #include <iostream>

sycl/source/detail/image_accessor_util.cpp

@@ -9,6 +9,7 @@
 // The test checks that 'image' with max allowed sizes is handled correctly.
 
 #include <iostream>
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 using namespace sycl;
 

sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp

@@ -4,6 +4,7 @@
 // Temporarily disable test on Windows due to regressions in GPU driver.
 // UNSUPPORTED: hip, windows
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 
 #include <iostream>

sycl/test-e2e/Basic/image/image_max_size.cpp

@@ -15,6 +15,7 @@
 
 #include <iostream>
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 
 int main() {

sycl/test-e2e/Basic/image/image_sample.cpp

@@ -5,6 +5,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/builtins.hpp>
 
 using namespace sycl;

sycl/test-e2e/Regression/image_access.cpp

@@ -9,6 +9,7 @@
 
 #else
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 
 using namespace sycl::access;

sycl/test-e2e/Sampler/common.hpp

@@ -5,6 +5,7 @@
 // clang-format off
 
 #include <sycl/accessor.hpp>
+#include <sycl/accessor_image.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/XPTI/image/accessors.cpp

@@ -5,6 +5,7 @@
 // clang-format off
 
 #include <sycl/accessor.hpp>
+#include <sycl/accessor_image.hpp>
 
 using namespace sycl;
 

sycl/test/abi/layout_accessors_device.cpp

@@ -13,10 +13,10 @@ int main() {
   myQueue.submit([&](handler &cgh) {
     accessor<float, 2, access::mode::read, access::target::image> NotValidType1(
         srcImage, cgh);
-    // expected-error@sycl/accessor.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}}
+    // expected-error@sycl/accessor_image.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}}
     accessor<int2, 2, access::mode::read, access::target::image> NotValidType2(
         srcImage, cgh);
-    // expected-error@sycl/accessor.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}}
+    // expected-error@sycl/accessor_image.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}}
     accessor<float4, 2, access::mode::read, access::target::image>
         ValidSYCLFloat(srcImage, cgh);
     accessor<int4, 2, access::mode::read, access::target::image> ValidSYCLInt(

sycl/test/abi/layout_accessors_host.cpp

@@ -113,9 +113,10 @@
 // CHECK-NEXT: detail/accessor_iterator.hpp
 // CHECK-NEXT: detail/generic_type_traits.hpp
 // CHECK-NEXT: detail/handler_proxy.hpp
-// CHECK-NEXT: detail/image_accessor_util.hpp
 // CHECK-NEXT: device.hpp
 // CHECK-NEXT: kernel_bundle_enums.hpp
+// CHECK-NEXT: pointers.hpp
+// CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: image.hpp
 // CHECK-NEXT: detail/backend_traits.hpp
 // CHECK-NEXT: sampler.hpp
@@ -125,8 +126,5 @@
 // CHECK-NEXT: detail/memcpy.hpp
 // CHECK-NEXT: detail/vector_convert.hpp
 // CHECK-NEXT: swizzles.def
-// CHECK-NEXT: pointers.hpp
-// CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/buffer_properties.hpp
-// CHECK-NEXT: detail/image_ocl_types.hpp
 // CHECK-EMPTY:

sycl/test/basic_tests/image_accessor_types.cpp

@@ -114,9 +114,10 @@
 // CHECK-NEXT: detail/accessor_iterator.hpp
 // CHECK-NEXT: detail/generic_type_traits.hpp
 // CHECK-NEXT: detail/handler_proxy.hpp
-// CHECK-NEXT: detail/image_accessor_util.hpp
 // CHECK-NEXT: device.hpp
 // CHECK-NEXT: kernel_bundle_enums.hpp
+// CHECK-NEXT: pointers.hpp
+// CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: image.hpp
 // CHECK-NEXT: detail/backend_traits.hpp
 // CHECK-NEXT: sampler.hpp
@@ -126,10 +127,7 @@
 // CHECK-NEXT: detail/memcpy.hpp
 // CHECK-NEXT: detail/vector_convert.hpp
 // CHECK-NEXT: swizzles.def
-// CHECK-NEXT: pointers.hpp
-// CHECK-NEXT: properties/accessor_properties.hpp
 // CHECK-NEXT: properties/buffer_properties.hpp
-// CHECK-NEXT: detail/image_ocl_types.hpp
 // CHECK-NEXT: queue.hpp
 // CHECK-NEXT: detail/assert_happened.hpp
 // CHECK-NEXT: detail/cg_types.hpp