[SYCL] Address review comments.

Signed-off-by: Sergey Kanaev <sergey.kanaev@intel.com>

Author: Sergey Kanaev

sycl/include/CL/sycl/detail/cg_types.hpp

@@ -1,3 +1,11 @@
+//==---- cg_types.hpp - Auxiliary types required by command group class ----==//
+//
+// 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 <CL/sycl/detail/host_profiling_info.hpp>

sycl/include/CL/sycl/detail/handler_proxy.hpp

@@ -1,3 +1,11 @@
+//==--------- handler_proxy.hpp - Proxy methods to call in handler ---------==//
+//
+// 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 <CL/sycl/access/access.hpp>

sycl/include/CL/sycl/interop_handler.hpp

@@ -1,3 +1,11 @@
+//==------- interop_handler.hpp - Argument for codeplay_introp_task --------==//
+//
+// 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 <CL/sycl/accessor.hpp>

sycl/source/CMakeLists.txt

@@ -144,6 +144,7 @@ set(SYCL_SOURCES
     "function_pointer.cpp"
     "half_type.cpp"
     "handler.cpp"
+    "interop_handler.cpp"
     "kernel.cpp"
     "platform.cpp"
     "program.cpp"

sycl/source/detail/cg.cpp

@@ -22,24 +22,5 @@
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 
-pi_native_handle interop_handler::GetNativeQueue() const {
-  return MQueue->getNative();
-}
-
-pi_native_handle interop_handler::GetNativeMem(detail::Requirement *Req) const {
-  auto Iter = std::find_if(std::begin(MMemObjs), std::end(MMemObjs),
-                           [=](ReqToMem Elem) { return (Elem.first == Req); });
-
-  if (Iter == std::end(MMemObjs)) {
-    throw("Invalid memory object used inside interop");
-  }
-
-  auto Plugin = MQueue->getPlugin();
-  pi_native_handle Handle;
-  Plugin.call<detail::PiApiKind::piextMemGetNativeHandle>(Iter->second,
-                                                          &Handle);
-  return Handle;
-}
-
 }  // sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/source/detail/handler_proxy.cpp

@@ -1,3 +1,11 @@
+//==--------- handler_proxy.cpp - Proxy methods to call in handler ---------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
 #include <CL/sycl/detail/handler_proxy.hpp>
 
 #include <CL/sycl/handler.hpp>

sycl/source/interop_handler.cpp

@@ -0,0 +1,37 @@
+//==------- interop_handler.cpp - Argument for codeplay_introp_task --------==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl/detail/defines.hpp>
+#include <CL/sycl/detail/pi.hpp>
+#include <CL/sycl/interop_handler.hpp>
+#include <detail/queue_impl.hpp>
+
+__SYCL_INLINE_NAMESPACE(cl) {
+namespace sycl {
+
+pi_native_handle interop_handler::GetNativeQueue() const {
+  return MQueue->getNative();
+}
+
+pi_native_handle interop_handler::GetNativeMem(detail::Requirement *Req) const {
+  auto Iter = std::find_if(std::begin(MMemObjs), std::end(MMemObjs),
+                           [=](ReqToMem Elem) { return (Elem.first == Req); });
+
+  if (Iter == std::end(MMemObjs)) {
+    throw("Invalid memory object used inside interop");
+  }
+
+  auto Plugin = MQueue->getPlugin();
+  pi_native_handle Handle;
+  Plugin.call<detail::PiApiKind::piextMemGetNativeHandle>(Iter->second,
+                                                          &Handle);
+  return Handle;
+}
+
+} // namespace sycl
+} // __SYCL_INLINE_NAMESPACE(cl)