[SYCL] Add device_type into sycl-ls prefix

By adding the device_type into each device prefix listing in sycl-ls,
the user can easily set SYCL_DEVICE_FILTER correctly.

Signed-off-by: Byoungro So <[email protected]>

Author: bso-intel

sycl/doc/EnvironmentVariables.md

@@ -65,7 +65,7 @@ Possible values of "device_type" are:
 - acc
 - \*
 
-Device_num is an integer that indexes the enumeration of devices from the sycl-ls utility tool, where the first device in that enumeration has index zero in each backend. For example, SYCL_DEVICE_FILTER=2 will return all devices with index '2' from all different backends. If multiple devices satisfy this device number (e.g., GPU and CPU devices can be assigned device number '2'), then default_selector will choose the device with the highest heuristic point. 
+Device_num is an integer that indexes the enumeration of devices from the sycl-ls utility tool, where the first device in that enumeration has index zero in each platform. For example, SYCL_DEVICE_FILTER=2 will return all devices with index '2' from all different platforms. If multiple devices satisfy this device number (e.g., GPU and CPU devices can be assigned device number '2'), then default_selector will choose the device with the highest heuristic point. 
 
 Assuming a filter has all three elements of the triple, it selects only those devices that come from the given backend, have the specified device type, AND have the given device index. If more than one filter is specified, the RT is restricted to the union of devices selected by all filters. The RT does not include the "host" backend and the host device automatically unless one of the filters explicitly specifies the "host" device type. Therefore, SYCL_DEVICE_FILTER=host should be set to enforce SYCL to use the host device only. 
 

sycl/tools/sycl-ls/sycl-ls.cpp

@@ -38,27 +38,24 @@ class custom_selector : public device_selector {
   }
 };
 
-static void printDeviceInfo(const device &Device, const std::string &Prepend) {
+std::string getDeviceTypeName(const device &Device) {
   auto DeviceType = Device.get_info<info::device::device_type>();
-  std::string DeviceTypeName;
   switch (DeviceType) {
   case info::device_type::cpu:
-    DeviceTypeName = "CPU ";
-    break;
+    return "cpu";
   case info::device_type::gpu:
-    DeviceTypeName = "GPU ";
-    break;
+    return "gpu";
   case info::device_type::host:
-    DeviceTypeName = "HOST";
-    break;
+    return "host";
   case info::device_type::accelerator:
-    DeviceTypeName = "ACC ";
-    break;
+    return "acc";
   default:
-    DeviceTypeName = "UNKNOWN";
-    break;
+    return "unknown";
   }
+}
 
+static void printDeviceInfo(const device &Device, const std::string &Prepend) {
+  std::string DeviceTypeName = getDeviceTypeName(Device);
   auto DeviceVersion = Device.get_info<info::device::version>();
   auto DeviceName = Device.get_info<info::device::name>();
   auto DeviceVendor = Device.get_info<info::device::vendor>();
@@ -73,17 +70,16 @@ static void printDeviceInfo(const device &Device, const std::string &Prepend) {
   } else {
     auto DevicePlatform = Device.get_info<info::device::platform>();
     auto DevicePlatformName = DevicePlatform.get_info<info::platform::name>();
-    std::cout << Prepend << DeviceTypeName << ": " << DevicePlatformName << " "
-              << DeviceVersion << " [" << DeviceDriverVersion << "]"
-              << std::endl;
+    std::cout << Prepend << " : " << DevicePlatformName << " " << DeviceVersion
+              << " [" << DeviceDriverVersion << "]" << std::endl;
   }
 }
 
 static void printSelectorChoice(const device_selector &Selector,
                                 const std::string &Prepend) {
   try {
     const auto &Dev = device(Selector);
-    printDeviceInfo(Dev, Prepend);
+    printDeviceInfo(Dev, Prepend + getDeviceTypeName(Dev));
 
   } catch (const cl::sycl::runtime_error &Exception) {
     // Truncate long string so it can fit in one-line
@@ -132,7 +128,8 @@ int main(int argc, char **argv) {
         std::cout << "        Device [#" << DeviceNum << "]:" << std::endl;
       else {
         backend Backend = Platform.get_backend();
-        std::cout << "[" << Backend << ":" << DeviceNum << "] ";
+        std::cout << "[" << Backend << ":" << getDeviceTypeName(Device) << ":"
+                  << DeviceNum << "]";
       }
       ++DeviceNum;
       printDeviceInfo(Device, verbose ? "        " : "");