[SYCL][NFC] Update includes in DPC++ headers.

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -8,9 +8,12 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp>
-#include <sycl/detail/defines_elementary.hpp>
-#include <sycl/detail/export.hpp>
+#include <CL/__spirv/spirv_types.hpp>         // for Scope, __ocl_event_t
+#include <sycl/detail/defines_elementary.hpp> // for __DPCPP_SYCL_EXTERNAL
+#include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
+
+#include <stddef.h> // for size_t
+#include <stdint.h> // for uint32_t
 
 // Convergent attribute
 #ifdef __SYCL_DEVICE_ONLY__

sycl/include/CL/__spirv/spirv_types.hpp

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include <sycl/detail/defines_elementary.hpp>
-#include <sycl/half_type.hpp>
+#include <sycl/detail/defines.hpp> // for SYCL_EXT_ONEAPI_MATRIX_VERSION
+#include <sycl/half_type.hpp>      // for half
 
-#include <complex>
-#include <cstddef>
-#include <cstdint>
+#include <complex> // for complex
+#include <cstddef> // for size_t
+#include <cstdint> // for uint32_t
 
 // TODO: include the header file with SPIR-V declarations from SPIRV-Headers
 // project.

sycl/include/CL/__spirv/spirv_vars.hpp

@@ -8,11 +8,13 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstdint>
-
 #ifdef __SYCL_DEVICE_ONLY__
 
+#include <sycl/detail/defines_elementary.hpp> // for __DPCPP_SYCL_EXTERNAL
+
+#include <cstddef> // for size_t
+#include <cstdint> // for uint8_t
+
 #define __SPIRV_VAR_QUALIFIERS extern "C" const
 
 #if defined(__NVPTX__) || defined(__AMDGCN__)

sycl/include/sycl/access/access.hpp

@@ -5,11 +5,15 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+
 #pragma once
 
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
+
+#ifdef __SYCL_DEVICE_ONLY__
 #include <CL/__spirv/spirv_ops.hpp>
-#include <sycl/detail/common.hpp>
-#include <sycl/detail/defines.hpp>
+#include <type_traits>
+#endif
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/accessor.hpp

@@ -8,36 +8,56 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp>
-#include <sycl/atomic.hpp>
-#include <sycl/buffer.hpp>
-#include <sycl/detail/accessor_iterator.hpp>
-#include <sycl/detail/cl.h>
-#include <sycl/detail/common.hpp>
-#include <sycl/detail/export.hpp>
-#include <sycl/detail/generic_type_traits.hpp>
-#include <sycl/detail/handler_proxy.hpp>
-#include <sycl/detail/image_accessor_util.hpp>
+#include <sycl/access/access.hpp>                     // for target, mode
+#include <sycl/aliases.hpp>                           // for float4, int4
+#include <sycl/aspects.hpp>                           // for aspect
+#include <sycl/atomic.hpp>                            // for atomic
+#include <sycl/buffer.hpp>                            // for range
+#include <sycl/detail/accessor_iterator.hpp>          // for accessor_iterator
+#include <sycl/detail/common.hpp>                     // for code_location
+#include <sycl/detail/defines.hpp>                    // for __SYCL_SPECIAL...
+#include <sycl/detail/defines_elementary.hpp>         // for __SYCL2020_DEP...
+#include <sycl/detail/export.hpp>                     // for __SYCL_EXPORT
+#include <sycl/detail/generic_type_traits.hpp>        // for is_genint, Try...
+#include <sycl/detail/handler_proxy.hpp>              // for associateWithH...
+#include <sycl/detail/helpers.hpp>                    // for loop
+#include <sycl/detail/image_accessor_util.hpp>        // for imageReadSampl...
+#include <sycl/detail/owner_less_base.hpp>            // for OwnerLessBase
+#include <sycl/detail/pi.h>                           // for PI_ERROR_INVAL...
+#include <sycl/detail/property_helper.hpp>            // for PropWithDataKind
+#include <sycl/detail/property_list_base.hpp>         // for PropertyListBase
+#include <sycl/detail/type_list.hpp>                  // for is_contained
+#include <sycl/detail/type_traits.hpp>                // for const_if_const_AS
+#include <sycl/device.hpp>                            // for device
+#include <sycl/exception.hpp>                         // for make_error_code
+#include <sycl/ext/oneapi/accessor_property_list.hpp> // for accessor_prope...
+#include <sycl/ext/oneapi/weak_object_base.hpp>       // for getSyclWeakObj...
+#include <sycl/id.hpp>                                // for id
+#include <sycl/image.hpp>                             // for image, image_c...
+#include <sycl/multi_ptr.hpp>                         // for multi_ptr
+#include <sycl/pointers.hpp>                          // for local_ptr, glo...
+#include <sycl/properties/accessor_properties.hpp>    // for buffer_location
+#include <sycl/properties/buffer_properties.hpp>      // for buffer, buffer...
+#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
+
+#ifdef __SYCL_DEVICE_ONLY__
 #include <sycl/detail/image_ocl_types.hpp>
