[SYCL][NFC] Drop platform.hpp includes

Author: AlexeySachkov

sycl/include/sycl/context.hpp

@@ -14,7 +14,6 @@
 #include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
 #include <sycl/detail/info_desc_helpers.hpp>  // for is_context_info_desc
 #include <sycl/detail/owner_less_base.hpp>    // for OwnerLessBase
-#include <sycl/platform.hpp>                  // for platform
 #include <sycl/property_list.hpp>             // for property_list
 #include <sycl/usm/usm_enums.hpp>             // for usm::alloc
 #include <ur_api.h>                           // for ur_native_handle_t

sycl/include/sycl/ext/oneapi/owner_less.hpp

@@ -18,7 +18,6 @@
 #include <sycl/ext/oneapi/weak_object.hpp>        // for weak_object
 #include <sycl/kernel.hpp>                        // for kernel
 #include <sycl/kernel_bundle_enums.hpp>           // for bundle_state
-#include <sycl/platform.hpp>                      // for platform
 #include <sycl/properties/image_properties.hpp>   // for sampled_i...
 #include <sycl/queue.hpp>                         // for queue
 #include <sycl/stream.hpp>                        // for stream
@@ -28,6 +27,7 @@ inline namespace _V1 {
 class kernel_id;
 template <bundle_state State> class kernel_bundle;
 template <bundle_state State> class device_image;
+class platform;
 
 namespace ext::oneapi {
 

sycl/source/detail/device_impl.hpp

@@ -16,6 +16,7 @@
 #include <sycl/ext/oneapi/experimental/device_architecture.hpp>
 #include <sycl/ext/oneapi/experimental/forward_progress.hpp>
 #include <sycl/kernel_bundle.hpp>
+#include <sycl/platform.hpp>
 
 #include <memory>
 #include <mutex>
@@ -25,9 +26,6 @@
 namespace sycl {
 inline namespace _V1 {
 
-// Forward declaration
-class platform;
-
 namespace detail {
 
 // Note that UR's enums have weird *_FORCE_UINT32 values, we ignore them in the

sycl/source/detail/kernel_bundle_impl.hpp

@@ -681,7 +681,7 @@ class kernel_bundle_impl {
   bool empty() const noexcept { return MDeviceImages.empty(); }
 
   backend get_backend() const noexcept {
-    return MContext.get_platform().get_backend();
+    return MContext.get_backend();
   }
 
   context get_context() const noexcept { return MContext; }

sycl/test/include_deps/sycl_accessor.hpp.cpp

@@ -82,10 +82,6 @@
 // CHECK-NEXT: info/ext_oneapi_device_traits.def
 // CHECK-NEXT: info/ext_oneapi_kernel_queue_specific_traits.def
 // CHECK-NEXT: info/sycl_backend_traits.def
-// CHECK-NEXT: platform.hpp
-// CHECK-NEXT: detail/string_view.hpp
-// CHECK-NEXT: detail/util.hpp
-// CHECK-NEXT: device_selector.hpp
 // CHECK-NEXT: usm/usm_enums.hpp
 // CHECK-NEXT: properties/buffer_properties.def
 // CHECK-EMPTY:

sycl/test/include_deps/sycl_detail_core.hpp.cpp

@@ -83,10 +83,6 @@
 // CHECK-NEXT: info/ext_oneapi_device_traits.def
 // CHECK-NEXT: info/ext_oneapi_kernel_queue_specific_traits.def
 // CHECK-NEXT: info/sycl_backend_traits.def
-// CHECK-NEXT: platform.hpp
-// CHECK-NEXT: detail/string_view.hpp
-// CHECK-NEXT: detail/util.hpp
-// CHECK-NEXT: device_selector.hpp
 // CHECK-NEXT: usm/usm_enums.hpp
 // CHECK-NEXT: properties/buffer_properties.def
 // CHECK-NEXT: queue.hpp
@@ -104,6 +100,9 @@
 // CHECK-NEXT: nd_range.hpp
 // CHECK-NEXT: detail/optional.hpp
 // CHECK-NEXT: device.hpp
+// CHECK-NEXT: detail/string_view.hpp
+// CHECK-NEXT: detail/util.hpp
+// CHECK-NEXT: device_selector.hpp
 // CHECK-NEXT: kernel_bundle_enums.hpp
 // CHECK-NEXT: event.hpp
 // CHECK-NEXT: exception_list.hpp

sycl/test/warnings/deprecated_get_backend_info.cpp

@@ -2,6 +2,7 @@
 #include <iostream>
 #include <sycl/detail/core.hpp>
 #include <sycl/kernel_bundle.hpp>
+#include <sycl/platform.hpp>
 
 using namespace sycl;