Skip to content

Commit a3d36e7

Browse files
committed
Change initial GetInfo assert to get ref count is >= 1.
1 parent 075b660 commit a3d36e7

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

include/ur_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ typedef enum ur_mem_type_t {
25192519
///////////////////////////////////////////////////////////////////////////////
25202520
/// @brief Memory Information type
25212521
typedef enum ur_mem_info_t {
2522-
UR_MEM_INFO_SIZE = 0, ///< [size_t] actual size of memory object in bytes
2522+
UR_MEM_INFO_SIZE = 0, ///< [size_t] actual size of the memory object in bytes
25232523
UR_MEM_INFO_CONTEXT = 1, ///< [::ur_context_handle_t] context in which the memory object was created
25242524
UR_MEM_INFO_REFERENCE_COUNT = 2, ///< [uint32_t] Reference count of the memory object.
25252525
///< The reference count returned should be considered immediately stale.

source/adapters/cuda/physical_mem.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ struct ur_physical_mem_handle_t_ {
3131
ur_physical_mem_properties_t Properties;
3232

3333
ur_physical_mem_handle_t_(native_type PhysMem, ur_context_handle_t_ *Ctx,
34-
ur_device_handle_t Device, size_t Size, ur_physical_mem_properties_t Properties)
34+
ur_device_handle_t Device, size_t Size,
35+
ur_physical_mem_properties_t Properties)
3536
: RefCount(1), PhysicalMem(PhysMem), Context(Ctx), Device(Device),
3637
Size(Size), Properties(Properties) {
3738
urContextRetain(Context);
@@ -57,5 +58,7 @@ struct ur_physical_mem_handle_t_ {
5758

5859
size_t getSize() const noexcept { return Size; }
5960

60-
ur_physical_mem_properties_t getProperties() const noexcept { return Properties; }
61+
ur_physical_mem_properties_t getProperties() const noexcept {
62+
return Properties;
63+
}
6164
};

test/conformance/virtual_memory/urPhysicalMemRelease.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST_P(urPhysicalMemReleaseTest, Success) {
1212
ASSERT_SUCCESS(
1313
urPhysicalMemGetInfo(physical_mem, UR_PHYSICAL_MEM_INFO_REFERENCE_COUNT,
1414
sizeof(referenceCount), &referenceCount, nullptr));
15-
ASSERT_EQ(referenceCount, 1);
15+
ASSERT_GE(1, referenceCount);
1616

1717
ASSERT_SUCCESS(urPhysicalMemRetain(physical_mem));
1818
ASSERT_SUCCESS(

test/conformance/virtual_memory/urPhysicalMemRetain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST_P(urPhysicalMemRetainTest, Success) {
1212
ASSERT_SUCCESS(
1313
urPhysicalMemGetInfo(physical_mem, UR_PHYSICAL_MEM_INFO_REFERENCE_COUNT,
1414
sizeof(referenceCount), &referenceCount, nullptr));
15-
ASSERT_EQ(referenceCount, 1);
15+
ASSERT_GE(1, referenceCount);
1616

1717
ASSERT_SUCCESS(urPhysicalMemRetain(physical_mem));
1818
ASSERT_SUCCESS(
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
{{OPT}}urPhysicalMemCreateWithSizeParamTest.Success/*
2-
urPhysicalMemCreateWithFlagsParamTest.Success/*
3-
urPhysicalMemCreateTest.InvalidSize/*
2+
urPhysicalMemCreateWithSizeParamTest.InvalidSize/*

0 commit comments

Comments
 (0)