Move UR device type conversion to separate function

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/source/detail/allowlist.cpp

@@ -399,25 +399,7 @@ void applyAllowList(std::vector<ur_device_handle_t> &UrDevices,
         Device, UR_DEVICE_INFO_TYPE, sizeof(UrDevType), &UrDevType, nullptr);
     // TODO need mechanism to do these casts, there's a bunch of this sort of
     // thing
-    sycl::info::device_type DeviceType = [UrDevType]() {
-      switch (UrDevType) {
-      default:
-      case UR_DEVICE_TYPE_ALL:
-        return info::device_type::all;
-      case UR_DEVICE_TYPE_GPU:
-        return info::device_type::gpu;
-      case UR_DEVICE_TYPE_CPU:
-        return info::device_type::cpu;
-      case UR_DEVICE_TYPE_FPGA:
-        return info::device_type::accelerator;
-      case UR_DEVICE_TYPE_CUSTOM:
-      case UR_DEVICE_TYPE_MCA:
-      case UR_DEVICE_TYPE_VPU:
-        return info::device_type::custom;
-      case UR_DEVICE_TYPE_DEFAULT:
-        return info::device_type::automatic;
-      }
-    }();
+    sycl::info::device_type DeviceType = detail::ConvertDeviceType(UrDevType);
     for (const auto &SyclDeviceType :
          getSyclDeviceTypeMap<true /*Enable 'acc'*/>()) {
       if (SyclDeviceType.second == DeviceType) {

sycl/source/detail/device_impl.hpp

@@ -64,6 +64,29 @@ ConvertAffinityDomain(const ur_device_affinity_domain_flags_t Domain) {
   }
 }
 
+inline info::device_type ConvertDeviceType(ur_device_type_t UrDevType) {
+  switch (UrDevType) {
+  case UR_DEVICE_TYPE_DEFAULT:
+    return info::device_type::automatic;
+  case UR_DEVICE_TYPE_ALL:
+    return info::device_type::all;
+  case UR_DEVICE_TYPE_GPU:
+    return info::device_type::gpu;
+  case UR_DEVICE_TYPE_CPU:
+    return info::device_type::cpu;
+  case UR_DEVICE_TYPE_FPGA:
+    return info::device_type::accelerator;
+  case UR_DEVICE_TYPE_MCA:
+  case UR_DEVICE_TYPE_VPU:
+  case UR_DEVICE_TYPE_CUSTOM:
+    return info::device_type::custom;
+  default:
+    assert(false);
+    // FIXME: what is that???
+    return info::device_type::custom;
+  }
+}
+
 // Note that UR's enums have weird *_FORCE_UINT32 values, we ignore them in the
 // callers. But we also can't write a fully-covered switch without mentioning it
 // there, which wouldn't make any sense. As such, ensure that "real" values
@@ -582,28 +605,7 @@ class device_impl : public std::enable_shared_from_this<device_impl> {
     // device_traits.def
 
     CASE(info::device::device_type) {
-      using device_type = info::device_type;
-      switch (get_info_impl<UR_DEVICE_INFO_TYPE>()) {
-      case UR_DEVICE_TYPE_DEFAULT:
-        return device_type::automatic;
-      case UR_DEVICE_TYPE_ALL:
-        return device_type::all;
-      case UR_DEVICE_TYPE_GPU:
-        return device_type::gpu;
-      case UR_DEVICE_TYPE_CPU:
-        return device_type::cpu;
-      case UR_DEVICE_TYPE_FPGA:
-        return device_type::accelerator;
-      case UR_DEVICE_TYPE_MCA:
-      case UR_DEVICE_TYPE_VPU:
-      case UR_DEVICE_TYPE_CUSTOM:
-        return device_type::custom;
-      default: {
-        assert(false);
-        // FIXME: what is that???
-        return device_type::custom;
-      }
-      }
+      return detail::ConvertDeviceType(get_info_impl<UR_DEVICE_INFO_TYPE>());
     }
 
     CASE(info::device::max_work_item_sizes<3>) {

sycl/source/detail/platform_impl.cpp

@@ -248,25 +248,7 @@ platform_impl::filterDeviceFilter(std::vector<ur_device_handle_t> &UrDevices,
     MAdapter->call<UrApiKind::urDeviceGetInfo>(Device, UR_DEVICE_INFO_TYPE,
                                                sizeof(ur_device_type_t),
                                                &UrDevType, nullptr);
-    info::device_type DeviceType = [UrDevType]() {
-      switch (UrDevType) {
-      default:
-      case UR_DEVICE_TYPE_ALL:
-        return info::device_type::all;
-      case UR_DEVICE_TYPE_GPU:
-        return info::device_type::gpu;
-      case UR_DEVICE_TYPE_CPU:
-        return info::device_type::cpu;
-      case UR_DEVICE_TYPE_FPGA:
-        return info::device_type::accelerator;
-      case UR_DEVICE_TYPE_CUSTOM:
-      case UR_DEVICE_TYPE_MCA:
-      case UR_DEVICE_TYPE_VPU:
-        return info::device_type::custom;
-      case UR_DEVICE_TYPE_DEFAULT:
-        return info::device_type::automatic;
-      }
-    }();
+    info::device_type DeviceType = detail::ConvertDeviceType(UrDevType);
 
     for (const FilterT &Filter : FilterList->get()) {
       backend FilterBackend = Filter.Backend.value_or(backend::all);