React to review comment

Signed-off-by: Alexander Batashev <[email protected]>

Author: Alexander Batashev

sycl/CMakeLists.txt

@@ -184,6 +184,8 @@ function( add_common_options LIB_NAME)
   endif()
 endfunction(add_common_options)
 
+set(SYCL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 # SYCL runtime library
 add_subdirectory( source )
 

sycl/include/CL/sycl/buffer.hpp

@@ -196,7 +196,7 @@ class buffer {
 
     size_t BufSize = 0;
     const detail::plugin &Plugin =
-        getContextPlugin(detail::getSyclObjImpl(SyclContext));
+        getPluginFromContext(detail::getSyclObjImpl(SyclContext));
     Plugin.call<detail::PiApiKind::piMemGetInfo>(
         detail::pi::cast<detail::RT::PiMem>(MemObject), CL_MEM_SIZE,
         sizeof(size_t), &BufSize, nullptr);

sycl/include/CL/sycl/context.hpp

@@ -22,7 +22,7 @@ class platform;
 namespace detail {
 class context_impl;
 const detail::plugin &
-getContextPlugin(const shared_ptr_class<context_impl> Context);
+getPluginFromContext(const shared_ptr_class<context_impl> Context);
 }
 
 class context {

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -222,7 +222,7 @@ template <int Dimensions> class image_impl final : public SYCLMemObjT {
   template <typename T>
   void getImageInfo(const ContextImplPtr Context, RT::PiMemImageInfo Info,
                     T &Dest) {
-    const detail::plugin &Plugin = getContextPlugin(Context);
+    const detail::plugin &Plugin = getPluginFromContext(Context);
     RT::PiMem Mem = pi::cast<RT::PiMem>(BaseT::MInteropMemObject);
     Plugin.call<PiApiKind::piMemImageGetInfo>(Mem, Info, sizeof(T), &Dest,
                                               nullptr);

sycl/source/accessor.cpp

@@ -1,4 +1,4 @@
-//==------------ accessor.cpp - SYCL standard header file ------------------==//
+//==------------ accessor.cpp - SYCL standard source file ------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/source/context.cpp

@@ -89,7 +89,7 @@ context::context(shared_ptr_class<detail::context_impl> Impl) : impl(Impl) {}
 
 namespace detail {
 const detail::plugin &
-getContextPlugin(const shared_ptr_class<context_impl> Context) {
+getPluginFromContext(const shared_ptr_class<context_impl> Context) {
   return Context->getPlugin();
 }
 } // namespace detail

sycl/source/detail/image_accessor_util.cpp

@@ -8,7 +8,6 @@
 
 #include <CL/sycl/accessor.hpp>
 #include <CL/sycl/builtins.hpp>
-#include <detail/scheduler/scheduler.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

sycl/source/detail/stream_impl.cpp

@@ -7,9 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl/detail/stream_impl.hpp>
-#include <cstdio>
 #include <detail/scheduler/scheduler.hpp>
 
+#include <cstdio>
+
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 namespace detail {

sycl/source/event.cpp

@@ -13,7 +13,6 @@
 #include <CL/sycl/info/info_desc.hpp>
 #include <detail/event_impl.hpp>
 #include <detail/scheduler/scheduler.hpp>
-
 #include <CL/sycl/stl.hpp>
 
 #include <memory>

sycl/test/CMakeLists.txt

@@ -6,7 +6,6 @@ set(CLANGXX_IN_BUILD "${LLVM_BINARY_DIR}/bin/clang++")
 set(CLANGCL_IN_BUILD "${LLVM_BINARY_DIR}/bin/clang-cl")
 
 get_target_property(SYCL_BINARY_DIR sycl-toolchain BINARY_DIR)
-get_target_property(SYCL_SOURCE_DIR sycl-toolchain SOURCE_DIR)
 
 set(SYCL_INCLUDE "${dst_dir}")
 

sycl/unittests/CMakeLists.txt

@@ -24,7 +24,7 @@ function(add_sycl_unittest test_dirname)
     )
   target_include_directories(${test_dirname} PRIVATE SYSTEM
       ${sycl_inc_dir}
-      ${CMAKE_SOURCE_DIR}/../sycl/source/
+      ${SYCL_SOURCE_DIR}/source/
     )
   # LLVM gtest uses LLVM utilities that require C++-14
   # CXX_STANDARD_REQUIRED makes CXX_STANDARD a hard requirement.