simplification of test_sycl_context_interface per PR feedback

Author: oleksandr-pavlyk

dpctl-capi/tests/test_sycl_context_interface.cpp

@@ -43,16 +43,20 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(vector_class<DPCTLSyclDeviceRef>,
 
 struct TestDPCTLContextInterface : public ::testing::TestWithParam<const char *>
 {
-    DPCTLSyclDeviceSelectorRef DSRef = nullptr;
+    DPCTLSyclDeviceRef DRef = nullptr;
 
     TestDPCTLContextInterface()
     {
-        EXPECT_NO_FATAL_FAILURE(DSRef = DPCTLFilterSelector_Create(GetParam()));
+        auto DS = DPCTLFilterSelector_Create(GetParam());
+        if (DS) {
+            EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DS));
+        }
+        DPCTLDeviceSelector_Delete(DS);
     }
 
     void SetUp()
     {
-        if (!DSRef) {
+        if (!DRef) {
             auto message = "Skipping as no device of type " +
                            std::string(GetParam()) + ".";
             GTEST_SKIP_(message.c_str());
@@ -61,32 +65,23 @@ struct TestDPCTLContextInterface : public ::testing::TestWithParam<const char *>
 
     ~TestDPCTLContextInterface()
     {
-        EXPECT_NO_FATAL_FAILURE(DPCTLDeviceSelector_Delete(DSRef));
+        EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     }
 };
 
 TEST_P(TestDPCTLContextInterface, Chk_Create)
 {
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
     EXPECT_NO_FATAL_FAILURE(CRef = DPCTLContext_Create(DRef, nullptr, 0));
     ASSERT_TRUE(CRef);
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
 }
 
 TEST_P(TestDPCTLContextInterface, Chk_CreateWithDevices)
 {
     size_t nCUs = 0;
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     DPCTLDeviceVectorRef DVRef = nullptr;
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
 
     /* TODO: Once we have wrappers for sub-device creation let us use those
      * functions.
@@ -108,7 +103,6 @@ TEST_P(TestDPCTLContextInterface, Chk_CreateWithDevices)
             GTEST_SKIP_("Skipping creating context for sub-devices");
         }
     }
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(DVRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
 }
@@ -117,12 +111,8 @@ TEST_P(TestDPCTLContextInterface, Chk_CreateWithDevices_GetDevices)
 {
     size_t nCUs = 0;
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     DPCTLDeviceVectorRef DVRef = nullptr;
     DPCTLDeviceVectorRef Res_DVRef = nullptr;
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
 
     /* TODO: Once we have wrappers for sub-device creation let us use those
      * functions.
@@ -151,7 +141,6 @@ TEST_P(TestDPCTLContextInterface, Chk_CreateWithDevices_GetDevices)
             GTEST_SKIP_("Skipping creating context for sub-devices");
         }
     }
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(DVRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(Res_DVRef));
@@ -160,30 +149,21 @@ TEST_P(TestDPCTLContextInterface, Chk_CreateWithDevices_GetDevices)
 TEST_P(TestDPCTLContextInterface, Chk_GetDevices)
 {
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     DPCTLDeviceVectorRef DVRef = nullptr;
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
     EXPECT_NO_FATAL_FAILURE(CRef = DPCTLContext_Create(DRef, nullptr, 0));
     ASSERT_TRUE(CRef);
     EXPECT_NO_FATAL_FAILURE(DVRef = DPCTLContext_GetDevices(CRef));
     ASSERT_TRUE(DVRef);
     EXPECT_TRUE(DPCTLDeviceVector_Size(DVRef) == 1);
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLDeviceVector_Delete(DVRef));
 }
 
 TEST_P(TestDPCTLContextInterface, Chk_AreEq)
 {
     DPCTLSyclContextRef CRef1 = nullptr, CRef2 = nullptr, CRef3 = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     bool are_eq = true, are_not_eq = false;
 
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
     EXPECT_NO_FATAL_FAILURE(CRef1 = DPCTLContext_Create(DRef, nullptr, 0));
     EXPECT_NO_FATAL_FAILURE(CRef2 = DPCTLContext_Copy(CRef1));
     // TODO: This work till DPC++ does not have a default context per device,
@@ -198,7 +178,6 @@ TEST_P(TestDPCTLContextInterface, Chk_AreEq)
     EXPECT_TRUE(are_eq);
     EXPECT_FALSE(are_not_eq);
 
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef1));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef2));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef3));
@@ -207,41 +186,31 @@ TEST_P(TestDPCTLContextInterface, Chk_AreEq)
 TEST_P(TestDPCTLContextInterface, Chk_IsHost)
 {
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     bool is_host_device = false, is_host_context = false;
 
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
     EXPECT_NO_FATAL_FAILURE(CRef = DPCTLContext_Create(DRef, nullptr, 0));
     ASSERT_TRUE(CRef);
 
     EXPECT_NO_FATAL_FAILURE(is_host_device = DPCTLDevice_IsHost(DRef));
     EXPECT_NO_FATAL_FAILURE(is_host_context = DPCTLContext_IsHost(CRef));
     EXPECT_TRUE(is_host_device == is_host_context);
 
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
 }
 
 TEST_P(TestDPCTLContextInterface, Chk_GetBackend)
 {
     DPCTLSyclContextRef CRef = nullptr;
-    DPCTLSyclDeviceRef DRef = nullptr;
     DPCTLSyclBackendType context_backend = DPCTL_UNKNOWN_BACKEND,
                          device_backend = DPCTL_UNKNOWN_BACKEND;
 
-    EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
-    if (!DRef)
-        GTEST_SKIP_("Device not found");
     EXPECT_NO_FATAL_FAILURE(CRef = DPCTLContext_Create(DRef, nullptr, 0));
     ASSERT_TRUE(CRef);
 
     EXPECT_NO_FATAL_FAILURE(device_backend = DPCTLDevice_GetBackend(DRef));
     EXPECT_NO_FATAL_FAILURE(context_backend = DPCTLContext_GetBackend(CRef));
     EXPECT_TRUE(device_backend == context_backend);
 
-    EXPECT_NO_FATAL_FAILURE(DPCTLDevice_Delete(DRef));
     EXPECT_NO_FATAL_FAILURE(DPCTLContext_Delete(CRef));
 }