Merge pull request #2182 from omarahmed1111/fix-success-with-unowned-native-handle-tests

Omar Ahmed · web-flow · commit c445e135e6c3 · 2024-10-11T11:15:17.000+01:00
Fix successWithUnOwnedNativeHandle tests
diff --git a/test/conformance/context/context_adapter_level_zero.match b/test/conformance/context/context_adapter_level_zero.match
@@ -1,3 +1,2 @@
 {{NONDETERMINISTIC}}
-urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
diff --git a/test/conformance/context/urContextCreateWithNativeHandle.cpp b/test/conformance/context/urContextCreateWithNativeHandle.cpp
@@ -46,11 +46,6 @@ TEST_P(urContextCreateWithNativeHandleTest, SuccessWithOwnedNativeHandle) {
     UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urContextCreateWithNativeHandle(
         native_context, adapter, 1, &device, &props, &ctx));
     ASSERT_NE(ctx, nullptr);
-
-    uint32_t ref_count = 0;
-    ASSERT_SUCCESS(urContextGetInfo(ctx, UR_CONTEXT_INFO_REFERENCE_COUNT,
-                                    sizeof(uint32_t), &ref_count, nullptr));
-    ASSERT_EQ(ref_count, 1);
 }
 
 TEST_P(urContextCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {
@@ -66,13 +61,6 @@ TEST_P(urContextCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {
     UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urContextCreateWithNativeHandle(
         native_context, adapter, 1, &device, &props, &ctx));
     ASSERT_NE(ctx, nullptr);
-
-    uint32_t ref_count = 0;
-    ASSERT_SUCCESS(urContextGetInfo(ctx, UR_CONTEXT_INFO_REFERENCE_COUNT,
-                                    sizeof(uint32_t), &ref_count, nullptr));
-    ASSERT_EQ(ref_count, 2);
-
-    ASSERT_SUCCESS(urContextRelease(ctx));
 }
 
 TEST_P(urContextCreateWithNativeHandleTest, InvalidNullHandleAdapter) {
diff --git a/test/conformance/device/device_adapter_cuda.match b/test/conformance/device/device_adapter_cuda.match
@@ -1,3 +1,2 @@
 {{NONDETERMINISTIC}}
-urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
diff --git a/test/conformance/device/device_adapter_hip.match b/test/conformance/device/device_adapter_hip.match
@@ -1,3 +1,2 @@
 {{NONDETERMINISTIC}}
-urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
diff --git a/test/conformance/device/device_adapter_level_zero.match b/test/conformance/device/device_adapter_level_zero.match
@@ -1,3 +1,2 @@
 {{NONDETERMINISTIC}}
-urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
diff --git a/test/conformance/device/device_adapter_level_zero_v2.match b/test/conformance/device/device_adapter_level_zero_v2.match
@@ -1,4 +1,3 @@
 {{NONDETERMINISTIC}}
-urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
 {{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE
diff --git a/test/conformance/device/device_adapter_opencl.match b/test/conformance/device/device_adapter_opencl.match
diff --git a/test/conformance/device/urDeviceCreateWithNativeHandle.cpp b/test/conformance/device/urDeviceCreateWithNativeHandle.cpp
@@ -43,12 +43,6 @@ TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithOwnedNativeHandle) {
         UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(
             native_handle, adapter, &props, &dev));
         ASSERT_NE(dev, nullptr);
-
-        uint32_t ref_count = 0;
-        ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,
-                                       sizeof(uint32_t), &ref_count, nullptr));
-
-        ASSERT_EQ(ref_count, 1);
     }
 }
 
@@ -66,12 +60,6 @@ TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {
         UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(
             native_handle, adapter, &props, &dev));
         ASSERT_NE(dev, nullptr);
-
-        uint32_t ref_count = 0;
-        ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,
-                                       sizeof(uint32_t), &ref_count, nullptr));
-
-        ASSERT_EQ(ref_count, 2);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`{{NONDETERMINISTIC}}`
`2`		`-urContextCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_`
`3`	`2`	`urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`{{NONDETERMINISTIC}}`
`2`		`-urDeviceCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle`
`3`	`2`	`{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,6 @@ TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithOwnedNativeHandle) {`
`43`	`43`	`UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(`
`44`	`44`	`native_handle, adapter, &props, &dev));`
`45`	`45`	`ASSERT_NE(dev, nullptr);`
`46`		`-`
`47`		`- uint32_t ref_count = 0;`
`48`		`- ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,`
`49`		`- sizeof(uint32_t), &ref_count, nullptr));`
`50`		`-`
`51`		`- ASSERT_EQ(ref_count, 1);`
`52`	`46`	`}`
`53`	`47`	`}`
`54`	`48`
`@@ -66,12 +60,6 @@ TEST_F(urDeviceCreateWithNativeHandleTest, SuccessWithUnOwnedNativeHandle) {`
`66`	`60`	`UUR_ASSERT_SUCCESS_OR_UNSUPPORTED(urDeviceCreateWithNativeHandle(`
`67`	`61`	`native_handle, adapter, &props, &dev));`
`68`	`62`	`ASSERT_NE(dev, nullptr);`
`69`		`-`
`70`		`- uint32_t ref_count = 0;`
`71`		`- ASSERT_SUCCESS(urDeviceGetInfo(dev, UR_DEVICE_INFO_REFERENCE_COUNT,`
`72`		`- sizeof(uint32_t), &ref_count, nullptr));`
`73`		`-`
`74`		`- ASSERT_EQ(ref_count, 2);`
`75`	`63`	`}`
`76`	`64`	`}`
`77`	`65`