[SYCL] Replaced cl_sampler_properties with pi_sampler_properties

Signed-off-by: Ivan Karachun <ivan.karachun@intel.com>

Author: Ivan Karachun

sycl/include/CL/sycl/detail/pi.h

@@ -155,6 +155,34 @@ typedef enum {
   PI_BUFFER_CREATE_TYPE_REGION = CL_BUFFER_CREATE_TYPE_REGION
 } _pi_buffer_create_type;
 
+typedef pi_bitfield pi_sampler_properties;
+const pi_bool PI_TRUE = CL_TRUE;
+const pi_bool PI_FALSE = CL_FALSE;
+
+typedef enum {
+ PI_SAMPLER_REFERENCE_COUNT   = CL_SAMPLER_REFERENCE_COUNT,
+ PI_SAMPLER_CONTEXT           = CL_SAMPLER_CONTEXT,
+ PI_SAMPLER_NORMALIZED_COORDS = CL_SAMPLER_NORMALIZED_COORDS,
+ PI_SAMPLER_ADDRESSING_MODE   = CL_SAMPLER_ADDRESSING_MODE,
+ PI_SAMPLER_FILTER_MODE       = CL_SAMPLER_FILTER_MODE,
+ PI_SAMPLER_MIP_FILTER_MODE   = CL_SAMPLER_MIP_FILTER_MODE,
+ PI_SAMPLER_LOD_MIN           = CL_SAMPLER_LOD_MIN,
+ PI_SAMPLER_LOD_MAX           = CL_SAMPLER_LOD_MAX
+} _pi_sampler_info;
+
+typedef enum {
+  PI_ADDRESS_MIRRORED_REPEAT = CL_ADDRESS_MIRRORED_REPEAT,
+  PI_ADDRESS_REPEAT          = CL_ADDRESS_REPEAT,
+  PI_ADDRESS_CLAMP_TO_EDGE   = CL_ADDRESS_CLAMP_TO_EDGE,
+  PI_ADDRESS_CLAMP           = CL_ADDRESS_CLAMP,
+  PI_ADDRESS_NONE            = CL_ADDRESS_NONE
+} _pi_addressing_mode;
+
+typedef enum {
+  PI_FILTER_NEAREST = CL_FILTER_NEAREST,
+  PI_FILTER_LINEAR  = CL_FILTER_LINEAR,
+} _pi_filter_mode;
+
 // NOTE: this is made 64-bit to match the size of cl_mem_flags to
 // make the translation to OpenCL transparent.
 // TODO: populate
@@ -187,6 +215,9 @@ typedef _pi_mem_type                pi_mem_type;
 typedef _pi_image_channel_order     pi_image_channel_order;
 typedef _pi_image_channel_type      pi_image_channel_type;
 typedef _pi_buffer_create_type      pi_buffer_create_type;
+typedef _pi_addressing_mode         pi_addressing_mode;
+typedef _pi_filter_mode             pi_filter_mode;
+typedef _pi_sampler_info            pi_sampler_info;
 
 // Opaque data type for compatibility with OpenMP.
 typedef void * _pi_offload_entry;
@@ -631,12 +662,12 @@ pi_result piEventRelease(pi_event event);
 //
 pi_result piSamplerCreate(
   pi_context                     context,
-  const cl_sampler_properties *  sampler_properties, // TODO: untie from OpenCL
+  const pi_sampler_properties *  sampler_properties,
   pi_sampler *                   result_sampler);
 
 pi_result piSamplerGetInfo(
   pi_sampler         sampler,
-  cl_sampler_info    param_name, // TODO: untie from OpenCL
+  pi_sampler_info    param_name,
   size_t             param_value_size,
   void *             param_value,
   size_t *           param_value_size_ret);

sycl/include/CL/sycl/detail/pi.hpp

