[SYCL] Make host device and host platform always available (#992)

Make host device and host platform always available, even when forcing a device type with SYCL_DEVICE_TYPE

Signed-off-by: James Brodman <[email protected]>

Author: jbrodman

sycl/source/detail/platform_impl.cpp

@@ -41,8 +41,8 @@ vector_class<platform> platform_impl::get_platforms() {
     }
   }
 
-  if (ForcedType == info::device_type::host || ForcedType == info::device_type::all)
-    Platforms.emplace_back(platform());
+  // The host platform should always be available.
+  Platforms.emplace_back(platform());
 
   return Platforms;
 }

sycl/source/device.cpp

@@ -41,10 +41,18 @@ vector_class<device> device::get_devices(info::device_type deviceType) {
   if (detail::match_types(deviceType, forced_type)) {
     detail::force_type(deviceType, forced_type);
     for (const auto &plt : platform::get_platforms()) {
-      vector_class<device> found_devices(plt.get_devices(deviceType));
-      if (!found_devices.empty())
-        devices.insert(devices.end(), found_devices.begin(),
-                       found_devices.end());
+      // Host device must always be available.
+      if (plt.is_host()) {
+        vector_class<device> host_device(
+            plt.get_devices(info::device_type::host));
+        if (!host_device.empty())
+          devices.insert(devices.end(), host_device.begin(), host_device.end());
+      } else {
+        vector_class<device> found_devices(plt.get_devices(deviceType));
+        if (!found_devices.empty())
+          devices.insert(devices.end(), found_devices.begin(),
+                         found_devices.end());
+      }
     }
   }
   return devices;

sycl/test/basic_tests/host_always_works.cpp

@@ -0,0 +1,23 @@
+// RUN: %clangxx -fsycl %s -o %t1.out
+// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
+// RUN: %CPU_RUN_PLACEHOLDER %t1.out
+// RUN: %GPU_RUN_PLACEHOLDER %t1.out
+// RUN: %ACC_RUN_PLACEHOLDER %t1.out
+
+//==------ host_always_works.cpp - Host Device Availability test -----------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+int main() {
+  device(host_selector{});
+  
+  return 0;
+}

sycl/test/basic_tests/host_platform_avail.cpp

@@ -0,0 +1,32 @@
+// RUN: %clangxx -fsycl %s -o %t1.out
+// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
+// RUN: %CPU_RUN_PLACEHOLDER %t1.out
+// RUN: %GPU_RUN_PLACEHOLDER %t1.out
+// RUN: %ACC_RUN_PLACEHOLDER %t1.out
+
+//==------ host_platform_avail.cpp - Host Platform Availability test -------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+int main() {
+  auto plats = platform::get_platforms();
+  bool found_host = false;
+
+  // Look for a host platform
+  for (const auto &plat : plats)  {
+    if (plat.is_host()) {
+      found_host = true;
+    }
+  }
+
+  // Fail if we didn't find a host platform
+  return (!found_host);
+}