More C-API tests for composite devices

Rename some variables for consistency

Author: ndgrigorian

dpctl/_sycl_device.pyx

@@ -1765,11 +1765,11 @@ cdef class SyclDevice(_SyclDevice):
                 The composite :class:`dpctl.SyclDevice` instance for a
                 component device, or ``None`` for a non-component device.
         """
-        cdef DPCTLSyclDeviceRef cDRef = NULL
-        cDRef = DPCTLDevice_GetCompositeDevice(self._device_ref)
-        if (cDRef is NULL):
+        cdef DPCTLSyclDeviceRef CDRef = NULL
+        CDRef = DPCTLDevice_GetCompositeDevice(self._device_ref)
+        if (CDRef is NULL):
             return None
-        return SyclDevice._create(cDRef)
+        return SyclDevice._create(CDRef)
 
     def component_devices(self):
         """ Returns a list of component devices contained in this SYCL device.

libsyclinterface/tests/test_sycl_device_interface.cpp

@@ -539,6 +539,18 @@ TEST_P(TestDPCTLSyclDeviceInterface, ChkGetGlobalMemCacheType)
                  res == DPCTL_MEM_CACHE_TYPE_READ_WRITE));
 }
 
+TEST_P(TestDPCTLSyclDeviceInterface, ChkGetCompositeDevice)
+{
+    DPCTLSyclDeviceRef CDRef = nullptr;
+    EXPECT_NO_FATAL_FAILURE(CDRef = DPCTLDevice_GetCompositeDevice(DRef));
+    if (DPCTLDevice_HasAspect(DRef, DPCTLSyclAspectType::is_component)) {
+        EXPECT_TRUE(CDRef != nullptr);
+    }
+    else {
+        EXPECT_TRUE(CDRef == nullptr);
+    }
+}
+
 INSTANTIATE_TEST_SUITE_P(DPCTLDeviceFns,
                          TestDPCTLSyclDeviceInterface,
                          ::testing::Values("opencl",
@@ -898,3 +910,18 @@ TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetSubGroupSizes)
     ASSERT_TRUE(sg_sizes == nullptr);
     ASSERT_TRUE(sg_sizes_len == 0);
 }
+
+TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetComponentDevices)
+{
+    DPCTLDeviceVectorRef cDVRef = nullptr;
+    EXPECT_NO_FATAL_FAILURE(cDVRef =
+                                DPCTLDevice_GetComponentDevices(Null_DRef));
+    ASSERT_TRUE(cDVRef == nullptr);
+}
+
+TEST_F(TestDPCTLSyclDeviceNullArgs, ChkGetCompositeDevice)
+{
+    DPCTLSyclDeviceRef CDRef = nullptr;
+    EXPECT_NO_FATAL_FAILURE(CDRef = DPCTLDevice_GetCompositeDevice(Null_DRef));
+    EXPECT_TRUE(CDRef == nullptr);
+}

libsyclinterface/tests/test_sycl_platform_interface.cpp

@@ -113,6 +113,28 @@ void check_platform_get_devices(__dpctl_keep const DPCTLSyclPlatformRef PRef)
     EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(DVRef));
 }
 
+void check_platform_get_composite_devices(
+    __dpctl_keep const DPCTLSyclPlatformRef PRef)
+{
+    DPCTLDeviceVectorRef CDVRef = nullptr;
+    size_t nCDevices = 0;
+
+    EXPECT_NO_FATAL_FAILURE(CDVRef = DPCTLPlatform_GetCompositeDevices(PRef));
+    EXPECT_TRUE(CDVRef != nullptr);
+    EXPECT_NO_FATAL_FAILURE(nCDevices = DPCTLDeviceVector_Size(CDVRef));
+    for (auto i = 0ul; i < nCDevices; ++i) {
+        DPCTLSyclDeviceRef CDRef = nullptr;
+        EXPECT_NO_FATAL_FAILURE(CDRef = DPCTLDeviceVector_GetAt(CDVRef, i));
+        ASSERT_TRUE(CDRef != nullptr);
+        ASSERT_TRUE(
+            DPCTLDevice_HasAspect(CDRef, DPCTLSyclAspectType::is_composite));
+        EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(CDRef));
+    }
+
+    EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Clear(CDVRef));
+    EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(CDVRef));
+}
+
 } // namespace
 
 struct TestDPCTLSyclPlatformInterface
@@ -308,6 +330,11 @@ TEST_P(TestDPCTLSyclPlatformInterface, ChkGetDevices)
     check_platform_get_devices(PRef);
 }
 
+TEST_P(TestDPCTLSyclPlatformInterface, ChkGetCompositeDevices)
+{
+    check_platform_get_composite_devices(PRef);
+}
+
 TEST_F(TestDPCTLSyclDefaultPlatform, ChkGetName) { check_platform_name(PRef); }
 
 TEST_F(TestDPCTLSyclDefaultPlatform, ChkGetVendor)