@@ -44,6 +44,10 @@ namespace pi {
   using PiMemFlags             = ::pi_mem_flags;
   using PiEvent                = ::pi_event;
   using PiSampler              = ::pi_sampler;
+  using PiSamplerInfo          = ::pi_sampler_info;
+  using PiSamplerProperties    = ::pi_sampler_properties;
+  using PiAddressingMode       = ::pi_addressing_mode;
+  using PiFilterMode           = ::pi_filter_mode;
   using PiMemImageFormat       = ::pi_image_format;
   using PiMemImageDesc         = ::pi_image_desc;
   using PiMemImageInfo         = ::pi_image_info;

sycl/source/detail/pi_opencl.cpp

@@ -212,23 +212,23 @@ pi_result OCL(piProgramCreate)(pi_context context, const void *il,
 }
 
 pi_result OCL(piSamplerCreate)(pi_context context,
-                               const cl_sampler_properties *sampler_properties,
+                               const pi_sampler_properties *sampler_properties,
                                pi_sampler *result_sampler) {
   // Initialize properties according to OpenCL 2.1 spec.
   pi_result error_code;
-  cl_bool normalizedCoords = CL_TRUE;
-  cl_addressing_mode addressingMode = CL_ADDRESS_CLAMP;
-  cl_filter_mode filterMode = CL_FILTER_NEAREST;
+  pi_bool normalizedCoords = PI_TRUE;
+  pi_addressing_mode addressingMode = PI_ADDRESS_CLAMP;
+  pi_filter_mode filterMode = PI_FILTER_NEAREST;
 
   // Unpack sampler properties
   for (std::size_t i = 0; sampler_properties && sampler_properties[i] != 0;
        ++i) {
-    if (sampler_properties[i] == CL_SAMPLER_NORMALIZED_COORDS) {
-      normalizedCoords = sampler_properties[++i];
-    } else if (sampler_properties[i] == CL_SAMPLER_ADDRESSING_MODE) {
-      addressingMode = sampler_properties[++i];
-    } else if (sampler_properties[i] == CL_SAMPLER_FILTER_MODE) {
-      filterMode = sampler_properties[++i];
+    if (sampler_properties[i] == PI_SAMPLER_NORMALIZED_COORDS) {
+      normalizedCoords = (pi_bool)sampler_properties[++i];
+    } else if (sampler_properties[i] == PI_SAMPLER_ADDRESSING_MODE) {
+      addressingMode = (pi_addressing_mode)sampler_properties[++i];
+    } else if (sampler_properties[i] == PI_SAMPLER_FILTER_MODE) {
+      filterMode = (pi_filter_mode)sampler_properties[++i];
     } else {
       PI_ASSERT(false, "Cannot recognize sampler property");
     }

sycl/source/detail/sampler_impl.cpp

@@ -24,13 +24,13 @@ sampler_impl::sampler_impl(cl_sampler clSampler, const context &syclContext) {
   RT::PiSampler Sampler = pi::cast<RT::PiSampler>(clSampler);
   m_contextToSampler[syclContext] = Sampler;
   PI_CALL(RT::piSamplerRetain(Sampler));
-  PI_CALL(RT::piSamplerGetInfo(Sampler, CL_SAMPLER_NORMALIZED_COORDS,
-                               sizeof(cl_bool), &m_CoordNormMode, nullptr));
-  PI_CALL(RT::piSamplerGetInfo(Sampler, CL_SAMPLER_ADDRESSING_MODE,
-                               sizeof(cl_addressing_mode), &m_AddrMode,
+  PI_CALL(RT::piSamplerGetInfo(Sampler, PI_SAMPLER_NORMALIZED_COORDS,
+                               sizeof(pi_bool), &m_CoordNormMode, nullptr));
+  PI_CALL(RT::piSamplerGetInfo(Sampler, PI_SAMPLER_ADDRESSING_MODE,
+                               sizeof(pi_addressing_mode), &m_AddrMode,
                                nullptr));
-  PI_CALL(RT::piSamplerGetInfo(Sampler, CL_SAMPLER_FILTER_MODE,
-                               sizeof(cl_filter_mode), &m_FiltMode,
+  PI_CALL(RT::piSamplerGetInfo(Sampler, PI_SAMPLER_FILTER_MODE,
+                               sizeof(pi_filter_mode), &m_FiltMode,
                                nullptr));
 }
 
@@ -45,13 +45,13 @@ RT::PiSampler sampler_impl::getOrCreateSampler(const context &Context) {
   if (m_contextToSampler[Context])
     return m_contextToSampler[Context];
 
-  const cl_sampler_properties sprops[] = {
-      CL_SAMPLER_NORMALIZED_COORDS,
-      static_cast<cl_sampler_properties>(m_CoordNormMode),
-      CL_SAMPLER_ADDRESSING_MODE,
-      static_cast<cl_sampler_properties>(m_AddrMode),
-      CL_SAMPLER_FILTER_MODE,
-      static_cast<cl_sampler_properties>(m_FiltMode),
+  const pi_sampler_properties sprops[] = {
+      PI_SAMPLER_NORMALIZED_COORDS,
+      static_cast<pi_sampler_properties>(m_CoordNormMode),
+      PI_SAMPLER_ADDRESSING_MODE,
+      static_cast<pi_sampler_properties>(m_AddrMode),
+      PI_SAMPLER_FILTER_MODE,
+      static_cast<pi_sampler_properties>(m_FiltMode),
       0};
 
   RT::PiResult errcode_ret = PI_SUCCESS;