[SYCL][NFC] Move sampler_impl to source dir (#2152)

Author: romanovvlad

sycl/CMakeLists.txt

@@ -14,7 +14,7 @@ include(AddSYCLExecutable)
 set(SYCL_MAJOR_VERSION 2)
 set(SYCL_MINOR_VERSION 1)
 set(SYCL_PATCH_VERSION 0)
-set(SYCL_DEV_ABI_VERSION 1)
+set(SYCL_DEV_ABI_VERSION 2)
 if (SYCL_ADD_DEV_VERSION_POSTFIX)
   set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")
 endif()

sycl/include/CL/sycl/sampler.hpp

@@ -12,7 +12,6 @@
 #include <CL/sycl/access/access.hpp>
 #include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/export.hpp>
-#include <CL/sycl/detail/sampler_impl.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
@@ -40,6 +39,23 @@ template <typename DataT, int Dimensions, access::mode AccessMode,
 class image_accessor;
 }
 
+namespace detail {
+#ifdef __SYCL_DEVICE_ONLY__
+class __SYCL_EXPORT sampler_impl {
+public:
+  sampler_impl() = default;
+
+  sampler_impl(__ocl_sampler_t Sampler) : m_Sampler(Sampler) {}
+
+  ~sampler_impl() = default;
+
+  __ocl_sampler_t m_Sampler;
+};
+#else
+class sampler_impl;
+#endif
+} // namespace detail
+
 /// Encapsulates a configuration for sampling an image accessor.
 ///
 /// \sa sycl_api_acc

sycl/source/detail/sampler_impl.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <CL/sycl/detail/sampler_impl.hpp>
 #include <detail/context_impl.hpp>
+#include <detail/sampler_impl.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

sycl/include/CL/sycl/detail/sampler_impl.hpp renamed to sycl/source/detail/sampler_impl.hpp

@@ -24,11 +24,6 @@ enum class coordinate_normalization_mode : unsigned int;
 namespace detail {
 class __SYCL_EXPORT sampler_impl {
 public:
-#ifdef __SYCL_DEVICE_ONLY__
-  __ocl_sampler_t m_Sampler;
-  sampler_impl(__ocl_sampler_t Sampler) : m_Sampler(Sampler) {}
-  sampler_impl() = default;
-#else
   std::unordered_map<context, RT::PiSampler> m_contextToSampler;
 
 private:
@@ -49,13 +44,8 @@ class __SYCL_EXPORT sampler_impl {
   coordinate_normalization_mode get_coordinate_normalization_mode() const;
 
   RT::PiSampler getOrCreateSampler(const context &Context);
-#endif
 
-#ifdef __SYCL_DEVICE_ONLY__
-  ~sampler_impl() = default;
-#else
   ~sampler_impl();
-#endif
 };
 
 } // namespace detail

sycl/source/detail/scheduler/commands.cpp

@@ -22,6 +22,7 @@
 #include <detail/kernel_info.hpp>
 #include <detail/program_manager/program_manager.hpp>
 #include <detail/queue_impl.hpp>
+#include <detail/sampler_impl.hpp>
 #include <detail/scheduler/commands.hpp>
 #include <detail/scheduler/scheduler.hpp>
 

sycl/source/sampler.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <CL/sycl/sampler.hpp>
+#include <detail/sampler_impl.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {

sycl/test/abi/symbol_size.cpp

@@ -8,7 +8,6 @@
 #include <CL/sycl/detail/accessor_impl.hpp>
 #include <CL/sycl/detail/buffer_impl.hpp>
 #include <CL/sycl/detail/image_impl.hpp>
-#include <CL/sycl/detail/sampler_impl.hpp>
 #include <CL/sycl/detail/stream_impl.hpp>
 #include <CL/sycl/device.hpp>
 #include <CL/sycl/device_event.hpp>
@@ -69,13 +68,6 @@ int main() {
 #ifdef __SYCL_DEVICE_ONLY__
   check_size<private_memory<int, 1>, 4>();
   check_size<detail::sampler_impl, 8>();
-#else
-  check_size<private_memory<int, 1>, 8>();
-#ifdef _MSC_VER
-  check_size<detail::sampler_impl, 80>();
-#else
-  check_size<detail::sampler_impl, 72>();
-#endif
 #endif
   check_size<program, 16>();
   check_size<range<1>, 8>();