fix device filtering logic

Author: PietroGhg

sycl/source/detail/device_filter.cpp

@@ -277,6 +277,19 @@ bool ods_target_list::backendCompatible(backend Backend) {
       });
 }
 
+bool ods_target_list::containsHost() {
+  for (const auto &Filter : TargetList) {
+    if (Filter.Backend == backend::host || Filter.Backend == backend::all)
+      if (Filter.DeviceType == info::device_type::host ||
+          Filter.DeviceType == info::device_type::all || !Filter.DeviceType)
+        // SYCL RT never creates more than one HOST device.
+        // All device numbers other than 0 are rejected.
+        if (!Filter.DeviceNum || Filter.DeviceNum == 0)
+          return true;
+  }
+  return false;
+}
+
 // ---------------------------------------
 // SYCL_DEVICE_FILTER support
 

sycl/source/detail/platform_impl.cpp

@@ -151,7 +151,10 @@ std::vector<platform> platform_impl::get_platforms() {
   // SYCL_DEVICE_FILTER
   detail::device_filter_list *FilterList =
       detail::SYCLConfig<detail::SYCL_DEVICE_FILTER>::get();
-  if (!FilterList || FilterList->backendCompatible(backend::host))
+  detail::ods_target_list *OdsTargetList =
+      detail::SYCLConfig<detail::ONEAPI_DEVICE_SELECTOR>::get();
+  if ((!FilterList || FilterList->backendCompatible(backend::host)) &&
+      (!OdsTargetList || OdsTargetList->backendCompatible(backend::host)))
     Platforms.emplace_back(
         createSyclObjFromImpl<platform>(platform_impl::getHostPlatformImpl()));
 
@@ -474,7 +477,8 @@ platform_impl::get_devices(info::device_type DeviceType) const {
                     DeviceType == info::device_type::all)) {
     // If SYCL_DEVICE_FILTER is set, check if filter contains host.
     device_filter_list *FilterList = SYCLConfig<SYCL_DEVICE_FILTER>::get();
-    if (!FilterList || FilterList->containsHost()) {
+    if ((!FilterList || FilterList->containsHost()) &&
+        (!OdsTargetList || OdsTargetList->containsHost())) {
       Res.push_back(
           createSyclObjFromImpl<device>(device_impl::getHostDeviceImpl()));
     }

sycl/source/device.cpp

@@ -66,6 +66,12 @@ std::vector<device> device::get_devices(info::device_type deviceType) {
       includeHost = false;
     else
       includeHost = FilterList->containsHost();
+  } else if (OdsTargetList) {
+    if (deviceType != info::device_type::host &&
+        deviceType != info::device_type::all)
+      includeHost = false;
+    else
+      includeHost = OdsTargetList->containsHost();
   } else {
     includeHost = detail::match_types(deviceType, info::device_type::host);
   }