Merge pull request #874 from aarongreig/aaron/miscCTSFixes

aarongreig · web-flow · commit fe4402d5f3e2 · 2023-09-20T14:39:43.000+01:00
Fix a few minor CTS issues
diff --git a/test/conformance/enqueue/urEnqueueMemImageCopy.cpp b/test/conformance/enqueue/urEnqueueMemImageCopy.cpp
@@ -62,7 +62,7 @@ struct urEnqueueMemImageCopyTest
 
     void TearDown() override {
         if (srcImage) {
-            EXPECT_SUCCESS(urMemRelease(dstImage));
+            EXPECT_SUCCESS(urMemRelease(srcImage));
         }
         if (dstImage) {
             EXPECT_SUCCESS(urMemRelease(dstImage));
diff --git a/test/conformance/enqueue/urEnqueueWriteHostPipe.cpp b/test/conformance/enqueue/urEnqueueWriteHostPipe.cpp
@@ -55,18 +55,6 @@ TEST_P(urEnqueueWriteHostPipeTest, InvalidNullPointerBuffer) {
                                             &phEventWaitList, phEvent));
 }
 
-TEST_P(urEnqueueWriteHostPipeTest, InvalidNullPointerEvent) {
-    uint32_t numEventsInWaitList = 0;
-    ur_event_handle_t phEventWaitList;
-    ur_event_handle_t *phEvent = nullptr;
-
-    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
-                     urEnqueueWriteHostPipe(queue, program, pipe_symbol,
-                                            /*blocking*/ true, &buffer, size,
-                                            numEventsInWaitList,
-                                            &phEventWaitList, phEvent));
-}
-
 TEST_P(urEnqueueWriteHostPipeTest, InvalidEventWaitList) {
     ur_event_handle_t phEventWaitList;
     ur_event_handle_t *phEvent = nullptr;
diff --git a/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp b/test/conformance/kernel/urKernelCreateWithNativeHandle.cpp
@@ -56,15 +56,8 @@ TEST_P(urKernelCreateWithNativeHandleTest, InvalidNullHandleProgram) {
                                        &properties, &native_kernel));
 }
 
-TEST_P(urKernelCreateWithNativeHandleTest, InvalidNullPointerProperties) {
-    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
-                     urKernelCreateWithNativeHandle(native_kernel_handle,
-                                                    context, program, nullptr,
-                                                    &native_kernel));
-}
-
 TEST_P(urKernelCreateWithNativeHandleTest, InvalidNullPointerNativeKernel) {
-    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
+    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
                      urKernelCreateWithNativeHandle(native_kernel_handle,
                                                     context, program,
                                                     &properties, nullptr));
diff --git a/test/conformance/kernel/urKernelSetArgPointer.cpp b/test/conformance/kernel/urKernelSetArgPointer.cpp
@@ -129,9 +129,9 @@ struct urKernelSetArgPointerNegativeTest : urKernelSetArgPointerTest {
     }
 
     void SetUp() {
+        UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());
         SetUpAllocation();
         ASSERT_NE(allocation, nullptr);
-        UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());
     }
 };
 UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgPointerNegativeTest);
diff --git a/test/conformance/program/urProgramCreateWithNativeHandle.cpp b/test/conformance/program/urProgramCreateWithNativeHandle.cpp
@@ -41,12 +41,12 @@ TEST_P(urProgramCreateWithNativeHandleTest, Success) {
 TEST_P(urProgramCreateWithNativeHandleTest, InvalidNullHandleContext) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
                      urProgramCreateWithNativeHandle(native_program_handle,
-                                                     context, nullptr,
+                                                     nullptr, nullptr,
                                                      &native_program));
 }
 
 TEST_P(urProgramCreateWithNativeHandleTest, InvalidNullPointerProgram) {
-    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
+    ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,
                      urProgramCreateWithNativeHandle(
                          native_program_handle, context, nullptr, nullptr));
 }
diff --git a/test/conformance/program/urProgramGetInfo.cpp b/test/conformance/program/urProgramGetInfo.cpp
@@ -5,7 +5,14 @@
 
 #include <uur/fixtures.h>
 
-using urProgramGetInfoTest = uur::urProgramTestWithParam<ur_program_info_t>;
+struct urProgramGetInfoTest : uur::urProgramTestWithParam<ur_program_info_t> {
+    void SetUp() override {
+        UUR_RETURN_ON_FATAL_FAILURE(
+            urProgramTestWithParam<ur_program_info_t>::SetUp());
+        // Some queries need the program to be built.
+        ASSERT_SUCCESS(urProgramBuild(this->context, program, nullptr));
+    }
+};
 
 UUR_TEST_SUITE_P(
     urProgramGetInfoTest,
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
@@ -810,7 +810,9 @@ struct urVirtualMemMappedTest : urVirtualMemTest {
     }
 
     void TearDown() override {
-        EXPECT_SUCCESS(urVirtualMemUnmap(context, virtual_ptr, size));
+        if (virtual_ptr) {
+            EXPECT_SUCCESS(urVirtualMemUnmap(context, virtual_ptr, size));
+        }
         UUR_RETURN_ON_FATAL_FAILURE(urVirtualMemTest::TearDown());
     }
 };
