Merge branch 'memory-retainrelease' into martin/memory-cts-spec-gap-REDO

oneapi-src · Oct 17, 2024 · 775a4ca · 775a4ca
2 parents 79e9e96 + 04ffed5
commit 775a4ca
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/source/adapters/level_zero/memory.cpp b/source/adapters/level_zero/memory.cpp
@@ -1881,7 +1881,9 @@ ur_result_t urMemGetInfo(
   }
   case UR_MEM_INFO_SIZE: {
     // Get size of the allocation
-    return ReturnValue(size_t{Buffer->Size});
+  }
+  case UR_MEM_INFO_REFERENCE_COUNT: {
+    return ReturnValue(Buffer->RefCount.load());
   }
   case UR_MEM_INFO_REFERENCE_COUNT: {
     return ReturnValue(Buffer->RefCount.load());

diff --git a/test/conformance/memory/memory_adapter_level_zero.match b/test/conformance/memory/memory_adapter_level_zero.match
@@ -1,5 +1,4 @@
 {{NONDETERMINISTIC}}
 urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
-{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
 {{Segmentation fault|Aborted}}
diff --git a/test/conformance/memory/urMemRelease.cpp b/test/conformance/memory/urMemRelease.cpp
@@ -16,4 +16,24 @@ TEST_P(urMemReleaseTest, InvalidNullHandleMem) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE,
                      urMemRelease(nullptr));
 }
-// temp
+
+TEST_P(urMemReleaseTest, CheckReferenceCount) {
+    uint32_t referenceCount = 0;
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 1);
+
+    ASSERT_SUCCESS(urMemRetain(buffer));
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 2);
+
+    ASSERT_SUCCESS(urMemRelease(buffer));
+
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 1);
+}
diff --git a/test/conformance/memory/urMemRetain.cpp b/test/conformance/memory/urMemRetain.cpp
@@ -9,9 +9,31 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemRetainTest);
 
 TEST_P(urMemRetainTest, Success) {
     ASSERT_SUCCESS(urMemRetain(buffer));
-    EXPECT_SUCCESS(urMemRelease(buffer));
+    ASSERT_SUCCESS(urMemRelease(buffer));
 }
 
 TEST_P(urMemRetainTest, InvalidNullHandleMem) {
     ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_NULL_HANDLE, urMemRetain(nullptr));
 }
+
+TEST_P(urMemRetainTest, CheckReferenceCount) {
+    uint32_t referenceCount = 0;
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 1);
+
+    { ASSERT_SUCCESS(urMemRetain(buffer)); }
+
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 2);
+
+    ASSERT_SUCCESS(urMemRelease(buffer));
+
+    ASSERT_SUCCESS(urMemGetInfo(buffer, UR_MEM_INFO_REFERENCE_COUNT,
+                                sizeof(referenceCount), &referenceCount,
+                                nullptr));
+    ASSERT_EQ(referenceCount, 1);
+}