[SYCL][CUDA] CUDA OpenCL platform ignored in get_devices

CUDA OpenCL platform is ignored on get_devices as suggested by feedback

Signed-off-by: Ruyman Reyes <ruyman@codeplay.com>

Author: Ruyman Reyes

sycl/source/detail/platform_impl.cpp

@@ -196,6 +196,41 @@ static void filterAllowList(vector_class<RT::PiDevice> &PiDevices,
   PiDevices.resize(InsertIDx);
 }
 
+
+// @return True if the device is invalid for the current backend preferences
+static bool isDeviceInvalidForBe(const device &Device) {
+
+  if (Device.is_host())
+    return false;
+
+  // Taking the version information from the platform gives us more useful
+  // information than the driver_version of the device.
+  const platform platform = Device.get_info<info::device::platform>();
+  const std::string platformVersion =
+      platform.get_info<info::platform::version>();
+
+  backend *BackendPref = detail::SYCLConfig<detail::SYCL_BE>::get();
+  auto BackendType = detail::getSyclObjImpl(Device)->getPlugin().getBackend();
+  static_assert(std::is_same<backend, decltype(BackendType)>(),
+                "Type is not the same");
+
+  // If no preference, assume OpenCL and reject CUDA backend
+  if (BackendType == backend::cuda && !BackendPref) {
+    return true;
+  } else if (!BackendPref)
+    return false;
+
+  // If using PI_CUDA, don't accept a non-CUDA device
+  if (BackendType == backend::opencl && *BackendPref == backend::cuda)
+    return true;
+
+  // If using PI_OPENCL, don't accept a non-OpenCL device
+  if (BackendType == backend::cuda && *BackendPref == backend::opencl)
+    return true;
+
+  return false;
+}
+
 vector_class<device>
 platform_impl::get_devices(info::device_type DeviceType) const {
   vector_class<device> Res;
@@ -236,6 +271,9 @@ platform_impl::get_devices(info::device_type DeviceType) const {
                            PiDevice, std::make_shared<platform_impl>(*this)));
                  });
 
+  Res.erase(std::remove_if(Res.begin(), Res.end(), isDeviceInvalidForBe), 
+    Res.end());
+
   return Res;
 }
 

sycl/source/device_selector.cpp

@@ -29,40 +29,6 @@ static bool isDeviceOfPreferredSyclBe(const device &Device) {
          backend::opencl;
 }
 
-// @return True if the device is invalid for the current backend preferences
-static bool isDeviceInvalidForBe(const device &Device) {
-
-  if (Device.is_host())
-    return false;
-
-  // Taking the version information from the platform gives us more useful
-  // information than the driver_version of the device.
-  const platform platform = Device.get_info<info::device::platform>();
-  const std::string platformVersion =
-      platform.get_info<info::platform::version>();
-
-  backend *BackendPref = detail::SYCLConfig<detail::SYCL_BE>::get();
-  auto BackendType = detail::getSyclObjImpl(Device)->getPlugin().getBackend();
-  static_assert(std::is_same<backend, decltype(BackendType)>(),
-                "Type is not the same");
-
-  // If no preference, assume OpenCL and reject CUDA backend
-  if (BackendType == backend::cuda && !BackendPref) {
-    return true;
-  } else if (!BackendPref)
-    return false;
-
-  // If using PI_CUDA, don't accept a non-CUDA device
-  if (BackendType == backend::opencl && *BackendPref == backend::cuda)
-    return true;
-
-  // If using PI_OPENCL, don't accept a non-OpenCL device
-  if (BackendType == backend::cuda && *BackendPref == backend::opencl)
-    return true;
-
-  return false;
-}
-
 device device_selector::select_device() const {
   vector_class<device> devices = device::get_devices();
   int score = -1;
@@ -102,7 +68,8 @@ device device_selector::select_device() const {
     // preference to the device of the preferred BE.
     //
     if (score < dev_score ||
-        (score == dev_score && isDeviceOfPreferredSyclBe(dev))) {
+        (score == dev_score && isDeviceOfPreferredSyclBe(dev) 
+         && dev_score != -1)) {
       res = &dev;
       score = dev_score;
     }
@@ -131,9 +98,6 @@ int default_selector::operator()(const device &dev) const {
 
   int Score = -1;
 
-  if (isDeviceInvalidForBe(dev))
-    return -1;
-
   // Give preference to device of SYCL BE.
   if (isDeviceOfPreferredSyclBe(dev))
     Score = 50;
@@ -157,9 +121,6 @@ int default_selector::operator()(const device &dev) const {
 int gpu_selector::operator()(const device &dev) const {
   int Score = -1;
 
-  if (isDeviceInvalidForBe(dev))
-    return -1;
-
   if (dev.is_gpu()) {
     Score = 1000;
     // Give preference to device of SYCL BE.
@@ -172,9 +133,6 @@ int gpu_selector::operator()(const device &dev) const {
 int cpu_selector::operator()(const device &dev) const {
   int Score = -1;
 
-  if (isDeviceInvalidForBe(dev))
-    return -1;
-
   if (dev.is_cpu()) {
     Score = 1000;
 
@@ -188,9 +146,6 @@ int cpu_selector::operator()(const device &dev) const {
 int accelerator_selector::operator()(const device &dev) const {
   int Score = -1;
 
-  if (isDeviceInvalidForBe(dev))
-    return -1;
-
   if (dev.is_accelerator()) {
     Score = 1000;
     // Give preference to device of SYCL BE.
@@ -205,10 +160,8 @@ int host_selector::operator()(const device &dev) const {
   if (dev.is_host()) {
     Score = 1000;
     // Give preference to device of SYCL BE.
-    if (isDeviceOfPreferredSyclBe(dev)) {
+    if (isDeviceOfPreferredSyclBe(dev))
       Score += 50;
-    } else if (isDeviceInvalidForBe(dev))
-      return -1;
   }
   return Score;
 }