-#include <sycl/detail/owner_less_base.hpp>
-#include <sycl/device.hpp>
-#include <sycl/exception.hpp>
-#include <sycl/ext/oneapi/accessor_property_list.hpp>
-#include <sycl/ext/oneapi/weak_object_base.hpp>
-#include <sycl/id.hpp>
-#include <sycl/image.hpp>
-#include <sycl/pointers.hpp>
-#include <sycl/properties/accessor_properties.hpp>
-#include <sycl/properties/buffer_properties.hpp>
-#include <sycl/property_list.hpp>
-#include <sycl/property_list_conversion.hpp>
-#include <sycl/sampler.hpp>
-
-#include <iterator>
-#include <optional>
-#include <type_traits>
-
-#include <utility>
+#endif
+
+#include <cstddef>     // for size_t
+#include <functional>  // for hash
+#include <iterator>    // for reverse_iterator
+#include <limits>      // for numeric_limits
+#include <memory>      // for shared_ptr
+#include <optional>    // for nullopt, optional
+#include <stdint.h>    // for uint32_t
+#include <tuple>       // for _Swallow_assign
+#include <type_traits> // for enable_if_t
+#include <typeinfo>    // for type_info
+#include <variant>     // for hash
 
 /// \file accessor.hpp
 /// The file contains implementations of accessor class.

sycl/include/sycl/aliases.hpp

@@ -8,12 +8,10 @@
 
 #pragma once
 
-#include <sycl/detail/cl.h>
-#include <sycl/detail/common.hpp>
-#include <sycl/detail/defines_elementary.hpp>
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
+#include <sycl/half_type.hpp>                 // for half
 
-#include <cstddef>
-#include <cstdint>
+#include <cstdint> // for uint8_t, int16_t, int32_t
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/aspects.hpp

@@ -7,7 +7,8 @@
 // ===--------------------------------------------------------------------=== //
 #pragma once
 
-#include <sycl/detail/defines.hpp>
+#include <sycl/detail/defines.hpp>            // for __SYCL_TYPE
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/async_handler.hpp

@@ -8,9 +8,7 @@
 
 #pragma once
 
-#include <sycl/detail/defines_elementary.hpp>
-
-#include <functional>
+#include <functional> // for function
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/atomic.hpp

@@ -8,18 +8,20 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
-#include <sycl/access/access.hpp>
-#include <sycl/detail/cl.h>
-#include <sycl/detail/helpers.hpp>
-#include <sycl/memory_enums.hpp>
+#include <CL/__spirv/spirv_types.hpp>         // for Scope, MemorySemanticsMask
+#include <sycl/access/access.hpp>             // for address_space, decorated
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
+#include <sycl/detail/helpers.hpp>            // for getSPIRVMemorySemanticsMask
+#include <sycl/memory_enums.hpp> // for memory_order, getStdMemoryO...
+#include <sycl/multi_ptr.hpp>    // for multi_ptr
 
-#ifndef __SYCL_DEVICE_ONLY__
-#include <atomic>
-#else
+#include <type_traits> // for is_same
+
+#ifdef __SYCL_DEVICE_ONLY__
 #include <cstring>
+#else
+#include <atomic> // for atomic, memory_order
 #endif
