Skip to content

Commit 1bd9f25

Browse files
ianaylianayl
committed
Cleanup comments and clang-format
1 parent b001eac commit 1bd9f25

File tree

5 files changed

+6
-91
lines changed

5 files changed

+6
-91
lines changed

‎sycl/include/sycl/ext/oneapi/experimental/enqueue_types.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==------ enqueue_functions.hpp ------- SYCL enqueue free functions -------==//
1+
//==--------------- enqueue_types.hpp ---- SYCL enqueue types --------------==//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -12,6 +12,7 @@ namespace sycl {
1212
inline namespace _V1 {
1313
namespace ext::oneapi::experimental {
1414

15+
/// @brief Indicates the destination device for USM data to be prefetched to
1516
enum class prefetch_type { device, host };
1617

1718
} // namespace ext::oneapi::experimental

‎sycl/include/sycl/queue.hpp‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -740,33 +740,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
740740
TlsCodeLocCapture.query());
741741
}
742742

743-
// /// Experimental implementation of prefetch supporting bidirectional USM
744-
// data
745-
// /// migration: Provides hints to the runtime library that data should be
746-
// made
747-
// /// available on a device earlier than Unified Shared Memory would
748-
// normally
749-
// /// require it to be available.
750-
// ///
751-
// /// \param Ptr is a USM pointer to the memory to be prefetched to the
752-
// device.
753-
// /// \param Count is a number of bytes to be prefetched.
754-
// /// \param Direction indicates the direction to prefetch data to/from.
755-
// /// \return an event representing prefetch operation.
756-
// event ext_oneapi_prefetch_exp(
757-
// const void *Ptr, size_t Count,
758-
// ext::oneapi::experimental::migration_direction Direction =
759-
// ext::oneapi::experimental::migration_direction::HOST_TO_DEVICE,
760-
// const detail::code_location &CodeLoc =
761-
// detail::code_location::current()) {
762-
// detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
763-
// return submit(
764-
// [=](handler &CGH) {
765-
// CGH.ext_oneapi_prefetch_exp(Ptr, Count, Direction);
766-
// },
767-
// TlsCodeLocCapture.query());
768-
// }
769-
770743
/// Provides hints to the runtime library that data should be made available
771744
/// on a device earlier than Unified Shared Memory would normally require it
772745
/// to be available.
@@ -787,34 +760,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
787760
TlsCodeLocCapture.query());
788761
}
789762

790-
// /// Experimental implementation of prefetch supporting bidirectional USM
791-
// data
792-
// /// migration: Provides hints to the runtime library that data should be
793-
// made
794-
// /// available on a device earlier than Unified Shared Memory would
795-
// normally
796-
// /// require it to be available.
797-
// ///
798-
// /// \param Ptr is a USM pointer to the memory to be prefetched to the
799-
// device.
800-
// /// \param Count is a number of bytes to be prefetched.
801-
// /// \param DepEvent is an event that specifies the kernel dependencies.
802-
// /// \param Direction indicates the direction to prefetch data to/from.
803-
// /// \return an event representing prefetch operation.
804-
// event ext_oneapi_prefetch_exp(
805-
// const void *Ptr, size_t Count, event DepEvent,
806-
// ext::oneapi::experimental::migration_direction Direction =
807-
// ext::oneapi::experimental::migration_direction::HOST_TO_DEVICE,
808-
// const detail::code_location &CodeLoc =
809-
// detail::code_location::current()) {
810-
// detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
811-
// return submit(
812-
// [=](handler &CGH) {
813-
// CGH.depends_on(DepEvent);
814-
// CGH.ext_oneapi_prefetch_exp(Ptr, Count, Direction);
815-
// },
816-
// TlsCodeLocCapture.query());
817-
// }
818763

819764
/// Provides hints to the runtime library that data should be made available
820765
/// on a device earlier than Unified Shared Memory would normally require it
@@ -837,36 +782,6 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
837782
TlsCodeLocCapture.query());
838783
}
839784

840-
// /// Experimental implementation of prefetch supporting bidirectional USM
841-
// data
842-
// /// migration: Provides hints to the runtime library that data should be
843-
// made
844-
// /// available on a device earlier than Unified Shared Memory would
845-
// normally
846-
// /// require it to be available.
847-
// ///
848-
// /// \param Ptr is a USM pointer to the memory to be prefetched to the
849-
// device.
850-
// /// \param Count is a number of bytes to be prefetched.
851-
// /// \param DepEvents is a vector of events that specifies the kernel
852-
// /// dependencies.
853-
// /// \param Direction indicates the direction to prefetch data to/from.
854-
// /// \return an event representing prefetch operation.
855-
// event ext_oneapi_prefetch_exp(
856-
// const void *Ptr, size_t Count, const std::vector<event> &DepEvents,
857-
// ext::oneapi::experimental::migration_direction Direction =
858-
// ext::oneapi::experimental::migration_direction::HOST_TO_DEVICE,
859-
// const detail::code_location &CodeLoc =
860-
// detail::code_location::current()) {
861-
// detail::tls_code_loc_t TlsCodeLocCapture(CodeLoc);
862-
// return submit(
863-
// [=](handler &CGH) {
864-
// CGH.depends_on(DepEvents);
865-
// CGH.ext_oneapi_prefetch_exp(Ptr, Count, Direction);
866-
// },
867-
// TlsCodeLocCapture.query());
868-
// }
869-
870785
/// Copies data from one 2D memory region to another, both pointed by
871786
/// USM pointers.
872787
/// No operations is done if \param Width or \param Height is zero. An

‎sycl/source/detail/cg.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
2020
#include <sycl/ext/oneapi/experimental/enqueue_types.hpp> // for prefetch_type
2121
#endif
22-
#include <sycl/kernel.hpp> // for kernel_impl
23-
#include <sycl/kernel_bundle.hpp> // for kernel_bundle_impl
22+
#include <sycl/kernel.hpp> // for kernel_impl
23+
#include <sycl/kernel_bundle.hpp> // for kernel_bundle_impl
2424

2525
#include <assert.h> // for assert
2626
#include <memory> // for shared_ptr, unique_ptr

‎sycl/test-e2e/USM/prefetch_exp.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//==---- prefetch_exp.cpp - Experimental 2-way USM prefetch test
2-
//------------==//
1+
//==-------- prefetch_exp.cpp - Experimental 2-way USM prefetch test -------==//
32
//
43
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
54
// See https://llvm.org/LICENSE.txt for license information.

‎sycl/test-e2e/format.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def execute(self, test, litConfig):
181181
substitutions.append(
182182
(
183183
"%{build}",
184-
"%clangxx -fsycl -fsycl-targets=%{sycl_triple} %verbose_print %s",
184+
"%clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%{sycl_triple} %verbose_print %s",
185185
)
186186
)
187187
if platform.system() == "Windows":

0 commit comments

Comments
 (0)