diff --git a/clang/docs/SYCLSupport.rst b/clang/docs/SYCLSupport.rst index 6b529e3eb0127..9a63b7a095c13 100644 --- a/clang/docs/SYCLSupport.rst +++ b/clang/docs/SYCLSupport.rst @@ -72,7 +72,7 @@ This is also in line with the behaviour of CUDA (`small example template class multi_ptr { // DecoratedType applies corresponding address space attribute to the type T // DecoratedType::type == "__attribute__((opencl_global)) T" - // See sycl/include/CL/sycl/access/access.hpp for more details + // See sycl/include/sycl/access/access.hpp for more details using pointer_t = typename DecoratedType::type *; pointer_t m_Pointer; diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index e106d05ea616e..5dbaed297dd69 100644 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -4585,8 +4585,8 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) { O << "// This is auto-generated SYCL integration header.\n"; O << "\n"; - O << "#include \n"; - O << "#include \n"; + O << "#include \n"; + O << "#include \n"; O << "\n"; @@ -5055,7 +5055,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { // We only want to emit the #includes if we have a variable that needs // them, so emit this one on the first time through the loop. if (!EmittedFirstSpecConstant && !DeviceGlobalsEmitted) - OS << "#include \n"; + OS << "#include \n"; Visited.insert(VD); std::string TopShim = EmitShims(OS, ShimCounter, Policy, VD); @@ -5101,10 +5101,10 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { } if (EmittedFirstSpecConstant) - OS << "#include \n"; + OS << "#include \n"; if (DeviceGlobalsEmitted) { - OS << "#include \n"; + OS << "#include \n"; DeviceGlobOS.flush(); OS << "namespace sycl::detail {\n"; OS << "namespace {\n"; diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp index dacb8ca20b608..989c2c785bf5e 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp @@ -9,7 +9,7 @@ int main() { cl::sycl::kernel_single_task([]() {}); } -// CHECK: #include +// CHECK: #include using namespace cl; @@ -402,4 +402,4 @@ constexpr sycl::specialization_id same_name{17}; } } // namespace outer -// CHECK: #include +// CHECK: #include diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp index 378dcf4eeb2ec..4840cc0ceeb89 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp @@ -9,7 +9,7 @@ int main() { cl::sycl::kernel_single_task([]() {}); } -// CHECK: #include +// CHECK: #include using namespace cl; @@ -155,4 +155,4 @@ constexpr sycl::specialization_id same_name{209}; } } -// CHECK: #include +// CHECK: #include diff --git a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp index d92fe72805700..fd5d42d095c9a 100644 --- a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp +++ b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp @@ -27,7 +27,7 @@ int main() { // CHECK-HEADER: } // namespace sycl // CHECK-HEADER: } // __SYCL_INLINE_NAMESPACE(cl) -// CHECK-FOOTER: #include +// CHECK-FOOTER: #include // Shims go before the registration. // CHECK-FOOTER: namespace Foo { @@ -47,7 +47,7 @@ int main() { // CHECK-FOOTER-NEXT: } // namespace __sycl_detail // CHECK-FOOTER-NEXT: } // namespace -// CHECK-FOOTER: #include +// CHECK-FOOTER: #include // CHECK-FOOTER: namespace sycl::detail { // CHECK-FOOTER-NEXT: namespace { // CHECK-FOOTER-NEXT: __sycl_device_global_registration::__sycl_device_global_registration() noexcept { diff --git a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp index 2f749b64be984..f24f8d80a8385 100644 --- a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp +++ b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp @@ -11,7 +11,7 @@ int main() { cl::sycl::kernel_single_task([]() {}); } -// CHECK: #include +// CHECK: #include constexpr sycl::specialization_id a{2}; // CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { @@ -247,8 +247,8 @@ struct Wrapper { } // namespace } // namespace outer -// CHECK: #include -// CHECK-NEXT: #include +// CHECK: #include +// CHECK-NEXT: #include // CHECK-NEXT: namespace sycl::detail { // CHECK-NEXT: namespace { // CHECK-NEXT: __sycl_device_global_registration::__sycl_device_global_registration() noexcept { diff --git a/clang/test/CodeGenSYCL/empty-integration-footer.cpp b/clang/test/CodeGenSYCL/empty-integration-footer.cpp index 2ff491855c07d..14dc6922de56d 100644 --- a/clang/test/CodeGenSYCL/empty-integration-footer.cpp +++ b/clang/test/CodeGenSYCL/empty-integration-footer.cpp @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -fsycl-int-footer=%t.h %s -emit-llvm -o %t.ll // RUN: FileCheck -input-file=%t.h %s --allow-empty -// CHECK-NOT: #include -// CHECK-NOT: #include +// CHECK-NOT: #include +// CHECK-NOT: #include diff --git a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp index 14fad42a87ab5..854cae63aede3 100644 --- a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp +++ b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp @@ -23,9 +23,9 @@ using namespace cl::sycl::ext::oneapi; // CHECK-HEADER: } // namespace sycl // CHECK-HEADER: } // __SYCL_INLINE_NAMESPACE(cl) -// CHECK-FOOTER: #include +// CHECK-FOOTER: #include -// CHECK-FOOTER: #include +// CHECK-FOOTER: #include // CHECK-FOOTER: namespace sycl::detail { // CHECK-FOOTER-NEXT: namespace { // CHECK-FOOTER-NEXT: __sycl_device_global_registration::__sycl_device_global_registration() noexcept { diff --git a/clang/test/CodeGenSYCL/integration_footer.cpp b/clang/test/CodeGenSYCL/integration_footer.cpp index a9fd6dcb6982e..f824fbd7aa432 100644 --- a/clang/test/CodeGenSYCL/integration_footer.cpp +++ b/clang/test/CodeGenSYCL/integration_footer.cpp @@ -7,7 +7,7 @@ int main() { cl::sycl::kernel_single_task([]() {}); } -// CHECK: #include +// CHECK: #include using namespace cl::sycl; @@ -200,4 +200,4 @@ auto &y = GlobalWrapper::template sc<20>; // CHECK-NOT: inline const char *get_spec_constant_symbolic_ID_impl<::GlobalWrapper::sc>() // CHECK: inline const char *get_spec_constant_symbolic_ID_impl<::GlobalWrapper::sc<20>>() -// CHECK: #include +// CHECK: #include diff --git a/clang/test/CodeGenSYCL/integration_header.cpp b/clang/test/CodeGenSYCL/integration_header.cpp index a71151581c6ea..b919191d1b574 100644 --- a/clang/test/CodeGenSYCL/integration_header.cpp +++ b/clang/test/CodeGenSYCL/integration_header.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -sycl-std=2020 -fsycl-int-header=%t.h %s -emit-llvm -o %t.ll // RUN: FileCheck -input-file=%t.h %s // -// CHECK: #include +// CHECK: #include // // CHECK: class first_kernel; // CHECK-NEXT: namespace second_namespace { diff --git a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp index 578213df9dd45..19ad226941654 100644 --- a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp @@ -4,7 +4,7 @@ // This test checks the integration header generated when // the kernel argument is an Accessor array. -// CHECK: #include +// CHECK: #include // CHECK: class kernel_A; diff --git a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp index c7c7d8bf8eeb7..9540af6dd74f3 100644 --- a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp @@ -4,7 +4,7 @@ // This test checks the integration header when kernel argument // is a struct containing an Accessor array. -// CHECK: #include +// CHECK: #include // CHECK: class kernel_C; diff --git a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp index 0c0783296857b..9bd433b831e4b 100644 --- a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp @@ -3,7 +3,7 @@ // This test checks the integration header generated for a kernel // with an argument that is a POD array. -// CHECK: #include +// CHECK: #include // CHECK: class kernel_B; diff --git a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp index 74d354597a517..fbb769786de6d 100644 --- a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp +++ b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp @@ -4,7 +4,7 @@ // This test checks the integration header generated when // the kernel argument is union. -// CHECK: #include +// CHECK: #include // CHECK: class kernel_A; diff --git a/clang/test/CodeGenSYCL/wrapped-accessor.cpp b/clang/test/CodeGenSYCL/wrapped-accessor.cpp index 8ebd53d66805a..7152920731e5c 100644 --- a/clang/test/CodeGenSYCL/wrapped-accessor.cpp +++ b/clang/test/CodeGenSYCL/wrapped-accessor.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -fsycl-int-header=%t.h %s -o %t.out // RUN: FileCheck -input-file=%t.h %s // -// CHECK: #include +// CHECK: #include // CHECK: class wrapped_access; diff --git a/clang/test/SemaSYCL/Inputs/CL/sycl/detail/defines_elementary.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp similarity index 100% rename from clang/test/SemaSYCL/Inputs/CL/sycl/detail/defines_elementary.hpp rename to clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp diff --git a/clang/test/SemaSYCL/Inputs/CL/sycl/detail/kernel_desc.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp similarity index 97% rename from clang/test/SemaSYCL/Inputs/CL/sycl/detail/kernel_desc.hpp rename to clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp index 6f797e0f93604..0ddbba218e000 100644 --- a/clang/test/SemaSYCL/Inputs/CL/sycl/detail/kernel_desc.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/libdevice/include/assert-happened.hpp b/libdevice/include/assert-happened.hpp index 8b50f5ef216b3..26e820c517d46 100644 --- a/libdevice/include/assert-happened.hpp +++ b/libdevice/include/assert-happened.hpp @@ -13,7 +13,7 @@ #ifdef __SPIR__ // NOTE Layout of this structure should be aligned with the one in -// sycl/include/CL/sycl/detail/assert_happened.hpp +// sycl/include/sycl/detail/assert_happened.hpp struct AssertHappened { int Flag = 0; char Expr[256 + 1] = ""; diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-bad-inline-test.cpp b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-bad-inline-test.cpp index e92019e233bd3..f3b374259b3c5 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-bad-inline-test.cpp +++ b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-bad-inline-test.cpp @@ -1,4 +1,4 @@ -#include +#include SYCL_EXTERNAL void custom_wrapper(const char *S) { sycl::ext::oneapi::experimental::printf(S); diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-compile-time-unknown.cpp b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-compile-time-unknown.cpp index e4069b8af5bde..428212bf49487 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-compile-time-unknown.cpp +++ b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf-compile-time-unknown.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace sycl; diff --git a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf.cpp b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf.cpp index 3f462fd7722c8..9556c38a8789a 100644 --- a/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf.cpp +++ b/llvm/test/SYCLLowerIR/printf_addrspace/Inputs/experimental-printf.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace sycl; diff --git a/sycl/.gitignore b/sycl/.gitignore index a3fcfee0cf3ca..072dfa6cfc49c 100644 --- a/sycl/.gitignore +++ b/sycl/.gitignore @@ -1,2 +1,2 @@ -include/CL/sycl/version.hpp -include/CL/sycl/feature_test.hpp +include/sycl/version.hpp +include/sycl/feature_test.hpp diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 6b81ca3d5a546..0348a05d03c34 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -154,9 +154,9 @@ set(sycl_inc_dir ${CMAKE_CURRENT_SOURCE_DIR}/include) set(sycl_src_dir ${CMAKE_CURRENT_SOURCE_DIR}/source) set(sycl_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR}/plugins) string(TIMESTAMP __SYCL_COMPILER_VERSION "%Y%m%d") -set(version_header "${sycl_inc_dir}/CL/sycl/version.hpp") +set(version_header "${sycl_inc_dir}/sycl/version.hpp") configure_file("${version_header}.in" "${version_header}") -set(feature_header "${sycl_inc_dir}/CL/sycl/feature_test.hpp") +set(feature_header "${sycl_inc_dir}/sycl/feature_test.hpp") configure_file("${feature_header}.in" "${feature_header}") include(AddBoostMp11Headers) diff --git a/sycl/doc/FAQ.md b/sycl/doc/FAQ.md index 5032533d75a60..55d9d666c8f1c 100644 --- a/sycl/doc/FAQ.md +++ b/sycl/doc/FAQ.md @@ -94,11 +94,11 @@ library is listed in the correct environment variable: `LD_LIBRARY_PATH` Example error message: ``` In file included from example.cpp:1: -In file included from C:\compiler\lib\clang\10.0.0\include\CL/sycl.hpp:11: -In file included from C:\compiler\lib\clang\10.0.0\include\CL/sycl/accessor.hpp:13: -In file included from C:\compiler\lib\clang\10.0.0\include\CL/sycl/buffer.hpp:10: -In file included from C:\compiler\lib\clang\10.0.0\include\CL/sycl/detail/buffer_impl.hpp:14: -In file included from C:\compiler\lib\clang\10.0.0\include\CL/sycl/detail/aligned_allocator.hpp:16: +In file included from C:\compiler\lib\clang\10.0.0\include\sycl/sycl.hpp:11: +In file included from C:\compiler\lib\clang\10.0.0\include\sycl/accessor.hpp:13: +In file included from C:\compiler\lib\clang\10.0.0\include\sycl/buffer.hpp:10: +In file included from C:\compiler\lib\clang\10.0.0\include\sycl/detail/buffer_impl.hpp:14: +In file included from C:\compiler\lib\clang\10.0.0\include\sycl/detail/aligned_allocator.hpp:16: C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.22.27905\include\algorithm(4493,9): error: SYCL kernel cannot call a dllimport function _STL_ASSERT(!(_Left < _Right), "invalid comparator"); diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md index 17b92a01c65d3..13f5807a0b43e 100644 --- a/sycl/doc/GetStartedGuide.md +++ b/sycl/doc/GetStartedGuide.md @@ -563,7 +563,7 @@ A simple DPC++ or SYCL\* program consists of following parts: Creating a file `simple-sycl-app.cpp` with the following C++/SYCL code: ```c++ -#include +#include int main() { // Creating buffer of 4 ints to be used inside the kernel code @@ -737,7 +737,7 @@ The example below illustrates how to use `cl::sycl::device_selector` to create device and queue objects bound to Intel GPU device: ```c++ -#include +#include int main() { class NEOGPUDeviceSelector : public cl::sycl::device_selector { diff --git a/sycl/doc/design/Assert.md b/sycl/doc/design/Assert.md index 22d701d0c3268..c59c5f9c67fd1 100644 --- a/sycl/doc/design/Assert.md +++ b/sycl/doc/design/Assert.md @@ -234,7 +234,7 @@ device binary image descriptor's property sets. Each device image is supplied with an array of property sets. For description of property sets see `struct pi_device_binary_struct` in -[`pi.h`](https://github.com/intel/llvm/blob/sycl/sycl/include/CL/sycl/detail/pi.h#L692) +[`pi.h`](https://github.com/intel/llvm/blob/sycl/sycl/include/sycl/detail/pi.h#L692) A distinct property set `SYCL/assert used` is added. In this set a property with the name of the kernel is added whenever the kernel uses assert. The use of diff --git a/sycl/doc/design/CompilerAndRuntimeDesign.md b/sycl/doc/design/CompilerAndRuntimeDesign.md index 2cc321ffca81c..cb85b6bd346fe 100644 --- a/sycl/doc/design/CompilerAndRuntimeDesign.md +++ b/sycl/doc/design/CompilerAndRuntimeDesign.md @@ -855,7 +855,7 @@ For instance: template class multi_ptr { // DecoratedType applies corresponding address space attribute to the type T // DecoratedType::type == "__attribute__((opencl_global)) T" - // See sycl/include/CL/sycl/access/access.hpp for more details + // See sycl/include/sycl/access/access.hpp for more details using pointer_t = typename DecoratedType::type *; pointer_t m_Pointer; diff --git a/sycl/doc/design/GlobalObjectsInRuntime.md b/sycl/doc/design/GlobalObjectsInRuntime.md index d09bfddad9e00..0815738e80822 100644 --- a/sycl/doc/design/GlobalObjectsInRuntime.md +++ b/sycl/doc/design/GlobalObjectsInRuntime.md @@ -17,7 +17,7 @@ At the same time, SYCL users may want to construct some SYCL objects globally, like in example below: ``` -#include +#include sycl::queue Queue; diff --git a/sycl/doc/design/KernelProgramCache.md b/sycl/doc/design/KernelProgramCache.md index e84f17361b828..fa46ab6e70289 100644 --- a/sycl/doc/design/KernelProgramCache.md +++ b/sycl/doc/design/KernelProgramCache.md @@ -284,7 +284,7 @@ following is done: All fields are atomic because they can be accessed from multiple threads. A specialization of helper class -[Locked](https://github.com/intel/llvm/blob/sycl/sycl/include/CL/sycl/detail/locked.hpp) +[Locked](https://github.com/intel/llvm/blob/sycl/sycl/include/sycl/detail/locked.hpp) for reference of proper mapping is returned by Acquire function. The use of this class implements RAII to make code look cleaner a bit. Now, GetCache function will return the mapping to be employed that includes the 3 components: kernel diff --git a/sycl/doc/design/PluginInterface.md b/sycl/doc/design/PluginInterface.md index 769475794b344..090baef565f22 100644 --- a/sycl/doc/design/PluginInterface.md +++ b/sycl/doc/design/PluginInterface.md @@ -72,8 +72,8 @@ SYCL_PI_TRACE=-1 lists all PI Traces above and more debug messages. #### Plugin binary interface Plugins should implement all the Interface APIs required for the PI Version -it supports. There is [pi.def](../../include/CL/sycl/detail/pi.def)/ -[pi.h](../../include/CL/sycl/detail/pi.h) file listing all PI API names that +it supports. There is [pi.def](../../include/sycl/detail/pi.def)/ +[pi.h](../../include/sycl/detail/pi.h) file listing all PI API names that can be called by the specific version of Plugin Interface. It exports a function - "piPluginInit" that returns the plugin details and function pointer table containing the list of pointers to implemented Interface @@ -149,7 +149,7 @@ into - **Interoperability API** which allows interoperability with underlying runtimes such as OpenCL. -See [pi.h](../../include/CL/sycl/detail/pi.h) header for the full list and +See [pi.h](../../include/sycl/detail/pi.h) header for the full list and descriptions of PI APIs. ### The Core OpenCL-based PI APIs diff --git a/sycl/doc/design/SYCL2020-SpecializationConstants.md b/sycl/doc/design/SYCL2020-SpecializationConstants.md index 0dbad5d63ce5b..3e7d682942357 100644 --- a/sycl/doc/design/SYCL2020-SpecializationConstants.md +++ b/sycl/doc/design/SYCL2020-SpecializationConstants.md @@ -818,7 +818,7 @@ inline const char *get_spec_constant_symbolic_ID() { } // __SYCL_INLINE_NAMESPACE(cl) // Detailed description of this header is provided below in corresponding RT section -#include +#include ``` Note that `get_spec_constant_symbolic_ID` specialization are generated for each @@ -915,7 +915,7 @@ namespace sycl { } } -#include +#include ``` ### DPC++ runtime diff --git a/sycl/doc/design/SYCLInstrumentationUsingXPTI.md b/sycl/doc/design/SYCLInstrumentationUsingXPTI.md index c1699d84436ec..4244b687b5a4a 100644 --- a/sycl/doc/design/SYCLInstrumentationUsingXPTI.md +++ b/sycl/doc/design/SYCLInstrumentationUsingXPTI.md @@ -78,7 +78,7 @@ plugin interface (PI) layer `initialize()` call. In this call, we will perform two operations: 1. Initialize all listeners and create a trace event to represent the graph. -This is done in `sycl/include/CL/sycl/detail/pi.cpp`. +This is done in `sycl/include/sycl/detail/pi.cpp`. 2. Send a `graph_create` event to all subscribers. This notification will only be sent once. diff --git a/sycl/doc/developer/ABIPolicyGuide.md b/sycl/doc/developer/ABIPolicyGuide.md index feeedb0493472..c5cc0f546e239 100644 --- a/sycl/doc/developer/ABIPolicyGuide.md +++ b/sycl/doc/developer/ABIPolicyGuide.md @@ -129,4 +129,4 @@ At the end of this window we will increment major version of the DPC++ library 1. If there is a need to add a new field in `sycl::handler` or/and `sycl::detail::CG` classes it can be done without breaking ABI using the approach described in the comment at the beggining of - [cg.hpp](../../include/CL/sycl/detail/cg.hpp) + [cg.hpp](../../include/sycl/detail/cg.hpp) diff --git a/sycl/doc/extensions/experimental/sycl_ext_intel_esimd/sycl_ext_intel_esimd.md b/sycl/doc/extensions/experimental/sycl_ext_intel_esimd/sycl_ext_intel_esimd.md index 28704d71a347e..b0e8fe0e36f23 100644 --- a/sycl/doc/extensions/experimental/sycl_ext_intel_esimd/sycl_ext_intel_esimd.md +++ b/sycl/doc/extensions/experimental/sycl_ext_intel_esimd/sycl_ext_intel_esimd.md @@ -37,7 +37,7 @@ functions will always return `1`. *Functor kernel* ```cpp -#include +#include #include using AccTy = sycl::accessor +#include #include #include @@ -620,7 +620,7 @@ The parameter and the return type in the ABI form will be `<8 x float>`. ## Examples ### Vector addition (USM) ```cpp -#include +#include #include #include diff --git a/sycl/doc/extensions/experimental/sycl_ext_oneapi_max_work_group_query.md b/sycl/doc/extensions/experimental/sycl_ext_oneapi_max_work_group_query.md index 39d0545de0ce2..19435c44f4b0d 100644 --- a/sycl/doc/extensions/experimental/sycl_ext_oneapi_max_work_group_query.md +++ b/sycl/doc/extensions/experimental/sycl_ext_oneapi_max_work_group_query.md @@ -76,9 +76,9 @@ gpu_queue.submit(work_range, ...); Right now, DPC++ does not support templated device descriptors as they are defined in the SYCL specification section 4.6.4.2 "Device information descriptors". When the implementation supports this syntax, `ext_oneapi_max_work_groups_[1,2,3]d` should be replaced by the templated syntax: `ext_oneapi_max_work_groups<[1,2,3]>`. ### Consistency with existing checks -The implementation already checks when enqueuing a kernel that the global and per dimension work-group number is smaller than `std::numeric_limits::max`. This check is implemented in `sycl/include/CL/sycl/handler.hpp`. For consistency, values returned by the two device descriptors are bound by this limit. +The implementation already checks when enqueuing a kernel that the global and per dimension work-group number is smaller than `std::numeric_limits::max`. This check is implemented in `sycl/include/sycl/handler.hpp`. For consistency, values returned by the two device descriptors are bound by this limit. ### Example of returned values -- If the device is the host or has an OpenCL back-end, the values returned - as they are not applicable - are the maximum values accepted at kernel submission (see `sycl/include/CL/sycl/handler.hpp`) which are currently `std::numeric_limits::max`. +- If the device is the host or has an OpenCL back-end, the values returned - as they are not applicable - are the maximum values accepted at kernel submission (see `sycl/include/sycl/handler.hpp`) which are currently `std::numeric_limits::max`. - CUDA: Back-end query using `CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_[X,Y,Z]`. diff --git a/sycl/doc/extensions/supported/C-CXX-StandardLibrary.rst b/sycl/doc/extensions/supported/C-CXX-StandardLibrary.rst index 92dc61b785117..1712a40e60251 100644 --- a/sycl/doc/extensions/supported/C-CXX-StandardLibrary.rst +++ b/sycl/doc/extensions/supported/C-CXX-StandardLibrary.rst @@ -115,7 +115,7 @@ Example of usage .. code: c++ #include - #include + #include template void simple_vadd(const std::array& VA, const std::array& VB, @@ -143,7 +143,7 @@ Example of usage .. code: c++ #include - #include + #include void device_sin_test() { cl::sycl::queue deviceQueue; diff --git a/sycl/doc/extensions/supported/sycl_ext_intel_fpga_reg.md b/sycl/doc/extensions/supported/sycl_ext_intel_fpga_reg.md index fe62ceae6e626..62756297b1949 100644 --- a/sycl/doc/extensions/supported/sycl_ext_intel_fpga_reg.md +++ b/sycl/doc/extensions/supported/sycl_ext_intel_fpga_reg.md @@ -1,7 +1,7 @@ # FPGA reg Intel FPGA extension `fpga_reg()` is implemented in header file -`#include `. +`#include `. fpga_reg is used to help compiler infer that at least one register is on the corresponding data path. @@ -22,7 +22,7 @@ The implementation is a wrapper class to map fpga_reg function call to a Clang b ## Usage ```c++ -#include +#include ... // force at least one register on data path int a = cl::sycl::intel::fpga_reg(a[k]) + b[k]; diff --git a/sycl/doc/extensions/supported/sycl_ext_oneapi_assert.asciidoc b/sycl/doc/extensions/supported/sycl_ext_oneapi_assert.asciidoc index 43aa2c346a24a..1004256596d7a 100644 --- a/sycl/doc/extensions/supported/sycl_ext_oneapi_assert.asciidoc +++ b/sycl/doc/extensions/supported/sycl_ext_oneapi_assert.asciidoc @@ -78,7 +78,7 @@ two mechanisms a device uses by testing the device aspect The `assert()` macro is defined in system include headers, not in SYCL headers. On most of systems it is `` and/or `` header files. The user can disable assertions in device code by defining the `NDEBUG` -preprocessor macro prior to including either of `` and +preprocessor macro prior to including either of `` and `/`. Following is an example use-case: diff --git a/sycl/gdb/libsycl.so-gdb.py b/sycl/gdb/libsycl.so-gdb.py index 9331f36e1fd4b..c48f20a473c98 100644 --- a/sycl/gdb/libsycl.so-gdb.py +++ b/sycl/gdb/libsycl.so-gdb.py @@ -35,7 +35,6 @@ def index(self, arg): arg = arg["MImpl"]["MIndex"] except: pass - # https://github.com/intel/llvm/blob/97272b7ebd569bfa13811913a31e30f926559217/sycl/include/CL/sycl/accessor.hpp#L678-L690 result = 0 for dim in range(self.depth): result = ( @@ -71,7 +70,6 @@ class HostAccessorLocal(HostAccessor): def index(self, arg): if arg.type.code == gdb.TYPE_CODE_INT: return int(arg) - # https://github.com/intel/llvm/blob/97272b7ebd569bfa13811913a31e30f926559217/sycl/include/CL/sycl/accessor.hpp#L1049-L1053 result = 0 for dim in range(self.depth): result = ( diff --git a/sycl/include/CL/__spirv/spirv_ops.hpp b/sycl/include/CL/__spirv/spirv_ops.hpp index 350820c66f36d..68c7ca1fe0590 100644 --- a/sycl/include/CL/__spirv/spirv_ops.hpp +++ b/sycl/include/CL/__spirv/spirv_ops.hpp @@ -8,11 +8,11 @@ #pragma once #include -#include -#include -#include #include #include +#include +#include +#include // Convergent attribute #ifdef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/__spirv/spirv_types.hpp b/sycl/include/CL/__spirv/spirv_types.hpp index 4fb0fa8886796..61cc20a0130be 100644 --- a/sycl/include/CL/__spirv/spirv_types.hpp +++ b/sycl/include/CL/__spirv/spirv_types.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/include/CL/sycl.hpp b/sycl/include/CL/sycl.hpp index 9b517ced4b659..1cdcfa32012be 100644 --- a/sycl/include/CL/sycl.hpp +++ b/sycl/include/CL/sycl.hpp @@ -8,66 +8,4 @@ #pragma once -#include -#include -#include -#include -#include -#include -#if SYCL_BACKEND_OPENCL -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO -#include -#endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include diff --git a/sycl/include/CL/sycl/detail/locked.hpp b/sycl/include/CL/sycl/detail/locked.hpp deleted file mode 100644 index e61c4d36c5059..0000000000000 --- a/sycl/include/CL/sycl/detail/locked.hpp +++ /dev/null @@ -1,39 +0,0 @@ -//==---------------- locked.hpp - Reference with lock -----------*- C++-*---==// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#pragma once - -#include - -#include -#include - -__SYCL_INLINE_NAMESPACE(cl) { -namespace sycl { -namespace detail { - /// Represents a reference to value with appropriate lock acquired. - /// Employed for acquire/release logic. Acquire action is construction - /// of instance of locked<>. Release action is destruction of instance of - /// locked<>. - template - class Locked { - std::reference_wrapper m_Value; - std::unique_lock m_Lock; - - public: - Locked(T &v, std::mutex &mutex) - : m_Value{v}, m_Lock{mutex} - {} - - T& get() const { - return m_Value.get(); - } - }; -} -} -} diff --git a/sycl/include/CL/sycl/properties/all_properties.hpp b/sycl/include/CL/sycl/properties/all_properties.hpp deleted file mode 100644 index 8b2e276218961..0000000000000 --- a/sycl/include/CL/sycl/properties/all_properties.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#include -#include -#include diff --git a/sycl/include/CL/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp similarity index 96% rename from sycl/include/CL/sycl/access/access.hpp rename to sycl/include/sycl/access/access.hpp index 430c1e715bc82..8efc8b55567dd 100644 --- a/sycl/include/CL/sycl/access/access.hpp +++ b/sycl/include/sycl/access/access.hpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -206,7 +206,9 @@ template struct DecoratedType { using type = __OPENCL_LOCAL_AS__ ElementType; }; -template struct remove_AS { typedef T type; }; +template struct remove_AS { + typedef T type; +}; #ifdef __SYCL_DEVICE_ONLY__ template struct deduce_AS { @@ -214,7 +216,9 @@ template struct deduce_AS { "Only types with address space attributes are supported"); }; -template struct remove_AS<__OPENCL_GLOBAL_AS__ T> { typedef T type; }; +template struct remove_AS<__OPENCL_GLOBAL_AS__ T> { + typedef T type; +}; #ifdef __ENABLE_USM_ADDR_SPACE__ template struct remove_AS<__OPENCL_GLOBAL_DEVICE_AS__ T> { @@ -240,7 +244,9 @@ template struct remove_AS<__OPENCL_PRIVATE_AS__ T> { typedef T type; }; -template struct remove_AS<__OPENCL_LOCAL_AS__ T> { typedef T type; }; +template struct remove_AS<__OPENCL_LOCAL_AS__ T> { + typedef T type; +}; template struct remove_AS<__OPENCL_CONSTANT_AS__ T> { typedef T type; diff --git a/sycl/include/CL/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp similarity index 99% rename from sycl/include/CL/sycl/accessor.hpp rename to sycl/include/sycl/accessor.hpp index fbb728ff85bbc..07cda2d1eace7 100644 --- a/sycl/include/CL/sycl/accessor.hpp +++ b/sycl/include/sycl/accessor.hpp @@ -9,25 +9,25 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/aliases.hpp b/sycl/include/sycl/aliases.hpp similarity index 98% rename from sycl/include/CL/sycl/aliases.hpp rename to sycl/include/sycl/aliases.hpp index bb6ccf40cc3d7..f42c43e066f92 100644 --- a/sycl/include/CL/sycl/aliases.hpp +++ b/sycl/include/sycl/aliases.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/aspects.hpp b/sycl/include/sycl/aspects.hpp similarity index 97% rename from sycl/include/CL/sycl/aspects.hpp rename to sycl/include/sycl/aspects.hpp index f7f10734a580c..94c6632707246 100644 --- a/sycl/include/CL/sycl/aspects.hpp +++ b/sycl/include/sycl/aspects.hpp @@ -7,7 +7,7 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/atomic.hpp b/sycl/include/sycl/atomic.hpp similarity index 98% rename from sycl/include/CL/sycl/atomic.hpp rename to sycl/include/sycl/atomic.hpp index 66075b01c4f3a..968de0bdcc767 100644 --- a/sycl/include/CL/sycl/atomic.hpp +++ b/sycl/include/sycl/atomic.hpp @@ -9,10 +9,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #ifndef __SYCL_DEVICE_ONLY__ #include @@ -219,8 +219,8 @@ class __SYCL2020_DEPRECATED( #endif // __ENABLE_USM_ADDR_SPACE__ void store(T Operand, memory_order Order = memory_order::relaxed) { - __spirv_AtomicStore( - Ptr, SpirvScope, detail::getSPIRVMemorySemanticsMask(Order), Operand); + __spirv_AtomicStore(Ptr, SpirvScope, + detail::getSPIRVMemorySemanticsMask(Order), Operand); } #ifdef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/sycl/atomic_fence.hpp b/sycl/include/sycl/atomic_fence.hpp similarity index 93% rename from sycl/include/CL/sycl/atomic_fence.hpp rename to sycl/include/sycl/atomic_fence.hpp index 056e876f39a07..5256c42715005 100644 --- a/sycl/include/CL/sycl/atomic_fence.hpp +++ b/sycl/include/sycl/atomic_fence.hpp @@ -9,8 +9,8 @@ #pragma once #include -#include -#include +#include +#include #ifndef __SYCL_DEVICE_ONLY__ #include diff --git a/sycl/include/CL/sycl/atomic_ref.hpp b/sycl/include/sycl/atomic_ref.hpp similarity index 99% rename from sycl/include/CL/sycl/atomic_ref.hpp rename to sycl/include/sycl/atomic_ref.hpp index de9fc32009e40..083c5c7319e1d 100644 --- a/sycl/include/CL/sycl/atomic_ref.hpp +++ b/sycl/include/sycl/atomic_ref.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __SYCL_DEVICE_ONLY__ -#include -#include +#include +#include #endif #ifndef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/sycl/backend.hpp b/sycl/include/sycl/backend.hpp similarity index 94% rename from sycl/include/CL/sycl/backend.hpp rename to sycl/include/sycl/backend.hpp index 40a3b76bbe235..668735af5faa5 100644 --- a/sycl/include/CL/sycl/backend.hpp +++ b/sycl/include/sycl/backend.hpp @@ -8,38 +8,38 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #if SYCL_BACKEND_OPENCL -#include +#include #endif #if SYCL_EXT_ONEAPI_BACKEND_CUDA #ifdef SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL #include #else -#include +#include #endif #endif #if SYCL_EXT_ONEAPI_BACKEND_HIP -#include +#include #endif #if SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/backend/cuda.hpp b/sycl/include/sycl/backend/cuda.hpp similarity index 74% rename from sycl/include/CL/sycl/backend/cuda.hpp rename to sycl/include/sycl/backend/cuda.hpp index 6c2b90c13de29..b18058d9f6902 100644 --- a/sycl/include/CL/sycl/backend/cuda.hpp +++ b/sycl/include/sycl/backend/cuda.hpp @@ -9,6 +9,6 @@ #pragma once -#include +#include -__SYCL_WARNING("CL/sycl/backend/cuda.hpp is deprecated and no required anymore") +__SYCL_WARNING("sycl/backend/cuda.hpp is deprecated and no required anymore") diff --git a/sycl/include/CL/sycl/backend/level_zero.hpp b/sycl/include/sycl/backend/level_zero.hpp similarity index 79% rename from sycl/include/CL/sycl/backend/level_zero.hpp rename to sycl/include/sycl/backend/level_zero.hpp index 8d808fec3e5ee..179556ee48b31 100644 --- a/sycl/include/CL/sycl/backend/level_zero.hpp +++ b/sycl/include/sycl/backend/level_zero.hpp @@ -8,9 +8,9 @@ #pragma once -#include +#include -__SYCL_WARNING("CL/sycl/backend/level_zero.hpp usage is deprecated, include " +__SYCL_WARNING("sycl/backend/level_zero.hpp usage is deprecated, include " "sycl/ext/oneapi/backend/level_zero.hpp instead") #include diff --git a/sycl/include/CL/sycl/backend/opencl.hpp b/sycl/include/sycl/backend/opencl.hpp similarity index 99% rename from sycl/include/CL/sycl/backend/opencl.hpp rename to sycl/include/sycl/backend/opencl.hpp index 503ab7d855493..cd5268b3cb436 100644 --- a/sycl/include/CL/sycl/backend/opencl.hpp +++ b/sycl/include/sycl/backend/opencl.hpp @@ -9,7 +9,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/backend_types.hpp b/sycl/include/sycl/backend_types.hpp similarity index 98% rename from sycl/include/CL/sycl/backend_types.hpp rename to sycl/include/sycl/backend_types.hpp index 8ce0bd65971af..cff6fb250d32d 100644 --- a/sycl/include/CL/sycl/backend_types.hpp +++ b/sycl/include/sycl/backend_types.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/include/CL/sycl/bit_cast.hpp b/sycl/include/sycl/bit_cast.hpp similarity index 100% rename from sycl/include/CL/sycl/bit_cast.hpp rename to sycl/include/sycl/bit_cast.hpp diff --git a/sycl/include/CL/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp similarity index 99% rename from sycl/include/CL/sycl/buffer.hpp rename to sycl/include/sycl/buffer.hpp index 26ad7fb8c25cd..c1efbc63fa060 100644 --- a/sycl/include/CL/sycl/buffer.hpp +++ b/sycl/include/sycl/buffer.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/builtins.hpp b/sycl/include/sycl/builtins.hpp similarity index 99% rename from sycl/include/CL/sycl/builtins.hpp rename to sycl/include/sycl/builtins.hpp index 3ca2f945be111..e2d259cde58cf 100644 --- a/sycl/include/CL/sycl/builtins.hpp +++ b/sycl/include/sycl/builtins.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // TODO Decide whether to mark functions with this attribute. #define __NOEXC /*noexcept*/ diff --git a/sycl/include/CL/sycl/builtins_esimd.hpp b/sycl/include/sycl/builtins_esimd.hpp similarity index 90% rename from sycl/include/CL/sycl/builtins_esimd.hpp rename to sycl/include/sycl/builtins_esimd.hpp index 383ad83e6646e..dfb22b08b172a 100644 --- a/sycl/include/CL/sycl/builtins_esimd.hpp +++ b/sycl/include/sycl/builtins_esimd.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include // TODO Decide whether to mark functions with this attribute. #define __NOEXC /*noexcept*/ diff --git a/sycl/include/CL/sycl/context.hpp b/sycl/include/sycl/context.hpp similarity index 96% rename from sycl/include/CL/sycl/context.hpp rename to sycl/include/sycl/context.hpp index ad8c266f8e1e9..10c60ca1626e1 100644 --- a/sycl/include/CL/sycl/context.hpp +++ b/sycl/include/sycl/context.hpp @@ -8,15 +8,15 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // 4.6.2 Context class diff --git a/sycl/include/CL/sycl/define_vendors.hpp b/sycl/include/sycl/define_vendors.hpp similarity index 100% rename from sycl/include/CL/sycl/define_vendors.hpp rename to sycl/include/sycl/define_vendors.hpp diff --git a/sycl/include/CL/sycl/detail/accessor_impl.hpp b/sycl/include/sycl/detail/accessor_impl.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/accessor_impl.hpp rename to sycl/include/sycl/detail/accessor_impl.hpp index ae7f9168f2c0c..42a1c0c23d0a3 100644 --- a/sycl/include/CL/sycl/detail/accessor_impl.hpp +++ b/sycl/include/sycl/detail/accessor_impl.hpp @@ -8,15 +8,18 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +template +class accessor; namespace ext { namespace intel { diff --git a/sycl/include/CL/sycl/detail/aligned_allocator.hpp b/sycl/include/sycl/detail/aligned_allocator.hpp similarity index 86% rename from sycl/include/CL/sycl/detail/aligned_allocator.hpp rename to sycl/include/sycl/detail/aligned_allocator.hpp index 4536a716d847a..6c16d68e8d215 100644 --- a/sycl/include/CL/sycl/detail/aligned_allocator.hpp +++ b/sycl/include/sycl/detail/aligned_allocator.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include @@ -23,13 +23,15 @@ namespace detail { template class aligned_allocator { public: using value_type = T; - using pointer = T*; - using const_pointer = const T*; - using reference = T&; - using const_reference = const T&; + using pointer = T *; + using const_pointer = const T *; + using reference = T &; + using const_reference = const T &; public: - template struct rebind { typedef aligned_allocator other; }; + template struct rebind { + typedef aligned_allocator other; + }; aligned_allocator() = default; ~aligned_allocator() = default; diff --git a/sycl/include/CL/sycl/detail/array.hpp b/sycl/include/sycl/detail/array.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/array.hpp rename to sycl/include/sycl/detail/array.hpp index 53bfee160514e..9b3a2aea5708b 100644 --- a/sycl/include/CL/sycl/detail/array.hpp +++ b/sycl/include/sycl/detail/array.hpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/assert_happened.hpp b/sycl/include/sycl/detail/assert_happened.hpp similarity index 95% rename from sycl/include/CL/sycl/detail/assert_happened.hpp rename to sycl/include/sycl/detail/assert_happened.hpp index 7c5f45c3fc4e5..4b2688952b21e 100644 --- a/sycl/include/CL/sycl/detail/assert_happened.hpp +++ b/sycl/include/sycl/detail/assert_happened.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include diff --git a/sycl/include/CL/sycl/detail/backend_traits.hpp b/sycl/include/sycl/detail/backend_traits.hpp similarity index 93% rename from sycl/include/CL/sycl/detail/backend_traits.hpp rename to sycl/include/sycl/detail/backend_traits.hpp index 715f37954d795..e07c6f702a7ba 100644 --- a/sycl/include/CL/sycl/detail/backend_traits.hpp +++ b/sycl/include/sycl/detail/backend_traits.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/backend_traits_cuda.hpp b/sycl/include/sycl/detail/backend_traits_cuda.hpp similarity index 94% rename from sycl/include/CL/sycl/detail/backend_traits_cuda.hpp rename to sycl/include/sycl/detail/backend_traits_cuda.hpp index 09c7c0a994a7b..5f676b0875348 100644 --- a/sycl/include/CL/sycl/detail/backend_traits_cuda.hpp +++ b/sycl/include/sycl/detail/backend_traits_cuda.hpp @@ -14,13 +14,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include typedef int CUdevice; typedef struct CUctx_st *CUcontext; diff --git a/sycl/include/CL/sycl/detail/backend_traits_hip.hpp b/sycl/include/sycl/detail/backend_traits_hip.hpp similarity index 94% rename from sycl/include/CL/sycl/detail/backend_traits_hip.hpp rename to sycl/include/sycl/detail/backend_traits_hip.hpp index 26e9359953d33..4fabbc1700369 100644 --- a/sycl/include/CL/sycl/detail/backend_traits_hip.hpp +++ b/sycl/include/sycl/detail/backend_traits_hip.hpp @@ -14,13 +14,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include typedef int HIPdevice; typedef struct ihipCtx_t *HIPcontext; diff --git a/sycl/include/CL/sycl/detail/backend_traits_level_zero.hpp b/sycl/include/sycl/detail/backend_traits_level_zero.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/backend_traits_level_zero.hpp rename to sycl/include/sycl/detail/backend_traits_level_zero.hpp index ca9b7ab77d70a..9f69d9f65b0f2 100644 --- a/sycl/include/CL/sycl/detail/backend_traits_level_zero.hpp +++ b/sycl/include/sycl/detail/backend_traits_level_zero.hpp @@ -15,16 +15,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include typedef struct _ze_command_queue_handle_t *ze_command_queue_handle_t; typedef struct _ze_context_handle_t *ze_context_handle_t; diff --git a/sycl/include/CL/sycl/detail/backend_traits_opencl.hpp b/sycl/include/sycl/detail/backend_traits_opencl.hpp similarity index 94% rename from sycl/include/CL/sycl/detail/backend_traits_opencl.hpp rename to sycl/include/sycl/detail/backend_traits_opencl.hpp index 2626f03ebdbab..dd5ec51e10060 100644 --- a/sycl/include/CL/sycl/detail/backend_traits_opencl.hpp +++ b/sycl/include/sycl/detail/backend_traits_opencl.hpp @@ -15,15 +15,15 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -126,7 +126,9 @@ template <> struct BackendReturn { using value_type = cl_event; }; #else -template <> struct interop { using type = cl_event; }; +template <> struct interop { + using type = cl_event; +}; template <> struct BackendInput { using type = cl_event; }; diff --git a/sycl/include/CL/sycl/detail/boolean.hpp b/sycl/include/sycl/detail/boolean.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/boolean.hpp rename to sycl/include/sycl/detail/boolean.hpp index 5f2c8776eca6d..2923fb565357f 100644 --- a/sycl/include/CL/sycl/detail/boolean.hpp +++ b/sycl/include/sycl/detail/boolean.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/buffer_impl.hpp b/sycl/include/sycl/detail/buffer_impl.hpp similarity index 95% rename from sycl/include/CL/sycl/detail/buffer_impl.hpp rename to sycl/include/sycl/detail/buffer_impl.hpp index 8e31cb1ecf792..272ef2e493dc4 100644 --- a/sycl/include/CL/sycl/detail/buffer_impl.hpp +++ b/sycl/include/sycl/detail/buffer_impl.hpp @@ -8,16 +8,16 @@ #pragma once -#include "CL/sycl/detail/pi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "sycl/detail/pi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/builtins.hpp b/sycl/include/sycl/detail/builtins.hpp similarity index 99% rename from sycl/include/CL/sycl/detail/builtins.hpp rename to sycl/include/sycl/detail/builtins.hpp index f4f0475ea905b..c3b0305531cd6 100644 --- a/sycl/include/CL/sycl/detail/builtins.hpp +++ b/sycl/include/sycl/detail/builtins.hpp @@ -9,8 +9,8 @@ #pragma once #include -#include -#include +#include +#include #include diff --git a/sycl/include/CL/sycl/detail/cg.hpp b/sycl/include/sycl/detail/cg.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/cg.hpp rename to sycl/include/sycl/detail/cg.hpp index ba70ddefcee2e..89139df4c569d 100644 --- a/sycl/include/CL/sycl/detail/cg.hpp +++ b/sycl/include/sycl/detail/cg.hpp @@ -8,23 +8,23 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/cg_types.hpp b/sycl/include/sycl/detail/cg_types.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/cg_types.hpp rename to sycl/include/sycl/detail/cg_types.hpp index 8d967e1a92edd..109bd4d62283f 100644 --- a/sycl/include/CL/sycl/detail/cg_types.hpp +++ b/sycl/include/sycl/detail/cg_types.hpp @@ -8,16 +8,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/cl.h b/sycl/include/sycl/detail/cl.h similarity index 100% rename from sycl/include/CL/sycl/detail/cl.h rename to sycl/include/sycl/detail/cl.h diff --git a/sycl/include/CL/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/common.hpp rename to sycl/include/sycl/detail/common.hpp index 1b0bcd34c95da..e6ae41208bfe8 100644 --- a/sycl/include/CL/sycl/detail/common.hpp +++ b/sycl/include/sycl/detail/common.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -129,7 +129,7 @@ static inline std::string codeToString(pi_int32 code) { #endif #ifndef SYCL_SUPPRESS_EXCEPTIONS -#include +#include // SYCL 1.2.1 exceptions #define __SYCL_REPORT_PI_ERR_TO_EXC(expr, exc, str) \ { \ diff --git a/sycl/include/CL/sycl/detail/common_info.hpp b/sycl/include/sycl/detail/common_info.hpp similarity index 91% rename from sycl/include/CL/sycl/detail/common_info.hpp rename to sycl/include/sycl/detail/common_info.hpp index b8a82f8cb2861..d63d00e18ea70 100644 --- a/sycl/include/CL/sycl/detail/common_info.hpp +++ b/sycl/include/sycl/detail/common_info.hpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/cuda_definitions.hpp b/sycl/include/sycl/detail/cuda_definitions.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/cuda_definitions.hpp rename to sycl/include/sycl/detail/cuda_definitions.hpp diff --git a/sycl/include/CL/sycl/detail/defines.hpp b/sycl/include/sycl/detail/defines.hpp similarity index 94% rename from sycl/include/CL/sycl/detail/defines.hpp rename to sycl/include/sycl/detail/defines.hpp index ae5d9f2c7f3e9..40cf18c953178 100644 --- a/sycl/include/CL/sycl/detail/defines.hpp +++ b/sycl/include/sycl/detail/defines.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include diff --git a/sycl/include/CL/sycl/detail/defines_elementary.hpp b/sycl/include/sycl/detail/defines_elementary.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/defines_elementary.hpp rename to sycl/include/sycl/detail/defines_elementary.hpp diff --git a/sycl/include/CL/sycl/detail/device_binary_image.hpp b/sycl/include/sycl/detail/device_binary_image.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/device_binary_image.hpp rename to sycl/include/sycl/detail/device_binary_image.hpp index 419b23230d293..086482b41156b 100644 --- a/sycl/include/CL/sycl/detail/device_binary_image.hpp +++ b/sycl/include/sycl/detail/device_binary_image.hpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include +#include +#include #include diff --git a/sycl/include/CL/sycl/detail/device_filter.hpp b/sycl/include/sycl/detail/device_filter.hpp similarity index 95% rename from sycl/include/CL/sycl/detail/device_filter.hpp rename to sycl/include/sycl/detail/device_filter.hpp index 746f7714e21a0..72fd27fee2cff 100644 --- a/sycl/include/CL/sycl/detail/device_filter.hpp +++ b/sycl/include/sycl/detail/device_filter.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/device_global_map.hpp b/sycl/include/sycl/detail/device_global_map.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/device_global_map.hpp rename to sycl/include/sycl/detail/device_global_map.hpp diff --git a/sycl/include/CL/sycl/detail/export.hpp b/sycl/include/sycl/detail/export.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/export.hpp rename to sycl/include/sycl/detail/export.hpp diff --git a/sycl/include/CL/sycl/detail/generic_type_lists.hpp b/sycl/include/sycl/detail/generic_type_lists.hpp similarity index 99% rename from sycl/include/CL/sycl/detail/generic_type_lists.hpp rename to sycl/include/sycl/detail/generic_type_lists.hpp index 3091644b079ab..ba4ea08d8ac99 100644 --- a/sycl/include/CL/sycl/detail/generic_type_lists.hpp +++ b/sycl/include/sycl/detail/generic_type_lists.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/generic_type_traits.hpp rename to sycl/include/sycl/detail/generic_type_traits.hpp index 670fb49104a60..475d9130fb4e4 100644 --- a/sycl/include/CL/sycl/detail/generic_type_traits.hpp +++ b/sycl/include/sycl/detail/generic_type_traits.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -431,10 +431,14 @@ struct select_cl_mptr_or_vector_or_scalar; // this struct helps to use std::uint8_t instead of std::byte, // which is not supported on device -template struct TypeHelper { using RetType = T; }; +template struct TypeHelper { + using RetType = T; +}; #if __cplusplus >= 201703L && (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0) -template <> struct TypeHelper { using RetType = std::uint8_t; }; +template <> struct TypeHelper { + using RetType = std::uint8_t; +}; #endif template using type_helper = typename TypeHelper::RetType; diff --git a/sycl/include/CL/sycl/detail/group_sort_impl.hpp b/sycl/include/sycl/detail/group_sort_impl.hpp similarity index 99% rename from sycl/include/CL/sycl/detail/group_sort_impl.hpp rename to sycl/include/sycl/detail/group_sort_impl.hpp index e80f2fd131e77..11fc079d9f745 100644 --- a/sycl/include/CL/sycl/detail/group_sort_impl.hpp +++ b/sycl/include/sycl/detail/group_sort_impl.hpp @@ -11,7 +11,7 @@ #pragma once #if __cplusplus >= 201703L -#include +#include #ifdef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/sycl/detail/handler_proxy.hpp b/sycl/include/sycl/detail/handler_proxy.hpp similarity index 90% rename from sycl/include/CL/sycl/detail/handler_proxy.hpp rename to sycl/include/sycl/detail/handler_proxy.hpp index 8ed01eb7a7b4d..922c7f6be29f3 100644 --- a/sycl/include/CL/sycl/detail/handler_proxy.hpp +++ b/sycl/include/sycl/detail/handler_proxy.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/helpers.hpp b/sycl/include/sycl/detail/helpers.hpp similarity index 92% rename from sycl/include/CL/sycl/detail/helpers.hpp rename to sycl/include/sycl/detail/helpers.hpp index 838b68f33a641..6c6ab4e3a8b3d 100644 --- a/sycl/include/CL/sycl/detail/helpers.hpp +++ b/sycl/include/sycl/detail/helpers.hpp @@ -10,11 +10,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -43,7 +43,6 @@ inline void memcpy(void *Dst, const void *Src, size_t Size) { } } - class context_impl; // The function returns list of events that can be passed to OpenCL API as // dependency list and waits for others. @@ -234,16 +233,16 @@ getSPIRVMemorySemanticsMask(const access::fence_space AccessSpace, ? static_cast( __spv::MemorySemanticsMask::SequentiallyConsistent | __spv::MemorySemanticsMask::CrossWorkgroupMemory) - : (AccessSpace == access::fence_space::local_space) - ? static_cast( - __spv::MemorySemanticsMask::SequentiallyConsistent | - LocalScopeMask) - : /* default: (AccessSpace == - access::fence_space::global_and_local) */ - static_cast( - __spv::MemorySemanticsMask::SequentiallyConsistent | - __spv::MemorySemanticsMask::CrossWorkgroupMemory | - LocalScopeMask); + : (AccessSpace == access::fence_space::local_space) + ? static_cast( + __spv::MemorySemanticsMask::SequentiallyConsistent | + LocalScopeMask) + : /* default: (AccessSpace == + access::fence_space::global_and_local) */ + static_cast( + __spv::MemorySemanticsMask::SequentiallyConsistent | + __spv::MemorySemanticsMask::CrossWorkgroupMemory | + LocalScopeMask); } } // namespace detail diff --git a/sycl/include/CL/sycl/detail/hip_definitions.hpp b/sycl/include/sycl/detail/hip_definitions.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/hip_definitions.hpp rename to sycl/include/sycl/detail/hip_definitions.hpp diff --git a/sycl/include/CL/sycl/detail/host_profiling_info.hpp b/sycl/include/sycl/detail/host_profiling_info.hpp similarity index 93% rename from sycl/include/CL/sycl/detail/host_profiling_info.hpp rename to sycl/include/sycl/detail/host_profiling_info.hpp index d2850113e79d9..25bdb805ace8b 100644 --- a/sycl/include/CL/sycl/detail/host_profiling_info.hpp +++ b/sycl/include/sycl/detail/host_profiling_info.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/image_accessor_util.hpp b/sycl/include/sycl/detail/image_accessor_util.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/image_accessor_util.hpp rename to sycl/include/sycl/detail/image_accessor_util.hpp index 151082445366a..ac48940d4bbd5 100644 --- a/sycl/include/CL/sycl/detail/image_accessor_util.hpp +++ b/sycl/include/sycl/detail/image_accessor_util.hpp @@ -12,12 +12,12 @@ #pragma once #ifndef __SYCL_DEVICE_ONLY__ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -799,8 +799,8 @@ void imageWriteHostImpl(const CoordT &Coords, const WriteDataT &Color, template DataT ReadPixelData(const cl_int4 PixelCoord, const id<3> ImgPitch, const image_channel_type ImageChannelType, - const image_channel_order ImageChannelOrder, - void *BasePtr, const uint8_t ElementSize) { + const image_channel_order ImageChannelOrder, void *BasePtr, + const uint8_t ElementSize) { DataT Color(0); auto Ptr = static_cast(BasePtr) + getImageOffset(PixelCoord, ImgPitch, @@ -925,29 +925,28 @@ DataT ReadPixelDataLinearFiltMode(const cl_int8 CoordValues, cl_int i0 = CoordValues.s0(), j0 = CoordValues.s1(), k0 = CoordValues.s2(), i1 = CoordValues.s4(), j1 = CoordValues.s5(), k1 = CoordValues.s6(); - auto getColorInFloat = - [&](cl_int4 V) { - DataT Res = getColor(V, SmplAddrMode, - ImgRange, ImgPitch, ImgChannelType, - ImgChannelOrder, BasePtr, ElementSize); - return Res.template convert(); - }; + auto getColorInFloat = [&](cl_int4 V) { + DataT Res = + getColor(V, SmplAddrMode, ImgRange, ImgPitch, ImgChannelType, + ImgChannelOrder, BasePtr, ElementSize); + return Res.template convert(); + }; // Get Color Values at each Coordinate. cl_float4 Ci0j0k0 = getColorInFloat(cl_int4{i0, j0, k0, 0}); - + cl_float4 Ci1j0k0 = getColorInFloat(cl_int4{i1, j0, k0, 0}); - + cl_float4 Ci0j1k0 = getColorInFloat(cl_int4{i0, j1, k0, 0}); - + cl_float4 Ci1j1k0 = getColorInFloat(cl_int4{i1, j1, k0, 0}); - + cl_float4 Ci0j0k1 = getColorInFloat(cl_int4{i0, j0, k1, 0}); - + cl_float4 Ci1j0k1 = getColorInFloat(cl_int4{i1, j0, k1, 0}); - + cl_float4 Ci0j1k1 = getColorInFloat(cl_int4{i0, j1, k1, 0}); - + cl_float4 Ci1j1k1 = getColorInFloat(cl_int4{i1, j1, k1, 0}); cl_float a = abc.x(); diff --git a/sycl/include/CL/sycl/detail/image_impl.hpp b/sycl/include/sycl/detail/image_impl.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/image_impl.hpp rename to sycl/include/sycl/detail/image_impl.hpp index b708e29e9f674..ffc5a0efedae9 100644 --- a/sycl/include/CL/sycl/detail/image_impl.hpp +++ b/sycl/include/sycl/detail/image_impl.hpp @@ -8,16 +8,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/image_ocl_types.hpp rename to sycl/include/sycl/detail/image_ocl_types.hpp index b4121f387942b..c4b186480a6c3 100644 --- a/sycl/include/CL/sycl/detail/image_ocl_types.hpp +++ b/sycl/include/sycl/detail/image_ocl_types.hpp @@ -28,8 +28,8 @@ #ifdef __SYCL_DEVICE_ONLY__ -#include -#include +#include +#include #include @@ -133,7 +133,7 @@ inline int getSPIRVNumChannels(int ImageChannelOrder) { case 3: // RA case 11: // RGx return 2; - case 4: // RGB + case 4: // RGB return 3; case 5: // RGBA case 6: // BGRA @@ -145,8 +145,8 @@ inline int getSPIRVNumChannels(int ImageChannelOrder) { case 13: // Depth case 14: // DepthStencil case 18: // sBGRA - // TODO: Enable the below assert after assert is supported for device - // compiler. assert(!"Unhandled image channel order in sycl."); + // TODO: Enable the below assert after assert is supported for device + // compiler. assert(!"Unhandled image channel order in sycl."); default: return 0; } @@ -268,4 +268,4 @@ __SYCL_IMAGETY_DISCARD_WRITE_2_DIM_IARRAY #undef __SYCL_IMAGETY_DISCARD_WRITE_2_DIM_IARRAY #undef __SYCL_IMAGETY_READ_2_DIM_IARRAY #undef __SYCL_IMAGETY_WRITE_2_DIM_IARRAY -#endif //#ifdef __SYCL_DEVICE_ONLY__ +#endif // #ifdef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/CL/sycl/detail/item_base.hpp b/sycl/include/sycl/detail/item_base.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/item_base.hpp rename to sycl/include/sycl/detail/item_base.hpp index 3bb8ed7b56570..82facd3fa71f1 100644 --- a/sycl/include/CL/sycl/detail/item_base.hpp +++ b/sycl/include/sycl/detail/item_base.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/kernel_desc.hpp b/sycl/include/sycl/detail/kernel_desc.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/kernel_desc.hpp rename to sycl/include/sycl/detail/kernel_desc.hpp index 243d7b7f75e01..3fdfe50589bf6 100644 --- a/sycl/include/CL/sycl/detail/kernel_desc.hpp +++ b/sycl/include/sycl/detail/kernel_desc.hpp @@ -10,8 +10,8 @@ // This header file must not include any standard C++ header files. -#include -#include +#include +#include #include diff --git a/sycl/include/sycl/detail/locked.hpp b/sycl/include/sycl/detail/locked.hpp new file mode 100644 index 0000000000000..e990d4e102194 --- /dev/null +++ b/sycl/include/sycl/detail/locked.hpp @@ -0,0 +1,34 @@ +//==---------------- locked.hpp - Reference with lock -----------*- C++-*---==// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#pragma once + +#include + +#include +#include + +__SYCL_INLINE_NAMESPACE(cl) { +namespace sycl { +namespace detail { +/// Represents a reference to value with appropriate lock acquired. +/// Employed for acquire/release logic. Acquire action is construction +/// of instance of locked<>. Release action is destruction of instance of +/// locked<>. +template class Locked { + std::reference_wrapper m_Value; + std::unique_lock m_Lock; + +public: + Locked(T &v, std::mutex &mutex) : m_Value{v}, m_Lock{mutex} {} + + T &get() const { return m_Value.get(); } +}; +} // namespace detail +} // namespace sycl +} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/CL/sycl/detail/memory_manager.hpp b/sycl/include/sycl/detail/memory_manager.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/memory_manager.hpp rename to sycl/include/sycl/detail/memory_manager.hpp index f77efd7480f9a..4ac08d9f00190 100644 --- a/sycl/include/CL/sycl/detail/memory_manager.hpp +++ b/sycl/include/sycl/detail/memory_manager.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/os_util.hpp b/sycl/include/sycl/detail/os_util.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/os_util.hpp rename to sycl/include/sycl/detail/os_util.hpp index 55b41b28b640c..148a869a8c896 100644 --- a/sycl/include/CL/sycl/detail/os_util.hpp +++ b/sycl/include/sycl/detail/os_util.hpp @@ -10,8 +10,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/pi.def b/sycl/include/sycl/detail/pi.def similarity index 100% rename from sycl/include/CL/sycl/detail/pi.def rename to sycl/include/sycl/detail/pi.def diff --git a/sycl/include/CL/sycl/detail/pi.h b/sycl/include/sycl/detail/pi.h similarity index 99% rename from sycl/include/CL/sycl/detail/pi.h rename to sycl/include/sycl/detail/pi.h index 9309f47defe1a..30e65a9310a3d 100644 --- a/sycl/include/CL/sycl/detail/pi.h +++ b/sycl/include/sycl/detail/pi.h @@ -81,7 +81,7 @@ // match is required. // TODO: We should consider re-implementing PI enums and constants and only // perform a mapping of PI to OpenCL in the pi_opencl backend. -#include +#include #include #include @@ -105,7 +105,7 @@ using pi_native_handle = uintptr_t; typedef enum { #define _PI_ERRC(NAME, VAL) NAME = VAL, #define _PI_ERRC_WITH_MSG(NAME, VAL, MSG) NAME = VAL, -#include +#include #undef _PI_ERRC #undef _PI_ERRC_WITH_MSG } _pi_result; @@ -1787,7 +1787,7 @@ struct _pi_plugin { char *Targets; struct FunctionPointers { #define _PI_API(api) decltype(::api) *api; -#include +#include } PiFunctionTable; }; diff --git a/sycl/include/CL/sycl/detail/pi.hpp b/sycl/include/sycl/detail/pi.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/pi.hpp rename to sycl/include/sycl/detail/pi.hpp index 6992ca1adab9f..a8ec2e9e6943a 100644 --- a/sycl/include/CL/sycl/detail/pi.hpp +++ b/sycl/include/sycl/detail/pi.hpp @@ -13,10 +13,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -41,7 +41,7 @@ namespace detail { enum class PiApiKind { #define _PI_API(api) api, -#include +#include }; class plugin; @@ -170,7 +170,7 @@ template struct PiFuncInfo {}; return MPlugin.PiFunctionTable.api; \ } \ }; -#include +#include /// Emits an XPTI trace before a PI API call is made /// \param FName The name of the PI API call diff --git a/sycl/include/CL/sycl/detail/pi_error.def b/sycl/include/sycl/detail/pi_error.def similarity index 100% rename from sycl/include/CL/sycl/detail/pi_error.def rename to sycl/include/sycl/detail/pi_error.def diff --git a/sycl/include/CL/sycl/detail/properties_traits.def b/sycl/include/sycl/detail/properties_traits.def similarity index 100% rename from sycl/include/CL/sycl/detail/properties_traits.def rename to sycl/include/sycl/detail/properties_traits.def diff --git a/sycl/include/CL/sycl/detail/property_helper.hpp b/sycl/include/sycl/detail/property_helper.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/property_helper.hpp rename to sycl/include/sycl/detail/property_helper.hpp index e4e8eea1007a4..c9d467e5fcf71 100644 --- a/sycl/include/CL/sycl/detail/property_helper.hpp +++ b/sycl/include/sycl/detail/property_helper.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/property_list_base.hpp b/sycl/include/sycl/detail/property_list_base.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/property_list_base.hpp rename to sycl/include/sycl/detail/property_list_base.hpp index d3f1ec09d44ac..ae96a06cd4c3c 100644 --- a/sycl/include/CL/sycl/detail/property_list_base.hpp +++ b/sycl/include/sycl/detail/property_list_base.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/service_kernel_names.hpp b/sycl/include/sycl/detail/service_kernel_names.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/service_kernel_names.hpp rename to sycl/include/sycl/detail/service_kernel_names.hpp diff --git a/sycl/include/CL/sycl/detail/spec_const_integration.hpp b/sycl/include/sycl/detail/spec_const_integration.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/spec_const_integration.hpp rename to sycl/include/sycl/detail/spec_const_integration.hpp diff --git a/sycl/include/CL/sycl/detail/spinlock.hpp b/sycl/include/sycl/detail/spinlock.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/spinlock.hpp rename to sycl/include/sycl/detail/spinlock.hpp index 1b1585bc45fdf..ded4ff8cd4848 100644 --- a/sycl/include/CL/sycl/detail/spinlock.hpp +++ b/sycl/include/sycl/detail/spinlock.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/include/CL/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp similarity index 99% rename from sycl/include/CL/sycl/detail/spirv.hpp rename to sycl/include/sycl/detail/spirv.hpp index 4b6244695f29b..c6dd228b279dd 100644 --- a/sycl/include/CL/sycl/detail/spirv.hpp +++ b/sycl/include/sycl/detail/spirv.hpp @@ -10,12 +10,12 @@ #include #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #ifdef __SYCL_DEVICE_ONLY__ __SYCL_INLINE_NAMESPACE(cl) { @@ -133,7 +133,9 @@ using WidenOpenCLTypeTo32_t = conditional_t< // Broadcast with scalar local index // Work-group supports any integral type // Sub-group currently supports only uint32_t -template struct GroupId { using type = size_t; }; +template struct GroupId { + using type = size_t; +}; template <> struct GroupId<::cl::sycl::ext::oneapi::sub_group> { using type = uint32_t; }; diff --git a/sycl/include/CL/sycl/detail/stl_type_traits.hpp b/sycl/include/sycl/detail/stl_type_traits.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/stl_type_traits.hpp rename to sycl/include/sycl/detail/stl_type_traits.hpp index 03403b7ba063e..9c3353e54c8e6 100644 --- a/sycl/include/CL/sycl/detail/stl_type_traits.hpp +++ b/sycl/include/sycl/detail/stl_type_traits.hpp @@ -8,9 +8,9 @@ #pragma once -#include #include #include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/CL/sycl/detail/sycl_fe_intrins.hpp b/sycl/include/sycl/detail/sycl_fe_intrins.hpp similarity index 100% rename from sycl/include/CL/sycl/detail/sycl_fe_intrins.hpp rename to sycl/include/sycl/detail/sycl_fe_intrins.hpp diff --git a/sycl/include/CL/sycl/detail/sycl_mem_obj_allocator.hpp b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp similarity index 97% rename from sycl/include/CL/sycl/detail/sycl_mem_obj_allocator.hpp rename to sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp index c03d28403deeb..617e679857cbf 100644 --- a/sycl/include/CL/sycl/detail/sycl_mem_obj_allocator.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp @@ -12,8 +12,7 @@ __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { namespace detail { -template -class aligned_allocator; +template class aligned_allocator; template using sycl_memory_object_allocator = aligned_allocator; @@ -89,4 +88,4 @@ class SYCLMemObjAllocatorHolder : public SYCLMemObjAllocator { }; } // namespace detail } // namespace sycl -} +} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/CL/sycl/detail/sycl_mem_obj_i.hpp b/sycl/include/sycl/detail/sycl_mem_obj_i.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/sycl_mem_obj_i.hpp rename to sycl/include/sycl/detail/sycl_mem_obj_i.hpp index c37d4945f1e9c..f4415145603ab 100644 --- a/sycl/include/CL/sycl/detail/sycl_mem_obj_i.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_i.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp b/sycl/include/sycl/detail/sycl_mem_obj_t.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp rename to sycl/include/sycl/detail/sycl_mem_obj_t.hpp index 10b4e415fd087..6d6a852ce619a 100644 --- a/sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_t.hpp @@ -8,16 +8,16 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -172,9 +172,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI { if (!FinalData) MUploadDataFunctor = nullptr; else - MUploadDataFunctor = [this, FinalData]() { - updateHostMemory(FinalData); - }; + MUploadDataFunctor = [this, FinalData]() { updateHostMemory(FinalData); }; } template diff --git a/sycl/include/CL/sycl/detail/tuple.hpp b/sycl/include/sycl/detail/tuple.hpp similarity index 95% rename from sycl/include/CL/sycl/detail/tuple.hpp rename to sycl/include/sycl/detail/tuple.hpp index 3beefa9074e1f..6298fb7c152d0 100644 --- a/sycl/include/CL/sycl/detail/tuple.hpp +++ b/sycl/include/sycl/detail/tuple.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include @@ -37,7 +37,7 @@ template constexpr tuple make_tuple(Ts... Args) { return sycl::detail::tuple{Args...}; } -template auto tie(Ts &... Args) { +template auto tie(Ts &...Args) { return sycl::detail::tuple(Args...); } @@ -82,8 +82,8 @@ template <> struct get<0> { } template - constexpr ret_type const &operator()(const tuple &Tuple) const - noexcept { + constexpr ret_type const & + operator()(const tuple &Tuple) const noexcept { return Tuple.holder.value; } }; @@ -124,7 +124,7 @@ template struct tuple { tuple(const tuple &RHS) : holder(RHS.holder.value), next(RHS.next) {} - tuple(const T &Value, const Ts &... Next) : holder(Value), next(Next...) {} + tuple(const T &Value, const Ts &...Next) : holder(Value), next(Next...) {} // required to convert std::tuple to inner tuple in user-provided functor tuple(const std::tuple &RHS) diff --git a/sycl/include/CL/sycl/detail/type_list.hpp b/sycl/include/sycl/detail/type_list.hpp similarity index 98% rename from sycl/include/CL/sycl/detail/type_list.hpp rename to sycl/include/sycl/detail/type_list.hpp index 2caeabe384e58..0f5f7e6fb5426 100644 --- a/sycl/include/CL/sycl/detail/type_list.hpp +++ b/sycl/include/sycl/detail/type_list.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/type_traits.hpp b/sycl/include/sycl/detail/type_traits.hpp similarity index 96% rename from sycl/include/CL/sycl/detail/type_traits.hpp rename to sycl/include/sycl/detail/type_traits.hpp index 0184ae9472406..3f0bbf6fc0b05 100644 --- a/sycl/include/CL/sycl/detail/type_traits.hpp +++ b/sycl/include/sycl/detail/type_traits.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -90,7 +90,9 @@ struct vector_alignment template struct vector_element_impl; template using vector_element_impl_t = typename vector_element_impl::type; -template struct vector_element_impl { using type = T; }; +template struct vector_element_impl { + using type = T; +}; template struct vector_element_impl> { using type = T; }; @@ -100,7 +102,9 @@ template struct vector_element { template using vector_element_t = typename vector_element::type; // change_base_type_t -template struct change_base_type { using type = B; }; +template struct change_base_type { + using type = B; +}; template struct change_base_type, B> { using type = vec; @@ -260,9 +264,13 @@ struct is_pointer_impl> : std::true_type {}; template struct is_pointer : is_pointer_impl> {}; // remove_pointer_t -template struct remove_pointer_impl { using type = T; }; +template struct remove_pointer_impl { + using type = T; +}; -template struct remove_pointer_impl { using type = T; }; +template struct remove_pointer_impl { + using type = T; +}; template struct remove_pointer_impl> { diff --git a/sycl/include/CL/sycl/detail/usm_impl.hpp b/sycl/include/sycl/detail/usm_impl.hpp similarity index 91% rename from sycl/include/CL/sycl/detail/usm_impl.hpp rename to sycl/include/sycl/detail/usm_impl.hpp index ebe71674f6d5d..4265d4df0453d 100644 --- a/sycl/include/CL/sycl/detail/usm_impl.hpp +++ b/sycl/include/sycl/detail/usm_impl.hpp @@ -7,9 +7,9 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/detail/util.hpp b/sycl/include/sycl/detail/util.hpp similarity index 95% rename from sycl/include/CL/sycl/detail/util.hpp rename to sycl/include/sycl/detail/util.hpp index 9b6095fa75b9e..c91fa4d74efcb 100644 --- a/sycl/include/CL/sycl/detail/util.hpp +++ b/sycl/include/sycl/detail/util.hpp @@ -10,8 +10,8 @@ #ifndef __SYCL_DEVICE_ONLY -#include -#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/device.hpp b/sycl/include/sycl/device.hpp similarity index 96% rename from sycl/include/CL/sycl/device.hpp rename to sycl/include/sycl/device.hpp index 1be20d38db45b..5e969ca71ecc6 100644 --- a/sycl/include/CL/sycl/device.hpp +++ b/sycl/include/sycl/device.hpp @@ -8,14 +8,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -27,7 +27,7 @@ class device_selector; namespace detail { class device_impl; auto getDeviceComparisonLambda(); -} +} // namespace detail /// The SYCL device class encapsulates a single SYCL device on which kernels /// may be executed. diff --git a/sycl/include/CL/sycl/device_event.hpp b/sycl/include/sycl/device_event.hpp similarity index 100% rename from sycl/include/CL/sycl/device_event.hpp rename to sycl/include/sycl/device_event.hpp diff --git a/sycl/include/CL/sycl/device_selector.hpp b/sycl/include/sycl/device_selector.hpp similarity index 96% rename from sycl/include/CL/sycl/device_selector.hpp rename to sycl/include/sycl/device_selector.hpp index 17b1503488a36..85bae514b1fba 100644 --- a/sycl/include/CL/sycl/device_selector.hpp +++ b/sycl/include/sycl/device_selector.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include // 4.6.1 Device selection class diff --git a/sycl/include/CL/sycl/event.hpp b/sycl/include/sycl/event.hpp similarity index 96% rename from sycl/include/CL/sycl/event.hpp rename to sycl/include/sycl/event.hpp index 62f4087fd2b1c..396df38fa675e 100644 --- a/sycl/include/CL/sycl/event.hpp +++ b/sycl/include/sycl/event.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/exception.hpp b/sycl/include/sycl/exception.hpp similarity index 98% rename from sycl/include/CL/sycl/exception.hpp rename to sycl/include/sycl/exception.hpp index 1d8157990c0d9..62ddafc20ded8 100644 --- a/sycl/include/CL/sycl/exception.hpp +++ b/sycl/include/sycl/exception.hpp @@ -10,12 +10,12 @@ // 4.9.2 Exception Class Interface -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/exception_list.hpp b/sycl/include/sycl/exception_list.hpp similarity index 90% rename from sycl/include/CL/sycl/exception_list.hpp rename to sycl/include/sycl/exception_list.hpp index 0528dacaa7d41..d552110af082e 100644 --- a/sycl/include/CL/sycl/exception_list.hpp +++ b/sycl/include/sycl/exception_list.hpp @@ -10,9 +10,9 @@ // 4.9.2 Exception Class Interface -#include -#include -#include +#include +#include +#include #include @@ -45,7 +45,7 @@ class __SYCL_EXPORT exception_list { private: friend class detail::queue_impl; void PushBack(const_reference Value); - void PushBack(value_type&& Value); + void PushBack(value_type &&Value); void Clear() noexcept; std::vector MList; }; diff --git a/sycl/include/sycl/ext/intel/esimd/common.hpp b/sycl/include/sycl/ext/intel/esimd/common.hpp index 816e1db4a7ac2..414dbfe7b275a 100644 --- a/sycl/include/sycl/ext/intel/esimd/common.hpp +++ b/sycl/include/sycl/ext/intel/esimd/common.hpp @@ -10,7 +10,7 @@ #pragma once -#include +#include #include // for uint* types #include diff --git a/sycl/include/sycl/ext/intel/esimd/detail/atomic_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/atomic_intrin.hpp index 7a567d62a4206..1d93b71f1e2c9 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/atomic_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/atomic_intrin.hpp @@ -9,7 +9,7 @@ /// @cond ESIMD_DETAIL -#include +#include // This function implements atomic update of pre-existing variable in the // absense of C++ 20's atomic_ref. diff --git a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp index 2d1d030a3a29c..888f6874eafa9 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp @@ -83,7 +83,7 @@ #include -#include +#include /// @cond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp index e840c790c7809..c69fc1da9f097 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp @@ -13,7 +13,7 @@ /// @cond ESIMD_DETAIL -#include +#include #include #include #include diff --git a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp index 5aedf987ad3e9..4dd4fefe5e954 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp @@ -13,19 +13,19 @@ #pragma once -#include -#include +#include #include #include #include +#include #include #ifndef __SYCL_DEVICE_ONLY__ // ESIMD_CPU Emulation support using esimd_cpu plugin -#include -#include +#include +#include #include #include diff --git a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp index bc12a65c8a5aa..ebc99469ccd28 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp @@ -12,8 +12,8 @@ /// @cond ESIMD_DETAIL -#include #include +#include #include #include diff --git a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp index e734f3ff3fefc..6e1337641e338 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp @@ -13,7 +13,7 @@ /// @cond ESIMD_DETAIL -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp index 21b1d31cd4e52..98856aec18c27 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp @@ -10,11 +10,11 @@ #pragma once -#include -#include // to define C++14,17 extensions -#include +#include +#include // to define C++14,17 extensions #include #include +#include #if defined(__ESIMD_DBG_HOST) && !defined(__SYCL_DEVICE_ONLY__) #define __esimd_dbg_print(a) std::cout << ">>> " << #a << "\n" diff --git a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp index bc231adfc40a2..7a97a40de2cc4 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp @@ -12,7 +12,7 @@ /// @cond ESIMD_DETAIL -#include +#include #include #include diff --git a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp index a1e7f42793adf..672537e6da95f 100644 --- a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp +++ b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp @@ -20,7 +20,7 @@ #pragma once -#include +#include // cstdint-type fields such as 'uint32_t' are to be used in funtion // pointer table file ('esimd_emulator_functions_v1.h') included in 'struct diff --git a/sycl/include/sycl/ext/intel/esimd/memory.hpp b/sycl/include/sycl/ext/intel/esimd/memory.hpp index cb4a7a4ac01cb..bdc208d7350f3 100644 --- a/sycl/include/sycl/ext/intel/esimd/memory.hpp +++ b/sycl/include/sycl/ext/intel/esimd/memory.hpp @@ -10,12 +10,12 @@ #pragma once -#include #include #include #include #include #include +#include #include diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp index 67692c38e1562..a49a7fe94dd83 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp @@ -8,9 +8,9 @@ #pragma once #include "fpga_utils.hpp" -#include -#include +#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp index fe5d9f259c300..e6a762137c43d 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include +#include +#include #include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp index d3ce106c50929..30fc2f9714708 100644 --- a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp +++ b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp @@ -8,9 +8,9 @@ #pragma once -#include // for __SYCL_INLINE_NAMESPACE -#include // for __SYCL_EXPORT -#include +#include // for __SYCL_INLINE_NAMESPACE +#include // for __SYCL_EXPORT +#include #include #include diff --git a/sycl/include/sycl/ext/intel/experimental/pipes.hpp b/sycl/include/sycl/ext/intel/experimental/pipes.hpp index c74360f7ebc66..571890a6388aa 100644 --- a/sycl/include/sycl/ext/intel/experimental/pipes.hpp +++ b/sycl/include/sycl/ext/intel/experimental/pipes.hpp @@ -11,8 +11,8 @@ #include "fpga_utils.hpp" #include #include -#include #include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp b/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp index 48d27a36b3f1b..f7b73949b513f 100644 --- a/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp +++ b/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp index 1d65e1454c184..7424d7cb13906 100644 --- a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp +++ b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/sycl/include/sycl/ext/intel/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/fpga_lsu.hpp index bec9f4e79aa9f..97777a50e85d9 100644 --- a/sycl/include/sycl/ext/intel/fpga_lsu.hpp +++ b/sycl/include/sycl/ext/intel/fpga_lsu.hpp @@ -8,8 +8,8 @@ #pragma once #include "fpga_utils.hpp" -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/intel/fpga_reg.hpp b/sycl/include/sycl/ext/intel/fpga_reg.hpp index d60ac19d53164..a9be1a9dba96e 100644 --- a/sycl/include/sycl/ext/intel/fpga_reg.hpp +++ b/sycl/include/sycl/ext/intel/fpga_reg.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/sycl/ext/intel/fpga_utils.hpp b/sycl/include/sycl/ext/intel/fpga_utils.hpp index b7d35d6d7d23f..1373220a94423 100644 --- a/sycl/include/sycl/ext/intel/fpga_utils.hpp +++ b/sycl/include/sycl/ext/intel/fpga_utils.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/intel/online_compiler.hpp b/sycl/include/sycl/ext/intel/online_compiler.hpp index d7212bb1b26ff..870e0042d07ff 100644 --- a/sycl/include/sycl/ext/intel/online_compiler.hpp +++ b/sycl/include/sycl/ext/intel/online_compiler.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_WARNING( "sycl/ext/intel/online_compiler.hpp usage is deprecated, include " diff --git a/sycl/include/sycl/ext/intel/pipes.hpp b/sycl/include/sycl/ext/intel/pipes.hpp index e05d1b2e35f0e..9600c00be0fb8 100644 --- a/sycl/include/sycl/ext/intel/pipes.hpp +++ b/sycl/include/sycl/ext/intel/pipes.hpp @@ -10,7 +10,7 @@ #include #include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/__function_pointer.hpp b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp index 9d259624e8c16..2360250a4d216 100644 --- a/sycl/include/sycl/ext/oneapi/__function_pointer.hpp +++ b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp @@ -10,11 +10,11 @@ #ifdef __SYCL_INTERNAL_API -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp index 9f5e64d1de42b..c7ae6537cd582 100644 --- a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp +++ b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp b/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp index e034399adddba..b0432f017b2eb 100644 --- a/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp +++ b/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/atomic_enums.hpp b/sycl/include/sycl/ext/oneapi/atomic_enums.hpp index 638db533ef5ab..8a7d764d5968e 100644 --- a/sycl/include/sycl/ext/oneapi/atomic_enums.hpp +++ b/sycl/include/sycl/ext/oneapi/atomic_enums.hpp @@ -9,10 +9,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include #ifndef __SYCL_DEVICE_ONLY__ #include diff --git a/sycl/include/sycl/ext/oneapi/atomic_fence.hpp b/sycl/include/sycl/ext/oneapi/atomic_fence.hpp index 485c4b7e87657..43ae7aaae2508 100644 --- a/sycl/include/sycl/ext/oneapi/atomic_fence.hpp +++ b/sycl/include/sycl/ext/oneapi/atomic_fence.hpp @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #ifndef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/ext/oneapi/atomic_ref.hpp b/sycl/include/sycl/ext/oneapi/atomic_ref.hpp index 7a0bd47083cde..30df94c65503c 100644 --- a/sycl/include/sycl/ext/oneapi/atomic_ref.hpp +++ b/sycl/include/sycl/ext/oneapi/atomic_ref.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include +#include +#include #include #ifdef __SYCL_DEVICE_ONLY__ -#include -#include +#include +#include #endif #ifndef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp b/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp index 4d2121f74e841..6deb8fb0630a7 100644 --- a/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp +++ b/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp b/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp index 3166d5f18f49e..62d66efc616c2 100644 --- a/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp +++ b/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp b/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp index dfa850ef0a725..eacec31b9932d 100644 --- a/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp +++ b/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp @@ -1,11 +1,11 @@ #pragma once #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/dot_product.hpp b/sycl/include/sycl/ext/oneapi/dot_product.hpp index 5f81681f0c96c..212843a55e364 100755 --- a/sycl/include/sycl/ext/oneapi/dot_product.hpp +++ b/sycl/include/sycl/ext/oneapi/dot_product.hpp @@ -10,6 +10,9 @@ #pragma once +#include +#include + __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { namespace ext { diff --git a/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp b/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp index 6408230a50108..0cff278970eb4 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp @@ -14,13 +14,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp b/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp index 13429456e5b95..f61a3da215ecf 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/experimental/bfloat16.hpp b/sycl/include/sycl/ext/oneapi/experimental/bfloat16.hpp index 39bad8d1ecc35..533976f36b890 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/bfloat16.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/bfloat16.hpp @@ -9,7 +9,7 @@ #pragma once #include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp index 57c1b0c58fc2c..ea2305614a3fb 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp index f00c8e8e654d5..9c7181a5e0371 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp @@ -9,7 +9,7 @@ #pragma once #if __cplusplus >= 201703L && (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0) -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp index 8af120b1ac869..0f08aed649a3c 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp @@ -9,9 +9,9 @@ #pragma once #if __cplusplus >= 201703L && (!defined(_HAS_STD_BYTE) || _HAS_STD_BYTE != 0) -#include -#include -#include +#include +#include +#include #include #include "group_helpers_sorters.hpp" diff --git a/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp b/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp index 5b050836d5c5a..ffe599c70ba34 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp @@ -17,9 +17,9 @@ #include -#include #include #include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp b/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp index ea966a085c9e9..ea7d927db299d 100644 --- a/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp +++ b/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp @@ -15,9 +15,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/filter_selector.hpp b/sycl/include/sycl/ext/oneapi/filter_selector.hpp index b6a5af81a0737..569b3ee56be06 100644 --- a/sycl/include/sycl/ext/oneapi/filter_selector.hpp +++ b/sycl/include/sycl/ext/oneapi/filter_selector.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/functional.hpp b/sycl/include/sycl/ext/oneapi/functional.hpp index 18b0c23cac74c..87c722d3b0150 100644 --- a/sycl/include/sycl/ext/oneapi/functional.hpp +++ b/sycl/include/sycl/ext/oneapi/functional.hpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #pragma once -#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp index bd2ba9730d76b..b0d7f93047d00 100644 --- a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp +++ b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp @@ -10,14 +10,14 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include #include #include #include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/group_local_memory.hpp b/sycl/include/sycl/ext/oneapi/group_local_memory.hpp index 3049b332fe616..b872e021a7e97 100644 --- a/sycl/include/sycl/ext/oneapi/group_local_memory.hpp +++ b/sycl/include/sycl/ext/oneapi/group_local_memory.hpp @@ -8,12 +8,12 @@ #pragma once #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-aot-amx.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-aot-amx.hpp index 21583b6a3e2f6..2e0bf6c83b73e 100644 --- a/sycl/include/sycl/ext/oneapi/matrix/matrix-aot-amx.hpp +++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-aot-amx.hpp @@ -32,8 +32,8 @@ #pragma once -#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp index 8842e63c4e3d0..b287419843d7a 100644 --- a/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp +++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp @@ -9,9 +9,9 @@ #pragma once #include -#include -#include +#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix.hpp index 52ca60eab19b9..01279c0abca90 100644 --- a/sycl/include/sycl/ext/oneapi/matrix/matrix.hpp +++ b/sycl/include/sycl/ext/oneapi/matrix/matrix.hpp @@ -14,7 +14,7 @@ #pragma once -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 1) #if defined(__AMXTILE__) && defined(__AMXINT8__) && defined(__AMXBF16__) diff --git a/sycl/include/sycl/ext/oneapi/properties/properties.hpp b/sycl/include/sycl/ext/oneapi/properties/properties.hpp index 80a03c0cba289..1fec5038ace17 100644 --- a/sycl/include/sycl/ext/oneapi/properties/properties.hpp +++ b/sycl/include/sycl/ext/oneapi/properties/properties.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include +#include #include #include #include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp b/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp index 9ddcc0352dda4..1e2af3a6e32e7 100644 --- a/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp +++ b/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/include/sycl/ext/oneapi/reduction.hpp b/sycl/include/sycl/ext/oneapi/reduction.hpp index 2a175d5d753bb..946f6d6d9a6f3 100644 --- a/sycl/include/sycl/ext/oneapi/reduction.hpp +++ b/sycl/include/sycl/ext/oneapi/reduction.hpp @@ -11,15 +11,15 @@ #if __cplusplus >= 201703L // Entire feature is dependent on C++17. -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/sub_group.hpp b/sycl/include/sycl/ext/oneapi/sub_group.hpp index 58f9c61d72433..ea5ecda946c16 100644 --- a/sycl/include/sycl/ext/oneapi/sub_group.hpp +++ b/sycl/include/sycl/ext/oneapi/sub_group.hpp @@ -10,17 +10,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include diff --git a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp index f65e8c85c55e5..d8b3472d9caec 100644 --- a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp +++ b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/feature_test.hpp.in b/sycl/include/sycl/feature_test.hpp.in similarity index 98% rename from sycl/include/CL/sycl/feature_test.hpp.in rename to sycl/include/sycl/feature_test.hpp.in index ca35109848b06..00134278216cc 100644 --- a/sycl/include/CL/sycl/feature_test.hpp.in +++ b/sycl/include/sycl/feature_test.hpp.in @@ -13,7 +13,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/functional.hpp b/sycl/include/sycl/functional.hpp similarity index 97% rename from sycl/include/CL/sycl/functional.hpp rename to sycl/include/sycl/functional.hpp index a11a111d73158..7e1c025eacea3 100644 --- a/sycl/include/CL/sycl/functional.hpp +++ b/sycl/include/sycl/functional.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include diff --git a/sycl/include/CL/sycl/group.hpp b/sycl/include/sycl/group.hpp similarity index 97% rename from sycl/include/CL/sycl/group.hpp rename to sycl/include/sycl/group.hpp index b6b338fee9d2f..78069d28a2ad3 100644 --- a/sycl/include/CL/sycl/group.hpp +++ b/sycl/include/sycl/group.hpp @@ -11,17 +11,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include __SYCL_INLINE_NAMESPACE(cl) { @@ -390,8 +390,7 @@ template class group { return async_work_group_copy(dest, src, numElements, 1); } - template - void wait_for(eventTN... Events) const { + template void wait_for(eventTN... Events) const { waitForHelper(Events...); } @@ -508,9 +507,7 @@ template class group { void waitForHelper() const {} - void waitForHelper(device_event Event) const { - Event.wait(); - } + void waitForHelper(device_event Event) const { Event.wait(); } template void waitForHelper(T E, Ts... Es) const { diff --git a/sycl/include/CL/sycl/group_algorithm.hpp b/sycl/include/sycl/group_algorithm.hpp similarity index 99% rename from sycl/include/CL/sycl/group_algorithm.hpp rename to sycl/include/sycl/group_algorithm.hpp index 9b26192bd036c..9615a1ae8be01 100644 --- a/sycl/include/CL/sycl/group_algorithm.hpp +++ b/sycl/include/sycl/group_algorithm.hpp @@ -12,15 +12,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/group_local_memory.hpp b/sycl/include/sycl/group_local_memory.hpp similarity index 96% rename from sycl/include/CL/sycl/group_local_memory.hpp rename to sycl/include/sycl/group_local_memory.hpp index 6478502629563..d434306c362e2 100644 --- a/sycl/include/CL/sycl/group_local_memory.hpp +++ b/sycl/include/sycl/group_local_memory.hpp @@ -29,7 +29,7 @@ __SYCL_DEPRECATED("use sycl::ext::oneapi::group_local_memory instead") std::enable_if_t< std::is_trivially_destructible::value && detail::is_group::value, multi_ptr> __SYCL_ALWAYS_INLINE - group_local_memory(Group g, Args &&... args) { + group_local_memory(Group g, Args &&...args) { return sycl::ext::oneapi::group_local_memory( g, std::forward(args)...); } diff --git a/sycl/include/CL/sycl/h_item.hpp b/sycl/include/sycl/h_item.hpp similarity index 97% rename from sycl/include/CL/sycl/h_item.hpp rename to sycl/include/sycl/h_item.hpp index 8d27bae1ca6af..1e94ac147286e 100644 --- a/sycl/include/CL/sycl/h_item.hpp +++ b/sycl/include/sycl/h_item.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/half_type.hpp b/sycl/include/sycl/half_type.hpp similarity index 97% rename from sycl/include/CL/sycl/half_type.hpp rename to sycl/include/sycl/half_type.hpp index 87e279ca96624..9d792b3225ebe 100644 --- a/sycl/include/CL/sycl/half_type.hpp +++ b/sycl/include/sycl/half_type.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include @@ -289,14 +289,14 @@ class half; // - VecNStorageT - representation of N-element vector of halfs. Follows the // same logic as StorageT #ifdef __SYCL_DEVICE_ONLY__ - using StorageT = _Float16; - using BIsRepresentationT = _Float16; - - using Vec2StorageT = StorageT __attribute__((ext_vector_type(2))); - using Vec3StorageT = StorageT __attribute__((ext_vector_type(3))); - using Vec4StorageT = StorageT __attribute__((ext_vector_type(4))); - using Vec8StorageT = StorageT __attribute__((ext_vector_type(8))); - using Vec16StorageT = StorageT __attribute__((ext_vector_type(16))); +using StorageT = _Float16; +using BIsRepresentationT = _Float16; + +using Vec2StorageT = StorageT __attribute__((ext_vector_type(2))); +using Vec3StorageT = StorageT __attribute__((ext_vector_type(3))); +using Vec4StorageT = StorageT __attribute__((ext_vector_type(4))); +using Vec8StorageT = StorageT __attribute__((ext_vector_type(8))); +using Vec16StorageT = StorageT __attribute__((ext_vector_type(16))); #else using StorageT = detail::host_half_impl::half_v2; // No need to extract underlying data type for built-in functions operating on @@ -319,11 +319,11 @@ template struct half_vec { } }; - using Vec2StorageT = half_vec<2>; - using Vec3StorageT = half_vec<3>; - using Vec4StorageT = half_vec<4>; - using Vec8StorageT = half_vec<8>; - using Vec16StorageT = half_vec<16>; +using Vec2StorageT = half_vec<2>; +using Vec3StorageT = half_vec<3>; +using Vec4StorageT = half_vec<4>; +using Vec8StorageT = half_vec<8>; +using Vec16StorageT = half_vec<16>; #endif class half { diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/sycl/handler.hpp similarity index 97% rename from sycl/include/CL/sycl/handler.hpp rename to sycl/include/sycl/handler.hpp index 11ce14f3ac20c..506a25a1821a2 100644 --- a/sycl/include/CL/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -8,27 +8,27 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -501,7 +501,7 @@ class __SYCL_EXPORT handler { // Recursively calls itself until arguments pack is fully processed. // The version for regular(standard layout) argument. template - void setArgsHelper(int ArgIndex, T &&Arg, Ts &&... Args) { + void setArgsHelper(int ArgIndex, T &&Arg, Ts &&...Args) { set_arg(ArgIndex, std::move(Arg)); setArgsHelper(++ArgIndex, std::move(Args)...); } @@ -817,15 +817,15 @@ class __SYCL_EXPORT handler { return false; range<1> LinearizedRange(Src.size()); - parallel_for> - (LinearizedRange, [=](id<1> Id) { - size_t Index = Id[0]; - id SrcId = detail::getDelinearizedId(Src.get_range(), Index); - id DstId = detail::getDelinearizedId(Dst.get_range(), Index); - Dst[DstId] = Src[SrcId]; - }); + parallel_for< + class __copyAcc2Acc>( + LinearizedRange, [=](id<1> Id) { + size_t Index = Id[0]; + id SrcId = detail::getDelinearizedId(Src.get_range(), Index); + id DstId = detail::getDelinearizedId(Dst.get_range(), Index); + Dst[DstId] = Src[SrcId]; + }); return true; } @@ -846,11 +846,10 @@ class __SYCL_EXPORT handler { if (!MIsHost) return false; - single_task> ([=]() { - *(Dst.get_pointer()) = *(Src.get_pointer()); - }); + single_task< + class __copyAcc2Acc>( + [=]() { *(Dst.get_pointer()) = *(Src.get_pointer()); }); return true; } @@ -866,12 +865,13 @@ class __SYCL_EXPORT handler { copyAccToPtrHost(accessor Src, TDst *Dst) { range Range = Src.get_range(); - parallel_for> - (Range, [=](id Index) { - const size_t LinearIndex = detail::getLinearIndex(Index, Range); - using TSrcNonConst = typename detail::remove_const_t; - (reinterpret_cast(Dst))[LinearIndex] = Src[Index]; - }); + parallel_for< + class __copyAcc2Ptr>( + Range, [=](id Index) { + const size_t LinearIndex = detail::getLinearIndex(Index, Range); + using TSrcNonConst = typename detail::remove_const_t; + (reinterpret_cast(Dst))[LinearIndex] = Src[Index]; + }); } /// Copies 1 element accessed by 0-dimensional accessor Src into the memory @@ -884,11 +884,11 @@ class __SYCL_EXPORT handler { detail::enable_if_t copyAccToPtrHost(accessor Src, TDst *Dst) { - single_task> - ([=]() { - using TSrcNonConst = typename detail::remove_const_t; - *(reinterpret_cast(Dst)) = *(Src.get_pointer()); - }); + single_task>( + [=]() { + using TSrcNonConst = typename detail::remove_const_t; + *(reinterpret_cast(Dst)) = *(Src.get_pointer()); + }); } /// Copies the memory pointed by Src into the memory accessed by Dst. @@ -901,11 +901,12 @@ class __SYCL_EXPORT handler { copyPtrToAccHost(TSrc *Src, accessor Dst) { range Range = Dst.get_range(); - parallel_for> - (Range, [=](id Index) { - const size_t LinearIndex = detail::getLinearIndex(Index, Range); - Dst[Index] = (reinterpret_cast(Src))[LinearIndex]; - }); + parallel_for< + class __copyPtr2Acc>( + Range, [=](id Index) { + const size_t LinearIndex = detail::getLinearIndex(Index, Range); + Dst[Index] = (reinterpret_cast(Src))[LinearIndex]; + }); } /// Copies 1 element pointed by Src to memory accessed by 0-dimensional @@ -918,10 +919,10 @@ class __SYCL_EXPORT handler { detail::enable_if_t copyPtrToAccHost(TSrc *Src, accessor Dst) { - single_task> - ([=]() { - *(Dst.get_pointer()) = *(reinterpret_cast(Src)); - }); + single_task>( + [=]() { + *(Dst.get_pointer()) = *(reinterpret_cast(Src)); + }); } #endif // __SYCL_DEVICE_ONLY__ @@ -1446,7 +1447,7 @@ class __SYCL_EXPORT handler { /// Registers pack of arguments(Args) with indexes starting from 0. /// /// \param Args are argument values to be set. - template void set_args(Ts &&... Args) { + template void set_args(Ts &&...Args) { setArgsHelper(0, std::move(Args)...); } @@ -2487,10 +2488,9 @@ class __SYCL_EXPORT handler { // TODO: Temporary implementation for host. Should be handled by memory // manger. range Range = Dst.get_range(); - parallel_for>(Range, [=](id Index) { - Dst[Index] = Pattern; - }); + parallel_for< + class __fill>( + Range, [=](id Index) { Dst[Index] = Pattern; }); } } diff --git a/sycl/include/CL/sycl/id.hpp b/sycl/include/sycl/id.hpp similarity index 98% rename from sycl/include/CL/sycl/id.hpp rename to sycl/include/sycl/id.hpp index 2a51ad69a38c7..b5547b9c86b80 100644 --- a/sycl/include/CL/sycl/id.hpp +++ b/sycl/include/sycl/id.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/image.hpp b/sycl/include/sycl/image.hpp similarity index 98% rename from sycl/include/CL/sycl/image.hpp rename to sycl/include/sycl/image.hpp index d60d50ff1c186..896a47fa0d3cc 100644 --- a/sycl/include/CL/sycl/image.hpp +++ b/sycl/include/sycl/image.hpp @@ -8,14 +8,14 @@ #pragma once -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/info/context_traits.def b/sycl/include/sycl/info/context_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/context_traits.def rename to sycl/include/sycl/info/context_traits.def diff --git a/sycl/include/CL/sycl/info/device_traits.def b/sycl/include/sycl/info/device_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/device_traits.def rename to sycl/include/sycl/info/device_traits.def diff --git a/sycl/include/CL/sycl/info/event_profiling_traits.def b/sycl/include/sycl/info/event_profiling_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/event_profiling_traits.def rename to sycl/include/sycl/info/event_profiling_traits.def diff --git a/sycl/include/CL/sycl/info/event_traits.def b/sycl/include/sycl/info/event_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/event_traits.def rename to sycl/include/sycl/info/event_traits.def diff --git a/sycl/include/CL/sycl/info/info_desc.hpp b/sycl/include/sycl/info/info_desc.hpp similarity index 95% rename from sycl/include/CL/sycl/info/info_desc.hpp rename to sycl/include/sycl/info/info_desc.hpp index b005c936d7da7..895470b682c44 100644 --- a/sycl/include/CL/sycl/info/info_desc.hpp +++ b/sycl/include/sycl/info/info_desc.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -325,26 +325,26 @@ template struct compatibility_param_traits {}; using input_type = in_type; \ }; -#include +#include -#include +#include -#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #ifdef __SYCL_INTERNAL_API -#include +#include #endif -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC #undef __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT @@ -362,8 +362,8 @@ template struct compatibility_param_traits {}; static constexpr auto value = kernel_device_specific::param; \ }; -#include -#include +#include +#include #undef __SYCL_PARAM_TRAITS_SPEC #undef __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT diff --git a/sycl/include/CL/sycl/info/kernel_device_specific_traits.def b/sycl/include/sycl/info/kernel_device_specific_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/kernel_device_specific_traits.def rename to sycl/include/sycl/info/kernel_device_specific_traits.def diff --git a/sycl/include/CL/sycl/info/kernel_sub_group_traits.def b/sycl/include/sycl/info/kernel_sub_group_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/kernel_sub_group_traits.def rename to sycl/include/sycl/info/kernel_sub_group_traits.def diff --git a/sycl/include/CL/sycl/info/kernel_traits.def b/sycl/include/sycl/info/kernel_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/kernel_traits.def rename to sycl/include/sycl/info/kernel_traits.def diff --git a/sycl/include/CL/sycl/info/kernel_work_group_traits.def b/sycl/include/sycl/info/kernel_work_group_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/kernel_work_group_traits.def rename to sycl/include/sycl/info/kernel_work_group_traits.def diff --git a/sycl/include/CL/sycl/info/platform_traits.def b/sycl/include/sycl/info/platform_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/platform_traits.def rename to sycl/include/sycl/info/platform_traits.def diff --git a/sycl/include/CL/sycl/info/program_traits.def b/sycl/include/sycl/info/program_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/program_traits.def rename to sycl/include/sycl/info/program_traits.def diff --git a/sycl/include/CL/sycl/info/queue_traits.def b/sycl/include/sycl/info/queue_traits.def similarity index 100% rename from sycl/include/CL/sycl/info/queue_traits.def rename to sycl/include/sycl/info/queue_traits.def diff --git a/sycl/include/CL/sycl/interop_handle.hpp b/sycl/include/sycl/interop_handle.hpp similarity index 96% rename from sycl/include/CL/sycl/interop_handle.hpp rename to sycl/include/sycl/interop_handle.hpp index c7f8398a8a6c5..6f0ee92000d56 100644 --- a/sycl/include/CL/sycl/interop_handle.hpp +++ b/sycl/include/sycl/interop_handle.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/interop_handler.hpp b/sycl/include/sycl/interop_handler.hpp similarity index 98% rename from sycl/include/CL/sycl/interop_handler.hpp rename to sycl/include/sycl/interop_handler.hpp index 4fa94ba8ed7fd..cb75c1c5f2b5d 100644 --- a/sycl/include/CL/sycl/interop_handler.hpp +++ b/sycl/include/sycl/interop_handler.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/item.hpp b/sycl/include/sycl/item.hpp similarity index 95% rename from sycl/include/CL/sycl/item.hpp rename to sycl/include/sycl/item.hpp index 17deeeda98455..acb4424e91315 100644 --- a/sycl/include/CL/sycl/item.hpp +++ b/sycl/include/sycl/item.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -25,7 +25,7 @@ template class RoundedRangeKernel; template class RoundedRangeKernelWithKH; -} +} // namespace detail template class id; template class range; diff --git a/sycl/include/CL/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp similarity index 97% rename from sycl/include/CL/sycl/kernel.hpp rename to sycl/include/sycl/kernel.hpp index 4c2baa446df5c..db88b1c321792 100644 --- a/sycl/include/CL/sycl/kernel.hpp +++ b/sycl/include/sycl/kernel.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp similarity index 98% rename from sycl/include/CL/sycl/kernel_bundle.hpp rename to sycl/include/sycl/kernel_bundle.hpp index 4244d3b18fb1e..47f4a8fa344ca 100644 --- a/sycl/include/CL/sycl/kernel_bundle.hpp +++ b/sycl/include/sycl/kernel_bundle.hpp @@ -8,14 +8,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -595,7 +595,7 @@ join_impl(const std::vector &Bundles); __SYCL_EXPORT std::shared_ptr join_impl(const std::vector &Bundles, bundle_state State); -} +} // namespace detail /// \returns a new kernel bundle that represents the union of all the device /// images in the input bundles with duplicates removed. diff --git a/sycl/include/CL/sycl/kernel_bundle_enums.hpp b/sycl/include/sycl/kernel_bundle_enums.hpp similarity index 100% rename from sycl/include/CL/sycl/kernel_bundle_enums.hpp rename to sycl/include/sycl/kernel_bundle_enums.hpp diff --git a/sycl/include/CL/sycl/kernel_handler.hpp b/sycl/include/sycl/kernel_handler.hpp similarity index 95% rename from sycl/include/CL/sycl/kernel_handler.hpp rename to sycl/include/sycl/kernel_handler.hpp index 1758b6694c724..f91f81bde3209 100644 --- a/sycl/include/CL/sycl/kernel_handler.hpp +++ b/sycl/include/sycl/kernel_handler.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/sycl/include/CL/sycl/known_identity.hpp b/sycl/include/sycl/known_identity.hpp similarity index 99% rename from sycl/include/CL/sycl/known_identity.hpp rename to sycl/include/sycl/known_identity.hpp index ba3e4d6110bc7..79e0c0cc8f253 100644 --- a/sycl/include/CL/sycl/known_identity.hpp +++ b/sycl/include/sycl/known_identity.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include #include #include +#include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/CL/sycl/marray.hpp b/sycl/include/sycl/marray.hpp similarity index 98% rename from sycl/include/CL/sycl/marray.hpp rename to sycl/include/sycl/marray.hpp index 6bc2c7bfffe47..be5cb830071f8 100644 --- a/sycl/include/CL/sycl/marray.hpp +++ b/sycl/include/sycl/marray.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -64,7 +64,7 @@ template class marray { template < typename... ArgTN, typename = EnableIfSuitableTypes, typename = typename std::enable_if::type> - constexpr marray(const ArgTN &... Args) : MData{Args...} {} + constexpr marray(const ArgTN &...Args) : MData{Args...} {} constexpr marray(const marray &Rhs) = default; diff --git a/sycl/include/CL/sycl/memory_enums.hpp b/sycl/include/sycl/memory_enums.hpp similarity index 98% rename from sycl/include/CL/sycl/memory_enums.hpp rename to sycl/include/sycl/memory_enums.hpp index 6b26435d180e0..67c515507f54d 100644 --- a/sycl/include/CL/sycl/memory_enums.hpp +++ b/sycl/include/sycl/memory_enums.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/multi_ptr.hpp b/sycl/include/sycl/multi_ptr.hpp similarity index 98% rename from sycl/include/CL/sycl/multi_ptr.hpp rename to sycl/include/sycl/multi_ptr.hpp index 75dd9f0a28e20..325db5b7dacfd 100644 --- a/sycl/include/CL/sycl/multi_ptr.hpp +++ b/sycl/include/sycl/multi_ptr.hpp @@ -8,11 +8,11 @@ #pragma once #include -#include -#include -#include #include #include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -30,8 +30,8 @@ template class multi_ptr { public: using element_type = detail::conditional_t::value, - cl::sycl::detail::half_impl::BIsRepresentationT, - ElementType>; + cl::sycl::detail::half_impl::BIsRepresentationT, + ElementType>; using difference_type = std::ptrdiff_t; // Implementation defined pointer and reference types that correspond to @@ -461,8 +461,7 @@ template class multi_ptr { }; // Specialization of multi_ptr for const void -template -class multi_ptr { +template class multi_ptr { public: using element_type = const void; using difference_type = std::ptrdiff_t; @@ -563,7 +562,7 @@ class multi_ptr { pointer_t get() const { return m_Pointer; } // Implicit conversion to the underlying pointer type - operator const void*() const { + operator const void *() const { return reinterpret_cast(m_Pointer); }; @@ -592,12 +591,12 @@ template multi_ptr(accessor) - ->multi_ptr; + -> multi_ptr; template multi_ptr(accessor) - ->multi_ptr; + -> multi_ptr; #endif template diff --git a/sycl/include/CL/sycl/nd_item.hpp b/sycl/include/sycl/nd_item.hpp similarity index 95% rename from sycl/include/CL/sycl/nd_item.hpp rename to sycl/include/sycl/nd_item.hpp index 3e35cef4cbfb2..7cf2c43fbff43 100644 --- a/sycl/include/CL/sycl/nd_item.hpp +++ b/sycl/include/sycl/nd_item.hpp @@ -9,15 +9,15 @@ #pragma once #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/nd_range.hpp b/sycl/include/sycl/nd_range.hpp similarity index 97% rename from sycl/include/CL/sycl/nd_range.hpp rename to sycl/include/sycl/nd_range.hpp index aa746653e79e0..ea138bfdd26f1 100644 --- a/sycl/include/CL/sycl/nd_range.hpp +++ b/sycl/include/sycl/nd_range.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include #include +#include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/CL/sycl/pipes.hpp b/sycl/include/sycl/pipes.hpp similarity index 100% rename from sycl/include/CL/sycl/pipes.hpp rename to sycl/include/sycl/pipes.hpp diff --git a/sycl/include/CL/sycl/platform.hpp b/sycl/include/sycl/platform.hpp similarity index 96% rename from sycl/include/CL/sycl/platform.hpp rename to sycl/include/sycl/platform.hpp index e6249a4883bd5..535f3f49bee52 100644 --- a/sycl/include/CL/sycl/platform.hpp +++ b/sycl/include/sycl/platform.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // 4.6.2 Platform class #include diff --git a/sycl/include/CL/sycl/pointers.hpp b/sycl/include/sycl/pointers.hpp similarity index 97% rename from sycl/include/CL/sycl/pointers.hpp rename to sycl/include/sycl/pointers.hpp index d658f89837d06..c19f8225b0349 100644 --- a/sycl/include/CL/sycl/pointers.hpp +++ b/sycl/include/sycl/pointers.hpp @@ -7,8 +7,7 @@ //===----------------------------------------------------------------------===// #pragma once -#include - +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/program.hpp b/sycl/include/sycl/program.hpp similarity index 98% rename from sycl/include/CL/sycl/program.hpp rename to sycl/include/sycl/program.hpp index 4657d994d45a2..6017ce29f8b4d 100644 --- a/sycl/include/CL/sycl/program.hpp +++ b/sycl/include/sycl/program.hpp @@ -10,17 +10,17 @@ #ifdef __SYCL_INTERNAL_API -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/properties/accessor_properties.hpp b/sycl/include/sycl/properties/accessor_properties.hpp similarity index 98% rename from sycl/include/CL/sycl/properties/accessor_properties.hpp rename to sycl/include/sycl/properties/accessor_properties.hpp index a0a97649c7cba..9bc3285ed4a77 100644 --- a/sycl/include/CL/sycl/properties/accessor_properties.hpp +++ b/sycl/include/sycl/properties/accessor_properties.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include +#include +#include #include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/include/sycl/properties/all_properties.hpp b/sycl/include/sycl/properties/all_properties.hpp new file mode 100644 index 0000000000000..91bf7f0cf584e --- /dev/null +++ b/sycl/include/sycl/properties/all_properties.hpp @@ -0,0 +1,6 @@ +#include +#include +#include +#include +#include +#include diff --git a/sycl/include/CL/sycl/properties/buffer_properties.hpp b/sycl/include/sycl/properties/buffer_properties.hpp similarity index 96% rename from sycl/include/CL/sycl/properties/buffer_properties.hpp rename to sycl/include/sycl/properties/buffer_properties.hpp index 15203cda547c3..9d69a8d841fcc 100644 --- a/sycl/include/CL/sycl/properties/buffer_properties.hpp +++ b/sycl/include/sycl/properties/buffer_properties.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/properties/context_properties.hpp b/sycl/include/sycl/properties/context_properties.hpp similarity index 84% rename from sycl/include/CL/sycl/properties/context_properties.hpp rename to sycl/include/sycl/properties/context_properties.hpp index 5f9e2f3584853..2fc7891c70340 100644 --- a/sycl/include/CL/sycl/properties/context_properties.hpp +++ b/sycl/include/sycl/properties/context_properties.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -31,9 +31,11 @@ namespace property { namespace context { namespace __SYCL2020_DEPRECATED( "use 'sycl::ext::oneapi::cuda::property::context' instead") cuda { - class use_primary_context : public ::cl::sycl::ext::oneapi::cuda::property:: - context::use_primary_context {}; +class use_primary_context : public ::cl::sycl::ext::oneapi::cuda::property:: + context::use_primary_context {}; +// clang-format off } // namespace cuda +// clang-format on } // namespace context } // namespace property diff --git a/sycl/include/CL/sycl/properties/image_properties.hpp b/sycl/include/sycl/properties/image_properties.hpp similarity index 94% rename from sycl/include/CL/sycl/properties/image_properties.hpp rename to sycl/include/sycl/properties/image_properties.hpp index d126c0581add0..9dd5acf86d4f3 100644 --- a/sycl/include/CL/sycl/properties/image_properties.hpp +++ b/sycl/include/sycl/properties/image_properties.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/properties/property_traits.hpp b/sycl/include/sycl/properties/property_traits.hpp similarity index 100% rename from sycl/include/CL/sycl/properties/property_traits.hpp rename to sycl/include/sycl/properties/property_traits.hpp diff --git a/sycl/include/CL/sycl/properties/queue_properties.hpp b/sycl/include/sycl/properties/queue_properties.hpp similarity index 90% rename from sycl/include/CL/sycl/properties/queue_properties.hpp rename to sycl/include/sycl/properties/queue_properties.hpp index 76a3bfaea9373..ba92cc954293d 100644 --- a/sycl/include/CL/sycl/properties/queue_properties.hpp +++ b/sycl/include/sycl/properties/queue_properties.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -46,9 +46,11 @@ namespace property { namespace queue { namespace __SYCL2020_DEPRECATED( "use 'sycl::ext::oneapi::cuda::property::queue' instead") cuda { - class use_default_stream : public ::cl::sycl::ext::oneapi::cuda::property:: - queue::use_default_stream {}; +class use_default_stream : public ::cl::sycl::ext::oneapi::cuda::property:: + queue::use_default_stream {}; +// clang-format off } // namespace cuda +// clang-format on } // namespace queue } // namespace property diff --git a/sycl/include/CL/sycl/properties/reduction_properties.hpp b/sycl/include/sycl/properties/reduction_properties.hpp similarity index 86% rename from sycl/include/CL/sycl/properties/reduction_properties.hpp rename to sycl/include/sycl/properties/reduction_properties.hpp index f4c98f9db1fd6..e921213bfd8d8 100644 --- a/sycl/include/CL/sycl/properties/reduction_properties.hpp +++ b/sycl/include/sycl/properties/reduction_properties.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/property_list.hpp b/sycl/include/sycl/property_list.hpp similarity index 94% rename from sycl/include/CL/sycl/property_list.hpp rename to sycl/include/sycl/property_list.hpp index 7431727fe0f97..c6349b81ea337 100644 --- a/sycl/include/CL/sycl/property_list.hpp +++ b/sycl/include/sycl/property_list.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/property_list_conversion.hpp b/sycl/include/sycl/property_list_conversion.hpp similarity index 96% rename from sycl/include/CL/sycl/property_list_conversion.hpp rename to sycl/include/sycl/property_list_conversion.hpp index 6b96c81cd5f35..8985014d231bd 100644 --- a/sycl/include/CL/sycl/property_list_conversion.hpp +++ b/sycl/include/sycl/property_list_conversion.hpp @@ -10,8 +10,8 @@ // accessor_property_list. A separate file helps to avoid cyclic dependencies // between header files. -#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/queue.hpp b/sycl/include/sycl/queue.hpp similarity index 99% rename from sycl/include/CL/sycl/queue.hpp rename to sycl/include/sycl/queue.hpp index 4477d7bfb05a3..b9be4d9d8c37a 100644 --- a/sycl/include/CL/sycl/queue.hpp +++ b/sycl/include/sycl/queue.hpp @@ -8,19 +8,19 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Explicitly request format macros #ifndef __STDC_FORMAT_MACROS diff --git a/sycl/include/CL/sycl/range.hpp b/sycl/include/sycl/range.hpp similarity index 99% rename from sycl/include/CL/sycl/range.hpp rename to sycl/include/sycl/range.hpp index 8ec9737723c9c..39d9a8eadd9b1 100644 --- a/sycl/include/CL/sycl/range.hpp +++ b/sycl/include/sycl/range.hpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/reduction.hpp b/sycl/include/sycl/reduction.hpp similarity index 99% rename from sycl/include/CL/sycl/reduction.hpp rename to sycl/include/sycl/reduction.hpp index 826335105bb0c..7416f38f31c6a 100644 --- a/sycl/include/CL/sycl/reduction.hpp +++ b/sycl/include/sycl/reduction.hpp @@ -11,7 +11,7 @@ #if __cplusplus >= 201703L // Entire feature is dependent on C++17. -#include +#include #include "sycl/ext/oneapi/reduction.hpp" diff --git a/sycl/include/CL/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp similarity index 93% rename from sycl/include/CL/sycl/sampler.hpp rename to sycl/include/sycl/sampler.hpp index 1d671fc1f189f..236c02ca5c4b7 100644 --- a/sycl/include/CL/sycl/sampler.hpp +++ b/sycl/include/sycl/sampler.hpp @@ -9,11 +9,11 @@ #pragma once #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -120,7 +120,8 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS sampler { friend decltype(Obj::impl) detail::getSyclObjImpl(const Obj &SyclObject); #endif template + cl::sycl::access::target AccessTarget, + access::placeholder IsPlaceholder> friend class detail::image_accessor; }; } // namespace sycl diff --git a/sycl/include/CL/sycl/specialization_id.hpp b/sycl/include/sycl/specialization_id.hpp similarity index 95% rename from sycl/include/CL/sycl/specialization_id.hpp rename to sycl/include/sycl/specialization_id.hpp index 0023507a7702a..20d699f55aa4a 100644 --- a/sycl/include/CL/sycl/specialization_id.hpp +++ b/sycl/include/sycl/specialization_id.hpp @@ -19,7 +19,7 @@ template class specialization_id { using value_type = T; template - explicit constexpr specialization_id(Args &&... args) + explicit constexpr specialization_id(Args &&...args) : MDefaultValue(std::forward(args)...) {} specialization_id(const specialization_id &rhs) = delete; diff --git a/sycl/include/CL/sycl/stl.hpp b/sycl/include/sycl/stl.hpp similarity index 92% rename from sycl/include/CL/sycl/stl.hpp rename to sycl/include/sycl/stl.hpp index 3e0caec81fa6c..487a4b4ee7468 100644 --- a/sycl/include/CL/sycl/stl.hpp +++ b/sycl/include/sycl/stl.hpp @@ -10,9 +10,9 @@ // 4.5 C++ Standard library classes required for the interface -#include -#include -#include +#include +#include +#include #include #include @@ -48,7 +48,7 @@ namespace sycl { #endif // defined(_WIN32) && !defined(_DLL) && !defined(__SYCL_DEVICE_ONLY__) template -std::unique_ptr make_unique_ptr(ArgsT &&... Args) { +std::unique_ptr make_unique_ptr(ArgsT &&...Args) { return std::unique_ptr(new T(std::forward(Args)...)); } diff --git a/sycl/include/CL/sycl/stream.hpp b/sycl/include/sycl/stream.hpp similarity index 98% rename from sycl/include/CL/sycl/stream.hpp rename to sycl/include/sycl/stream.hpp index 95d9371075284..781e0b0065e83 100644 --- a/sycl/include/CL/sycl/stream.hpp +++ b/sycl/include/sycl/stream.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -631,12 +631,12 @@ inline void writeHItem(GlobalBufAccessorT &GlobalFlushBuf, unsigned Len = 0; Len += append(Buf, "h_item("); for (int I = 0; I < 3; ++I) { - Len += append(Buf + Len, I == 0 ? "\n global " - : I == 1 ? "\n logical local " - : "\n physical local "); - Len += ItemToStr(Buf + Len, I == 0 ? HItem.get_global() - : I == 1 ? HItem.get_logical_local() - : HItem.get_physical_local()); + Len += append(Buf + Len, I == 0 ? "\n global " + : I == 1 ? "\n logical local " + : "\n physical local "); + Len += ItemToStr(Buf + Len, I == 0 ? HItem.get_global() + : I == 1 ? HItem.get_logical_local() + : HItem.get_physical_local()); } Len += append(Buf + Len, "\n)"); write(GlobalFlushBuf, FlushBufferSize, WIOffset, Buf, Len); diff --git a/sycl/include/CL/sycl/sub_group.hpp b/sycl/include/sycl/sub_group.hpp similarity index 97% rename from sycl/include/CL/sycl/sub_group.hpp rename to sycl/include/sycl/sub_group.hpp index 40fc72a0040b1..260d05f8fdfc8 100644 --- a/sycl/include/CL/sycl/sub_group.hpp +++ b/sycl/include/sycl/sub_group.hpp @@ -8,8 +8,8 @@ #pragma once -#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/include/CL/sycl/swizzles.def b/sycl/include/sycl/swizzles.def similarity index 100% rename from sycl/include/CL/sycl/swizzles.def rename to sycl/include/sycl/swizzles.def diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp index 049d82c7caf42..58fbad49deb43 100644 --- a/sycl/include/sycl/sycl.hpp +++ b/sycl/include/sycl/sycl.hpp @@ -8,4 +8,66 @@ #pragma once -#include +#include +#include +#include +#include +#include +#include +#if SYCL_BACKEND_OPENCL +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/sycl/include/CL/sycl/sycl_span.hpp b/sycl/include/sycl/sycl_span.hpp similarity index 95% rename from sycl/include/CL/sycl/sycl_span.hpp rename to sycl/include/sycl/sycl_span.hpp index c27bd0a2b183f..bd3a367f5de5a 100644 --- a/sycl/include/CL/sycl/sycl_span.hpp +++ b/sycl/include/sycl/sycl_span.hpp @@ -188,8 +188,8 @@ struct __is_span_compatible_container< // remove_pointer_t(*)[] is convertible to // ElementType(*)[] typename std::enable_if< - std::is_convertible_v()))> (*)[], + std::is_convertible_v()))> (*)[], _ElementType (*)[]>, std::nullptr_t>::type>> : public std::true_type {}; @@ -287,23 +287,23 @@ template class _SYCL_SPAN_TEMPLATE_VIS span { } template - _SYCL_SPAN_INLINE_VISIBILITY constexpr span last() const - noexcept { + _SYCL_SPAN_INLINE_VISIBILITY constexpr span + last() const noexcept { static_assert(_Count <= _Extent, "Count out of range in span::last()"); return span{data() + size() - _Count, _Count}; } _SYCL_SPAN_INLINE_VISIBILITY - constexpr span first(size_type __count) const - noexcept { + constexpr span + first(size_type __count) const noexcept { _SYCL_SPAN_ASSERT(__count <= size(), "Count out of range in span::first(count)"); return {data(), __count}; } _SYCL_SPAN_INLINE_VISIBILITY - constexpr span last(size_type __count) const - noexcept { + constexpr span + last(size_type __count) const noexcept { _SYCL_SPAN_ASSERT(__count <= size(), "Count out of range in span::last(count)"); return {data() + size() - __count, __count}; @@ -326,8 +326,8 @@ template class _SYCL_SPAN_TEMPLATE_VIS span { _SYCL_SPAN_INLINE_VISIBILITY constexpr span - subspan(size_type __offset, size_type __count = dynamic_extent) const - noexcept { + subspan(size_type __offset, + size_type __count = dynamic_extent) const noexcept { _SYCL_SPAN_ASSERT(__offset <= size(), "Offset out of range in span::subspan(offset, count)"); _SYCL_SPAN_ASSERT(__count <= size() || __count == dynamic_extent, @@ -485,23 +485,23 @@ class _SYCL_SPAN_TEMPLATE_VIS span<_Tp, dynamic_extent> { } template - _SYCL_SPAN_INLINE_VISIBILITY constexpr span last() const - noexcept { + _SYCL_SPAN_INLINE_VISIBILITY constexpr span + last() const noexcept { _SYCL_SPAN_ASSERT(_Count <= size(), "Count out of range in span::last()"); return span{data() + size() - _Count, _Count}; } _SYCL_SPAN_INLINE_VISIBILITY - constexpr span first(size_type __count) const - noexcept { + constexpr span + first(size_type __count) const noexcept { _SYCL_SPAN_ASSERT(__count <= size(), "Count out of range in span::first(count)"); return {data(), __count}; } _SYCL_SPAN_INLINE_VISIBILITY - constexpr span last(size_type __count) const - noexcept { + constexpr span + last(size_type __count) const noexcept { _SYCL_SPAN_ASSERT(__count <= size(), "Count out of range in span::last(count)"); return {data() + size() - __count, __count}; @@ -519,8 +519,8 @@ class _SYCL_SPAN_TEMPLATE_VIS span<_Tp, dynamic_extent> { } constexpr span _SYCL_SPAN_INLINE_VISIBILITY - subspan(size_type __offset, size_type __count = dynamic_extent) const - noexcept { + subspan(size_type __offset, + size_type __count = dynamic_extent) const noexcept { _SYCL_SPAN_ASSERT(__offset <= size(), "Offset out of range in span::subspan(offset, count)"); _SYCL_SPAN_ASSERT(__count <= size() || __count == dynamic_extent, @@ -614,16 +614,16 @@ as_writable_bytes(span<_Tp, _Extent> __s) noexcept template span(_Tp (&)[_Sz]) -> span<_Tp, dynamic_extent>; -template span(std::array<_Tp, _Sz> &)->span<_Tp, _Sz>; +template span(std::array<_Tp, _Sz> &) -> span<_Tp, _Sz>; template -span(const std::array<_Tp, _Sz> &)->span; +span(const std::array<_Tp, _Sz> &) -> span; template -span(_Container &)->span; +span(_Container &) -> span; template -span(const _Container &)->span; +span(const _Container &) -> span; } // namespace sycl } // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/CL/sycl/types.hpp b/sycl/include/sycl/types.hpp similarity index 98% rename from sycl/include/CL/sycl/types.hpp rename to sycl/include/sycl/types.hpp index b7f3eb2316249..3caa0d6d40300 100644 --- a/sycl/include/CL/sycl/types.hpp +++ b/sycl/include/sycl/types.hpp @@ -10,7 +10,7 @@ #pragma once -#include +#include // Define __NO_EXT_VECTOR_TYPE_ON_HOST__ to avoid using ext_vector_type // extension even if the host compiler supports it. The same can be @@ -46,14 +46,14 @@ #error "SYCL device compiler is built without ext_vector_type support" #endif // __HAS_EXT_VECTOR_TYPE__ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -567,14 +567,15 @@ template class vec { // SizeChecker is needed for vec(const argTN &... args) ctor to validate args. template - struct SizeChecker: detail::conditional_t {}; + struct SizeChecker : detail::conditional_t { + }; template struct SizeChecker : detail::conditional_t, - std::false_type> {}; + SizeChecker, + std::false_type> {}; #define __SYCL_ALLOW_VECTOR_SIZES(num_elements) \ template \ @@ -818,7 +819,7 @@ template class vec { // base types are match and that the NumElements == sum of lengths of args. template , typename = EnableIfSuitableNumElements> - constexpr vec(const argTN &... args) { + constexpr vec(const argTN &...args) { vaargCtorHelper(0, args...); } @@ -921,8 +922,7 @@ template class vec { // function would activate a bug in MSVC that is fixed only in v19.20. // Until then MSVC does not recognize such constexpr functions as const and // thus does not let using them in template parameters inside swizzle.def. - template - struct Indexer { + template struct Indexer { static constexpr int value = Index; }; @@ -1148,8 +1148,7 @@ template class vec { // Use __SYCL_DEVICE_ONLY__ macro because cast to OpenCL vector type is defined // by SYCL device compiler only. #ifdef __SYCL_DEVICE_ONLY__ - return vec{ - (typename vec::DataType)~m_Data}; + return vec{(typename vec::DataType) ~m_Data}; #else vec Ret; for (size_t I = 0; I < NumElements; ++I) { @@ -1164,7 +1163,7 @@ template class vec { // by SYCL device compiler only. #ifdef __SYCL_DEVICE_ONLY__ return vec{ - (typename vec::DataType)!m_Data}; + (typename vec::DataType) !m_Data}; #else vec Ret; for (size_t I = 0; I < NumElements; ++I) { @@ -1350,15 +1349,14 @@ template class vec { } template - constexpr void vaargCtorHelper(int Idx, const T1 &arg, - const argTN &... args) { + constexpr void vaargCtorHelper(int Idx, const T1 &arg, const argTN &...args) { int NewIdx = vaargCtorHelper(Idx, arg); vaargCtorHelper(NewIdx, args...); } template constexpr void vaargCtorHelper(int Idx, const vec &arg, - const argTN &... args) { + const argTN &...args) { int NewIdx = vaargCtorHelper(Idx, arg); vaargCtorHelper(NewIdx, args...); } @@ -1384,7 +1382,7 @@ template class vec { // all compilers supporting deduction guides also support fold expressions template ::value && ...)>> -vec(T, U...)->vec; +vec(T, U...) -> vec; #endif namespace detail { @@ -1856,8 +1854,7 @@ class SwizzleOp { // function would activate a bug in MSVC that is fixed only in v19.20. // Until then MSVC does not recognize such constexpr functions as const and // thus does not let using them in template parameters inside swizzle.def. - template - struct Indexer { + template struct Indexer { static constexpr int IDXs[sizeof...(Indexes)] = {Indexes...}; static constexpr int value = IDXs[Index >= getNumElements() ? 0 : Index]; }; @@ -2083,7 +2080,6 @@ __SYCL_RELLOGOP(||) } // namespace sycl } // __SYCL_INLINE_NAMESPACE(cl) - #ifdef __SYCL_USE_EXT_VECTOR_TYPE__ #define __SYCL_DECLARE_TYPE_VIA_CL_T(type) \ using __##type##_t = cl::sycl::cl_##type; \ @@ -2152,10 +2148,10 @@ namespace detail { // sizeof(IN). expected to handle scalar types in IN. template using select_apply_cl_t = - conditional_t>>; -} // detail + conditional_t>>; +} // namespace detail #define __SYCL_DECLARE_CONVERTER(base, num) \ template <> class BaseCLTypeConverter { \ diff --git a/sycl/include/CL/sycl/usm.hpp b/sycl/include/sycl/usm.hpp similarity index 99% rename from sycl/include/CL/sycl/usm.hpp rename to sycl/include/sycl/usm.hpp index 925390e774bf2..885b4baf71b21 100644 --- a/sycl/include/CL/sycl/usm.hpp +++ b/sycl/include/sycl/usm.hpp @@ -7,10 +7,10 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include -#include -#include +#include #include +#include +#include #include diff --git a/sycl/include/CL/sycl/usm/usm_allocator.hpp b/sycl/include/sycl/usm/usm_allocator.hpp similarity index 94% rename from sycl/include/CL/sycl/usm/usm_allocator.hpp rename to sycl/include/sycl/usm/usm_allocator.hpp index 5b0ae87c2ea2e..5c3ca1037bfb0 100644 --- a/sycl/include/CL/sycl/usm/usm_allocator.hpp +++ b/sycl/include/sycl/usm/usm_allocator.hpp @@ -7,13 +7,13 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/include/CL/sycl/usm/usm_enums.hpp b/sycl/include/sycl/usm/usm_enums.hpp similarity index 100% rename from sycl/include/CL/sycl/usm/usm_enums.hpp rename to sycl/include/sycl/usm/usm_enums.hpp diff --git a/sycl/include/CL/sycl/version.hpp.in b/sycl/include/sycl/version.hpp.in similarity index 100% rename from sycl/include/CL/sycl/version.hpp.in rename to sycl/include/sycl/version.hpp.in diff --git a/sycl/plugins/cuda/CMakeLists.txt b/sycl/plugins/cuda/CMakeLists.txt index 4e66a582cd3d5..121ca56060bf2 100644 --- a/sycl/plugins/cuda/CMakeLists.txt +++ b/sycl/plugins/cuda/CMakeLists.txt @@ -25,8 +25,8 @@ endif() add_sycl_plugin(cuda SOURCES - "${sycl_inc_dir}/CL/sycl/detail/pi.h" - "${sycl_inc_dir}/CL/sycl/detail/pi.hpp" + "${sycl_inc_dir}/sycl/detail/pi.h" + "${sycl_inc_dir}/sycl/detail/pi.hpp" "pi_cuda.hpp" "pi_cuda.cpp" LIBRARIES diff --git a/sycl/plugins/cuda/pi_cuda.cpp b/sycl/plugins/cuda/pi_cuda.cpp index c522a24ff0281..03052ccd2b94c 100644 --- a/sycl/plugins/cuda/pi_cuda.cpp +++ b/sycl/plugins/cuda/pi_cuda.cpp @@ -11,10 +11,10 @@ /// /// \ingroup sycl_pi_cuda -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/sycl/plugins/cuda/pi_cuda.hpp b/sycl/plugins/cuda/pi_cuda.hpp index feda2c87ff115..7b5163bf15344 100644 --- a/sycl/plugins/cuda/pi_cuda.hpp +++ b/sycl/plugins/cuda/pi_cuda.hpp @@ -25,7 +25,7 @@ #define _PI_CUDA_PLUGIN_VERSION_STRING \ _PI_PLUGIN_VERSION_STRING(_PI_CUDA_PLUGIN_VERSION) -#include "CL/sycl/detail/pi.h" +#include "sycl/detail/pi.h" #include #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/sycl/plugins/esimd_emulator/CMakeLists.txt b/sycl/plugins/esimd_emulator/CMakeLists.txt index 13f686bbb2781..b033a5e3e5199 100755 --- a/sycl/plugins/esimd_emulator/CMakeLists.txt +++ b/sycl/plugins/esimd_emulator/CMakeLists.txt @@ -104,7 +104,7 @@ endif() add_sycl_plugin(esimd_emulator SOURCES - "${sycl_inc_dir}/CL/sycl/detail/pi.h" + "${sycl_inc_dir}/sycl/detail/pi.h" "pi_esimd_emulator.cpp" LIBRARIES "${LEVEL_ZERO_LOADER}" diff --git a/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp b/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp index 917ee67b4446b..80b89e663ecd5 100644 --- a/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp +++ b/sycl/plugins/esimd_emulator/pi_esimd_emulator.cpp @@ -14,20 +14,20 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include // SLM_BTI +#include +#include +#include +#include +#include #include @@ -343,7 +343,7 @@ static bool isNull(int NDims, const size_t *R) { // NDims is the number of dimensions in the ND-range. Kernels are // normalized in the handler so that all kernels take an sycl::nd_item -// as argument (see StoreLambda in CL/sycl/handler.hpp). For kernels +// as argument (see StoreLambda in sycl/handler.hpp). For kernels // whose workgroup size (LocalWorkSize) is unspecified, InvokeImpl // sets LocalWorkSize to {1, 1, 1}, i.e. each workgroup contains just // one work item. CM emulator will run several workgroups in parallel @@ -2009,7 +2009,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) { #define _PI_API(api) \ (PluginInit->PiFunctionTable).api = (decltype(&::api))(&api); -#include +#include return PI_SUCCESS; } diff --git a/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp b/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp index 36d1a48443e0b..fc18173d11b3c 100755 --- a/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp +++ b/sycl/plugins/esimd_emulator/pi_esimd_emulator.hpp @@ -14,11 +14,11 @@ #pragma once -#include #include #include #include #include +#include #include #include diff --git a/sycl/plugins/hip/CMakeLists.txt b/sycl/plugins/hip/CMakeLists.txt index 129456bed76b5..c3a8c9cdd034d 100644 --- a/sycl/plugins/hip/CMakeLists.txt +++ b/sycl/plugins/hip/CMakeLists.txt @@ -12,8 +12,8 @@ set(HIP_HEADERS "${SYCL_BUILD_PI_HIP_INCLUDE_DIR};${SYCL_BUILD_PI_HIP_HSA_INCLUD # Create pi_hip library add_sycl_plugin(hip SOURCES - "${sycl_inc_dir}/CL/sycl/detail/pi.h" - "${sycl_inc_dir}/CL/sycl/detail/pi.hpp" + "${sycl_inc_dir}/sycl/detail/pi.h" + "${sycl_inc_dir}/sycl/detail/pi.hpp" "pi_hip.hpp" "pi_hip.cpp" INCLUDE_DIRS diff --git a/sycl/plugins/hip/pi_hip.cpp b/sycl/plugins/hip/pi_hip.cpp index 4262f21f3eb22..c3409e52ab0ef 100644 --- a/sycl/plugins/hip/pi_hip.cpp +++ b/sycl/plugins/hip/pi_hip.cpp @@ -11,10 +11,10 @@ /// /// \ingroup sycl_pi_hip -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/sycl/plugins/hip/pi_hip.hpp b/sycl/plugins/hip/pi_hip.hpp index 96d2d8721d199..484be74aa4a02 100644 --- a/sycl/plugins/hip/pi_hip.hpp +++ b/sycl/plugins/hip/pi_hip.hpp @@ -25,7 +25,7 @@ #define _PI_HIP_PLUGIN_VERSION_STRING \ _PI_PLUGIN_VERSION_STRING(_PI_HIP_PLUGIN_VERSION) -#include "CL/sycl/detail/pi.h" +#include "sycl/detail/pi.h" #include #include #include diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt index a0903bbd5befb..9391ff1e5729e 100755 --- a/sycl/plugins/level_zero/CMakeLists.txt +++ b/sycl/plugins/level_zero/CMakeLists.txt @@ -107,7 +107,7 @@ find_package(Threads REQUIRED) add_sycl_plugin(level_zero SOURCES - "${sycl_inc_dir}/CL/sycl/detail/pi.h" + "${sycl_inc_dir}/sycl/detail/pi.h" "${CMAKE_CURRENT_SOURCE_DIR}/pi_level_zero.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/pi_level_zero.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/usm_allocator.cpp" diff --git a/sycl/plugins/level_zero/pi_level_zero.cpp b/sycl/plugins/level_zero/pi_level_zero.cpp index ff59349bd0f82..13b6a71d01bfa 100755 --- a/sycl/plugins/level_zero/pi_level_zero.cpp +++ b/sycl/plugins/level_zero/pi_level_zero.cpp @@ -12,7 +12,6 @@ /// \ingroup sycl_pi_level_zero #include "pi_level_zero.hpp" -#include #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include #include #include @@ -8325,7 +8325,7 @@ pi_result piPluginInit(pi_plugin *PluginInit) { #define _PI_API(api) \ (PluginInit->PiFunctionTable).api = (decltype(&::api))(&api); -#include +#include enableZeTracing(); return PI_SUCCESS; diff --git a/sycl/plugins/level_zero/pi_level_zero.hpp b/sycl/plugins/level_zero/pi_level_zero.hpp index 20d58c08d5380..43deac742e7c2 100755 --- a/sycl/plugins/level_zero/pi_level_zero.hpp +++ b/sycl/plugins/level_zero/pi_level_zero.hpp @@ -25,7 +25,6 @@ #define _PI_LEVEL_ZERO_PLUGIN_VERSION_STRING \ _PI_PLUGIN_VERSION_STRING(_PI_LEVEL_ZERO_PLUGIN_VERSION) -#include #include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/sycl/plugins/level_zero/usm_allocator.cpp b/sycl/plugins/level_zero/usm_allocator.cpp index 498c7619b0273..d821cd3ae5c51 100644 --- a/sycl/plugins/level_zero/usm_allocator.cpp +++ b/sycl/plugins/level_zero/usm_allocator.cpp @@ -23,8 +23,8 @@ #include #include "usm_allocator.hpp" -#include #include +#include // USM allocations are a minimum of 4KB/64KB/2MB even when a smaller size is // requested. The implementation distinguishes between allocations of size diff --git a/sycl/plugins/opencl/CMakeLists.txt b/sycl/plugins/opencl/CMakeLists.txt index 80e16f55c6fe3..9943827e48788 100644 --- a/sycl/plugins/opencl/CMakeLists.txt +++ b/sycl/plugins/opencl/CMakeLists.txt @@ -12,7 +12,7 @@ add_sycl_plugin(opencl SOURCES - "${sycl_inc_dir}/CL/sycl/detail/pi.h" + "${sycl_inc_dir}/sycl/detail/pi.h" "pi_opencl.cpp" LIBRARIES OpenCL-ICD diff --git a/sycl/plugins/opencl/pi_opencl.cpp b/sycl/plugins/opencl/pi_opencl.cpp index fa9fa8e2405a8..9063273d847f0 100644 --- a/sycl/plugins/opencl/pi_opencl.cpp +++ b/sycl/plugins/opencl/pi_opencl.cpp @@ -16,9 +16,9 @@ #define CL_USE_DEPRECATED_OPENCL_1_2_APIS -#include -#include #include +#include +#include #include #include diff --git a/sycl/source/accessor.cpp b/sycl/source/accessor.cpp index 7731615ea2b74..8791a487cb1ec 100644 --- a/sycl/source/accessor.cpp +++ b/sycl/source/accessor.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/backend.cpp b/sycl/source/backend.cpp index f492716c47fa0..6039adc6aa048 100644 --- a/sycl/source/backend.cpp +++ b/sycl/source/backend.cpp @@ -13,14 +13,14 @@ #include "detail/platform_impl.hpp" #include "detail/plugin.hpp" #include "detail/queue_impl.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/backend/level_zero.cpp b/sycl/source/backend/level_zero.cpp index 406edb755834a..9a6b6750a03ba 100644 --- a/sycl/source/backend/level_zero.cpp +++ b/sycl/source/backend/level_zero.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/backend/opencl.cpp b/sycl/source/backend/opencl.cpp index 7e76478c8e630..f50c39bc2f226 100644 --- a/sycl/source/backend/opencl.cpp +++ b/sycl/source/backend/opencl.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include #include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/context.cpp b/sycl/source/context.cpp index 9e19d608f69ae..79ec7ad99b1e3 100644 --- a/sycl/source/context.cpp +++ b/sycl/source/context.cpp @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -94,7 +94,7 @@ context::context(cl_context ClContext, async_handler AsyncHandler) { return impl->get_info(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -102,7 +102,7 @@ context::context(cl_context ClContext, async_handler AsyncHandler) { template <> __SYCL_EXPORT bool context::has_property() const { \ return impl->has_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -111,7 +111,7 @@ context::context(cl_context ClContext, async_handler AsyncHandler) { __SYCL_EXPORT param_type context::get_property() const { \ return impl->get_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/detail/accessor_impl.cpp b/sycl/source/detail/accessor_impl.cpp index cab2c08c4c37c..1ec6804d400ed 100644 --- a/sycl/source/detail/accessor_impl.cpp +++ b/sycl/source/detail/accessor_impl.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/allowlist.hpp b/sycl/source/detail/allowlist.hpp index b12f2eab5a3ac..690573535562c 100644 --- a/sycl/source/detail/allowlist.hpp +++ b/sycl/source/detail/allowlist.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include #include +#include +#include #include #include diff --git a/sycl/source/detail/backend_impl.hpp b/sycl/source/detail/backend_impl.hpp index 0e86cfe2ec152..6f76ca25b4523 100644 --- a/sycl/source/detail/backend_impl.hpp +++ b/sycl/source/detail/backend_impl.hpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/buffer_impl.cpp b/sycl/source/detail/buffer_impl.cpp index 47c40804cdef0..1ac7c89b12e80 100644 --- a/sycl/source/detail/buffer_impl.cpp +++ b/sycl/source/detail/buffer_impl.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/builtins_geometric.cpp b/sycl/source/detail/builtins_geometric.cpp index 14514e22a3851..cebd320e4c116 100644 --- a/sycl/source/detail/builtins_geometric.cpp +++ b/sycl/source/detail/builtins_geometric.cpp @@ -10,7 +10,7 @@ // in SYCL SPEC section - 4.13.6 Geometric functions. #include "builtins_helper.hpp" -#include +#include #include diff --git a/sycl/source/detail/builtins_helper.hpp b/sycl/source/detail/builtins_helper.hpp index 53915ef89f215..41deb22339a3c 100644 --- a/sycl/source/detail/builtins_helper.hpp +++ b/sycl/source/detail/builtins_helper.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // TODO Decide whether to mark functions with this attribute. #define __NOEXC /*noexcept*/ diff --git a/sycl/source/detail/builtins_integer.cpp b/sycl/source/detail/builtins_integer.cpp index da3776c72614b..f8040f6106f01 100644 --- a/sycl/source/detail/builtins_integer.cpp +++ b/sycl/source/detail/builtins_integer.cpp @@ -10,7 +10,7 @@ // in SYCL SPEC section - 4.13.4 Integer functions. #include "builtins_helper.hpp" -#include +#include #include #include diff --git a/sycl/source/detail/builtins_math.cpp b/sycl/source/detail/builtins_math.cpp index 4737035eff628..e2c52d761ff89 100644 --- a/sycl/source/detail/builtins_math.cpp +++ b/sycl/source/detail/builtins_math.cpp @@ -16,7 +16,7 @@ #define _USE_MATH_DEFINES #include "builtins_helper.hpp" -#include +#include #include diff --git a/sycl/source/detail/builtins_relational.cpp b/sycl/source/detail/builtins_relational.cpp index 82a0c5a6db926..03f5617616eb7 100644 --- a/sycl/source/detail/builtins_relational.cpp +++ b/sycl/source/detail/builtins_relational.cpp @@ -10,7 +10,7 @@ // in SYCL SPEC section - 4.13.7 Relational functions. #include "builtins_helper.hpp" -#include +#include #include diff --git a/sycl/source/detail/circular_buffer.hpp b/sycl/source/detail/circular_buffer.hpp index c72c68c39ca82..ecdd58ecd818a 100644 --- a/sycl/source/detail/circular_buffer.hpp +++ b/sycl/source/detail/circular_buffer.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/source/detail/common.cpp b/sycl/source/detail/common.cpp index d28d596d8d2ec..9dcbde0318141 100644 --- a/sycl/source/detail/common.cpp +++ b/sycl/source/detail/common.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -21,7 +21,7 @@ const char *stringifyErrorCode(pi_int32 error) { #define _PI_ERRC_WITH_MSG(NAME, VAL, MSG) \ case NAME: \ return MSG; -#include +#include #undef _PI_ERRC #undef _PI_ERRC_WITH_MSG diff --git a/sycl/source/detail/config.cpp b/sycl/source/detail/config.cpp index 4ac9700a5e48c..641c08eca752f 100644 --- a/sycl/source/detail/config.cpp +++ b/sycl/source/detail/config.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/sycl/source/detail/config.hpp b/sycl/source/detail/config.hpp index c61f3366a0583..0b561b692b0fe 100644 --- a/sycl/source/detail/config.hpp +++ b/sycl/source/detail/config.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/context_impl.cpp b/sycl/source/detail/context_impl.cpp index d8728fb6def18..9589fe8347d76 100644 --- a/sycl/source/detail/context_impl.cpp +++ b/sycl/source/detail/context_impl.cpp @@ -6,20 +6,20 @@ // // ===--------------------------------------------------------------------=== // -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/context_impl.hpp b/sycl/source/detail/context_impl.hpp index 75eece4e8b072..f65ef04fe3cdd 100644 --- a/sycl/source/detail/context_impl.hpp +++ b/sycl/source/detail/context_impl.hpp @@ -7,17 +7,17 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/context_info.hpp b/sycl/source/detail/context_info.hpp index 737c6bbb7a508..852fb1e4f00f9 100644 --- a/sycl/source/detail/context_info.hpp +++ b/sycl/source/detail/context_info.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/device_binary_image.cpp b/sycl/source/detail/device_binary_image.cpp index c1ea2a347c061..2349409494d39 100644 --- a/sycl/source/detail/device_binary_image.cpp +++ b/sycl/source/detail/device_binary_image.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include #include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/device_filter.cpp b/sycl/source/detail/device_filter.cpp index 67cc128331529..e0001e47a68b6 100644 --- a/sycl/source/detail/device_filter.cpp +++ b/sycl/source/detail/device_filter.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include +#include +#include #include #include diff --git a/sycl/source/detail/device_global_map_entry.hpp b/sycl/source/detail/device_global_map_entry.hpp index f467dfc39ab87..e60d315956513 100644 --- a/sycl/source/detail/device_global_map_entry.hpp +++ b/sycl/source/detail/device_global_map_entry.hpp @@ -8,16 +8,20 @@ #pragma once +#include #include #include #include +#include + __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { namespace detail { // Forward declaration class device_impl; +class context_impl; struct DeviceGlobalMapEntry { // The unique identifier of the device_global. diff --git a/sycl/source/detail/device_image_impl.hpp b/sycl/source/detail/device_image_impl.hpp index 4886c5c8ae25a..3dec447e75421 100644 --- a/sycl/source/detail/device_image_impl.hpp +++ b/sycl/source/detail/device_image_impl.hpp @@ -8,18 +8,18 @@ #pragma once -#include -#include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/device_impl.cpp b/sycl/source/detail/device_impl.cpp index 395f746f5aac5..d47682f11cd22 100644 --- a/sycl/source/detail/device_impl.cpp +++ b/sycl/source/detail/device_impl.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include #include diff --git a/sycl/source/detail/device_impl.hpp b/sycl/source/detail/device_impl.hpp index 098c82dad8944..18b1c28cfed07 100644 --- a/sycl/source/detail/device_impl.hpp +++ b/sycl/source/detail/device_impl.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/device_info.hpp b/sycl/source/detail/device_info.hpp index 23b04577863ec..0d7afa3660b14 100644 --- a/sycl/source/detail/device_info.hpp +++ b/sycl/source/detail/device_info.hpp @@ -7,19 +7,19 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/error_handling/enqueue_kernel.cpp b/sycl/source/detail/error_handling/enqueue_kernel.cpp index f2a2f649e5f7d..e82723434b15b 100644 --- a/sycl/source/detail/error_handling/enqueue_kernel.cpp +++ b/sycl/source/detail/error_handling/enqueue_kernel.cpp @@ -12,9 +12,9 @@ #include "error_handling.hpp" -#include -#include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/error_handling/error_handling.hpp b/sycl/source/detail/error_handling/error_handling.hpp index 38b63323a0965..8acc159996c9d 100644 --- a/sycl/source/detail/error_handling/error_handling.hpp +++ b/sycl/source/detail/error_handling/error_handling.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/event_impl.cpp b/sycl/source/detail/event_impl.cpp index 2719d92b97e22..c6cba3816cdd7 100644 --- a/sycl/source/detail/event_impl.cpp +++ b/sycl/source/detail/event_impl.cpp @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include #include #include #include +#include +#include #include "detail/config.hpp" diff --git a/sycl/source/detail/event_impl.hpp b/sycl/source/detail/event_impl.hpp index 1a6bf26dc9931..4dec3b7d7b5ab 100644 --- a/sycl/source/detail/event_impl.hpp +++ b/sycl/source/detail/event_impl.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/event_info.hpp b/sycl/source/detail/event_info.hpp index 62d4ed01c2947..4344a48481f93 100644 --- a/sycl/source/detail/event_info.hpp +++ b/sycl/source/detail/event_info.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/filter_selector_impl.cpp b/sycl/source/detail/filter_selector_impl.cpp index 1adfee4316c3a..42e7e3c26e9ff 100644 --- a/sycl/source/detail/filter_selector_impl.cpp +++ b/sycl/source/detail/filter_selector_impl.cpp @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/filter_selector_impl.hpp b/sycl/source/detail/filter_selector_impl.hpp index d29b831ef921e..e09e352521ff7 100644 --- a/sycl/source/detail/filter_selector_impl.hpp +++ b/sycl/source/detail/filter_selector_impl.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/sycl/source/detail/force_device.cpp b/sycl/source/detail/force_device.cpp index 6a8fb6646febc..742bc3431d165 100644 --- a/sycl/source/detail/force_device.cpp +++ b/sycl/source/detail/force_device.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include #include +#include +#include #include #include diff --git a/sycl/source/detail/force_device.hpp b/sycl/source/detail/force_device.hpp index 0700634ade578..05db6f1da89ce 100644 --- a/sycl/source/detail/force_device.hpp +++ b/sycl/source/detail/force_device.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/global_handler.cpp b/sycl/source/detail/global_handler.cpp index c0174f81d6d80..2c2b970678ef4 100644 --- a/sycl/source/detail/global_handler.cpp +++ b/sycl/source/detail/global_handler.cpp @@ -6,9 +6,6 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include #include #include @@ -17,6 +14,9 @@ #include #include #include +#include +#include +#include #ifdef _WIN32 #include diff --git a/sycl/source/detail/global_handler.hpp b/sycl/source/detail/global_handler.hpp index b3d6357686e0c..2c0c28eef3454 100644 --- a/sycl/source/detail/global_handler.hpp +++ b/sycl/source/detail/global_handler.hpp @@ -8,8 +8,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/sycl/source/detail/handler_proxy.cpp b/sycl/source/detail/handler_proxy.cpp index c294634763b76..0e79921c6973d 100644 --- a/sycl/source/detail/handler_proxy.cpp +++ b/sycl/source/detail/handler_proxy.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include +#include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/helpers.cpp b/sycl/source/detail/helpers.cpp index 5ef25d598bf18..fea60a2d1579b 100644 --- a/sycl/source/detail/helpers.cpp +++ b/sycl/source/detail/helpers.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include +#include -#include #include #include +#include #include diff --git a/sycl/source/detail/image_accessor_util.cpp b/sycl/source/detail/image_accessor_util.cpp index 06b32c56a0556..8d07b3d1546e7 100644 --- a/sycl/source/detail/image_accessor_util.cpp +++ b/sycl/source/detail/image_accessor_util.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/image_impl.cpp b/sycl/source/detail/image_impl.cpp index 2150fa2e66b22..14591faf96d5d 100644 --- a/sycl/source/detail/image_impl.cpp +++ b/sycl/source/detail/image_impl.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/sycl/source/detail/kernel_bundle_impl.hpp b/sycl/source/detail/kernel_bundle_impl.hpp index 2e0d19295a84b..b537c6f341385 100644 --- a/sycl/source/detail/kernel_bundle_impl.hpp +++ b/sycl/source/detail/kernel_bundle_impl.hpp @@ -8,15 +8,15 @@ #pragma once -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp index 7696bf8a0a8a1..5901abb1420f3 100644 --- a/sycl/source/detail/kernel_impl.hpp +++ b/sycl/source/detail/kernel_impl.hpp @@ -8,15 +8,15 @@ #pragma once -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/kernel_info.hpp b/sycl/source/detail/kernel_info.hpp index 129a2e571ab08..ad13edd693fd8 100644 --- a/sycl/source/detail/kernel_info.hpp +++ b/sycl/source/detail/kernel_info.hpp @@ -8,11 +8,11 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/kernel_program_cache.hpp b/sycl/source/detail/kernel_program_cache.hpp index 1dded43d9b6f2..dabf01445247e 100644 --- a/sycl/source/detail/kernel_program_cache.hpp +++ b/sycl/source/detail/kernel_program_cache.hpp @@ -8,12 +8,12 @@ #pragma once -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/mem_alloc_helper.hpp b/sycl/source/detail/mem_alloc_helper.hpp index 0cbc8c4bada86..0f4799a19ab98 100644 --- a/sycl/source/detail/mem_alloc_helper.hpp +++ b/sycl/source/detail/mem_alloc_helper.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/memory_manager.cpp b/sycl/source/detail/memory_manager.cpp index ece95985dd095..83f71f0e64dc9 100644 --- a/sycl/source/detail/memory_manager.cpp +++ b/sycl/source/detail/memory_manager.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include #include #include +#include #include #include diff --git a/sycl/source/detail/online_compiler/online_compiler.cpp b/sycl/source/detail/online_compiler/online_compiler.cpp index 78f2c12098d19..7cf8c25b46c77 100644 --- a/sycl/source/detail/online_compiler/online_compiler.cpp +++ b/sycl/source/detail/online_compiler/online_compiler.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include #include #include diff --git a/sycl/source/detail/os_util.cpp b/sycl/source/detail/os_util.cpp index 36d42624d6714..355bc3827bfa7 100644 --- a/sycl/source/detail/os_util.cpp +++ b/sycl/source/detail/os_util.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include #include diff --git a/sycl/source/detail/persistent_device_code_cache.hpp b/sycl/source/detail/persistent_device_code_cache.hpp index d02ca5f03915e..ba2931a0b7600 100644 --- a/sycl/source/detail/persistent_device_code_cache.hpp +++ b/sycl/source/detail/persistent_device_code_cache.hpp @@ -8,14 +8,14 @@ #pragma once -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp index c90548e29c15f..71cf9a53421b0 100644 --- a/sycl/source/detail/pi.cpp +++ b/sycl/source/detail/pi.cpp @@ -12,16 +12,16 @@ /// \ingroup sycl_pi #include "context_impl.hpp" -#include -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/platform_impl.cpp b/sycl/source/detail/platform_impl.cpp index 1cd0e76244b73..705e84b78ed20 100644 --- a/sycl/source/detail/platform_impl.cpp +++ b/sycl/source/detail/platform_impl.cpp @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include #include @@ -338,7 +338,7 @@ bool platform_impl::has(aspect Aspect) const { #define __SYCL_PARAM_TRAITS_SPEC(param_type, param, ret_type) \ template ret_type platform_impl::get_info() const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC } // namespace detail diff --git a/sycl/source/detail/platform_impl.hpp b/sycl/source/detail/platform_impl.hpp index a0e673d440f7d..644c1968cf04c 100644 --- a/sycl/source/detail/platform_impl.hpp +++ b/sycl/source/detail/platform_impl.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/platform_info.hpp b/sycl/source/detail/platform_info.hpp index ff385c3bb4250..7195089dfb3f8 100644 --- a/sycl/source/detail/platform_info.hpp +++ b/sycl/source/detail/platform_info.hpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include #include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/platform_util.cpp b/sycl/source/detail/platform_util.cpp index 9c3afa41c1a11..9d48f0271140b 100644 --- a/sycl/source/detail/platform_util.cpp +++ b/sycl/source/detail/platform_util.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include -#include #include +#include +#include #if defined(__SYCL_RT_OS_LINUX) #include diff --git a/sycl/source/detail/platform_util.hpp b/sycl/source/detail/platform_util.hpp index 2616f03ab01dc..dbba92895f661 100644 --- a/sycl/source/detail/platform_util.hpp +++ b/sycl/source/detail/platform_util.hpp @@ -8,9 +8,12 @@ #pragma once -#include #include +#include // for ::size_t + +#include + #ifdef _MSC_VER // This feature is not supported in MSVC. #define __builtin_expect(a, b) (a) diff --git a/sycl/source/detail/plugin.hpp b/sycl/source/detail/plugin.hpp index ef67ec261bc6d..4c45a9faf7bdf 100644 --- a/sycl/source/detail/plugin.hpp +++ b/sycl/source/detail/plugin.hpp @@ -7,15 +7,15 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include #ifdef XPTI_ENABLE_INSTRUMENTATION // Include the headers necessary for emitting traces using the trace framework @@ -40,7 +40,7 @@ template struct PiApiArgTuple; using type = typename function_traits::args_type; \ }; -#include +#include #undef _PI_API template diff --git a/sycl/source/detail/plugin_printers.hpp b/sycl/source/detail/plugin_printers.hpp index b28dc24dcc472..5d0a98ef52488 100644 --- a/sycl/source/detail/plugin_printers.hpp +++ b/sycl/source/detail/plugin_printers.hpp @@ -10,7 +10,7 @@ #pragma once -#include +#include #include diff --git a/sycl/source/detail/posix_pi.cpp b/sycl/source/detail/posix_pi.cpp index de422883afb56..6bcdd3834d3b9 100644 --- a/sycl/source/detail/posix_pi.cpp +++ b/sycl/source/detail/posix_pi.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include #include #include diff --git a/sycl/source/detail/program_impl.cpp b/sycl/source/detail/program_impl.cpp index 3ec486c3aa692..980ee4c4c7089 100644 --- a/sycl/source/detail/program_impl.cpp +++ b/sycl/source/detail/program_impl.cpp @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/program_impl.hpp b/sycl/source/detail/program_impl.hpp index bb3d670ef2cfa..1c44415a67665 100644 --- a/sycl/source/detail/program_impl.hpp +++ b/sycl/source/detail/program_impl.hpp @@ -7,16 +7,16 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp index a7d82151d59f0..5106cc744a08a 100644 --- a/sycl/source/detail/program_manager/program_manager.cpp +++ b/sycl/source/detail/program_manager/program_manager.cpp @@ -6,15 +6,6 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -24,7 +15,16 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include #include diff --git a/sycl/source/detail/program_manager/program_manager.hpp b/sycl/source/detail/program_manager/program_manager.hpp index 835c87008dbd9..3ce14ad854031 100644 --- a/sycl/source/detail/program_manager/program_manager.hpp +++ b/sycl/source/detail/program_manager/program_manager.hpp @@ -7,17 +7,17 @@ //===----------------------------------------------------------------------===// #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp index 844d2187483d1..0d00dfc6180d0 100644 --- a/sycl/source/detail/queue_impl.cpp +++ b/sycl/source/detail/queue_impl.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp index 875c4065ae370..053e0cd76980e 100644 --- a/sycl/source/detail/queue_impl.hpp +++ b/sycl/source/detail/queue_impl.hpp @@ -8,18 +8,6 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -29,6 +17,18 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/source/detail/sampler_impl.cpp b/sycl/source/detail/sampler_impl.cpp index 00994acf30e1f..24a2d4b2b3296 100644 --- a/sycl/source/detail/sampler_impl.cpp +++ b/sycl/source/detail/sampler_impl.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/sampler_impl.hpp b/sycl/source/detail/sampler_impl.hpp index 682b92bf70a29..ee4dd3b98b495 100644 --- a/sycl/source/detail/sampler_impl.hpp +++ b/sycl/source/detail/sampler_impl.hpp @@ -9,9 +9,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp index e8ac4a895fafd..98eaa72a08e8c 100644 --- a/sycl/source/detail/scheduler/commands.cpp +++ b/sycl/source/detail/scheduler/commands.cpp @@ -8,13 +8,6 @@ #include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -28,6 +21,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/scheduler/commands.hpp b/sycl/source/detail/scheduler/commands.hpp index 0a0dfa8badf61..b1c65612dfc46 100644 --- a/sycl/source/detail/scheduler/commands.hpp +++ b/sycl/source/detail/scheduler/commands.hpp @@ -17,11 +17,11 @@ #include #include -#include -#include -#include #include #include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/scheduler/graph_builder.cpp b/sycl/source/detail/scheduler/graph_builder.cpp index 31edb0bd31e97..e57a056d210f9 100644 --- a/sycl/source/detail/scheduler/graph_builder.cpp +++ b/sycl/source/detail/scheduler/graph_builder.cpp @@ -7,13 +7,13 @@ //===----------------------------------------------------------------------===// #include "detail/config.hpp" -#include -#include -#include #include #include #include #include +#include +#include +#include #include #include diff --git a/sycl/source/detail/scheduler/scheduler.cpp b/sycl/source/detail/scheduler/scheduler.cpp index 2901b7dc30c70..1f72fa85e1a82 100644 --- a/sycl/source/detail/scheduler/scheduler.cpp +++ b/sycl/source/detail/scheduler/scheduler.cpp @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include "CL/sycl/detail/sycl_mem_obj_i.hpp" -#include +#include "sycl/detail/sycl_mem_obj_i.hpp" #include #include #include #include #include +#include #include #include diff --git a/sycl/source/detail/scheduler/scheduler.hpp b/sycl/source/detail/scheduler/scheduler.hpp index 39075dbcd2703..928b41354c065 100644 --- a/sycl/source/detail/scheduler/scheduler.hpp +++ b/sycl/source/detail/scheduler/scheduler.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include #include #include +#include +#include #include #include diff --git a/sycl/source/detail/scheduler/scheduler_helpers.cpp b/sycl/source/detail/scheduler/scheduler_helpers.cpp index d3233117283dc..45c33044e3c05 100644 --- a/sycl/source/detail/scheduler/scheduler_helpers.cpp +++ b/sycl/source/detail/scheduler/scheduler_helpers.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/scheduler/scheduler_helpers.hpp b/sycl/source/detail/scheduler/scheduler_helpers.hpp index c7030c9b69603..767a337ee7f29 100644 --- a/sycl/source/detail/scheduler/scheduler_helpers.hpp +++ b/sycl/source/detail/scheduler/scheduler_helpers.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include diff --git a/sycl/source/detail/spec_constant_impl.cpp b/sycl/source/detail/spec_constant_impl.cpp index bca01db8b7822..24996bc7709a0 100644 --- a/sycl/source/detail/spec_constant_impl.cpp +++ b/sycl/source/detail/spec_constant_impl.cpp @@ -8,10 +8,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/spec_constant_impl.hpp b/sycl/source/detail/spec_constant_impl.hpp index 5e076cd5070c4..dbdb889e59381 100644 --- a/sycl/source/detail/spec_constant_impl.hpp +++ b/sycl/source/detail/spec_constant_impl.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/stream_impl.cpp b/sycl/source/detail/stream_impl.cpp index 097f928525278..d317d8aadb3e6 100644 --- a/sycl/source/detail/stream_impl.cpp +++ b/sycl/source/detail/stream_impl.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include #include diff --git a/sycl/source/detail/stream_impl.hpp b/sycl/source/detail/stream_impl.hpp index 7fb1a57ddb865..ba9de575b0a4a 100644 --- a/sycl/source/detail/stream_impl.hpp +++ b/sycl/source/detail/stream_impl.hpp @@ -8,13 +8,13 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/sycl/source/detail/sycl_mem_obj_t.cpp b/sycl/source/detail/sycl_mem_obj_t.cpp index 81643b7ea1f50..cac139faccaed 100644 --- a/sycl/source/detail/sycl_mem_obj_t.cpp +++ b/sycl/source/detail/sycl_mem_obj_t.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/thread_pool.hpp b/sycl/source/detail/thread_pool.hpp index c6544059cd011..82765b7ac18fd 100644 --- a/sycl/source/detail/thread_pool.hpp +++ b/sycl/source/detail/thread_pool.hpp @@ -16,7 +16,7 @@ #include #include -#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/usm/usm_impl.cpp b/sycl/source/detail/usm/usm_impl.cpp index 8341c09b63d4a..b642d45c50395 100644 --- a/sycl/source/detail/usm/usm_impl.cpp +++ b/sycl/source/detail/usm/usm_impl.cpp @@ -6,13 +6,13 @@ // // ===--------------------------------------------------------------------=== // -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sycl/source/detail/util.cpp b/sycl/source/detail/util.cpp index 5cf6633486a4f..aace9a77e3f64 100644 --- a/sycl/source/detail/util.cpp +++ b/sycl/source/detail/util.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/detail/windows_pi.cpp b/sycl/source/detail/windows_pi.cpp index be4c9f582b44c..80cc478dafa90 100644 --- a/sycl/source/detail/windows_pi.cpp +++ b/sycl/source/detail/windows_pi.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/source/detail/xpti_registry.hpp b/sycl/source/detail/xpti_registry.hpp index d5b0b7f916b85..1cd6419cb04bd 100644 --- a/sycl/source/detail/xpti_registry.hpp +++ b/sycl/source/detail/xpti_registry.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #ifdef XPTI_ENABLE_INSTRUMENTATION // Include the headers necessary for emitting diff --git a/sycl/source/device.cpp b/sycl/source/device.cpp index 5bbbc42106255..02e2de97e6373 100644 --- a/sycl/source/device.cpp +++ b/sycl/source/device.cpp @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -152,7 +152,7 @@ device::get_info() const { template __SYCL_EXPORT ret_type device::get_info() \ const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/device_selector.cpp b/sycl/source/device_selector.cpp index ee808b4f3480d..90ebe93c3bafa 100644 --- a/sycl/source/device_selector.cpp +++ b/sycl/source/device_selector.cpp @@ -6,18 +6,18 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include #include +#include // 4.6.1 Device selection class #include diff --git a/sycl/source/esimd_emulator_device_interface.cpp b/sycl/source/esimd_emulator_device_interface.cpp index 5a612ad09ad9c..2952c85c9ec87 100644 --- a/sycl/source/esimd_emulator_device_interface.cpp +++ b/sycl/source/esimd_emulator_device_interface.cpp @@ -15,7 +15,7 @@ /// /// \ingroup sycl_pi_esimd_emulator -#include +#include #include __SYCL_INLINE_NAMESPACE(cl) { diff --git a/sycl/source/event.cpp b/sycl/source/event.cpp index 3c64aed678bac..0b148c73cf72a 100644 --- a/sycl/source/event.cpp +++ b/sycl/source/event.cpp @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include #include @@ -75,7 +75,7 @@ event::event(std::shared_ptr event_impl) return impl->get_info(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -87,7 +87,7 @@ event::event(std::shared_ptr event_impl) return impl->get_profiling_info(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/exception.cpp b/sycl/source/exception.cpp index 9ee88c57df0ad..3394e2f6b4149 100644 --- a/sycl/source/exception.cpp +++ b/sycl/source/exception.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// // 4.9.2 Exception Class Interface -#include -#include +#include +#include #include diff --git a/sycl/source/exception_list.cpp b/sycl/source/exception_list.cpp index 93cdbf9ef850f..3c213c644a376 100644 --- a/sycl/source/exception_list.cpp +++ b/sycl/source/exception_list.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // 4.9.2 Exception Class Interface -#include +#include #include diff --git a/sycl/source/half_type.cpp b/sycl/source/half_type.cpp index f17541fa9b8a8..aed32a1830dab 100644 --- a/sycl/source/half_type.cpp +++ b/sycl/source/half_type.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include -#include +#include +#include // This is included to enable __builtin_expect() #include diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index 37eeef61a1091..92abfbd64fe1d 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -8,14 +8,6 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -24,6 +16,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/interop_handle.cpp b/sycl/source/interop_handle.cpp index 36da4d8e9c9c4..ceba88eb0e218 100644 --- a/sycl/source/interop_handle.cpp +++ b/sycl/source/interop_handle.cpp @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include #include #include #include +#include +#include +#include #include diff --git a/sycl/source/interop_handler.cpp b/sycl/source/interop_handler.cpp index f6fb55ad28120..47f54aa7c4ed1 100644 --- a/sycl/source/interop_handler.cpp +++ b/sycl/source/interop_handler.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/source/kernel.cpp b/sycl/source/kernel.cpp index 0283e10d036b8..923ee061f9ca1 100644 --- a/sycl/source/kernel.cpp +++ b/sycl/source/kernel.cpp @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -52,7 +52,7 @@ kernel::get_info() const { template __SYCL_EXPORT ret_type kernel::get_info() \ const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -78,7 +78,7 @@ kernel::get_info(const device &Device, template __SYCL_EXPORT ret_type kernel::get_info( \ const device &, in_type) const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC #undef __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT @@ -93,7 +93,7 @@ kernel::get_work_group_info(const device &dev) const { template __SYCL_EXPORT ret_type \ kernel::get_work_group_info(const device &) const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -121,7 +121,7 @@ kernel::get_sub_group_info( kernel::get_sub_group_info(const device &, in_type) \ const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC #undef __SYCL_PARAM_TRAITS_SPEC_WITH_INPUT diff --git a/sycl/source/platform.cpp b/sycl/source/platform.cpp index a78bb18798ead..fae338435bb25 100644 --- a/sycl/source/platform.cpp +++ b/sycl/source/platform.cpp @@ -6,15 +6,15 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -63,7 +63,7 @@ bool platform::has(aspect Aspect) const { return impl->has(Aspect); } template __SYCL_EXPORT ret_type \ platform::get_info() const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/program.cpp b/sycl/source/program.cpp index afe1319016169..5deea41519bc3 100644 --- a/sycl/source/program.cpp +++ b/sycl/source/program.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include #include +#include +#include +#include #include @@ -111,7 +111,7 @@ program::get_info() const { template __SYCL_EXPORT ret_type program::get_info() \ const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -119,7 +119,7 @@ program::get_info() const { template <> __SYCL_EXPORT bool program::has_property() const { \ return impl->has_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -128,7 +128,7 @@ program::get_info() const { __SYCL_EXPORT param_type program::get_property() const { \ return impl->get_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp index b660c6f07f26c..7c5b14e9e24dc 100644 --- a/sycl/source/queue.cpp +++ b/sycl/source/queue.cpp @@ -6,14 +6,14 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include #include @@ -173,7 +173,7 @@ queue::get_info() const { template __SYCL_EXPORT RetType queue::get_info() \ const; -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/sampler.cpp b/sycl/source/sampler.cpp index 1f5073cf47da8..d46300d2c74d6 100644 --- a/sycl/source/sampler.cpp +++ b/sycl/source/sampler.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include -#include #include +#include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -47,7 +47,7 @@ bool sampler::operator!=(const sampler &rhs) const { template <> __SYCL_EXPORT bool sampler::has_property() const { \ return impl->has_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -56,7 +56,7 @@ bool sampler::operator!=(const sampler &rhs) const { __SYCL_EXPORT param_type sampler::get_property() const { \ return impl->get_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/source/spirv_ops.cpp b/sycl/source/spirv_ops.cpp index 1f67db77ba0e8..df78b95f6a45c 100644 --- a/sycl/source/spirv_ops.cpp +++ b/sycl/source/spirv_ops.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include -#include #include +#include #include diff --git a/sycl/source/stream.cpp b/sycl/source/stream.cpp index aeeafee955647..70a5df16e4c6f 100644 --- a/sycl/source/stream.cpp +++ b/sycl/source/stream.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include -#include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { @@ -69,7 +69,7 @@ bool stream::operator!=(const stream &RHS) const { return !(impl == RHS.impl); } __SYCL_EXPORT bool stream::has_property() const noexcept { \ return impl->has_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC @@ -78,7 +78,7 @@ bool stream::operator!=(const stream &RHS) const { return !(impl == RHS.impl); } __SYCL_EXPORT param_type stream::get_property() const { \ return impl->get_property(); \ } -#include +#include #undef __SYCL_PARAM_TRAITS_SPEC diff --git a/sycl/test/abi/layout_accessors_device.cpp b/sycl/test/abi/layout_accessors_device.cpp index 576389ff7c60c..0519a7bedb040 100644 --- a/sycl/test/abi/layout_accessors_device.cpp +++ b/sycl/test/abi/layout_accessors_device.cpp @@ -4,7 +4,7 @@ // clang-format off -#include +#include using namespace cl::sycl; diff --git a/sycl/test/abi/layout_accessors_host.cpp b/sycl/test/abi/layout_accessors_host.cpp index 2550c4432e803..2110cd565cccf 100644 --- a/sycl/test/abi/layout_accessors_host.cpp +++ b/sycl/test/abi/layout_accessors_host.cpp @@ -4,7 +4,7 @@ // clang-format off -#include +#include using namespace cl::sycl; diff --git a/sycl/test/abi/layout_array.cpp b/sycl/test/abi/layout_array.cpp index a9a8865ae30c7..072ce0a6f2bb0 100644 --- a/sycl/test/abi/layout_array.cpp +++ b/sycl/test/abi/layout_array.cpp @@ -6,7 +6,7 @@ // clang-format off // TODO fix individual headers and include them instead of sycl.hpp -#include +#include SYCL_EXTERNAL void id(sycl::id<2>) {} diff --git a/sycl/test/abi/layout_buffer.cpp b/sycl/test/abi/layout_buffer.cpp index 39192ece2bcca..a7811f6ce22c1 100644 --- a/sycl/test/abi/layout_buffer.cpp +++ b/sycl/test/abi/layout_buffer.cpp @@ -4,7 +4,7 @@ // clang-format off -#include +#include void foo(sycl::buffer) {} // CHECK: 0 | class sycl::detail::buffer_impl diff --git a/sycl/test/abi/layout_handler.cpp b/sycl/test/abi/layout_handler.cpp index 72bdcf382fde8..b5c67b497b820 100644 --- a/sycl/test/abi/layout_handler.cpp +++ b/sycl/test/abi/layout_handler.cpp @@ -2,8 +2,8 @@ // REQUIRES: linux // UNSUPPORTED: libcxx -#include -#include +#include +#include void foo() { sycl::queue Q; diff --git a/sycl/test/abi/layout_image.cpp b/sycl/test/abi/layout_image.cpp index ef717f617b4d4..2fa40ca40a27d 100644 --- a/sycl/test/abi/layout_image.cpp +++ b/sycl/test/abi/layout_image.cpp @@ -4,7 +4,7 @@ // clang-format off -#include +#include sycl::image<2> Img{sycl::image_channel_order::rgba, sycl::image_channel_type::fp16, sycl::range<2>{10, 10}}; diff --git a/sycl/test/abi/layout_vec.cpp b/sycl/test/abi/layout_vec.cpp index cc835e902c0e2..4be1b8bbcc844 100644 --- a/sycl/test/abi/layout_vec.cpp +++ b/sycl/test/abi/layout_vec.cpp @@ -5,7 +5,7 @@ // clang-format off -#include +#include SYCL_EXTERNAL void foo(sycl::vec) {} diff --git a/sycl/test/abi/symbol_size_alignment.cpp b/sycl/test/abi/symbol_size_alignment.cpp index 68cd05e158745..26e50df0d09ff 100644 --- a/sycl/test/abi/symbol_size_alignment.cpp +++ b/sycl/test/abi/symbol_size_alignment.cpp @@ -4,25 +4,25 @@ // Changing symbol size or alignment is a breaking change. If it happens, refer // to the ABI Policy Guide for further instructions on breaking ABI. -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace cl::sycl; diff --git a/sycl/test/abi/user_mangling.cpp b/sycl/test/abi/user_mangling.cpp index 44fa3a866900b..af66df4569f40 100644 --- a/sycl/test/abi/user_mangling.cpp +++ b/sycl/test/abi/user_mangling.cpp @@ -4,7 +4,7 @@ // REQUIRES: linux // UNSUPPORTED: libcxx -#include +#include #ifdef __SYCL_DEVICE_ONLY__ // CHK-DEVICE: define dso_local spir_func void @_Z4accdN2cl4sycl8accessorIiLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEE({{.*}}) diff --git a/sycl/test/abi/vtable.cpp b/sycl/test/abi/vtable.cpp index 44aa731cf5823..ecf2fff76726c 100644 --- a/sycl/test/abi/vtable.cpp +++ b/sycl/test/abi/vtable.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-vtable-layouts %s | FileCheck %s // REQUIRES: linux -#include +#include // clang-format off diff --git a/sycl/test/basic_tests/SYCL-2020-spec-const-ids-order.cpp b/sycl/test/basic_tests/SYCL-2020-spec-const-ids-order.cpp index ecb8b1c6850ba..25c2bb40c21f7 100644 --- a/sycl/test/basic_tests/SYCL-2020-spec-const-ids-order.cpp +++ b/sycl/test/basic_tests/SYCL-2020-spec-const-ids-order.cpp @@ -14,7 +14,7 @@ // constants, emits correct specialization constats map file and can properly // translate the resulting bitcode to SPIR-V. -#include +#include const static sycl::specialization_id SpecConst42{42}; const static sycl::specialization_id SecondValue{42}; diff --git a/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp b/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp index 16b2cbf45bac7..65aec35c67d01 100644 --- a/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp +++ b/sycl/test/basic_tests/SYCL-2020-spec-constants.cpp @@ -17,7 +17,7 @@ // constants, emits correct specialization constats map file and can properly // translate the resulting bitcode to SPIR-V. -#include +#include #include #include diff --git a/sycl/test/basic_tests/accessor/accessor_property_list_ct.cpp b/sycl/test/basic_tests/accessor/accessor_property_list_ct.cpp index dc87884db0588..a0b0b582b9ac2 100644 --- a/sycl/test/basic_tests/accessor/accessor_property_list_ct.cpp +++ b/sycl/test/basic_tests/accessor/accessor_property_list_ct.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -#include +#include #include diff --git a/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp b/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp index a44b54e0eb0ee..1fc8384407043 100644 --- a/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp +++ b/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include +#include #include diff --git a/sycl/test/basic_tests/accessor/addrspace_exposure.cpp b/sycl/test/basic_tests/accessor/addrspace_exposure.cpp index 0e793032f60e5..4f2be337a71a1 100644 --- a/sycl/test/basic_tests/accessor/addrspace_exposure.cpp +++ b/sycl/test/basic_tests/accessor/addrspace_exposure.cpp @@ -6,8 +6,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include +#include #include // This test checks that concrete address spaces are not exposed in device code diff --git a/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp b/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp index bdf0ce73d2367..6e03fcff08223 100644 --- a/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp +++ b/sycl/test/basic_tests/accessor/atomic_zero_dimension_accessor.cpp @@ -6,7 +6,7 @@ // especially FPGA which changes some of the template specializations // with the __ENABLE_USM_ADDR_SPACE__ macro. -#include +#include using namespace sycl; diff --git a/sycl/test/basic_tests/accessor/target_device.cpp b/sycl/test/basic_tests/accessor/target_device.cpp index 32c221c369c3f..edf0f3595976c 100644 --- a/sycl/test/basic_tests/accessor/target_device.cpp +++ b/sycl/test/basic_tests/accessor/target_device.cpp @@ -6,7 +6,7 @@ // over in llvm-test-suite along with the other changes // needed to support the SYCL 2020 target updates. -#include +#include int main() { sycl::queue testQueue; diff --git a/sycl/test/basic_tests/address_space_traits.cpp b/sycl/test/basic_tests/address_space_traits.cpp index 92f345e87fd80..5aa7b60a8754d 100644 --- a/sycl/test/basic_tests/address_space_traits.cpp +++ b/sycl/test/basic_tests/address_space_traits.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-device-only -D__ENABLE_USM_ADDR_SPACE__ -fsycl-targets=%sycl_triple %s -c -#include #include +#include using namespace cl::sycl; int main() { diff --git a/sycl/test/basic_tests/aliases.cpp b/sycl/test/basic_tests/aliases.cpp index c2c59a424f4c1..e9f168c7fcba1 100644 --- a/sycl/test/basic_tests/aliases.cpp +++ b/sycl/test/basic_tests/aliases.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/basic_tests/atomic-ref-instantiation.cpp b/sycl/test/basic_tests/atomic-ref-instantiation.cpp index f00d377e61d70..e64fe02052344 100644 --- a/sycl/test/basic_tests/atomic-ref-instantiation.cpp +++ b/sycl/test/basic_tests/atomic-ref-instantiation.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -o %t.out -Xclang -verify-ignore-unexpected=note // expected-no-diagnostics -#include +#include struct A {}; diff --git a/sycl/test/basic_tests/buffer/buffer_ctad.cpp b/sycl/test/basic_tests/buffer/buffer_ctad.cpp index ee38871623307..a0c6038ad226c 100644 --- a/sycl/test/basic_tests/buffer/buffer_ctad.cpp +++ b/sycl/test/basic_tests/buffer/buffer_ctad.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning // expected-no-diagnostics -#include #include #include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/buffer/buffer_for_not_device_copyable.cpp b/sycl/test/basic_tests/buffer/buffer_for_not_device_copyable.cpp index 8424705c6ab74..cc1bf76b6be10 100644 --- a/sycl/test/basic_tests/buffer/buffer_for_not_device_copyable.cpp +++ b/sycl/test/basic_tests/buffer/buffer_for_not_device_copyable.cpp @@ -13,7 +13,7 @@ int main() { static_assert(!is_device_copyable_v); std::vector sv{"hello", "sycl", "world"}; buffer b2(sv.data(), range<1>(3)); - //expected-error@CL/sycl/buffer.hpp:* {{'std::string' is not a device copyable type}} + //expected-error@sycl/buffer.hpp:* {{'std::string' is not a device copyable type}} return 0; } diff --git a/sycl/test/basic_tests/code_location.cpp b/sycl/test/basic_tests/code_location.cpp index d7ef1b9f95fef..bafea8b4d6a0d 100644 --- a/sycl/test/basic_tests/code_location.cpp +++ b/sycl/test/basic_tests/code_location.cpp @@ -3,9 +3,9 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %t.out -#include #include #include +#include int main() { auto code_loc = sycl::detail::code_location::current(); diff --git a/sycl/test/basic_tests/define_vendors.cpp b/sycl/test/basic_tests/define_vendors.cpp index 7a6b6780ee670..7503b1a858171 100644 --- a/sycl/test/basic_tests/define_vendors.cpp +++ b/sycl/test/basic_tests/define_vendors.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -c -o %t.out -#include +#include #if !defined(SYCL_IMPLEMENTATION_ONEAPI) #error SYCL_IMPLEMENTATION_ONEAPI is not defined diff --git a/sycl/test/basic_tests/device.cpp b/sycl/test/basic_tests/device.cpp index 5720f6f6e8130..46f4b61ee7888 100644 --- a/sycl/test/basic_tests/device.cpp +++ b/sycl/test/basic_tests/device.cpp @@ -3,9 +3,9 @@ // This test performs basic check of the SYCL device class. -#include #include #include +#include #include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/event_async_exception.cpp b/sycl/test/basic_tests/event_async_exception.cpp index 819a25710ffd5..fd1605346743e 100644 --- a/sycl/test/basic_tests/event_async_exception.cpp +++ b/sycl/test/basic_tests/event_async_exception.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include // This test checks that if there is a submit failure, the asynchronous // exception is associated with the returned event. diff --git a/sycl/test/basic_tests/exceptions-SYCL-2020.cpp b/sycl/test/basic_tests/exceptions-SYCL-2020.cpp index b4020c9bfabc2..23244f812ee0b 100644 --- a/sycl/test/basic_tests/exceptions-SYCL-2020.cpp +++ b/sycl/test/basic_tests/exceptions-SYCL-2020.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/free_function_queries/free_function_queries_interface.cpp b/sycl/test/basic_tests/free_function_queries/free_function_queries_interface.cpp index 9a6c8e8b0971d..34ac94089f951 100644 --- a/sycl/test/basic_tests/free_function_queries/free_function_queries_interface.cpp +++ b/sycl/test/basic_tests/free_function_queries/free_function_queries_interface.cpp @@ -8,7 +8,7 @@ // //===------------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/basic_tests/generic_type_traits.cpp b/sycl/test/basic_tests/generic_type_traits.cpp index 5a4c6d9a15097..8fc72d90ad797 100644 --- a/sycl/test/basic_tests/generic_type_traits.cpp +++ b/sycl/test/basic_tests/generic_type_traits.cpp @@ -1,10 +1,10 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -#include -#include -#include #include #include +#include +#include +#include namespace s = cl::sycl; namespace d = cl::sycl::detail; diff --git a/sycl/test/basic_tests/group.cpp b/sycl/test/basic_tests/group.cpp index 19423391f14f1..bb5209a18caac 100644 --- a/sycl/test/basic_tests/group.cpp +++ b/sycl/test/basic_tests/group.cpp @@ -8,9 +8,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include using namespace std; using cl::sycl::detail::Builder; diff --git a/sycl/test/basic_tests/handler/handler_generic_lambda_interface.cpp b/sycl/test/basic_tests/handler/handler_generic_lambda_interface.cpp index 144030b683111..3325481da021f 100644 --- a/sycl/test/basic_tests/handler/handler_generic_lambda_interface.cpp +++ b/sycl/test/basic_tests/handler/handler_generic_lambda_interface.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/test/basic_tests/handler/handler_one_dim_range_init_list.cpp b/sycl/test/basic_tests/handler/handler_one_dim_range_init_list.cpp index 8100fa57139a5..bea2926706a6d 100644 --- a/sycl/test/basic_tests/handler/handler_one_dim_range_init_list.cpp +++ b/sycl/test/basic_tests/handler/handler_one_dim_range_init_list.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp b/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp index 10e392b7f8159..90f911b12a3e5 100644 --- a/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp +++ b/sycl/test/basic_tests/handler/unnamed-lambda-negative.cpp @@ -1,27 +1,27 @@ // RUN: %clangxx -fsycl -fsycl-device-only -std=c++17 -fno-sycl-unnamed-lambda -isystem %sycl_include/sycl -Xclang -verify -fsyntax-only %s -Xclang -verify-ignore-unexpected=note -#include +#include int main() { cl::sycl::queue q; - // expected-error@CL/sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} + // expected-error@sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} // expected-note@+1 {{in instantiation of function template}} q.single_task([=](){}); - // expected-error@CL/sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} + // expected-error@sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} // expected-note@+1 {{in instantiation of function template}} q.parallel_for(cl::sycl::range<1>{1}, [=](cl::sycl::item<1>){}); q.submit([&](cl::sycl::handler &cgh) { - // expected-error@CL/sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} + // expected-error@sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} // expected-note@+1 {{in instantiation of function template}} cgh.single_task([=](){}); - // expected-error@CL/sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} + // expected-error@sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} // expected-note@+1 {{in instantiation of function template}} cgh.parallel_for(cl::sycl::range<1>{1}, [=](cl::sycl::item<1>){}); - // expected-error@CL/sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} + // expected-error@sycl/kernel.hpp:* {{No kernel name provided without -fsycl-unnamed-lambda enabled!}} // expected-note@+1 {{in instantiation of function template}} cgh.parallel_for_work_group(cl::sycl::range<1>{1}, [=](cl::sycl::group<1>){}); }); diff --git a/sycl/test/basic_tests/host_image_accessor_read.cpp b/sycl/test/basic_tests/host_image_accessor_read.cpp index 2bcd820b77bfc..134444f91d982 100644 --- a/sycl/test/basic_tests/host_image_accessor_read.cpp +++ b/sycl/test/basic_tests/host_image_accessor_read.cpp @@ -9,9 +9,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include int foo(float *image_data) { diff --git a/sycl/test/basic_tests/id.cpp b/sycl/test/basic_tests/id.cpp index 222e09bcdb1f5..23595544e2ff4 100644 --- a/sycl/test/basic_tests/id.cpp +++ b/sycl/test/basic_tests/id.cpp @@ -10,9 +10,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include using cl::sycl::detail::Builder; diff --git a/sycl/test/basic_tests/id_ctad.cpp b/sycl/test/basic_tests/id_ctad.cpp index 431ab68876afb..1c18372ed22c4 100644 --- a/sycl/test/basic_tests/id_ctad.cpp +++ b/sycl/test/basic_tests/id_ctad.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include using namespace std; int main() { diff --git a/sycl/test/basic_tests/image_accessor_types.cpp b/sycl/test/basic_tests/image_accessor_types.cpp index 4133d75954444..168aff07f0d8f 100644 --- a/sycl/test/basic_tests/image_accessor_types.cpp +++ b/sycl/test/basic_tests/image_accessor_types.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsyntax-only %fsycl-host-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s // RUN: %clangxx -fsyntax-only -fsycl -fsycl-device-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -#include #include +#include using namespace cl::sycl; class mod_image; @@ -13,10 +13,10 @@ int main() { myQueue.submit([&](handler &cgh) { accessor NotValidType1( srcImage, cgh); - // expected-error@CL/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.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}} accessor NotValidType2( srcImage, cgh); - // expected-error@CL/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.hpp:* {{The data type of an image accessor must be only cl_int4, cl_uint4, cl_float4 or cl_half4}} accessor ValidSYCLFloat(srcImage, cgh); accessor ValidSYCLInt( diff --git a/sycl/test/basic_tests/implicit_conversion_error.cpp b/sycl/test/basic_tests/implicit_conversion_error.cpp index 2cf5325a08d48..24f57239b2d0d 100644 --- a/sycl/test/basic_tests/implicit_conversion_error.cpp +++ b/sycl/test/basic_tests/implicit_conversion_error.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsyntax-only %fsycl-host-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +#include int main() { cl::sycl::queue q; diff --git a/sycl/test/basic_tests/interop-backend-traits.cpp b/sycl/test/basic_tests/interop-backend-traits.cpp index fcf5de70b1aee..9821d149cab14 100644 --- a/sycl/test/basic_tests/interop-backend-traits.cpp +++ b/sycl/test/basic_tests/interop-backend-traits.cpp @@ -7,7 +7,7 @@ #ifdef USE_OPENCL #include -#include +#include constexpr auto Backend = sycl::backend::opencl; #endif @@ -21,13 +21,13 @@ constexpr auto Backend = sycl::backend::ext_oneapi_level_zero; #endif #ifdef USE_CUDA -#include +#include constexpr auto Backend = sycl::backend::ext_oneapi_cuda; #endif #ifdef USE_HIP -#include +#include constexpr auto Backend = sycl::backend::ext_oneapi_hip; #endif diff --git a/sycl/test/basic_tests/is_device_copyable.cpp b/sycl/test/basic_tests/is_device_copyable.cpp index e2f4d5d5c7dcf..d695f2634b118 100644 --- a/sycl/test/basic_tests/is_device_copyable.cpp +++ b/sycl/test/basic_tests/is_device_copyable.cpp @@ -9,7 +9,7 @@ // expected-no-diagnostics -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/is_device_copyable_neg.cpp b/sycl/test/basic_tests/is_device_copyable_neg.cpp index 21dfaf689e960..da9c0f31c96a6 100644 --- a/sycl/test/basic_tests/is_device_copyable_neg.cpp +++ b/sycl/test/basic_tests/is_device_copyable_neg.cpp @@ -4,7 +4,7 @@ // This test checks if compiler reports compilation error on an attempt to pass // a struct with type that is not device copyable as SYCL kernel parameter. -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/item.cpp b/sycl/test/basic_tests/item.cpp index 902f460c6a103..9c0d9c99a1005 100644 --- a/sycl/test/basic_tests/item.cpp +++ b/sycl/test/basic_tests/item.cpp @@ -7,9 +7,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include using cl::sycl::detail::Builder; diff --git a/sycl/test/basic_tests/kernel_size_mismatch.cpp b/sycl/test/basic_tests/kernel_size_mismatch.cpp index 4a3271a4c5dbe..fc8c6f6ca4964 100644 --- a/sycl/test/basic_tests/kernel_size_mismatch.cpp +++ b/sycl/test/basic_tests/kernel_size_mismatch.cpp @@ -3,7 +3,7 @@ // Tests for static assertion failure when kernel lambda mismatches between host // and device. -#include +#include int main() { sycl::queue Q; @@ -13,7 +13,7 @@ int main() { (void)A; // expected-no-diagnostics #else - // expected-error-re@CL/sycl/handler.hpp:* {{static_assert failed due to requirement '{{.*}}': Unexpected kernel lambda size. This can be caused by an external host compiler producing a lambda with an unexpected layout. This is a limitation of the compiler.}} + // expected-error-re@sycl/handler.hpp:* {{static_assert failed due to requirement '{{.*}}': Unexpected kernel lambda size. This can be caused by an external host compiler producing a lambda with an unexpected layout. This is a limitation of the compiler.}} #endif }).wait(); } diff --git a/sycl/test/basic_tests/known_identity.cpp b/sycl/test/basic_tests/known_identity.cpp index 2b4f9b92c9158..dd231a35dbe47 100644 --- a/sycl/test/basic_tests/known_identity.cpp +++ b/sycl/test/basic_tests/known_identity.cpp @@ -5,9 +5,9 @@ // This test performs basic checks of has_known_identity and known_identity // type traits. -#include #include #include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/library_loading.cpp b/sycl/test/basic_tests/library_loading.cpp index facbd3b1911d6..f05d24a441d74 100644 --- a/sycl/test/basic_tests/library_loading.cpp +++ b/sycl/test/basic_tests/library_loading.cpp @@ -3,7 +3,7 @@ // RUN: env SYCL_PI_TRACE=-1 %t.out 2>&1 | FileCheck %s // Checks pi traces on library loading -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/linear-host-dev.cpp b/sycl/test/basic_tests/linear-host-dev.cpp index 2f7843941bdd9..a0e620c3db512 100644 --- a/sycl/test/basic_tests/linear-host-dev.cpp +++ b/sycl/test/basic_tests/linear-host-dev.cpp @@ -1,10 +1,10 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %RUN_ON_HOST %t.out | FileCheck %s -#include #include #include #include +#include // Check that linear id is monotonically increased on host device. // Only there we can reliable check that. Since the kernel has a restriction diff --git a/sycl/test/basic_tests/macros.cpp b/sycl/test/basic_tests/macros.cpp index c898834f5b04f..e9b92896a7d11 100644 --- a/sycl/test/basic_tests/macros.cpp +++ b/sycl/test/basic_tests/macros.cpp @@ -14,4 +14,4 @@ // DEVICE-DAG: #define SYCL_EXTERNAL // DEVICE-DAG: #define __SYCL_DEVICE_ONLY__ -#include +#include diff --git a/sycl/test/basic_tests/marray/marray.cpp b/sycl/test/basic_tests/marray/marray.cpp index 1c5debd1fdd48..3e69d98ad61a8 100755 --- a/sycl/test/basic_tests/marray/marray.cpp +++ b/sycl/test/basic_tests/marray/marray.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include using namespace sycl; int main() { diff --git a/sycl/test/basic_tests/min_max_test.cpp b/sycl/test/basic_tests/min_max_test.cpp index 5934d2975846e..fde42cd4ce710 100644 --- a/sycl/test/basic_tests/min_max_test.cpp +++ b/sycl/test/basic_tests/min_max_test.cpp @@ -4,7 +4,7 @@ #include "windows.h" -#include "CL/sycl.hpp" +#include "sycl.hpp" int main() { int tmp = min(1, 4); diff --git a/sycl/test/basic_tests/nd_item.cpp b/sycl/test/basic_tests/nd_item.cpp index a2a657e418e44..1ae8ad8db9b41 100644 --- a/sycl/test/basic_tests/nd_item.cpp +++ b/sycl/test/basic_tests/nd_item.cpp @@ -7,9 +7,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include using namespace std; using cl::sycl::detail::Builder; diff --git a/sycl/test/basic_tests/nd_range.cpp b/sycl/test/basic_tests/nd_range.cpp index be239bb2047fc..592f2998db2d3 100644 --- a/sycl/test/basic_tests/nd_range.cpp +++ b/sycl/test/basic_tests/nd_range.cpp @@ -7,9 +7,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include using namespace std; int main() { diff --git a/sycl/test/basic_tests/offset-accessor-get_pointer.cpp b/sycl/test/basic_tests/offset-accessor-get_pointer.cpp index c2624e39abcbc..392f9cb1b2c91 100644 --- a/sycl/test/basic_tests/offset-accessor-get_pointer.cpp +++ b/sycl/test/basic_tests/offset-accessor-get_pointer.cpp @@ -11,7 +11,7 @@ // accessors in the past. Not relevant for images, which do not support offset // accessors. -#include +#include #include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/parallel_for_range_host.cpp b/sycl/test/basic_tests/parallel_for_range_host.cpp index d580a99851990..1f30952adfc5a 100644 --- a/sycl/test/basic_tests/parallel_for_range_host.cpp +++ b/sycl/test/basic_tests/parallel_for_range_host.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include +#include #include diff --git a/sycl/test/basic_tests/parallel_for_type_check.cpp b/sycl/test/basic_tests/parallel_for_type_check.cpp index 5fb03efa4f50a..19f6bf376d894 100644 --- a/sycl/test/basic_tests/parallel_for_type_check.cpp +++ b/sycl/test/basic_tests/parallel_for_type_check.cpp @@ -3,8 +3,8 @@ // This test performs basic type check for sycl::id that is used in result type. // Check that sycl::id is converted from sycl::item. -#include #include +#include int main() { sycl::queue q; diff --git a/sycl/test/basic_tests/parallel_for_user_types.cpp b/sycl/test/basic_tests/parallel_for_user_types.cpp index ff616fe73bd18..b050ed2b778d4 100644 --- a/sycl/test/basic_tests/parallel_for_user_types.cpp +++ b/sycl/test/basic_tests/parallel_for_user_types.cpp @@ -4,8 +4,8 @@ // This test performs basic check of supporting user defined class that are // implicitly converted from sycl::item/sycl::nd_item in parallel_for. -#include #include +#include template class item_wrapper { public: diff --git a/sycl/test/basic_tests/property_list.cpp b/sycl/test/basic_tests/property_list.cpp index 5ebf7e19ae9bd..718343c15e057 100644 --- a/sycl/test/basic_tests/property_list.cpp +++ b/sycl/test/basic_tests/property_list.cpp @@ -5,8 +5,8 @@ // This test performs basic check of the SYCL property_list class. -#include #include +#include namespace sycl_property = cl::sycl::property; diff --git a/sycl/test/basic_tests/property_traits.cpp b/sycl/test/basic_tests/property_traits.cpp index 1c2008ed482cb..9837aaa70ea5c 100644 --- a/sycl/test/basic_tests/property_traits.cpp +++ b/sycl/test/basic_tests/property_traits.cpp @@ -1,8 +1,8 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning // expected-no-diagnostics -#include #include +#include #define CHECK_IS_PROPERTY(PROP) \ static_assert(is_property::value, \ diff --git a/sycl/test/basic_tests/queue/queue_parallel_for_interface.cpp b/sycl/test/basic_tests/queue/queue_parallel_for_interface.cpp index 709d9aeeb8702..f49ce712b3d1d 100644 --- a/sycl/test/basic_tests/queue/queue_parallel_for_interface.cpp +++ b/sycl/test/basic_tests/queue/queue_parallel_for_interface.cpp @@ -8,8 +8,8 @@ // //===------------------------------------------------------------------------===// -#include #include +#include #include template diff --git a/sycl/test/basic_tests/range.cpp b/sycl/test/basic_tests/range.cpp index 6b4e7dd01bd86..badb8c6406262 100644 --- a/sycl/test/basic_tests/range.cpp +++ b/sycl/test/basic_tests/range.cpp @@ -7,9 +7,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include -#include #include +#include +#include using namespace std; int main() { diff --git a/sycl/test/basic_tests/range_ctad.cpp b/sycl/test/basic_tests/range_ctad.cpp index 10698524da86d..3014a5eaa9540 100644 --- a/sycl/test/basic_tests/range_ctad.cpp +++ b/sycl/test/basic_tests/range_ctad.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include using namespace std; int main() { diff --git a/sycl/test/basic_tests/range_error.cpp b/sycl/test/basic_tests/range_error.cpp index 2aed44d9eb7ca..7efd1c6e2cb6d 100644 --- a/sycl/test/basic_tests/range_error.cpp +++ b/sycl/test/basic_tests/range_error.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning -#include -#include #include +#include +#include using namespace std; int main() { diff --git a/sycl/test/basic_tests/reduction_ctor.cpp b/sycl/test/basic_tests/reduction_ctor.cpp index 6f673f48b6c66..29dd1429d3270 100644 --- a/sycl/test/basic_tests/reduction_ctor.cpp +++ b/sycl/test/basic_tests/reduction_ctor.cpp @@ -5,8 +5,8 @@ // and the combine() method of the aux class 'reducer'. #include "reduction_utils.hpp" -#include #include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/reduction_utils.hpp b/sycl/test/basic_tests/reduction_utils.hpp index 5503ae838ebf8..f335262b4b639 100644 --- a/sycl/test/basic_tests/reduction_utils.hpp +++ b/sycl/test/basic_tests/reduction_utils.hpp @@ -1,4 +1,4 @@ -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/set_arg_error.cpp b/sycl/test/basic_tests/set_arg_error.cpp index c7ea5be42808e..01c271687633c 100644 --- a/sycl/test/basic_tests/set_arg_error.cpp +++ b/sycl/test/basic_tests/set_arg_error.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +#include struct TriviallyCopyable { int a; diff --git a/sycl/test/basic_tests/single_task_error_message.cpp b/sycl/test/basic_tests/single_task_error_message.cpp index 6040ef5b61e1f..98dba1908bc0a 100644 --- a/sycl/test/basic_tests/single_task_error_message.cpp +++ b/sycl/test/basic_tests/single_task_error_message.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note -o - %s -#include #include +#include int main() { { int varA = 42; @@ -10,8 +10,8 @@ int main() { { myQueue .single_task([&](sycl::handler &cgh) { - // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} - // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} + // expected-error-re@sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} + // expected-error-re@sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} }) .wait(); } @@ -26,8 +26,8 @@ int main() { myQueue .single_task(e, [&](sycl::handler &cgh) { - // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} - // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} + // expected-error-re@sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} + // expected-error-re@sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} }) .wait(); } @@ -42,8 +42,8 @@ int main() { myQueue .single_task(vector_event, [&](sycl::handler &cgh) { - // expected-error-re@CL/sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} - // expected-error-re@CL/sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} + // expected-error-re@sycl/queue.hpp:* {{static_assert failed due to requirement '{{.*}}': sycl::queue.single_task() requires a kernel instead of command group.{{.*}} Use queue.submit() instead}} + // expected-error-re@sycl/detail/cg_types.hpp:* {{no matching function for call to object of type '(lambda at {{.*}}single_task_error_message.cpp:{{.*}})'}} }) .wait(); } diff --git a/sycl/test/basic_tests/span.cpp b/sycl/test/basic_tests/span.cpp index 41c40e9af2106..ae2a13099b8fb 100644 --- a/sycl/test/basic_tests/span.cpp +++ b/sycl/test/basic_tests/span.cpp @@ -8,7 +8,7 @@ // //===----------------------------------------------------------------------===// -#include +#include int main() { // test the various span declarations, especially unspecialized ones. diff --git a/sycl/test/basic_tests/spec_const_types.cpp b/sycl/test/basic_tests/spec_const_types.cpp index 494d04e3a3cf3..481f930a8a5e7 100644 --- a/sycl/test/basic_tests/spec_const_types.cpp +++ b/sycl/test/basic_tests/spec_const_types.cpp @@ -14,7 +14,7 @@ // constants, emits correct specialization constats map file and can properly // translate the resulting bitcode to SPIR-V. -#include +#include #include #include diff --git a/sycl/test/basic_tests/stdcpp_compat.cpp b/sycl/test/basic_tests/stdcpp_compat.cpp index a1fbedda65fca..d397028589327 100644 --- a/sycl/test/basic_tests/stdcpp_compat.cpp +++ b/sycl/test/basic_tests/stdcpp_compat.cpp @@ -8,7 +8,7 @@ // The test checks SYCL headers C++ compiance and that a warning is emitted // when compiling in < C++17 mode. -#include +#include // cxx14-warning@* {{DPCPP does not support C++ version earlier than C++17. Some features might not be available.}} // diff --git a/sycl/test/basic_tests/stream/byte.cpp b/sycl/test/basic_tests/stream/byte.cpp index 33d89e165af9f..f1640169b3d3b 100644 --- a/sycl/test/basic_tests/stream/byte.cpp +++ b/sycl/test/basic_tests/stream/byte.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -o %t.out -// expected-error@CL/sycl/stream.hpp:* {{Convert the byte to a numeric value using std::to_integer}} +// expected-error@sycl/stream.hpp:* {{Convert the byte to a numeric value using std::to_integer}} -#include +#include int main() { sycl::queue q; diff --git a/sycl/test/basic_tests/stream/no_intrinsic.cpp b/sycl/test/basic_tests/stream/no_intrinsic.cpp index 8dae270141866..e221b3409a586 100644 --- a/sycl/test/basic_tests/stream/no_intrinsic.cpp +++ b/sycl/test/basic_tests/stream/no_intrinsic.cpp @@ -13,7 +13,7 @@ // CHECK-NOT: call spir_func void @{{.*}}__spirvL22initGlobalInvocationId{{.*}} -#include +#include using namespace cl::sycl; diff --git a/sycl/test/basic_tests/sycl-kernel-save-user-names.cpp b/sycl/test/basic_tests/sycl-kernel-save-user-names.cpp index 70dcffeaf70bb..0f021f16888e6 100644 --- a/sycl/test/basic_tests/sycl-kernel-save-user-names.cpp +++ b/sycl/test/basic_tests/sycl-kernel-save-user-names.cpp @@ -8,7 +8,7 @@ // names. (It is a copy of clang/test/CodeGenSYCL/save-user-names.cpp with just // additional compilation steps). -#include +#include struct NestedSimple { int NestedSimpleField; diff --git a/sycl/test/basic_tests/types.cpp b/sycl/test/basic_tests/types.cpp index 7b06e1dc0b471..d4a65322b3687 100644 --- a/sycl/test/basic_tests/types.cpp +++ b/sycl/test/basic_tests/types.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/test/basic_tests/valid_kernel_args.cpp b/sycl/test/basic_tests/valid_kernel_args.cpp index 1f05990b0ed49..f00d14c544ec7 100644 --- a/sycl/test/basic_tests/valid_kernel_args.cpp +++ b/sycl/test/basic_tests/valid_kernel_args.cpp @@ -12,7 +12,7 @@ // Check that the test can be compiled with device compiler as well. // RUN: %clangxx -fsycl-device-only -fsyntax-only %s -Wno-sycl-strict -#include +#include struct SomeStructure { char a; diff --git a/sycl/test/basic_tests/vector_cross.cpp b/sycl/test/basic_tests/vector_cross.cpp index 7a32377901e9c..5bef47fa19457 100644 --- a/sycl/test/basic_tests/vector_cross.cpp +++ b/sycl/test/basic_tests/vector_cross.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include #include #include +#include bool isEqualTo(double x, double y, double epsilon = 0.001) { return std::fabs(x - y) <= epsilon; diff --git a/sycl/test/basic_tests/vectors/ctad.cpp b/sycl/test/basic_tests/vectors/ctad.cpp index d80c4da9088da..dcfa6805a09f1 100644 --- a/sycl/test/basic_tests/vectors/ctad.cpp +++ b/sycl/test/basic_tests/vectors/ctad.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include namespace sycl = cl::sycl; diff --git a/sycl/test/basic_tests/vectors/ctad_fail.cpp b/sycl/test/basic_tests/vectors/ctad_fail.cpp index b584cebb698d0..72cf96b42bbb9 100644 --- a/sycl/test/basic_tests/vectors/ctad_fail.cpp +++ b/sycl/test/basic_tests/vectors/ctad_fail.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected %s -#include +#include namespace sycl = cl::sycl; diff --git a/sycl/test/basic_tests/vectors/vectors.cpp b/sycl/test/basic_tests/vectors/vectors.cpp index d8229cb2d134a..777fa07bb9086 100644 --- a/sycl/test/basic_tests/vectors/vectors.cpp +++ b/sycl/test/basic_tests/vectors/vectors.cpp @@ -9,7 +9,7 @@ //===----------------------------------------------------------------------===// #define SYCL_SIMPLE_SWIZZLES -#include +#include void check_vectors(sycl::int4 a, sycl::int4 b, sycl::int4 c, sycl::int4 gold) { sycl::int4 result = a * (sycl::int4)b.y() + c; diff --git a/sycl/test/basic_tests/version.cpp b/sycl/test/basic_tests/version.cpp index 64e0067958a5b..54c40226a5c6f 100644 --- a/sycl/test/basic_tests/version.cpp +++ b/sycl/test/basic_tests/version.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl %s -o %t.out -#include +#include int main() { #if !defined(__LIBSYCL_MAJOR_VERSION) || __LIBSYCL_MAJOR_VERSION < 0 diff --git a/sycl/test/check_device_code/buffer_location_codegen.cpp b/sycl/test/check_device_code/buffer_location_codegen.cpp index 5d23b2498af75..d52515d0ee566 100644 --- a/sycl/test/check_device_code/buffer_location_codegen.cpp +++ b/sycl/test/check_device_code/buffer_location_codegen.cpp @@ -3,7 +3,7 @@ // CHECK: define {{.*}}spir_kernel void @_ZTSZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_E15kernel_function{{.*}} !kernel_arg_buffer_location ![[MDBL:[0-9]+]] // CHECK: ![[MDBL]] = !{i32 3, i32 -1, i32 -1, i32 -1, i32 -1, i32 -1, i32 2, i32 -1, i32 -1, i32 -1, i32 2, i32 -1, i32 -1, i32 -1, i32 -1} -#include +#include struct Base { int A, B; diff --git a/sycl/test/check_device_code/group_operations.cpp b/sycl/test/check_device_code/group_operations.cpp index f0689c436fe48..7145b38c4f254 100644 --- a/sycl/test/check_device_code/group_operations.cpp +++ b/sycl/test/check_device_code/group_operations.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl-device-only -ffp-model=precise -Xclang -no-enable-noundef-analysis %s -o - | FileCheck %s -#include +#include using namespace sycl; diff --git a/sycl/test/check_device_code/id_queries_fit_int.cpp b/sycl/test/check_device_code/id_queries_fit_int.cpp index 14a01deb6d5e0..2d3440f5414ea 100644 --- a/sycl/test/check_device_code/id_queries_fit_int.cpp +++ b/sycl/test/check_device_code/id_queries_fit_int.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -fsycl-id-queries-fit-in-int -fno-sycl-early-optimizations -S %s -fno-legacy-pass-manager -o - | FileCheck %s -#include +#include using namespace sycl; diff --git a/sycl/test/check_device_code/islessgreater.cpp b/sycl/test/check_device_code/islessgreater.cpp index 9ad05940f1b9a..adb1b5cdc82cc 100644 --- a/sycl/test/check_device_code/islessgreater.cpp +++ b/sycl/test/check_device_code/islessgreater.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl-device-only %s -o - -Xclang -disable-llvm-passes | FileCheck %s -#include +#include SYCL_EXTERNAL void test_islessgreater(float a, float b) { sycl::islessgreater(a, b); diff --git a/sycl/test/check_device_code/kernel_arguments_as.cpp b/sycl/test/check_device_code/kernel_arguments_as.cpp index fbbecaf891d8d..f3309bc9cd096 100644 --- a/sycl/test/check_device_code/kernel_arguments_as.cpp +++ b/sycl/test/check_device_code/kernel_arguments_as.cpp @@ -16,7 +16,7 @@ // // CHECK-NOT: define weak_odr dso_local spir_kernel void @"{{.*}}check_adress_space"({{.*}}addrspace(4){{.*}}) -#include +#include using namespace cl::sycl; diff --git a/sycl/test/check_device_code/matrix/matrix-nvptx-bf16-test.cpp b/sycl/test/check_device_code/matrix/matrix-nvptx-bf16-test.cpp index 001b64e87fd74..4756cd4f6d9d9 100644 --- a/sycl/test/check_device_code/matrix/matrix-nvptx-bf16-test.cpp +++ b/sycl/test/check_device_code/matrix/matrix-nvptx-bf16-test.cpp @@ -2,7 +2,7 @@ // RUN: %clangxx -fsycl-device-only -fsycl-targets=nvptx64-nvidia-cuda -Xsycl-target-backend --cuda-gpu-arch=sm_80 -DSYCL_EXT_ONEAPI_MATRIX=3 -S -Xclang -emit-llvm %s -o -| FileCheck %s -#include +#include using namespace sycl; using namespace sycl::ext::oneapi::experimental::matrix; diff --git a/sycl/test/check_device_code/matrix/matrix-nvptx-tf32-test.cpp b/sycl/test/check_device_code/matrix/matrix-nvptx-tf32-test.cpp index 9381bf709c2d3..92392bfe3066d 100644 --- a/sycl/test/check_device_code/matrix/matrix-nvptx-tf32-test.cpp +++ b/sycl/test/check_device_code/matrix/matrix-nvptx-tf32-test.cpp @@ -19,7 +19,7 @@ // advantage of being able to use a portable interface across Intel and Nvidia // backends. -#include +#include using namespace sycl; using namespace sycl::ext::oneapi::experimental::matrix; diff --git a/sycl/test/check_device_code/no_offset.cpp b/sycl/test/check_device_code/no_offset.cpp index 5c0aa74e22830..66b74c3fa6d94 100644 --- a/sycl/test/check_device_code/no_offset.cpp +++ b/sycl/test/check_device_code/no_offset.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -fsycl-early-optimizations -fsycl-dead-args-optimization -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ -S -emit-llvm -o - %s | FileCheck %s -#include +#include inline constexpr int size = 100; diff --git a/sycl/test/check_device_code/no_offset_error.cpp b/sycl/test/check_device_code/no_offset_error.cpp index 0f92bbcded67b..a7d1a320a1acc 100644 --- a/sycl/test/check_device_code/no_offset_error.cpp +++ b/sycl/test/check_device_code/no_offset_error.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -Xclang -verify -Xclang -verify-ignore-unexpected=note -emit-llvm -o - %s -#include +#include inline constexpr int size = 100; @@ -12,7 +12,7 @@ int main() { q.submit([&](sycl::handler &cgh) { sycl::ext::oneapi::accessor_property_list PL{sycl::ext::oneapi::no_offset, sycl::no_init}; sycl::accessor acc_a(a, cgh, sycl::write_only, PL); - // expected-error@CL/sycl/accessor.hpp:* {{static_assert failed due to requirement '!(accessor_property_list, sycl::property::no_init>::has_property())': Accessor has no_offset property, get_offset() can not be used}} + // expected-error@sycl/accessor.hpp:* {{static_assert failed due to requirement '!(accessor_property_list, sycl::property::no_init>::has_property())': Accessor has no_offset property, get_offset() can not be used}} auto b = acc_a.get_offset(); }); diff --git a/sycl/test/check_device_code/sub_group_mask.cpp b/sycl/test/check_device_code/sub_group_mask.cpp index e5a544a90ca60..2a7c0b14a914f 100644 --- a/sycl/test/check_device_code/sub_group_mask.cpp +++ b/sycl/test/check_device_code/sub_group_mask.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -I %sycl_include -S -emit-llvm -fsycl-device-only %s -o - -Xclang -disable-llvm-passes -Xclang -no-enable-noundef-analysis | FileCheck %s -#include +#include using namespace sycl; diff --git a/sycl/test/check_device_code/usm_pointers.cpp b/sycl/test/check_device_code/usm_pointers.cpp index 74cd74d4ddde8..7a597fc2e4e9b 100644 --- a/sycl/test/check_device_code/usm_pointers.cpp +++ b/sycl/test/check_device_code/usm_pointers.cpp @@ -26,7 +26,7 @@ // CHECK-ENABLE-NEXT: %[[HOSTCAST:[0-9]+]] = addrspacecast i8 addrspace(6)* %[[HOSTLOAD]] to i8 addrspace(4)* // ret i8 addrspace(4)* %[[HOSTCAST]] -#include +#include using namespace cl::sycl; diff --git a/sycl/test/esimd/block_load_store.cpp b/sycl/test/esimd/block_load_store.cpp index 6b4a95dcbfec4..fbd529c15b183 100644 --- a/sycl/test/esimd/block_load_store.cpp +++ b/sycl/test/esimd/block_load_store.cpp @@ -2,9 +2,9 @@ // This test checks that block_load/store API gets successfully compiled. -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/check_lsc.cpp b/sycl/test/esimd/check_lsc.cpp index 6c77ff46d478d..e5898829e4c6d 100644 --- a/sycl/test/esimd/check_lsc.cpp +++ b/sycl/test/esimd/check_lsc.cpp @@ -6,9 +6,9 @@ // - emit an error if some of the restrictions on template parameters are // violated -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/ctor_codegen.cpp b/sycl/test/esimd/ctor_codegen.cpp index b0697a8db8006..765664f570230 100644 --- a/sycl/test/esimd/ctor_codegen.cpp +++ b/sycl/test/esimd/ctor_codegen.cpp @@ -2,8 +2,8 @@ // Check efficiency of LLVM IR generated for various simd constructors. -#include #include +#include using namespace sycl; using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/dpas.cpp b/sycl/test/esimd/dpas.cpp index 71485694c3732..835a94c726f28 100644 --- a/sycl/test/esimd/dpas.cpp +++ b/sycl/test/esimd/dpas.cpp @@ -3,8 +3,8 @@ // RUN: sycl-post-link -split-esimd -lower-esimd -O0 -S %t -o %t.table // RUN: FileCheck %s -input-file=%t_esimd_0.ll -#include #include +#include using namespace sycl::ext::intel::esimd; using namespace sycl::ext::intel::experimental::esimd; diff --git a/sycl/test/esimd/esimd-util-compiler-eval.cpp b/sycl/test/esimd/esimd-util-compiler-eval.cpp index 735c06dbfa7ea..9c5ee3ab50396 100644 --- a/sycl/test/esimd/esimd-util-compiler-eval.cpp +++ b/sycl/test/esimd/esimd-util-compiler-eval.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-device-only -c %s // This test checks compile-time evaluation of functions from esimd_util.hpp -#include "CL/sycl.hpp" +#include "sycl.hpp" #include "sycl/ext/intel/esimd.hpp" using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/esimd_verify.cpp b/sycl/test/esimd/esimd_verify.cpp index b0322f4310664..1e27959fd9722 100644 --- a/sycl/test/esimd/esimd_verify.cpp +++ b/sycl/test/esimd/esimd_verify.cpp @@ -1,8 +1,8 @@ // RUN: not %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -S %s -o /dev/null 2>&1 | FileCheck %s // RUN: not %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -O0 -S %s -o /dev/null 2>&1 | FileCheck %s -#include #include +#include using namespace cl::sycl; using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/flat_atomic.cpp b/sycl/test/esimd/flat_atomic.cpp index 484287dde32b6..78f0cf7845ef7 100644 --- a/sycl/test/esimd/flat_atomic.cpp +++ b/sycl/test/esimd/flat_atomic.cpp @@ -2,9 +2,9 @@ // This test checks compilation of ESIMD atomic APIs. -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/gather_scatter.cpp b/sycl/test/esimd/gather_scatter.cpp index 209b795c8fe4b..e3a93fc7d3291 100644 --- a/sycl/test/esimd/gather_scatter.cpp +++ b/sycl/test/esimd/gather_scatter.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s // expected-no-diagnostics -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/gather_scatter_rgba.cpp b/sycl/test/esimd/gather_scatter_rgba.cpp index b6546be1d6906..e481b2d5b1d76 100644 --- a/sycl/test/esimd/gather_scatter_rgba.cpp +++ b/sycl/test/esimd/gather_scatter_rgba.cpp @@ -5,9 +5,9 @@ // - emit an error if some of the restrictions on template parameters are // violated -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/genx_func_attr.cpp b/sycl/test/esimd/genx_func_attr.cpp index 8cbe64143e8b8..75c58005b1753 100644 --- a/sycl/test/esimd/genx_func_attr.cpp +++ b/sycl/test/esimd/genx_func_attr.cpp @@ -4,9 +4,9 @@ // Checks ESIMD intrinsic translation. -#include -#include +#include #include +#include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/glob.cpp b/sycl/test/esimd/glob.cpp index c7919d028ec55..b61a6e59830ec 100644 --- a/sycl/test/esimd/glob.cpp +++ b/sycl/test/esimd/glob.cpp @@ -6,9 +6,9 @@ // mode, can be accessed in functions and correct LLVM IR is generated // (including translation of the register attribute) -#include #include #include +#include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/global_var.cpp b/sycl/test/esimd/global_var.cpp index 4e9f6d7666e25..c24439ff7bdc8 100644 --- a/sycl/test/esimd/global_var.cpp +++ b/sycl/test/esimd/global_var.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s -#include #include +#include using namespace cl::sycl; @@ -42,7 +42,7 @@ void kernel_call() { q.submit([&](cl::sycl::handler &cgh) { cgh.parallel_for(nd_range<1>(1, 1), [=](nd_item<1> ndi) { - //expected-note@CL/sycl/handler.hpp:* 2{{called by 'kernel_parallel_for}} + //expected-note@sycl/handler.hpp:* 2{{called by 'kernel_parallel_for}} //expected-error@+1{{ESIMD globals cannot be used in a SYCL context}} vc = 0; //expected-note@+1{{called by}} diff --git a/sycl/test/esimd/hw_compile.cpp b/sycl/test/esimd/hw_compile.cpp index 45db846b3d18f..cc52edc60299c 100644 --- a/sycl/test/esimd/hw_compile.cpp +++ b/sycl/test/esimd/hw_compile.cpp @@ -1,9 +1,9 @@ // Basic ESIMD test which checks that ESIMD invocation syntax can get compiled. // RUN: %clangxx -fsycl -fsycl-device-only -c %s -o %t.bc -#include #include #include +#include int main(void) { constexpr unsigned Size = 4; diff --git a/sycl/test/esimd/intrins_trans.cpp b/sycl/test/esimd/intrins_trans.cpp index 28e9487cd4591..13c238aaacfbb 100644 --- a/sycl/test/esimd/intrins_trans.cpp +++ b/sycl/test/esimd/intrins_trans.cpp @@ -5,9 +5,9 @@ // Checks ESIMD intrinsic translation. // NOTE: must be run in -O0, as optimizer optimizes away some of the code -#include -#include +#include #include +#include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/lane_id.cpp b/sycl/test/esimd/lane_id.cpp index aa6773a47fbe6..441a3191df119 100644 --- a/sycl/test/esimd/lane_id.cpp +++ b/sycl/test/esimd/lane_id.cpp @@ -3,8 +3,8 @@ // This test checks the codegen for the basic usage of __ESIMD_SIMT_BEGIN - // __ESIMD_SIMT_END construct. -#include #include +#include using namespace cl::sycl; using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/lower-external-funcs.cpp b/sycl/test/esimd/lower-external-funcs.cpp index 9fe6fde65e20f..2ed2767320e7b 100644 --- a/sycl/test/esimd/lower-external-funcs.cpp +++ b/sycl/test/esimd/lower-external-funcs.cpp @@ -6,8 +6,8 @@ // from the module and go through sycl-post-link. This test also checks that // ESIMD lowering happens for such functions as well. -#include #include +#include constexpr unsigned VL = 8; using namespace cl::sycl; diff --git a/sycl/test/esimd/lsc.cpp b/sycl/test/esimd/lsc.cpp index 395ddca633c6b..68ae0ae608ca2 100644 --- a/sycl/test/esimd/lsc.cpp +++ b/sycl/test/esimd/lsc.cpp @@ -5,9 +5,9 @@ // Checks ESIMD intrinsic translation. // NOTE: must be run in -O0, as optimizer optimizes away some of the code -#include -#include +#include #include +#include using namespace sycl::ext::intel::esimd; using namespace sycl::ext::intel::experimental::esimd; diff --git a/sycl/test/esimd/math_impl.cpp b/sycl/test/esimd/math_impl.cpp index a436f7d6566fc..6bd3a8101f712 100644 --- a/sycl/test/esimd/math_impl.cpp +++ b/sycl/test/esimd/math_impl.cpp @@ -3,9 +3,9 @@ // This test checks the codegen for the following ESIMD APIs: // sin, cos, exp, log. -#include -#include +#include #include +#include using namespace cl::sycl; using namespace sycl::ext::intel; diff --git a/sycl/test/esimd/nbarriers.cpp b/sycl/test/esimd/nbarriers.cpp index 02233e1c6de6c..72c7e1bc27cd3 100644 --- a/sycl/test/esimd/nbarriers.cpp +++ b/sycl/test/esimd/nbarriers.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -c -fsycl-device-only -Xclang -emit-llvm %s -o %t -#include #include +#include using namespace sycl::ext::intel::esimd; using namespace sycl::ext::intel::experimental::esimd; diff --git a/sycl/test/esimd/odr.cpp b/sycl/test/esimd/odr.cpp index 37aa015074c28..c857ef276a349 100644 --- a/sycl/test/esimd/odr.cpp +++ b/sycl/test/esimd/odr.cpp @@ -11,9 +11,9 @@ // CUDA does not support intrinsics generated by the ESIMD compilation path: // UNSUPPORTED: cuda || hip_amd -#include #include #include +#include using namespace cl::sycl; using namespace sycl::ext::intel; diff --git a/sycl/test/esimd/regression/unary_op_const_simd.cpp b/sycl/test/esimd/regression/unary_op_const_simd.cpp index 79f726d5672ab..17cef09bca317 100644 --- a/sycl/test/esimd/regression/unary_op_const_simd.cpp +++ b/sycl/test/esimd/regression/unary_op_const_simd.cpp @@ -4,8 +4,8 @@ // This test checks that compiler can apply unary operators to constant simd, // simd_mask and simd_view objects, as well as to non-constant ones. -#include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/simd_copy_to_copy_from.cpp b/sycl/test/esimd/simd_copy_to_copy_from.cpp index 8d636b951e3f0..8a8f4b3d835cb 100644 --- a/sycl/test/esimd/simd_copy_to_copy_from.cpp +++ b/sycl/test/esimd/simd_copy_to_copy_from.cpp @@ -6,9 +6,9 @@ // - emit an error if argument of an incompatible type is used // in place of the accessor argument -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/simd_mask.cpp b/sycl/test/esimd/simd_mask.cpp index 95d6777e8ec4c..07a4594bf7a11 100644 --- a/sycl/test/esimd/simd_mask.cpp +++ b/sycl/test/esimd/simd_mask.cpp @@ -5,9 +5,9 @@ // This test checks that both host and device compilers can // successfully compile simd_mask APIs. -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/slm_atomic.cpp b/sycl/test/esimd/slm_atomic.cpp index cd485b218cdd1..f8e778d97b50b 100644 --- a/sycl/test/esimd/slm_atomic.cpp +++ b/sycl/test/esimd/slm_atomic.cpp @@ -2,9 +2,9 @@ // This test checks compilation of ESIMD slm atomic APIs. -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/slm_block.cpp b/sycl/test/esimd/slm_block.cpp index 35d16c8e46acb..35a8964b77f2d 100644 --- a/sycl/test/esimd/slm_block.cpp +++ b/sycl/test/esimd/slm_block.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s // expected-no-diagnostics -#include #include #include +#include #include using namespace sycl::ext::intel::esimd; diff --git a/sycl/test/esimd/slm_gather_scatter.cpp b/sycl/test/esimd/slm_gather_scatter.cpp index 63a75d25d64f1..6d565a8407e66 100644 --- a/sycl/test/esimd/slm_gather_scatter.cpp +++ b/sycl/test/esimd/slm_gather_scatter.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-device-only -fsyntax-only -Xclang -verify %s // expected-no-diagnostics -#include #include #include +#include #include using namespace sycl::ext::intel; diff --git a/sycl/test/esimd/spirv_intrins_trans.cpp b/sycl/test/esimd/spirv_intrins_trans.cpp index 87b2b5d2d39ef..7d976611971ef 100644 --- a/sycl/test/esimd/spirv_intrins_trans.cpp +++ b/sycl/test/esimd/spirv_intrins_trans.cpp @@ -6,8 +6,8 @@ // are correctly translated into GenX counterparts (implemented in // LowerESIMD.cpp) -#include #include +#include template __attribute__((sycl_kernel)) void kernel(Func kernelFunc) { diff --git a/sycl/test/esimd/vadd.cpp b/sycl/test/esimd/vadd.cpp index 5178d1a1ae6af..0b97aabe75be0 100644 --- a/sycl/test/esimd/vadd.cpp +++ b/sycl/test/esimd/vadd.cpp @@ -10,10 +10,10 @@ // RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -fno-legacy-pass-manager \ // RUN: -fsycl-instrument-device-code -#include #include #include #include +#include using namespace cl::sycl; diff --git a/sycl/test/extensions/fpga.cpp b/sycl/test/extensions/fpga.cpp index 5c2290af0a07f..be9963f45847c 100644 --- a/sycl/test/extensions/fpga.cpp +++ b/sycl/test/extensions/fpga.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out -#include #include +#include #include diff --git a/sycl/test/extensions/group-algorithm.cpp b/sycl/test/extensions/group-algorithm.cpp index 51bbc15074119..8f72d14b3547a 100644 --- a/sycl/test/extensions/group-algorithm.cpp +++ b/sycl/test/extensions/group-algorithm.cpp @@ -11,11 +11,11 @@ // RUNx: %clangxx -fsycl -fsycl-targets=%sycl_triple -DSPIRV_1_3 %s -I . -o \ %t13.out -#include #include #include #include #include +#include using namespace sycl; using namespace sycl::ext::oneapi; diff --git a/sycl/test/extensions/inline_asm.cpp b/sycl/test/extensions/inline_asm.cpp index 162934ba14ce9..7bfda5712612d 100644 --- a/sycl/test/extensions/inline_asm.cpp +++ b/sycl/test/extensions/inline_asm.cpp @@ -2,9 +2,9 @@ // found in https://github.com/intel/llvm-test-suite/tree/intel/SYCL/InlineAsm // RUN: %clangxx -fsycl %s -o %t.out -#include #include #include +#include #include constexpr const size_t DEFAULT_PROBLEM_SIZE = 16; diff --git a/sycl/test/extensions/macro.cpp b/sycl/test/extensions/macro.cpp index debf736e5d5a0..62c309b8a75fb 100644 --- a/sycl/test/extensions/macro.cpp +++ b/sycl/test/extensions/macro.cpp @@ -2,8 +2,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %t.out -#include #include +#include int main() { #if SYCL_BACKEND_OPENCL == 1 std::cout << "SYCL_BACKEND_OPENCL=1" << std::endl; diff --git a/sycl/test/extensions/macro_cuda.cpp b/sycl/test/extensions/macro_cuda.cpp index 247c96489fc0f..bd9ee07febd40 100644 --- a/sycl/test/extensions/macro_cuda.cpp +++ b/sycl/test/extensions/macro_cuda.cpp @@ -2,8 +2,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %t.out // REQUIRES: cuda_be -#include #include +#include int main() { #if SYCL_EXT_ONEAPI_BACKEND_CUDA == 1 std::cout << "SYCL_EXT_ONEAPI_BACKEND_CUDA=1" << std::endl; diff --git a/sycl/test/extensions/macro_esimd_emulator.cpp b/sycl/test/extensions/macro_esimd_emulator.cpp index 13891c99dd969..bbfe07fc8a828 100644 --- a/sycl/test/extensions/macro_esimd_emulator.cpp +++ b/sycl/test/extensions/macro_esimd_emulator.cpp @@ -2,8 +2,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %t.out // REQUIRES: esimd_emulator_be -#include #include +#include int main() { #if SYCL_EXT_INTEL_BACKEND_ESIMD_EMULATOR == 1 std::cout << "SYCL_EXT_INTEL_BACKEND_ESIMD_EMULATOR=1" << std::endl; diff --git a/sycl/test/extensions/macro_hip.cpp b/sycl/test/extensions/macro_hip.cpp index 9319d9da35697..249a7d11abd6a 100644 --- a/sycl/test/extensions/macro_hip.cpp +++ b/sycl/test/extensions/macro_hip.cpp @@ -2,8 +2,8 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %t.out // REQUIRES: hip_be -#include #include +#include int main() { #if SYCL_EXT_ONEAPI_BACKEND_HIP == 1 std::cout << "SYCL_EXT_ONEAPI_BACKEND_HIP=1" << std::endl; diff --git a/sycl/test/extensions/properties/properties_ctor_constexpr.cpp b/sycl/test/extensions/properties/properties_ctor_constexpr.cpp index efc12f79548f1..be8a2acbecc1a 100644 --- a/sycl/test/extensions/properties/properties_ctor_constexpr.cpp +++ b/sycl/test/extensions/properties/properties_ctor_constexpr.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_ctor_negative.cpp b/sycl/test/extensions/properties/properties_ctor_negative.cpp index 725a8e0cd1b6c..dc99e49fefd79 100644 --- a/sycl/test/extensions/properties/properties_ctor_negative.cpp +++ b/sycl/test/extensions/properties/properties_ctor_negative.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_device_copyable.cpp b/sycl/test/extensions/properties/properties_device_copyable.cpp index 7bc4943fab782..7ed16ba681c3d 100644 --- a/sycl/test/extensions/properties/properties_device_copyable.cpp +++ b/sycl/test/extensions/properties/properties_device_copyable.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_device_global.cpp b/sycl/test/extensions/properties/properties_device_global.cpp index d9b3fbc5a9690..f859852ccb4c6 100644 --- a/sycl/test/extensions/properties/properties_device_global.cpp +++ b/sycl/test/extensions/properties/properties_device_global.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include diff --git a/sycl/test/extensions/properties/properties_equality.cpp b/sycl/test/extensions/properties/properties_equality.cpp index 2f2f871ddc18d..2a06bb0ce9fdf 100644 --- a/sycl/test/extensions/properties/properties_equality.cpp +++ b/sycl/test/extensions/properties/properties_equality.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_get_property.cpp b/sycl/test/extensions/properties/properties_get_property.cpp index a7ee46b1d065c..b1d8f2db48f7d 100644 --- a/sycl/test/extensions/properties/properties_get_property.cpp +++ b/sycl/test/extensions/properties/properties_get_property.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %t.out -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_get_property_negative.cpp b/sycl/test/extensions/properties/properties_get_property_negative.cpp index 7857df87dee55..f2707d72d210a 100644 --- a/sycl/test/extensions/properties/properties_get_property_negative.cpp +++ b/sycl/test/extensions/properties/properties_get_property_negative.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_has_property.cpp b/sycl/test/extensions/properties/properties_has_property.cpp index 1e44533e314d3..57479d2837358 100644 --- a/sycl/test/extensions/properties/properties_has_property.cpp +++ b/sycl/test/extensions/properties/properties_has_property.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_is_property_key.cpp b/sycl/test/extensions/properties/properties_is_property_key.cpp index 3da9fbcd286d7..11c30d8c1eaa0 100644 --- a/sycl/test/extensions/properties/properties_is_property_key.cpp +++ b/sycl/test/extensions/properties/properties_is_property_key.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_is_property_list.cpp b/sycl/test/extensions/properties/properties_is_property_list.cpp index fc8a937e2fee0..7de96856b510c 100644 --- a/sycl/test/extensions/properties/properties_is_property_list.cpp +++ b/sycl/test/extensions/properties/properties_is_property_list.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_is_property_value.cpp b/sycl/test/extensions/properties/properties_is_property_value.cpp index b4515fc2fd76c..af07b8c24813c 100644 --- a/sycl/test/extensions/properties/properties_is_property_value.cpp +++ b/sycl/test/extensions/properties/properties_is_property_value.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include "mock_compile_time_properties.hpp" diff --git a/sycl/test/extensions/properties/properties_latency_control.cpp b/sycl/test/extensions/properties/properties_latency_control.cpp index 8536abb71cbb7..b00e74ad6d93d 100644 --- a/sycl/test/extensions/properties/properties_latency_control.cpp +++ b/sycl/test/extensions/properties/properties_latency_control.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s // expected-no-diagnostics -#include +#include #include diff --git a/sycl/test/extensions/sub_group_as.cpp b/sycl/test/extensions/sub_group_as.cpp index 43e79ac5aeb9a..a0c9957e5a9e8 100644 --- a/sycl/test/extensions/sub_group_as.cpp +++ b/sycl/test/extensions/sub_group_as.cpp @@ -2,11 +2,11 @@ // RUN: %clangxx -fsycl -fsycl-device-only -O0 -S -emit-llvm -x c++ -Xclang -no-enable-noundef-analysis %s -o - | FileCheck %s --check-prefix CHECK-O0 // Test compilation with -O3 when all methods are inlined in kernel function // and -O0 when helper methods are preserved. -#include #include #include #include #include +#include int main(int argc, char *argv[]) { cl::sycl::queue queue; diff --git a/sycl/test/extensions/sub_group_mask.cpp b/sycl/test/extensions/sub_group_mask.cpp index 2af2673ab5c8a..d809feae9f77a 100644 --- a/sycl/test/extensions/sub_group_mask.cpp +++ b/sycl/test/extensions/sub_group_mask.cpp @@ -8,9 +8,9 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include #include #include +#include int main() { for (size_t sgsize = 32; sgsize > 4; sgsize /= 2) { diff --git a/sycl/test/extensions/usm/usm_alloc_utility.cpp b/sycl/test/extensions/usm/usm_alloc_utility.cpp index 4551f95b71ab5..b51dc0543cd52 100644 --- a/sycl/test/extensions/usm/usm_alloc_utility.cpp +++ b/sycl/test/extensions/usm/usm_alloc_utility.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/extensions/usm/usm_allocator.cpp b/sycl/test/extensions/usm/usm_allocator.cpp index ac8be36109b81..b372fb6c5c2d7 100644 --- a/sycl/test/extensions/usm/usm_allocator.cpp +++ b/sycl/test/extensions/usm/usm_allocator.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/gdb/accessors-device.cpp b/sycl/test/gdb/accessors-device.cpp index fb932f9534af8..06b9515d64121 100644 --- a/sycl/test/gdb/accessors-device.cpp +++ b/sycl/test/gdb/accessors-device.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -c -fno-color-diagnostics -Xclang -ast-dump %s -I %sycl_include -Wno-sycl-strict | FileCheck %s // UNSUPPORTED: windows -#include +#include typedef cl::sycl::accessor dummy; diff --git a/sycl/test/gdb/accessors.cpp b/sycl/test/gdb/accessors.cpp index dceb6c559c138..388a1d20d4cd5 100644 --- a/sycl/test/gdb/accessors.cpp +++ b/sycl/test/gdb/accessors.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -c -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s // UNSUPPORTED: windows -#include +#include typedef cl::sycl::accessor dummy; diff --git a/sycl/test/gdb/printers.cpp b/sycl/test/gdb/printers.cpp index 1ee2bdbbf7731..fca7b68653707 100644 --- a/sycl/test/gdb/printers.cpp +++ b/sycl/test/gdb/printers.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -c -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s // UNSUPPORTED: windows -#include -#include +#include +#include typedef cl::sycl::id<1> dummy_id; typedef cl::sycl::buffer dummy_buffer; diff --git a/sycl/test/gdb/private-memory-device.cpp b/sycl/test/gdb/private-memory-device.cpp index e02d0f140f05c..24f4170cdc81c 100644 --- a/sycl/test/gdb/private-memory-device.cpp +++ b/sycl/test/gdb/private-memory-device.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl-device-only -c -fno-color-diagnostics -Xclang -ast-dump %s -I %sycl_include -Wno-sycl-strict | FileCheck %s // UNSUPPORTED: windows -#include -#include +#include +#include typedef cl::sycl::private_memory, 1> dummy; diff --git a/sycl/test/gdb/private-memory.cpp b/sycl/test/gdb/private-memory.cpp index 1d9d71928771b..c5784cf0ba226 100644 --- a/sycl/test/gdb/private-memory.cpp +++ b/sycl/test/gdb/private-memory.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -c -fsycl -fno-color-diagnostics -Xclang -ast-dump %s | FileCheck %s // UNSUPPORTED: windows -#include -#include +#include +#include typedef cl::sycl::private_memory, 1> dummy; diff --git a/sycl/test/helpers.hpp b/sycl/test/helpers.hpp index a93bd25645998..8073bf5420c99 100644 --- a/sycl/test/helpers.hpp +++ b/sycl/test/helpers.hpp @@ -6,8 +6,7 @@ // //===----------------------------------------------------------------------===// -#include - +#include using namespace cl; diff --git a/sycl/test/invoke_simd/invoke_simd.cpp b/sycl/test/invoke_simd/invoke_simd.cpp index 66ce1ca29c6ed..37296b453f255 100644 --- a/sycl/test/invoke_simd/invoke_simd.cpp +++ b/sycl/test/invoke_simd/invoke_simd.cpp @@ -7,10 +7,10 @@ // they are fully supported. #define __INVOKE_SIMD_ENABLE_ALL_CALLABLES -#include #include #include #include +#include #include #include diff --git a/sycl/test/invoke_simd/std_simd.cpp b/sycl/test/invoke_simd/std_simd.cpp index da5694519f436..6fb7abc70a5c8 100644 --- a/sycl/test/invoke_simd/std_simd.cpp +++ b/sycl/test/invoke_simd/std_simd.cpp @@ -2,8 +2,8 @@ // This test checks basic APIs of the std::simd and std::simd_mask. -#include #include +#include #include diff --git a/sycl/test/kernel_param/attr.cpp b/sycl/test/kernel_param/attr.cpp index 104cf53b4bcf7..c8f831f376f2e 100755 --- a/sycl/test/kernel_param/attr.cpp +++ b/sycl/test/kernel_param/attr.cpp @@ -3,7 +3,7 @@ // Check copying of parallel_for kernel attributes to wrapper kernel. -#include +#include using namespace cl::sycl; int main() { diff --git a/sycl/test/matrix/matrix-amx-bf16-test.cpp b/sycl/test/matrix/matrix-amx-bf16-test.cpp index 7c1f89350f9b9..450d3dc44b404 100644 --- a/sycl/test/matrix/matrix-amx-bf16-test.cpp +++ b/sycl/test/matrix/matrix-amx-bf16-test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -DSYCL_EXT_ONEAPI_MATRIX=1 -march=sapphirerapids -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 1) #include diff --git a/sycl/test/matrix/matrix-amx-int8-test.cpp b/sycl/test/matrix/matrix-amx-int8-test.cpp index 4d3ec4e0ead3a..0c383bf2b7b43 100644 --- a/sycl/test/matrix/matrix-amx-int8-test.cpp +++ b/sycl/test/matrix/matrix-amx-int8-test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -DSYCL_EXT_ONEAPI_MATRIX=1 -march=sapphirerapids -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 1) #include diff --git a/sycl/test/matrix/matrix-bf16-test-SG-16.cpp b/sycl/test/matrix/matrix-bf16-test-SG-16.cpp index 0150c420e3bd9..b0113e2c30742 100644 --- a/sycl/test/matrix/matrix-bf16-test-SG-16.cpp +++ b/sycl/test/matrix/matrix-bf16-test-SG-16.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/matrix-bf16-test.cpp b/sycl/test/matrix/matrix-bf16-test.cpp index efa118a33bff7..f871571b40635 100644 --- a/sycl/test/matrix/matrix-bf16-test.cpp +++ b/sycl/test/matrix/matrix-bf16-test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/matrix-bfloat16-test.cpp b/sycl/test/matrix/matrix-bfloat16-test.cpp index fb9995cd0e322..384714adef3d2 100644 --- a/sycl/test/matrix/matrix-bfloat16-test.cpp +++ b/sycl/test/matrix/matrix-bfloat16-test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/matrix-elemwise-ops.cpp b/sycl/test/matrix/matrix-elemwise-ops.cpp index 257ea3f821629..6fb68c12867c2 100644 --- a/sycl/test/matrix/matrix-elemwise-ops.cpp +++ b/sycl/test/matrix/matrix-elemwise-ops.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/matrix-int8-test-SG-16.cpp b/sycl/test/matrix/matrix-int8-test-SG-16.cpp index 2905a2ea66311..170abc5490add 100644 --- a/sycl/test/matrix/matrix-int8-test-SG-16.cpp +++ b/sycl/test/matrix/matrix-int8-test-SG-16.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -O2 %s -o %t.out -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/matrix-int8-test.cpp b/sycl/test/matrix/matrix-int8-test.cpp index ba4327a8e6cd5..aa38ece1b8713 100644 --- a/sycl/test/matrix/matrix-int8-test.cpp +++ b/sycl/test/matrix/matrix-int8-test.cpp @@ -4,7 +4,7 @@ // CHECK-DAG: %"struct.__spv::__spirv_JointMatrixINTEL.[[#]]" = type { [12 x [12 x [1 x [4 x i32]]]] addrspace(4)* } // CHECK-DAG: %"struct.__spv::__spirv_JointMatrixINTEL.[[#]]" = type { [48 x [12 x [4 x [4 x i8]]]] addrspace(4)* } -#include +#include #if (SYCL_EXT_ONEAPI_MATRIX == 2) #include diff --git a/sycl/test/matrix/query.cpp b/sycl/test/matrix/query.cpp index d75ea156632dd..544f2319aa082 100644 --- a/sycl/test/matrix/query.cpp +++ b/sycl/test/matrix/query.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -o query %s -#include #include +#include using namespace sycl; using namespace sycl::ext::oneapi::experimental::matrix; diff --git a/sycl/test/multi_ptr/ctad.cpp b/sycl/test/multi_ptr/ctad.cpp index a37c94fda737a..1edaefd04ec30 100644 --- a/sycl/test/multi_ptr/ctad.cpp +++ b/sycl/test/multi_ptr/ctad.cpp @@ -7,7 +7,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include namespace sycl = cl::sycl; diff --git a/sycl/test/regression/bit_cast.hpp b/sycl/test/regression/bit_cast.hpp index 49e4a8e9a2b7b..8edcb1ae81e25 100644 --- a/sycl/test/regression/bit_cast.hpp +++ b/sycl/test/regression/bit_cast.hpp @@ -1,7 +1,7 @@ // The purpose of this test is to check that the following code can be // successfully compiled -#include +#include int main() { sycl::half x; diff --git a/sycl/test/regression/buffer_from_rvalue.cpp b/sycl/test/regression/buffer_from_rvalue.cpp index fe24b77818d9a..9054013960819 100644 --- a/sycl/test/regression/buffer_from_rvalue.cpp +++ b/sycl/test/regression/buffer_from_rvalue.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=2020 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out // expected-no-diagnostics -#include +#include int main() { std::vector v(1); diff --git a/sycl/test/regression/builtins_vector1.cpp b/sycl/test/regression/builtins_vector1.cpp index e951ce1c5a8ca..20a52bd1b7c2e 100644 --- a/sycl/test/regression/builtins_vector1.cpp +++ b/sycl/test/regression/builtins_vector1.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include +#include namespace sycl = cl::sycl; diff --git a/sycl/test/regression/check_config_processing.cpp b/sycl/test/regression/check_config_processing.cpp index 7a1f79a985b86..420e5b30dc044 100644 --- a/sycl/test/regression/check_config_processing.cpp +++ b/sycl/test/regression/check_config_processing.cpp @@ -5,9 +5,9 @@ // RUN: ls *.dot // RUN: rm *.dot -#include #include #include +#include int main() { std::string testEnvVarValue = getenv("TEST"); diff --git a/sycl/test/regression/check_default_instance.cpp b/sycl/test/regression/check_default_instance.cpp index 599b8504995ab..e9a12ab07cdfd 100644 --- a/sycl/test/regression/check_default_instance.cpp +++ b/sycl/test/regression/check_default_instance.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s // expected-no-diagnostics -#include +#include int main() { sycl::ext::oneapi::accessor_property_list PL{ diff --git a/sycl/test/regression/check_simple_name_collisions.cpp b/sycl/test/regression/check_simple_name_collisions.cpp index 0db83613a47e8..ce01bc121dabf 100644 --- a/sycl/test/regression/check_simple_name_collisions.cpp +++ b/sycl/test/regression/check_simple_name_collisions.cpp @@ -21,6 +21,6 @@ #define IMAGE #define UNDEFINED -#include +#include int main() { return 0; } diff --git a/sycl/test/regression/check_static_property.cpp b/sycl/test/regression/check_static_property.cpp index 46e73ca68cb5b..02eb272c4673a 100644 --- a/sycl/test/regression/check_static_property.cpp +++ b/sycl/test/regression/check_static_property.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s // expected-no-diagnostics -#include +#include int main() { sycl::ext::oneapi::accessor_property_list PL{sycl::ext::oneapi::no_alias}; diff --git a/sycl/test/regression/constexpr-fp16-numeric-limits.cpp b/sycl/test/regression/constexpr-fp16-numeric-limits.cpp index c1e00be21b8bb..3ea34ea88917e 100644 --- a/sycl/test/regression/constexpr-fp16-numeric-limits.cpp +++ b/sycl/test/regression/constexpr-fp16-numeric-limits.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning -Wno-sycl-strict // expected-no-diagnostics -#include +#include int main() { constexpr cl::sycl::half L1 = std::numeric_limits::min(); diff --git a/sycl/test/regression/copy-with-unnamed-lambda.cpp b/sycl/test/regression/copy-with-unnamed-lambda.cpp index 07f427eb6ff03..97b26e806e09c 100644 --- a/sycl/test/regression/copy-with-unnamed-lambda.cpp +++ b/sycl/test/regression/copy-with-unnamed-lambda.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda %s -o %t.out // The purpose of this test is to check that the following code can be // successfully compiled -#include +#include #include diff --git a/sycl/test/regression/disabled_std_byte.cpp b/sycl/test/regression/disabled_std_byte.cpp index 735c09e39e488..342bc675aaa26 100644 --- a/sycl/test/regression/disabled_std_byte.cpp +++ b/sycl/test/regression/disabled_std_byte.cpp @@ -1,4 +1,4 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify -D_HAS_STD_BYTE=0 %s -Xclang -verify-ignore-unexpected=note,warning // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning // expected-no-diagnostics -#include +#include diff --git a/sycl/test/regression/fsycl-host-compiler-win.cpp b/sycl/test/regression/fsycl-host-compiler-win.cpp index e0f643624d4b2..ac9be4a92dc67 100644 --- a/sycl/test/regression/fsycl-host-compiler-win.cpp +++ b/sycl/test/regression/fsycl-host-compiler-win.cpp @@ -12,7 +12,7 @@ // // Uses -fsycl-host-compiler= on a simple test, requires 'cl' -#include +#include #ifndef DEFINE_CHECK #error predefined macro not set diff --git a/sycl/test/regression/fsycl-host-compiler.cpp b/sycl/test/regression/fsycl-host-compiler.cpp index 2860c6faf4d42..cc45872914b26 100644 --- a/sycl/test/regression/fsycl-host-compiler.cpp +++ b/sycl/test/regression/fsycl-host-compiler.cpp @@ -11,7 +11,7 @@ // // Uses -fsycl-host-compiler= on a simple test, requires 'g++' -#include +#include #ifndef DEFINE_CHECK #error predefined macro not set diff --git a/sycl/test/regression/fsycl-save-temps.cpp b/sycl/test/regression/fsycl-save-temps.cpp index abf53bf43ed02..91902d7c430a7 100644 --- a/sycl/test/regression/fsycl-save-temps.cpp +++ b/sycl/test/regression/fsycl-save-temps.cpp @@ -9,7 +9,7 @@ // Verify that a sample compilation succeeds with -save-temps // RUN: %clangxx -fsycl -save-temps %s -o %t.out -#include +#include void foo() {} diff --git a/sycl/test/regression/half_union.cpp b/sycl/test/regression/half_union.cpp index 2bdd8ef972970..006a83d969d42 100644 --- a/sycl/test/regression/half_union.cpp +++ b/sycl/test/regression/half_union.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: %RUN_ON_HOST %t.out -#include +#include typedef union _u16_to_half { unsigned short u; diff --git a/sycl/test/regression/headers_conflict.cpp b/sycl/test/regression/headers_conflict.cpp index 85dc14af19284..ac32eae6299ef 100644 --- a/sycl/test/regression/headers_conflict.cpp +++ b/sycl/test/regression/headers_conflict.cpp @@ -10,4 +10,4 @@ #define SUCCESS 0 class distance; -#include +#include diff --git a/sycl/test/regression/isordered.cpp b/sycl/test/regression/isordered.cpp index 1f50a606df8bc..a6f892489a500 100644 --- a/sycl/test/regression/isordered.cpp +++ b/sycl/test/regression/isordered.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_DEVICE_FILTER=host %t.out -#include +#include int main() { cl::sycl::range<1> ndRng(3); diff --git a/sycl/test/regression/joint_group_conflict.cpp b/sycl/test/regression/joint_group_conflict.cpp index 6ca300d976003..f2d698ec1e1fc 100644 --- a/sycl/test/regression/joint_group_conflict.cpp +++ b/sycl/test/regression/joint_group_conflict.cpp @@ -8,7 +8,7 @@ // Tests that creating a shared library with multiple object files using joint // group operations does not cause conflicting definitions. -#include +#include #ifdef CASE1 #define FNAME test1 diff --git a/sycl/test/regression/mad_sat.cpp b/sycl/test/regression/mad_sat.cpp index c3415293daeb7..9c44684eefa99 100644 --- a/sycl/test/regression/mad_sat.cpp +++ b/sycl/test/regression/mad_sat.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl %s -o %t.out // RUN: env SYCL_DEVICE_FILTER=host %t.out -#include +#include int main() { cl::sycl::queue testQueue; diff --git a/sycl/test/regression/memcpy-in-vec-as.cpp b/sycl/test/regression/memcpy-in-vec-as.cpp index b63b8643f3822..c2725eafbe297 100644 --- a/sycl/test/regression/memcpy-in-vec-as.cpp +++ b/sycl/test/regression/memcpy-in-vec-as.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -D_FORTIFY_SOURCE=2 %s -o %t.out -#include #include +#include int main() { using res_vec_type = cl::sycl::vec; diff --git a/sycl/test/regression/operator-names.cpp b/sycl/test/regression/operator-names.cpp index 5dc850ee3de2e..442b30303a499 100644 --- a/sycl/test/regression/operator-names.cpp +++ b/sycl/test/regression/operator-names.cpp @@ -8,4 +8,4 @@ // the -fno-operator-names option //===----------------------------------------------------------------------===// -#include +#include diff --git a/sycl/test/regression/print_args.cpp b/sycl/test/regression/print_args.cpp index 742e0fe80816d..99ee9c209fe0b 100644 --- a/sycl/test/regression/print_args.cpp +++ b/sycl/test/regression/print_args.cpp @@ -9,7 +9,7 @@ template auto printArgs(TArg0 arg, TArgs... args) { } -#include +#include int main() { return 0; diff --git a/sycl/test/regression/spec_const_O0.cpp b/sycl/test/regression/spec_const_O0.cpp index d4707725673ab..f11ceb4423fe2 100644 --- a/sycl/test/regression/spec_const_O0.cpp +++ b/sycl/test/regression/spec_const_O0.cpp @@ -2,7 +2,7 @@ // This test checks that even under -O0 the entire call chain starting from // kh.get_specialization_constant and ending with // __sycl_getScalar2020SpecConstantValue gets inlined. -#include +#include using namespace cl::sycl; diff --git a/sycl/test/regression/sub-group-store-const-ref.cpp b/sycl/test/regression/sub-group-store-const-ref.cpp index 4fdc5172b3ae9..8b0782dd7c422 100644 --- a/sycl/test/regression/sub-group-store-const-ref.cpp +++ b/sycl/test/regression/sub-group-store-const-ref.cpp @@ -10,7 +10,7 @@ //===----------------------------------------------------------------------===// // This test checks that sub_group::store supports const reference. //===----------------------------------------------------------------------===// -#include +#include using namespace sycl; void test(ext::oneapi::sub_group sg, global_ptr ptr) { sg.store(ptr, 1); } diff --git a/sycl/test/regression/sycl-include-gnu17.cpp b/sycl/test/regression/sycl-include-gnu17.cpp index f56d262c1f0bd..f5abc7f82dd27 100644 --- a/sycl/test/regression/sycl-include-gnu17.cpp +++ b/sycl/test/regression/sycl-include-gnu17.cpp @@ -3,8 +3,8 @@ // UNSUPPORTED: system-windows -#include #include +#include int main() { std::cout << "Passed" << std::endl; diff --git a/sycl/test/regression/unable-to-redeclare-device.cpp b/sycl/test/regression/unable-to-redeclare-device.cpp index 1dd68535a7597..65b228629b3e6 100644 --- a/sycl/test/regression/unable-to-redeclare-device.cpp +++ b/sycl/test/regression/unable-to-redeclare-device.cpp @@ -11,7 +11,7 @@ // This test checks that the following symbols (Device, GroupOperation) are not // defined in global namespace by sycl.hpp and available to user //===----------------------------------------------------------------------===// -#include +#include enum GroupOperation { ADD, SUB diff --git a/sycl/test/regression/unnamed-lambda-split-order.cpp b/sycl/test/regression/unnamed-lambda-split-order.cpp index d6693c16d2134..a0cbe02e2566b 100644 --- a/sycl/test/regression/unnamed-lambda-split-order.cpp +++ b/sycl/test/regression/unnamed-lambda-split-order.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda %s -o %t.out -#include "CL/sycl.hpp" +#include "sycl.hpp" // This validates the case where using a lambda in a kernel in a different order // than the lexical order of the lambdas. In a previous implementation of diff --git a/sycl/test/regression/unnamed-lambda.cpp b/sycl/test/regression/unnamed-lambda.cpp index aa2858235162e..ebb2636631d51 100644 --- a/sycl/test/regression/unnamed-lambda.cpp +++ b/sycl/test/regression/unnamed-lambda.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -c %s -o %t.temp // RUN: %clangxx -fsycl -sycl-std=1.2.1 -c %s -o %t.temp -#include "CL/sycl.hpp" +#include "sycl.hpp" // This validates that the unnamed lambda logic in the library correctly works // with a new implementation of __builtin_unique_stable_name, where diff --git a/sycl/test/regression/vec-to-half.cpp b/sycl/test/regression/vec-to-half.cpp index 86aded1cd54c7..2d9566be56fe6 100644 --- a/sycl/test/regression/vec-to-half.cpp +++ b/sycl/test/regression/vec-to-half.cpp @@ -1,7 +1,7 @@ // RUN: %clang -fsycl -O0 -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning // expected-no-diagnostics -#include +#include int main() { cl::sycl::vec V(1.0); diff --git a/sycl/test/scheduler/BasicSchedulerTests.cpp b/sycl/test/scheduler/BasicSchedulerTests.cpp index e30092d1db467..556cb22b5da18 100644 --- a/sycl/test/scheduler/BasicSchedulerTests.cpp +++ b/sycl/test/scheduler/BasicSchedulerTests.cpp @@ -8,7 +8,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/scheduler/DataMovement.cpp b/sycl/test/scheduler/DataMovement.cpp index fdf20a648be13..aeaa31db098ce 100644 --- a/sycl/test/scheduler/DataMovement.cpp +++ b/sycl/test/scheduler/DataMovement.cpp @@ -12,7 +12,7 @@ // The test checks that no additional host allocation is performed by the SYCL // RT if host ptr is used -#include +#include #include diff --git a/sycl/test/scheduler/GetWaitList.cpp b/sycl/test/scheduler/GetWaitList.cpp index ae68853d2375f..0d86babd2d8dd 100644 --- a/sycl/test/scheduler/GetWaitList.cpp +++ b/sycl/test/scheduler/GetWaitList.cpp @@ -8,7 +8,7 @@ // //===----------------------------------------------------------------------===// -#include +#include int main() { cl::sycl::event start; diff --git a/sycl/test/scheduler/HostAcc.cpp b/sycl/test/scheduler/HostAcc.cpp index c6d33e465a7db..cf015c4d37647 100644 --- a/sycl/test/scheduler/HostAcc.cpp +++ b/sycl/test/scheduler/HostAcc.cpp @@ -8,7 +8,7 @@ // //===----------------------------------------------------------------------===// -#include +#include using namespace cl; diff --git a/sycl/test/scheduler/MultipleDevices.cpp b/sycl/test/scheduler/MultipleDevices.cpp index cc9bc112889a3..a52ee3d2883f3 100644 --- a/sycl/test/scheduler/MultipleDevices.cpp +++ b/sycl/test/scheduler/MultipleDevices.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/scheduler/ReleaseResourcesTest.cpp b/sycl/test/scheduler/ReleaseResourcesTest.cpp index aca6f1c52bc58..396dc713e22df 100644 --- a/sycl/test/scheduler/ReleaseResourcesTest.cpp +++ b/sycl/test/scheduler/ReleaseResourcesTest.cpp @@ -9,7 +9,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include "../helpers.hpp" diff --git a/sycl/test/type_traits/half_operator_types.cpp b/sycl/test/type_traits/half_operator_types.cpp index e430a5fbc79a0..cc3f4c6ed859a 100644 --- a/sycl/test/type_traits/half_operator_types.cpp +++ b/sycl/test/type_traits/half_operator_types.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include using namespace std; template void math_operator_helper() { diff --git a/sycl/test/type_traits/integer_n_bit.cpp b/sycl/test/type_traits/integer_n_bit.cpp index 40b7e5b5bcb03..b82140787f4e5 100644 --- a/sycl/test/type_traits/integer_n_bit.cpp +++ b/sycl/test/type_traits/integer_n_bit.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include namespace s = cl::sycl; namespace d = cl::sycl::detail; diff --git a/sycl/test/type_traits/type_list.cpp b/sycl/test/type_traits/type_list.cpp index f55b4cbd91385..85a970ee4e5e1 100644 --- a/sycl/test/type_traits/type_list.cpp +++ b/sycl/test/type_traits/type_list.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/type_traits/type_traits.cpp b/sycl/test/type_traits/type_traits.cpp index 796eafa9aae00..8d923c14355af 100644 --- a/sycl/test/type_traits/type_traits.cpp +++ b/sycl/test/type_traits/type_traits.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include diff --git a/sycl/test/warnings/conversion_deprecation.cpp b/sycl/test/warnings/conversion_deprecation.cpp index 767ee6c852726..b6826d5e786ee 100644 --- a/sycl/test/warnings/conversion_deprecation.cpp +++ b/sycl/test/warnings/conversion_deprecation.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -#include +#include int main() { cl::sycl::id<1> id_obj(64); diff --git a/sycl/test/warnings/free_functions_deprecation.cpp b/sycl/test/warnings/free_functions_deprecation.cpp index aa9505275dd20..b36934c109980 100644 --- a/sycl/test/warnings/free_functions_deprecation.cpp +++ b/sycl/test/warnings/free_functions_deprecation.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include +#include int main() { // expected-warning@+1 {{'this_group<1>' is deprecated: use sycl::ext::oneapi::experimental::this_group() instead}} diff --git a/sycl/test/warnings/group_local_memory_deprecation.cpp b/sycl/test/warnings/group_local_memory_deprecation.cpp index 9398d9baddf49..82dd04eab74f1 100644 --- a/sycl/test/warnings/group_local_memory_deprecation.cpp +++ b/sycl/test/warnings/group_local_memory_deprecation.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl-device-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include +#include class KernelA; diff --git a/sycl/test/warnings/interop_task_deprecation.cpp b/sycl/test/warnings/interop_task_deprecation.cpp index be516cd41f1ad..b80fe044f19fa 100644 --- a/sycl/test/warnings/interop_task_deprecation.cpp +++ b/sycl/test/warnings/interop_task_deprecation.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include +#include using namespace sycl; diff --git a/sycl/test/warnings/kernel_wg_info_deprecation.cpp b/sycl/test/warnings/kernel_wg_info_deprecation.cpp index 8f5354ad401d1..b1217ec7dba17 100644 --- a/sycl/test/warnings/kernel_wg_info_deprecation.cpp +++ b/sycl/test/warnings/kernel_wg_info_deprecation.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include -#include +#include +#include using namespace sycl; diff --git a/sycl/test/warnings/run_on_host_intel_deprecation.hpp b/sycl/test/warnings/run_on_host_intel_deprecation.hpp index 2f49af982b107..a41f48ca6a344 100644 --- a/sycl/test/warnings/run_on_host_intel_deprecation.hpp +++ b/sycl/test/warnings/run_on_host_intel_deprecation.hpp @@ -1,6 +1,6 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include +#include using namespace sycl; diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp index 7c809b1b9dcda..c39db53cf9358 100644 --- a/sycl/test/warnings/sycl_2020_deprecations.cpp +++ b/sycl/test/warnings/sycl_2020_deprecations.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=2020 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out -#include #include +#include int main() { cl_context ClCtx; diff --git a/sycl/test/warnings/warnings.cpp b/sycl/test/warnings/warnings.cpp index 0728da0967d28..bb4bc9c159edd 100644 --- a/sycl/test/warnings/warnings.cpp +++ b/sycl/test/warnings/warnings.cpp @@ -1,7 +1,7 @@ -// RUN: %clangxx -fsycl --no-system-header-prefix=CL/sycl -fsyntax-only -Wall -Wextra -Werror -Wno-ignored-attributes -Wno-deprecated-declarations -Wpessimizing-move -Wunused-variable -Wmismatched-tags -Wunneeded-internal-declaration -Wno-unknown-cuda-version -Wno-unused-parameter -Wno-unused-command-line-argument %s -// RUN: %clangxx -fsycl -E --no-system-header-prefix=CL/sycl %s -o %t.ii +// RUN: %clangxx -fsycl --no-system-header-prefix=sycl -fsyntax-only -Wall -Wextra -Werror -Wno-ignored-attributes -Wno-deprecated-declarations -Wpessimizing-move -Wunused-variable -Wmismatched-tags -Wunneeded-internal-declaration -Wno-unknown-cuda-version -Wno-unused-parameter -Wno-unused-command-line-argument %s +// RUN: %clangxx -fsycl -E --no-system-header-prefix=sycl %s -o %t.ii // RUN: %clangxx -fsycl -fsyntax-only -Wall -Wextra -Werror -Wno-ignored-attributes -Wno-deprecated-declarations -Wpessimizing-move -Wunused-variable -Wmismatched-tags -Wunneeded-internal-declaration -Wno-unknown-cuda-version -Wno-unused-parameter -Wno-unused-command-line-argument %t.ii -#include +#include using namespace cl::sycl; int main() { diff --git a/sycl/tools/sycl-ls/sycl-ls.cpp b/sycl/tools/sycl-ls/sycl-ls.cpp index 63e53f684566c..4c00f53f27fd9 100644 --- a/sycl/tools/sycl-ls/sycl-ls.cpp +++ b/sycl/tools/sycl-ls/sycl-ls.cpp @@ -16,7 +16,7 @@ // In verbose mode it also prints, which devices would be chosen by various SYCL // device selectors. // -#include +#include #include #include diff --git a/sycl/tools/sycl-trace/CMakeLists.txt b/sycl/tools/sycl-trace/CMakeLists.txt index a1911b343325e..2eb1465d4e501 100644 --- a/sycl/tools/sycl-trace/CMakeLists.txt +++ b/sycl/tools/sycl-trace/CMakeLists.txt @@ -21,8 +21,8 @@ find_package(Python3 REQUIRED) add_custom_target(pi-pretty-printers COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_pi_pretty_printers.py - ${sycl_inc_dir}/CL/sycl/detail/pi.h - SOURCES ${sycl_inc_dir}/CL/sycl/detail/pi.h + ${sycl_inc_dir}/sycl/detail/pi.h + SOURCES ${sycl_inc_dir}/sycl/detail/pi.h BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/pi_structs.hpp ${CMAKE_CURRENT_BINARY_DIR}/pi_printers.def diff --git a/sycl/tools/sycl-trace/collector.cpp b/sycl/tools/sycl-trace/collector.cpp index 0d44b32b30b58..cbab9a7201067 100755 --- a/sycl/tools/sycl-trace/collector.cpp +++ b/sycl/tools/sycl-trace/collector.cpp @@ -8,7 +8,7 @@ #include "xpti/xpti_trace_framework.h" -#include +#include sycl::detail::SpinLock GlobalLock; diff --git a/sycl/tools/sycl-trace/pi_trace_collector.cpp b/sycl/tools/sycl-trace/pi_trace_collector.cpp index b1489100cc3c7..bdc590c8f6dec 100644 --- a/sycl/tools/sycl-trace/pi_trace_collector.cpp +++ b/sycl/tools/sycl-trace/pi_trace_collector.cpp @@ -14,8 +14,8 @@ #include "pi_arguments_handler.hpp" #include "pi_structs.hpp" -#include #include +#include #include #include @@ -41,7 +41,7 @@ static std::string getResult(pi_result Res) { case NAME: \ return #NAME; #define _PI_ERRC_WITH_MSG(NAME, VAL, MSG) _PI_ERRC(NAME, VAL) -#include +#include #undef _PI_ERRC #undef _PI_ERRC_WITH_MSG } @@ -58,7 +58,7 @@ static void setupClassicPrinter() { << "\n"; \ sycl::detail::pi::printArgs(Args...); \ }); -#include +#include #undef _PI_API ResultPrinter = new std::function( diff --git a/sycl/tools/sycl-trace/ze_trace_collector.cpp b/sycl/tools/sycl-trace/ze_trace_collector.cpp index c9be5b9c20d07..a6f5128e53f55 100644 --- a/sycl/tools/sycl-trace/ze_trace_collector.cpp +++ b/sycl/tools/sycl-trace/ze_trace_collector.cpp @@ -11,7 +11,7 @@ #include "xpti/xpti_trace_framework.h" -#include +#include #include diff --git a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp b/sycl/tools/xpti_helpers/pi_arguments_handler.hpp index 08049cef70d20..16328992d7a9f 100644 --- a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp +++ b/sycl/tools/xpti_helpers/pi_arguments_handler.hpp @@ -9,8 +9,8 @@ #pragma once -#include -#include +#include +#include #include #include @@ -69,7 +69,7 @@ class PiArgumentsHandler { MHandler##_##api(Plugin, Result, ArgsData); \ return; \ } -#include +#include #undef _PI_API } @@ -90,7 +90,7 @@ class PiArgumentsHandler { std::apply(Wrapper, Tuple); \ }; \ } -#include +#include #undef _PI_API private: @@ -98,7 +98,7 @@ class PiArgumentsHandler { std::function, void *)> \ MHandler##_##api = \ [](const pi_plugin &, std::optional, void *) {}; -#include +#include #undef _PI_API }; } // namespace xpti_helpers diff --git a/sycl/unittests/Extensions/DefaultContext.cpp b/sycl/unittests/Extensions/DefaultContext.cpp index d93fe545fe1ee..b12924edfdd57 100644 --- a/sycl/unittests/Extensions/DefaultContext.cpp +++ b/sycl/unittests/Extensions/DefaultContext.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp b/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp index bad193277d964..f5cb25dc2e626 100644 --- a/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp +++ b/sycl/unittests/SYCL2020/GetNativeOpenCL.cpp @@ -9,9 +9,9 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS #define __SYCL_INTERNAL_API -#include -#include #include +#include +#include #include #include diff --git a/sycl/unittests/SYCL2020/KernelBundle.cpp b/sycl/unittests/SYCL2020/KernelBundle.cpp index c25e397770e3d..5fd5817a4f030 100644 --- a/sycl/unittests/SYCL2020/KernelBundle.cpp +++ b/sycl/unittests/SYCL2020/KernelBundle.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include #include #include diff --git a/sycl/unittests/SYCL2020/KernelID.cpp b/sycl/unittests/SYCL2020/KernelID.cpp index 8c122692e5d72..24675c3586d82 100644 --- a/sycl/unittests/SYCL2020/KernelID.cpp +++ b/sycl/unittests/SYCL2020/KernelID.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/unittests/SYCL2020/SpecializationConstant.cpp b/sycl/unittests/SYCL2020/SpecializationConstant.cpp index 3c511f28f27db..3d828f27165c0 100644 --- a/sycl/unittests/SYCL2020/SpecializationConstant.cpp +++ b/sycl/unittests/SYCL2020/SpecializationConstant.cpp @@ -8,8 +8,8 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include +#include #include #include diff --git a/sycl/unittests/assert/assert.cpp b/sycl/unittests/assert/assert.cpp index 74bf38d7595bc..16a2590bafda0 100644 --- a/sycl/unittests/assert/assert.cpp +++ b/sycl/unittests/assert/assert.cpp @@ -21,8 +21,8 @@ #define SYCL_FALLBACK_ASSERT 1 // Enable use of interop kernel c-tor #define __SYCL_INTERNAL_API -#include -#include +#include +#include #include #include diff --git a/sycl/unittests/buffer/BufferLocation.cpp b/sycl/unittests/buffer/BufferLocation.cpp index b519447be9e56..f4752871b8ab1 100644 --- a/sycl/unittests/buffer/BufferLocation.cpp +++ b/sycl/unittests/buffer/BufferLocation.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/sycl/unittests/helpers/PiImage.hpp b/sycl/unittests/helpers/PiImage.hpp index 599e9ec7b6bae..09ac7dd94583f 100644 --- a/sycl/unittests/helpers/PiImage.hpp +++ b/sycl/unittests/helpers/PiImage.hpp @@ -8,10 +8,10 @@ #pragma once -#include -#include #include #include +#include +#include __SYCL_INLINE_NAMESPACE(cl) { namespace sycl { diff --git a/sycl/unittests/helpers/PiMock.hpp b/sycl/unittests/helpers/PiMock.hpp index cb3c45af2a1c5..4f19ac4b39075 100644 --- a/sycl/unittests/helpers/PiMock.hpp +++ b/sycl/unittests/helpers/PiMock.hpp @@ -27,12 +27,12 @@ #pragma once -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include @@ -58,7 +58,7 @@ namespace RT = detail::pi; decltype(&::api) FuncPtr) { \ MPlugin->PiFunctionTable.api = FuncPtr; \ } -#include +#include #undef _PI_API /// The PiMock class wraps an instance of a SYCL platform class, diff --git a/sycl/unittests/helpers/ScopedEnvVar.hpp b/sycl/unittests/helpers/ScopedEnvVar.hpp index 6e02b631a1f2a..047780b1000a7 100644 --- a/sycl/unittests/helpers/ScopedEnvVar.hpp +++ b/sycl/unittests/helpers/ScopedEnvVar.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/unittests/kernel-and-program/Cache.cpp b/sycl/unittests/kernel-and-program/Cache.cpp index 694576070bdc5..e2647086ed57f 100644 --- a/sycl/unittests/kernel-and-program/Cache.cpp +++ b/sycl/unittests/kernel-and-program/Cache.cpp @@ -8,14 +8,14 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include "CL/sycl/detail/pi.h" #include "detail/context_impl.hpp" #include "detail/kernel_program_cache.hpp" #include "detail/program_impl.hpp" -#include +#include "sycl/detail/pi.h" #include #include #include +#include #include diff --git a/sycl/unittests/kernel-and-program/DeviceInfo.cpp b/sycl/unittests/kernel-and-program/DeviceInfo.cpp index 236293e44f89f..38b1d6933b065 100644 --- a/sycl/unittests/kernel-and-program/DeviceInfo.cpp +++ b/sycl/unittests/kernel-and-program/DeviceInfo.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include +#include using namespace sycl; diff --git a/sycl/unittests/kernel-and-program/KernelInfo.cpp b/sycl/unittests/kernel-and-program/KernelInfo.cpp index 278710557b0a2..b0fc9370d5ce2 100644 --- a/sycl/unittests/kernel-and-program/KernelInfo.cpp +++ b/sycl/unittests/kernel-and-program/KernelInfo.cpp @@ -8,10 +8,10 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include #include #include +#include using namespace sycl; diff --git a/sycl/unittests/kernel-and-program/KernelRelease.cpp b/sycl/unittests/kernel-and-program/KernelRelease.cpp index 95fb4b3e1b714..6a02f33b48bb2 100644 --- a/sycl/unittests/kernel-and-program/KernelRelease.cpp +++ b/sycl/unittests/kernel-and-program/KernelRelease.cpp @@ -8,10 +8,10 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include #include #include +#include #include #include diff --git a/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp b/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp index d4e3d64f0fec6..dc50815ddac73 100644 --- a/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp +++ b/sycl/unittests/kernel-and-program/PersistentDeviceCodeCache.cpp @@ -9,14 +9,14 @@ // Detailed description of the tests cases can be seen per test function. #include "../thread_safety/ThreadUtils.h" #include "detail/persistent_device_code_cache.hpp" -#include -#include -#include #include #include #include #include #include +#include +#include +#include #include #define ASSERT_NO_ERROR(x) \ diff --git a/sycl/unittests/misc/KernelBuildOptions.cpp b/sycl/unittests/misc/KernelBuildOptions.cpp index 7ad5f993820c1..5b576ffb32ad5 100644 --- a/sycl/unittests/misc/KernelBuildOptions.cpp +++ b/sycl/unittests/misc/KernelBuildOptions.cpp @@ -11,9 +11,9 @@ #define __SYCL_INTERNAL_API #endif -#include #include #include +#include #include diff --git a/sycl/unittests/misc/OsUtils.cpp b/sycl/unittests/misc/OsUtils.cpp index b63e7187bae4a..5368d874b73ca 100644 --- a/sycl/unittests/misc/OsUtils.cpp +++ b/sycl/unittests/misc/OsUtils.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include #ifdef _WIN32 /// Compare for string equality, but ignore difference between forward slash (/) diff --git a/sycl/unittests/pi/EnqueueMemTest.cpp b/sycl/unittests/pi/EnqueueMemTest.cpp index 41539c3e8ef5c..0d80a2252fe98 100644 --- a/sycl/unittests/pi/EnqueueMemTest.cpp +++ b/sycl/unittests/pi/EnqueueMemTest.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "TestGetPlugin.hpp" -#include #include #include +#include using namespace cl::sycl; diff --git a/sycl/unittests/pi/PiUtility.cpp b/sycl/unittests/pi/PiUtility.cpp index 243c962ad4964..1292d6a6fe9ba 100644 --- a/sycl/unittests/pi/PiUtility.cpp +++ b/sycl/unittests/pi/PiUtility.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include -#include -#include +#include +#include #include diff --git a/sycl/unittests/pi/PlatformTest.cpp b/sycl/unittests/pi/PlatformTest.cpp index f9a4f442043da..5a38b10e2a17d 100644 --- a/sycl/unittests/pi/PlatformTest.cpp +++ b/sycl/unittests/pi/PlatformTest.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// #include "TestGetPlugin.hpp" -#include -#include #include #include +#include +#include #include namespace { diff --git a/sycl/unittests/pi/TestGetPlatforms.hpp b/sycl/unittests/pi/TestGetPlatforms.hpp index ae2b6d0f25a7e..8aeb3a26ecb8c 100644 --- a/sycl/unittests/pi/TestGetPlatforms.hpp +++ b/sycl/unittests/pi/TestGetPlatforms.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include #include #include diff --git a/sycl/unittests/pi/cuda/CMakeLists.txt b/sycl/unittests/pi/cuda/CMakeLists.txt index df1679c8a5eb2..94ac39f07e474 100644 --- a/sycl/unittests/pi/cuda/CMakeLists.txt +++ b/sycl/unittests/pi/cuda/CMakeLists.txt @@ -19,7 +19,7 @@ target_compile_definitions(PiCudaTests target_include_directories(PiCudaTests PRIVATE "../" - "${sycl_inc_dir}/CL/sycl/detail/" + "${sycl_inc_dir}/sycl/detail/" "${sycl_inc_dir}" "${sycl_plugin_dir}/cuda/" ) diff --git a/sycl/unittests/pi/cuda/test_base_objects.cpp b/sycl/unittests/pi/cuda/test_base_objects.cpp index b2892b2cedc08..a8a695c11335c 100644 --- a/sycl/unittests/pi/cuda/test_base_objects.cpp +++ b/sycl/unittests/pi/cuda/test_base_objects.cpp @@ -11,11 +11,11 @@ #include #include "TestGetPlugin.hpp" -#include -#include -#include #include #include +#include +#include +#include #include diff --git a/sycl/unittests/pi/cuda/test_commands.cpp b/sycl/unittests/pi/cuda/test_commands.cpp index aeb68dea27b64..453ca8c5e7705 100644 --- a/sycl/unittests/pi/cuda/test_commands.cpp +++ b/sycl/unittests/pi/cuda/test_commands.cpp @@ -12,10 +12,10 @@ #include "CudaUtils.hpp" #include "TestGetPlugin.hpp" -#include -#include #include #include +#include +#include using namespace cl::sycl; diff --git a/sycl/unittests/pi/cuda/test_contexts.cpp b/sycl/unittests/pi/cuda/test_contexts.cpp index ae4f9597483c3..30ec8eb7699a3 100644 --- a/sycl/unittests/pi/cuda/test_contexts.cpp +++ b/sycl/unittests/pi/cuda/test_contexts.cpp @@ -16,10 +16,10 @@ #include "CudaUtils.hpp" #include "TestGetPlugin.hpp" -#include -#include #include #include +#include +#include using namespace cl::sycl; diff --git a/sycl/unittests/pi/cuda/test_device.cpp b/sycl/unittests/pi/cuda/test_device.cpp index fd8d35dea415c..25bbd2fd80d91 100644 --- a/sycl/unittests/pi/cuda/test_device.cpp +++ b/sycl/unittests/pi/cuda/test_device.cpp @@ -11,10 +11,10 @@ #include #include "TestGetPlugin.hpp" -#include -#include #include #include +#include +#include using namespace cl::sycl; diff --git a/sycl/unittests/pi/cuda/test_interop_get_native.cpp b/sycl/unittests/pi/cuda/test_interop_get_native.cpp index d6d861d143246..d6dd70ae27513 100644 --- a/sycl/unittests/pi/cuda/test_interop_get_native.cpp +++ b/sycl/unittests/pi/cuda/test_interop_get_native.cpp @@ -11,7 +11,7 @@ #include #include "TestGetPlatforms.hpp" -#include +#include #include diff --git a/sycl/unittests/pi/cuda/test_kernels.cpp b/sycl/unittests/pi/cuda/test_kernels.cpp index 936856aecfb7f..c6273b35e6bb7 100644 --- a/sycl/unittests/pi/cuda/test_kernels.cpp +++ b/sycl/unittests/pi/cuda/test_kernels.cpp @@ -11,10 +11,10 @@ #include #include "TestGetPlugin.hpp" -#include -#include #include #include +#include +#include // PI CUDA kernels carry an additional argument for the implicit global offset. #define NUM_IMPLICIT_ARGS 1 diff --git a/sycl/unittests/pi/cuda/test_mem_obj.cpp b/sycl/unittests/pi/cuda/test_mem_obj.cpp index 93d54659f1d42..deb0b6347a268 100644 --- a/sycl/unittests/pi/cuda/test_mem_obj.cpp +++ b/sycl/unittests/pi/cuda/test_mem_obj.cpp @@ -12,11 +12,11 @@ #include "CudaUtils.hpp" #include "TestGetPlugin.hpp" -#include -#include -#include #include #include +#include +#include +#include using namespace cl::sycl; diff --git a/sycl/unittests/pi/cuda/test_primary_context.cpp b/sycl/unittests/pi/cuda/test_primary_context.cpp index be7f27a7a738a..feffa0833a632 100644 --- a/sycl/unittests/pi/cuda/test_primary_context.cpp +++ b/sycl/unittests/pi/cuda/test_primary_context.cpp @@ -11,8 +11,8 @@ #include #include "TestGetPlatforms.hpp" -#include #include +#include #include diff --git a/sycl/unittests/pi/cuda/test_sampler_properties.cpp b/sycl/unittests/pi/cuda/test_sampler_properties.cpp index d5eaef87b0862..3814e74a4d9b3 100644 --- a/sycl/unittests/pi/cuda/test_sampler_properties.cpp +++ b/sycl/unittests/pi/cuda/test_sampler_properties.cpp @@ -9,9 +9,9 @@ #include "gtest/gtest.h" #include "TestGetPlugin.hpp" -#include -#include #include +#include +#include #include diff --git a/sycl/unittests/pi/piInteropRetain.cpp b/sycl/unittests/pi/piInteropRetain.cpp index d8a56f0f3ad3a..34238b11a9bc6 100644 --- a/sycl/unittests/pi/piInteropRetain.cpp +++ b/sycl/unittests/pi/piInteropRetain.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include -#include -#include +#include +#include #include #include diff --git a/sycl/unittests/pi/pi_arguments_handler.cpp b/sycl/unittests/pi/pi_arguments_handler.cpp index ca43ceb039b37..54f4cc9dfb1c5 100644 --- a/sycl/unittests/pi/pi_arguments_handler.cpp +++ b/sycl/unittests/pi/pi_arguments_handler.cpp @@ -10,7 +10,7 @@ #include "pi_arguments_handler.hpp" -#include +#include #include diff --git a/sycl/unittests/program_manager/BuildLog.cpp b/sycl/unittests/program_manager/BuildLog.cpp index 8f9295056a85f..a23264b9cb808 100644 --- a/sycl/unittests/program_manager/BuildLog.cpp +++ b/sycl/unittests/program_manager/BuildLog.cpp @@ -9,7 +9,6 @@ #include "gtest/internal/gtest-internal.h" #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include #include #include @@ -17,6 +16,7 @@ #include #include #include +#include #include diff --git a/sycl/unittests/program_manager/EliminatedArgMask.cpp b/sycl/unittests/program_manager/EliminatedArgMask.cpp index 8c9d7c75fce96..224b5624af11a 100644 --- a/sycl/unittests/program_manager/EliminatedArgMask.cpp +++ b/sycl/unittests/program_manager/EliminatedArgMask.cpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include #include +#include #include #include diff --git a/sycl/unittests/program_manager/SubDevices.cpp b/sycl/unittests/program_manager/SubDevices.cpp index b0ff4f6a78f01..3e3c1b774438f 100644 --- a/sycl/unittests/program_manager/SubDevices.cpp +++ b/sycl/unittests/program_manager/SubDevices.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include #include #include diff --git a/sycl/unittests/program_manager/itt_annotations.cpp b/sycl/unittests/program_manager/itt_annotations.cpp index eefa9478ab5ee..422a01ae0872a 100644 --- a/sycl/unittests/program_manager/itt_annotations.cpp +++ b/sycl/unittests/program_manager/itt_annotations.cpp @@ -8,11 +8,11 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include #include #include #include +#include #include diff --git a/sycl/unittests/program_manager/passing_link_and_compile_options.cpp b/sycl/unittests/program_manager/passing_link_and_compile_options.cpp index d732d474f5ee6..9c8da5c18465d 100644 --- a/sycl/unittests/program_manager/passing_link_and_compile_options.cpp +++ b/sycl/unittests/program_manager/passing_link_and_compile_options.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/unittests/queue/EventClear.cpp b/sycl/unittests/queue/EventClear.cpp index 00350b9fc5f0b..ecd4c430432f3 100644 --- a/sycl/unittests/queue/EventClear.cpp +++ b/sycl/unittests/queue/EventClear.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include +#include using namespace cl::sycl; diff --git a/sycl/unittests/queue/GetProfilingInfo.cpp b/sycl/unittests/queue/GetProfilingInfo.cpp index 2cefa047edde1..596c4ad3b0bb8 100644 --- a/sycl/unittests/queue/GetProfilingInfo.cpp +++ b/sycl/unittests/queue/GetProfilingInfo.cpp @@ -9,9 +9,9 @@ // //===----------------------------------------------------------------------===// -#include #include #include +#include #include #include diff --git a/sycl/unittests/queue/USM.cpp b/sycl/unittests/queue/USM.cpp index 829e05a42d44d..b490d38fb53d3 100644 --- a/sycl/unittests/queue/USM.cpp +++ b/sycl/unittests/queue/USM.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include #include +#include #include diff --git a/sycl/unittests/queue/Wait.cpp b/sycl/unittests/queue/Wait.cpp index ca9da41c2f143..fbc22b82cc0e8 100644 --- a/sycl/unittests/queue/Wait.cpp +++ b/sycl/unittests/queue/Wait.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#include #include #include #include #include #include +#include #include diff --git a/sycl/unittests/scheduler/Commands.cpp b/sycl/unittests/scheduler/Commands.cpp index aaab8029695f6..90d7135a14b74 100644 --- a/sycl/unittests/scheduler/Commands.cpp +++ b/sycl/unittests/scheduler/Commands.cpp @@ -42,7 +42,7 @@ pi_result redefinePiEventRelease(pi_event) { return PI_SUCCESS; } // This test checks a handling of empty events in WaitWithBarrier command. // Original reproducer for l0 plugin led to segfault(nullptr dereference): // -// #include +// #include // int main() { // sycl::queue q; // sycl::event e; diff --git a/sycl/unittests/scheduler/InOrderQueueSyncCheck.cpp b/sycl/unittests/scheduler/InOrderQueueSyncCheck.cpp index 6b3be2efebd31..01a28cc4f4e1c 100644 --- a/sycl/unittests/scheduler/InOrderQueueSyncCheck.cpp +++ b/sycl/unittests/scheduler/InOrderQueueSyncCheck.cpp @@ -8,9 +8,9 @@ #include "SchedulerTest.hpp" #include "SchedulerTestUtils.hpp" -#include #include #include +#include #include diff --git a/sycl/unittests/scheduler/LeavesCollection.cpp b/sycl/unittests/scheduler/LeavesCollection.cpp index 19d243388d198..ceb29a4ac455e 100644 --- a/sycl/unittests/scheduler/LeavesCollection.cpp +++ b/sycl/unittests/scheduler/LeavesCollection.cpp @@ -8,10 +8,10 @@ #include "SchedulerTestUtils.hpp" -#include #include #include #include +#include using namespace cl::sycl::detail; diff --git a/sycl/unittests/scheduler/RequiredWGSize.cpp b/sycl/unittests/scheduler/RequiredWGSize.cpp index 39c6964f9e653..a62e4e0b2d89e 100644 --- a/sycl/unittests/scheduler/RequiredWGSize.cpp +++ b/sycl/unittests/scheduler/RequiredWGSize.cpp @@ -8,11 +8,11 @@ #define SYCL2020_DISABLE_DEPRECATION_WARNINGS -#include #include #include #include #include +#include #include diff --git a/sycl/unittests/scheduler/SchedulerTest.hpp b/sycl/unittests/scheduler/SchedulerTest.hpp index c127ca06d5120..cf5bfbe7eb121 100644 --- a/sycl/unittests/scheduler/SchedulerTest.hpp +++ b/sycl/unittests/scheduler/SchedulerTest.hpp @@ -8,7 +8,7 @@ #pragma once -#include +#include #include diff --git a/sycl/unittests/scheduler/SchedulerTestUtils.hpp b/sycl/unittests/scheduler/SchedulerTestUtils.hpp index f4dcc4e0f215f..37983af08a9c1 100644 --- a/sycl/unittests/scheduler/SchedulerTestUtils.hpp +++ b/sycl/unittests/scheduler/SchedulerTestUtils.hpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// #pragma once -#include #include #include #include #include +#include #include #include diff --git a/sycl/unittests/stream/stream.cpp b/sycl/unittests/stream/stream.cpp index ce755bfd08aa9..844c062638307 100644 --- a/sycl/unittests/stream/stream.cpp +++ b/sycl/unittests/stream/stream.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include +#include #include #include diff --git a/sycl/unittests/thread_safety/HostAccessorDeadLock.cpp b/sycl/unittests/thread_safety/HostAccessorDeadLock.cpp index 5fa4e6de58b61..a408255864f87 100644 --- a/sycl/unittests/thread_safety/HostAccessorDeadLock.cpp +++ b/sycl/unittests/thread_safety/HostAccessorDeadLock.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// #include "ThreadUtils.h" -#include #include #include +#include #include namespace { diff --git a/sycl/unittests/windows/dllmain.cpp b/sycl/unittests/windows/dllmain.cpp index 0e46f0eea9483..a9674c76811ad 100644 --- a/sycl/unittests/windows/dllmain.cpp +++ b/sycl/unittests/windows/dllmain.cpp @@ -12,10 +12,10 @@ * distinct binary executable. */ -#include #include #include #include +#include #include diff --git a/xpti/doc/SYCL_Tracing_Implementation.md b/xpti/doc/SYCL_Tracing_Implementation.md index f78823061c8b5..a4382d26b64f8 100644 --- a/xpti/doc/SYCL_Tracing_Implementation.md +++ b/xpti/doc/SYCL_Tracing_Implementation.md @@ -67,7 +67,7 @@ plugin interface (PI) layer `initialize()` call. In this call, we will perform two operations: 1. Initialize all listeners and create a trace event to represent the graph. -This is done in `sycl/include/CL/sycl/detail/pi.cpp`. +This is done in `sycl/include/sycl/detail/pi.cpp`. 2. Send a `graph_create` event to all subscribers. This notification will only be sent once.