Remove properties check

Signed-off-by: Dmitry Sidorov <[email protected]>

Author: MrSidims

sycl/plugins/opencl/pi_opencl.cpp

@@ -23,7 +23,6 @@
 #include <iostream>
 #include <limits>
 #include <map>
-#include <set>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -36,7 +35,6 @@
   }
 
 const char SupportedVersion[] = _PI_H_VERSION_STRING;
-std::map<pi_context, std::set<std::string>> SupportedExtensions;
 
 // Want all the needed casts be explicit, do not define conversion operators.
 template <class To, class From> To cast(From value) {
@@ -70,39 +68,6 @@ CONSTFIX char clSetProgramSpecializationConstantName[] =
 
 #undef CONSTFIX
 
-// Helper to get extensions that are common for all devices within a context
-pi_result getSupportedExtensionsWithinContext(pi_context context) {
-  size_t deviceCount;
-  cl_int ret_err = clGetContextInfo(
-      cast<cl_context>(context), CL_CONTEXT_DEVICES, 0, nullptr, &deviceCount);
-  if (ret_err != CL_SUCCESS || deviceCount < 1)
-    return PI_INVALID_CONTEXT;
-  std::vector<cl_device_id> devicesInCtx(deviceCount);
-  ret_err = clGetContextInfo(cast<cl_context>(context), CL_CONTEXT_DEVICES,
-                             deviceCount * sizeof(cl_device_id),
-                             devicesInCtx.data(), nullptr);
-
-  size_t retSize;
-  std::set<std::string> commonExtensions;
-  for (size_t i = 0; i != deviceCount; ++i) {
-    ret_err = clGetDeviceInfo(devicesInCtx[i], CL_DEVICE_EXTENSIONS, 0, nullptr,
-                              &retSize);
-    if (ret_err != CL_SUCCESS)
-      return PI_INVALID_DEVICE;
-    std::string extensions(retSize, '\0');
-    ret_err = clGetDeviceInfo(devicesInCtx[i], CL_DEVICE_EXTENSIONS, retSize,
-                              &extensions[0], nullptr);
-    if (ret_err != CL_SUCCESS)
-      return PI_INVALID_DEVICE;
-    std::string extension;
-    std::stringstream ss(extensions);
-    while (getline(ss, extension, ' '))
-      commonExtensions.insert(extension);
-  }
-  SupportedExtensions.emplace(context, commonExtensions);
-  return cast<pi_result>(ret_err);
-}
-
 // USM helper function to get an extension function pointer
 template <const char *FuncName, typename T>
 static pi_result getExtFuncFromContext(pi_context context, T *fptr) {
@@ -561,37 +526,18 @@ pi_result piMemBufferCreate(pi_context context, pi_mem_flags flags, size_t size,
                             const pi_mem_properties *properties) {
   pi_result ret_err = PI_INVALID_OPERATION;
   if (properties) {
+    // TODO: need to check if all properties are supported by OpenCL RT and
+    // ignore unsupported
     clCreateBufferWithPropertiesINTEL_fn FuncPtr = nullptr;
-    const size_t propSize = sizeof(properties) / sizeof(pi_mem_properties);
     // First we need to look up the function pointer
     ret_err = getExtFuncFromContext<clCreateBufferWithPropertiesName,
                                     clCreateBufferWithPropertiesINTEL_fn>(
         context, &FuncPtr);
     if (FuncPtr) {
-      std::vector<pi_mem_properties> supported(properties,
-                                               properties + propSize);
-      // Go through buffer properties. If there is one, that shall be propagated
-      // to an OpenCL runtime - check if this property is being supported.
-      for (auto prop = supported.begin(); prop != supported.end(); ++prop) {
-        if (SupportedExtensions.find(context) == SupportedExtensions.end())
-          ret_err = getSupportedExtensionsWithinContext(context);
-        // Check if PI_MEM_PROPERTIES_CHANNEL property is supported. If it's
-        // not - just ignore it, as it's an optimization hint.
-        if (*prop == PI_MEM_PROPERTIES_CHANNEL) {
-          if (SupportedExtensions[context].find(
-                  "cl_intel_mem_channel_property") ==
-              SupportedExtensions[context].end())
-            prop = supported.erase(prop);
-        } else
-          assert(!"Unsupported property found");
-      }
-      if (!supported.empty()) {
-        *ret_mem =
-            cast<pi_mem>(FuncPtr(cast<cl_context>(context), supported.data(),
-                                 cast<cl_mem_flags>(flags), size, host_ptr,
-                                 cast<cl_int *>(&ret_err)));
-        return ret_err;
-      }
+      *ret_mem = cast<pi_mem>(FuncPtr(cast<cl_context>(context), properties,
+                                      cast<cl_mem_flags>(flags), size, host_ptr,
+                                      cast<cl_int *>(&ret_err)));
+      return ret_err;
     }
   }