update context initialization.

Signed-off-by: rehana begam <[email protected]>

Author: rbegam

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -1576,7 +1576,7 @@ pi_result _pi_platform::populateDeviceCacheIfNeeded() {
 
         for (uint32_t i = 0; i < numQueueGroups; i++) {
           if (QueueProperties[i].flags &
-              ZE_COMMAND_QUEUE_GROUP_PROPERTY_FLAG_COMPUTE) {
+              ZE_COMMAND_QUEUE_GROUP_PROPERTY_FLAG_COMPUTE && QueueProperties[i].numQueues > 1) {
             Ordinals.push_back(i);
           }
         }
@@ -1833,29 +1833,25 @@ pi_result piDeviceGetInfo(pi_device Device, pi_device_info ParamName,
   case PI_DEVICE_INFO_VERSION:
     return ReturnValue(Device->Platform->ZeDriverApiVersion.c_str());
   case PI_DEVICE_INFO_PARTITION_MAX_SUB_DEVICES: {
-    uint32_t ZeSubDeviceCount = 0;
-    if (Device->isSubDevice()) {
-      pi_result Res = Device->Platform->populateDeviceCacheIfNeeded();
-      if (Res != PI_SUCCESS) {
-        return Res;
-      }
-
-      return ReturnValue(pi_uint32{(unsigned int)(Device->SubDevices.size())});
+    pi_result Res = Device->Platform->populateDeviceCacheIfNeeded();
+    if (Res != PI_SUCCESS) {
+      return Res;
     }
-    ZE_CALL(zeDeviceGetSubDevices, (ZeDevice, &ZeSubDeviceCount, nullptr));
-    return ReturnValue(pi_uint32{ZeSubDeviceCount});
+    return ReturnValue(pi_uint32{(unsigned int)(Device->SubDevices.size())});
   }
   case PI_DEVICE_INFO_REFERENCE_COUNT:
     return ReturnValue(pi_uint32{Device->RefCount});
   case PI_DEVICE_INFO_PARTITION_PROPERTIES: {
     // SYCL spec says: if this SYCL device cannot be partitioned into at least
     // two sub devices then the returned vector must be empty.
-    if (!Device->isSubDevice()) {
-      uint32_t ZeSubDeviceCount = 0;
-      ZE_CALL(zeDeviceGetSubDevices, (ZeDevice, &ZeSubDeviceCount, nullptr));
-      if (ZeSubDeviceCount < 2) {
-        return ReturnValue(pi_device_partition_property{0});
-      }
+    pi_result Res = Device->Platform->populateDeviceCacheIfNeeded();
+    if (Res != PI_SUCCESS) {
+      return Res;
+    }
+
+    uint32_t ZeSubDeviceCount = Device->SubDevices.size();
+    if (ZeSubDeviceCount < 2) {
+      return ReturnValue(pi_device_partition_property{0});
     }
     // It is debatable if SYCL sub-device and partitioning APIs sufficient to
     // expose Level Zero sub-devices?  We start with support of

sycl/plugins/level_zero/pi_level_zero.hpp

@@ -291,7 +291,7 @@ struct _pi_device : _pi_object {
   int32_t ZeComputeQueueGroupIndex;
   int32_t ZeCopyQueueGroupIndex;
 
-  // Keep the index of the compute engine 
+  // Keep the index of the compute engine
   int32_t ZeComputeEngineIndex = 0;
 
   // Cache the properties of the compute/copy queue groups.
@@ -363,6 +363,14 @@ struct _pi_context : _pi_object {
     // include root device itself as well)
     SingleRootDevice =
         Devices[0]->RootDevice ? Devices[0]->RootDevice : Devices[0];
+
+    // For context with sub subdevices, the SingleRootDevice might still
+    // not be the root device.
+    // Check whether the SingleRootDevice is the subdevice or root device.
+    if (SingleRootDevice->isSubDevice()) {
+      SingleRootDevice = SingleRootDevice->RootDevice;
+    }
+
     for (auto &Device : Devices) {
       if ((!Device->RootDevice && Device != SingleRootDevice) ||
           (Device->RootDevice && Device->RootDevice != SingleRootDevice)) {