@@ -826,8 +828,10 @@ struct urVirtualMemMappedTestWithParam : urVirtualMemTestWithParam<T> {
     }
 
     void TearDown() override {
-        EXPECT_SUCCESS(
-            urVirtualMemUnmap(this->context, this->virtual_ptr, this->size));
+        if (this->virtual_ptr) {
+            EXPECT_SUCCESS(urVirtualMemUnmap(this->context, this->virtual_ptr,
+                                             this->size));
+        }
         UUR_RETURN_ON_FATAL_FAILURE(urVirtualMemTestWithParam<T>::TearDown());
     }
 };
@@ -861,7 +865,9 @@ struct urUSMDeviceAllocTestWithParam : urQueueTestWithParam<T> {
     }
 
     void TearDown() override {
-        ASSERT_SUCCESS(urUSMFree(this->context, ptr));
+        if (ptr) {
+            ASSERT_SUCCESS(urUSMFree(this->context, ptr));
+        }
         if (pool) {
             ASSERT_TRUE(use_pool);
             ASSERT_SUCCESS(urUSMPoolRelease(pool));
diff --git a/test/conformance/virtual_memory/urVirtualMemGranularityGetInfo.cpp b/test/conformance/virtual_memory/urVirtualMemGranularityGetInfo.cpp
@@ -4,8 +4,20 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #include <uur/fixtures.h>
 
-using urVirtualMemGranularityGetInfoTest =
-    uur::urContextTestWithParam<ur_virtual_mem_granularity_info_t>;
+struct urVirtualMemGranularityGetInfoTest
+    : uur::urContextTestWithParam<ur_virtual_mem_granularity_info_t> {
+    void SetUp() override {
+        UUR_RETURN_ON_FATAL_FAILURE(
+            urContextTestWithParam<ur_virtual_mem_granularity_info_t>::SetUp());
+        ur_bool_t virtual_memory_support = false;
+        ASSERT_SUCCESS(urDeviceGetInfo(
+            this->device, UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT,
+            sizeof(ur_bool_t), &virtual_memory_support, nullptr));
+        if (!virtual_memory_support) {
+            GTEST_SKIP() << "Virtual memory is not supported.";
+        }
+    }
+};
 
 UUR_TEST_SUITE_P(
     urVirtualMemGranularityGetInfoTest,
@@ -42,7 +54,19 @@ TEST_P(urVirtualMemGranularityGetInfoTest, Success) {
     }
 }
 
-using urVirtualMemGranularityGetInfoNegativeTest = uur::urContextTest;
+struct urVirtualMemGranularityGetInfoNegativeTest : uur::urContextTest {
+    void SetUp() override {
+        UUR_RETURN_ON_FATAL_FAILURE(urContextTest::SetUp());
+
+        ur_bool_t virtual_memory_support = false;
+        ASSERT_SUCCESS(urDeviceGetInfo(
+            device, UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT, sizeof(ur_bool_t),
+            &virtual_memory_support, nullptr));
+        if (!virtual_memory_support) {
+            GTEST_SKIP() << "Virtual memory is not supported.";
+        }
+    }
+};
 UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urVirtualMemGranularityGetInfoNegativeTest);
 
 TEST_P(urVirtualMemGranularityGetInfoNegativeTest, InvalidNullHandleContext) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ struct urEnqueueMemImageCopyTest`
`62`	`62`
`63`	`63`	`void TearDown() override {`
`64`	`64`	`if (srcImage) {`
`65`		`- EXPECT_SUCCESS(urMemRelease(dstImage));`
	`65`	`+ EXPECT_SUCCESS(urMemRelease(srcImage));`
`66`	`66`	`}`
`67`	`67`	`if (dstImage) {`
`68`	`68`	`EXPECT_SUCCESS(urMemRelease(dstImage));`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ struct urKernelSetArgPointerNegativeTest : urKernelSetArgPointerTest {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`void SetUp() {`
	`132`	`+ UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());`
`132`	`133`	`SetUpAllocation();`
`133`	`134`	`ASSERT_NE(allocation, nullptr);`
`134`		`- UUR_RETURN_ON_FATAL_FAILURE(urKernelSetArgPointerTest::SetUp());`
`135`	`135`	`}`
`136`	`136`	`};`
`137`	`137`	`UUR_INSTANTIATE_KERNEL_TEST_SUITE_P(urKernelSetArgPointerNegativeTest);`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ TEST_P(urProgramCreateWithNativeHandleTest, Success) {`
`41`	`41`	`TEST_P(urProgramCreateWithNativeHandleTest, InvalidNullHandleContext) {`
`42`	`42`	`ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,`
`43`	`43`	`urProgramCreateWithNativeHandle(native_program_handle,`
`44`		`- context, nullptr,`
	`44`	`+ nullptr, nullptr,`
`45`	`45`	`&native_program));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`TEST_P(urProgramCreateWithNativeHandleTest, InvalidNullPointerProgram) {`
`49`		`- ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,`
	`49`	`+ ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_POINTER,`
`50`	`50`	`urProgramCreateWithNativeHandle(`
`51`	`51`	`native_program_handle, context, nullptr, nullptr));`
`52`	`52`	`}`