-#include <type_traits>
 
 #define __SYCL_STATIC_ASSERT_NOT_FLOAT(T)                                      \
   static_assert(!std::is_same<T, float>::value,                                \

sycl/include/sycl/atomic_fence.hpp

@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
-#include <sycl/detail/spirv.hpp>
-#include <sycl/memory_enums.hpp>
+#include <sycl/memory_enums.hpp> // for getStdMemoryOrder, memory_order
 
-#ifndef __SYCL_DEVICE_ONLY__
-#include <atomic>
+#ifdef __SYCL_DEVICE_ONLY__
+#include <sycl/detail/spirv.hpp>
+#else
+#include <atomic> // for atomic_thread_fence
 #endif
 
 namespace sycl {

sycl/include/sycl/atomic_ref.hpp

@@ -8,20 +8,20 @@
 
 #pragma once
 
-#include <sycl/access/access.hpp>
-#include <sycl/aspects.hpp>
-#include <sycl/atomic.hpp>
-#include <sycl/detail/defines.hpp>
-#include <sycl/memory_enums.hpp>
+#include <sycl/access/access.hpp> // for address_space
+#include <sycl/bit_cast.hpp>      // for bit_cast
+#include <sycl/memory_enums.hpp>  // for getStdMemoryOrder, memory_order
+
 #ifdef __SYCL_DEVICE_ONLY__
 #include <sycl/detail/spirv.hpp>
 #include <sycl/multi_ptr.hpp>
+#else
+#include <atomic> // for atomic
 #endif
 
-#ifndef __SYCL_DEVICE_ONLY__
-#include <atomic>
-#endif
-#include <type_traits>
+#include <stddef.h>    // for size_t, ptrdiff_t
+#include <stdint.h>    // for uintptr_t, uint32_t, uint64_t
+#include <type_traits> // for enable_if_t, bool_constant
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/backend.hpp

@@ -8,15 +8,33 @@
 
 #pragma once
 
-#include <sycl/accessor.hpp>
-#include <sycl/backend_types.hpp>
-#include <sycl/buffer.hpp>
-#include <sycl/context.hpp>
-#include <sycl/detail/backend_traits.hpp>
-#include <sycl/feature_test.hpp>
-#include <sycl/image.hpp>
+#include <sycl/access/access.hpp>             // for mode, placeholder
+#include <sycl/accessor.hpp>                  // for accessor
+#include <sycl/async_handler.hpp>             // for async_handler
+#include <sycl/backend_types.hpp>             // for backend
+#include <sycl/buffer.hpp>                    // for buffer_allocator
+#include <sycl/context.hpp>                   // for context, get_na...
+#include <sycl/detail/backend_traits.hpp>     // for InteropFeatureS...
+#include <sycl/detail/cl.h>                   // for _cl_event
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL_DEPRECATED
+#include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
+#include <sycl/detail/impl_utils.hpp>         // for createSyclObjFr...
+#include <sycl/detail/pi.h>                   // for pi_native_handle
+#include <sycl/device.hpp>                    // for device, get_native
+#include <sycl/event.hpp>                     // for event, get_native
+#include <sycl/exception.hpp>                 // for make_error_code
+#include <sycl/feature_test.hpp>              // for SYCL_BACKEND_OP...
+#include <sycl/handler.hpp>                   // for buffer
+#include <sycl/image.hpp>                     // for image, image_al...
+#include <sycl/kernel.hpp>                    // for kernel, get_native
+#include <sycl/kernel_bundle.hpp>             // for kernel_bundle
+#include <sycl/kernel_bundle_enums.hpp>       // for bundle_state
+#include <sycl/platform.hpp>                  // for platform, get_n...
+#include <sycl/property_list.hpp>             // for property_list
+#include <sycl/queue.hpp>                     // for queue, get_native
+
 #if SYCL_BACKEND_OPENCL
-#include <sycl/detail/backend_traits_opencl.hpp>
+#include <sycl/detail/backend_traits_opencl.hpp> // for interop
 #endif
 #if SYCL_EXT_ONEAPI_BACKEND_CUDA
 #ifdef SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL
@@ -29,20 +47,13 @@
 #include <sycl/detail/backend_traits_hip.hpp>
 #endif
 #if SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO
-#include <sycl/detail/backend_traits_level_zero.hpp>
+#include <sycl/detail/backend_traits_level_zero.hpp> // for _ze_command_lis...
 #endif
-#include <sycl/detail/common.hpp>
-#include <sycl/detail/export.hpp>
-#include <sycl/detail/pi.h>
-#include <sycl/detail/pi.hpp>
-#include <sycl/device.hpp>
-#include <sycl/event.hpp>
-#include <sycl/exception.hpp>
-#include <sycl/kernel_bundle.hpp>
-#include <sycl/platform.hpp>
-#include <sycl/queue.hpp>
-
-#include <type_traits>
+
+#include <memory>      // for shared_ptr
+#include <stdint.h>    // for int32_t
+#include <type_traits> // for enable_if_t
+#include <vector>      // for vector
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/backend/opencl.hpp

@@ -1,4 +1,3 @@
-
 //==---------------- opencl.hpp - SYCL OpenCL backend ----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -9,9 +8,18 @@
 
 #pragma once
 
-#include <sycl/backend.hpp>
+#include <sycl/backend_types.hpp>             // for backend
+#include <sycl/context.hpp>                   // for context
+#include <sycl/detail/backend_traits.hpp>     // for interop
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL_DEPRECATED
+#include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
+#include <sycl/detail/pi.h>                   // for pi_native_handle
+#include <sycl/device.hpp>                    // for device
+#include <sycl/platform.hpp>                  // for platform
+#include <sycl/queue.hpp>                     // for queue
 
-#include <string>
+#include <string>      // for string
+#include <type_traits> // for enable_if_t
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/backend_types.hpp

@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <sycl/detail/defines_elementary.hpp>
+#include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
 
-#include <ostream>
+#include <ostream> // for operator<<, ostream
 
 namespace sycl {
 inline namespace _V1 {