React to offline comments

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

Author: Alexander Batashev

sycl/include/CL/sycl/device.hpp

@@ -21,11 +21,7 @@ namespace sycl {
 class device_selector;
 namespace detail {
 class device_impl;
-
-// Helper function to avoid calls to implementation detail methods.
-pi_device getRawDevice(device &D);
 }
-
 class device {
 public:
   /// Constructs a SYCL device instance as a host device.

sycl/include/CL/sycl/intel/function_pointer.hpp

@@ -28,6 +28,11 @@ namespace intel {
 
 using device_func_ptr_holder_t = cl_ulong;
 
+namespace detail {
+device_func_ptr_holder_t getDeviceFunctionPointerImpl(device &D, program &P,
+                                                      const char *FuncName);
+}
+
 /// \brief this function performs a cast from device_func_ptr_holder_t type
 /// to the provided function pointer type.
 template <
@@ -77,13 +82,7 @@ device_func_ptr_holder_t get_device_func_ptr(FuncType F, const char *FuncName,
         "Program must be built before passing to get_device_func_ptr");
   }
 
-  device_func_ptr_holder_t FPtr = 0;
-  // FIXME: return value must be checked here, but since we cannot yet check
-  // if corresponding extension is supported, let's silently ignore it here.
-  PI_CALL(piextGetDeviceFunctionPointer)(
-      detail::getRawDevice(D), detail::getRawProgram(P), FuncName, &FPtr);
-
-  return FPtr;
+  return detail::getDeviceFunctionPointerImpl(D, P, FuncName);
 }
 
 } // namespace intel

sycl/include/CL/sycl/program.hpp

@@ -23,9 +23,6 @@ class context;
 class device;
 namespace detail {
 class program_impl;
-
-// Helper function to avoid calls to implementation detail methods.
-pi_program getRawProgram(program &P);
 }
 
 enum class program_state { none, compiled, linked };

sycl/source/CMakeLists.txt

@@ -88,6 +88,7 @@ set(SYCL_SOURCES
     "event.cpp"
     "exception.cpp"
     "exception_list.cpp"
+    "function_pointer.cpp"
     "half_type.cpp"
     "handler.cpp"
     "kernel.cpp"

sycl/source/device.cpp

@@ -22,9 +22,6 @@ void force_type(info::device_type &t, const info::device_type &ft) {
     throw cl::sycl::invalid_parameter_error("No device of forced type.");
   }
 }
-pi_device getRawDevice(device &D) {
-  return detail::pi::cast<pi_device>(detail::getSyclObjImpl(D)->getHandleRef());
-}
 } // namespace detail
 
 device::device() : impl(std::make_shared<detail::device_impl>()) {}

sycl/source/function_pointer.cpp

@@ -0,0 +1,32 @@
+//==----------- function_pointer.cpp --- SYCL Function pointers ------------==//
+//
+// 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/intel/function_pointer.hpp>
+#include <CL/sycl/detail/device_impl.hpp>
+#include <CL/sycl/detail/program_impl.hpp>
+
+__SYCL_INLINE namespace cl {
+namespace sycl {
+namespace intel {
+namespace detail {
+device_func_ptr_holder_t getDeviceFunctionPointerImpl(device &D, program &P,
+                                                      const char *FuncName) {
+  device_func_ptr_holder_t FPtr = 0;
+  // FIXME: return value must be checked here, but since we cannot yet check
+  // if corresponding extension is supported, let's silently ignore it here.
+  PI_CALL(piextGetDeviceFunctionPointer)(
+      sycl::detail::pi::cast<pi_device>(sycl::detail::getSyclObjImpl(D)->getHandleRef()),
+      sycl::detail::pi::cast<pi_program>(sycl::detail::getSyclObjImpl(P)->getHandleRef()),
+      FuncName, &FPtr);
+  return FPtr;
+}
+
+} // namespace detail
+} // namespace intel
+} // namespace sycl
+} // namespace cl

sycl/source/program.cpp

@@ -13,12 +13,7 @@
 
 __SYCL_INLINE namespace cl {
 namespace sycl {
-namespace detail {
-pi_program getRawProgram(program &P) {
-  return detail::pi::cast<pi_program>(
-      detail::getSyclObjImpl(P)->getHandleRef());
-}
-} // namespace detail
+
 program::program(const context &context)
     : impl(std::make_shared<detail::program_impl>(
           detail::getSyclObjImpl(context))) {}