[SYCL] Reduce buffer.hpp dependency on half/bfloat16 (#13498)

Can't eliminate it because that requires
#13497 that is awaiting ABI breaking
window.

Author: aelovikov-intel

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -14,6 +14,7 @@
 
 #include <stddef.h> // for size_t
 #include <stdint.h> // for uint32_t
+#include <type_traits>
 
 // Convergent attribute
 #ifdef __SYCL_DEVICE_ONLY__

sycl/include/CL/__spirv/spirv_types.hpp

@@ -9,7 +9,6 @@
 #pragma once
 
 #include <sycl/detail/defines.hpp> // for __has_builtin
-#include <sycl/half_type.hpp>      // for half
 
 #include <cstddef> // for size_t
 #include <cstdint> // for uint32_t

sycl/include/sycl/detail/generic_type_lists.hpp

@@ -10,9 +10,6 @@
 
 #include <sycl/access/access.hpp>    // for address_space
 #include <sycl/detail/type_list.hpp> // for type_list, address_space_list
-#include <sycl/half_type.hpp>        // for half
-
-#include <sycl/ext/oneapi/bfloat16.hpp> // bfloat16
 
 #include <cstddef>     // for byte, size_t
 #include <type_traits> // for conditional_t, is_signed_v, is_...
@@ -26,6 +23,16 @@ inline namespace _V1 {
 template <typename T, int N> class vec;
 template <typename Type, std::size_t NumElements> class marray;
 
+namespace detail {
+namespace half_impl {
+class half;
+}
+} // namespace detail
+using half = detail::half_impl::half;
+
+namespace ext::oneapi {
+class bfloat16;
+}
 namespace detail {
 namespace gtl {
 // floating point types

sycl/include/sycl/detail/type_traits.hpp

@@ -11,7 +11,6 @@
 #include <sycl/access/access.hpp>             // for decorated, address_space
 #include <sycl/detail/generic_type_lists.hpp> // for vec, marray, integer_list
 #include <sycl/detail/type_list.hpp>          // for is_contained, find_twi...
-#include <sycl/half_type.hpp>                 // for half
 
 #include <array>       // for array
 #include <cstddef>     // for size_t

sycl/source/detail/plugin_printers.hpp

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <sycl/detail/iostream_proxy.hpp>
 #include <sycl/detail/pi.hpp>
 
 #include <type_traits>

sycl/test/include_deps/sycl_accessor.hpp.cpp

@@ -10,15 +10,15 @@
 // CHECK-NEXT: CL/__spirv/spirv_ops.hpp
 // CHECK-NEXT: CL/__spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
+// CHECK-NEXT: detail/export.hpp
+// CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: bit_cast.hpp
-// CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: detail/iostream_proxy.hpp
 // CHECK-NEXT: detail/vector_traits.hpp
 // CHECK-NEXT: aspects.hpp
 // CHECK-NEXT: info/aspects.def
 // CHECK-NEXT: info/aspects_deprecated.def
-// CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: atomic.hpp
 // CHECK-NEXT: detail/helpers.hpp
 // CHECK-NEXT: detail/pi.hpp
@@ -60,7 +60,6 @@
 // CHECK-NEXT: detail/boost/mp11/detail/mp_map_find.hpp
 // CHECK-NEXT: detail/boost/mp11/detail/mp_with_index.hpp
 // CHECK-NEXT: detail/boost/mp11/integer_sequence.hpp
-// CHECK-NEXT: ext/oneapi/bfloat16.hpp
 // CHECK-NEXT: buffer.hpp
 // CHECK-NEXT: context.hpp
 // CHECK-NEXT: async_handler.hpp
@@ -78,6 +77,7 @@
 // CHECK-NEXT: info/info_desc.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp
 // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp
+// CHECK-NEXT: ext/oneapi/bfloat16.hpp
 // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp
 // CHECK-NEXT: info/platform_traits.def
 // CHECK-NEXT: info/context_traits.def

sycl/test/include_deps/sycl_buffer.hpp.cpp

@@ -10,14 +10,7 @@
 // CHECK-NEXT: CL/__spirv/spirv_ops.hpp
 // CHECK-NEXT: CL/__spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
-// CHECK-NEXT: half_type.hpp
-// CHECK-NEXT: bit_cast.hpp
 // CHECK-NEXT: detail/export.hpp
-// CHECK-NEXT: detail/iostream_proxy.hpp
-// CHECK-NEXT: detail/vector_traits.hpp
-// CHECK-NEXT: aspects.hpp
-// CHECK-NEXT: info/aspects.def
-// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: backend_types.hpp
 // CHECK-NEXT: context.hpp
 // CHECK-NEXT: async_handler.hpp
@@ -30,6 +23,9 @@
 // CHECK-NEXT: memory_enums.hpp
 // CHECK-NEXT: CL/__spirv/spirv_vars.hpp
 // CHECK-NEXT: detail/info_desc_helpers.hpp
+// CHECK-NEXT: aspects.hpp
+// CHECK-NEXT: info/aspects.def
+// CHECK-NEXT: info/aspects_deprecated.def
 // CHECK-NEXT: id.hpp
 // CHECK-NEXT: detail/array.hpp
 // CHECK-NEXT: exception.hpp
@@ -39,6 +35,7 @@
 // CHECK-NEXT: CL/cl_platform.h
 // CHECK-NEXT: CL/cl_ext.h
 // CHECK-NEXT: detail/common.hpp
+// CHECK-NEXT: detail/iostream_proxy.hpp
 // CHECK-NEXT: range.hpp
 // CHECK-NEXT: info/info_desc.hpp
 // CHECK-NEXT: detail/type_traits.hpp
@@ -71,10 +68,13 @@
 // CHECK-NEXT: detail/boost/mp11/detail/mp_map_find.hpp
 // CHECK-NEXT: detail/boost/mp11/detail/mp_with_index.hpp
 // CHECK-NEXT: detail/boost/mp11/integer_sequence.hpp
-// CHECK-NEXT: ext/oneapi/bfloat16.hpp
-// CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp
 // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp
+// CHECK-NEXT: ext/oneapi/bfloat16.hpp
+// CHECK-NEXT: aliases.hpp
+// CHECK-NEXT: half_type.hpp
+// CHECK-NEXT: bit_cast.hpp
+// CHECK-NEXT: detail/vector_traits.hpp
 // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp
 // CHECK-NEXT: info/platform_traits.def
 // CHECK-NEXT: info/context_traits.def

sycl/test/include_deps/sycl_detail_core.hpp.cpp

@@ -11,15 +11,15 @@
 // CHECK-NEXT: CL/__spirv/spirv_ops.hpp
 // CHECK-NEXT: CL/__spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
+// CHECK-NEXT: detail/export.hpp
+// CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
 // CHECK-NEXT: bit_cast.hpp
-// CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: detail/iostream_proxy.hpp
 // CHECK-NEXT: detail/vector_traits.hpp
 // CHECK-NEXT: aspects.hpp
 // CHECK-NEXT: info/aspects.def
 // CHECK-NEXT: info/aspects_deprecated.def
-// CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: atomic.hpp
 // CHECK-NEXT: detail/helpers.hpp
 // CHECK-NEXT: detail/pi.hpp
@@ -61,7 +61,6 @@
 // CHECK-NEXT: detail/boost/mp11/detail/mp_map_find.hpp
 // CHECK-NEXT: detail/boost/mp11/detail/mp_with_index.hpp
 // CHECK-NEXT: detail/boost/mp11/integer_sequence.hpp
-// CHECK-NEXT: ext/oneapi/bfloat16.hpp
 // CHECK-NEXT: buffer.hpp
 // CHECK-NEXT: context.hpp
 // CHECK-NEXT: async_handler.hpp
@@ -79,6 +78,7 @@
 // CHECK-NEXT: info/info_desc.hpp
 // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp
 // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp
+// CHECK-NEXT: ext/oneapi/bfloat16.hpp
 // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp
 // CHECK-NEXT: info/platform_traits.def
 // CHECK-NEXT: info/context_traits.def