Skip to content

rocfile/test: Split HipMemoryTypes into supported and unsupported #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derobins merged 1 commit into from
Nov 6, 2025
Merged

rocfile/test: Split HipMemoryTypes into supported and unsupported #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions rocfile/test/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,43 +47,43 @@ struct RocFileBuffer : public RocFileOpened {
void *nonnull_ptr;
};

TEST_F(RocFileBuffer, register_internal_device_memory)
TEST_F(RocFileBuffer, register_internal_supported_hip_memory)
{
StrictMock<MHip> mhip;
expect_buffer_registration(mhip, hipMemoryTypeDevice);
Context<DriverState>::get()->registerBuffer(nonnull_ptr, 0, 0);
for (const auto memoryType : SupportedHipMemoryTypes) {
StrictMock<MHip> mhip;
expect_buffer_registration(mhip, memoryType);
Context<DriverState>::get()->registerBuffer(nonnull_ptr, 0, 0);
}
}

TEST_F(RocFileBuffer, register_device_memory)
TEST_F(RocFileBuffer, register_supported_hip_memory)
{
StrictMock<MHip> mhip;
expect_buffer_registration(mhip, hipMemoryTypeDevice);
ASSERT_EQ(rocFileBufRegister(nonnull_ptr, 0, 0), ROCFILE_SUCCESS);
for (const auto memoryType : SupportedHipMemoryTypes) {
StrictMock<MHip> mhip;
expect_buffer_registration(mhip, memoryType);
ASSERT_EQ(rocFileBufRegister(nonnull_ptr, 0, 0), ROCFILE_SUCCESS);
}
}

TEST_F(RocFileBuffer, register_internal_not_device_memory)
TEST_F(RocFileBuffer, register_internal_unsupported_hip_memory)
{
for (const auto memoryType : HipMemoryTypes) {
if (memoryType != hipMemoryTypeDevice) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_THROW(Context<DriverState>::get()->registerBuffer(nonnull_ptr, 0, 0), InvalidMemoryType);
}
for (const auto memoryType : UnsupportedHipMemoryTypes) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_THROW(Context<DriverState>::get()->registerBuffer(nonnull_ptr, 0, 0), InvalidMemoryType);
}
}

TEST_F(RocFileBuffer, register_not_device_memory)
TEST_F(RocFileBuffer, register_unsupported_hip_memory)
{
for (const auto memoryType : HipMemoryTypes) {
if (memoryType != hipMemoryTypeDevice) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileBufRegister(nonnull_ptr, 0, 0), RocFileOpError(rocFileHipMemoryTypeInvalid));
}
for (const auto memoryType : UnsupportedHipMemoryTypes) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileBufRegister(nonnull_ptr, 0, 0), RocFileOpError(rocFileHipMemoryTypeInvalid));
}
}

Expand Down
44 changes: 18 additions & 26 deletions rocfile/test/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,17 @@ TEST(RocFileFallbackBackend, FallbackBackendIsBarelyWillingToHandleDeviceMemory)
ASSERT_EQ(Fallback().score(mfile, mbuffer, io_size, file_offset, buffer_offset), 0);
}

TEST(RocFileFallbackBackend, FallbackBackendRejectsNonDeviceMemory)
TEST(RocFileFallbackBackend, FallbackBackendRejectsUnsupportedHipMemoryTypes)
{
auto mfile{std::make_shared<StrictMock<MFile>>()};
size_t io_size{2048};
hoff_t file_offset{4096};
hoff_t buffer_offset{1024};

for (const auto memoryType : HipMemoryTypes) {
if (memoryType != hipMemoryTypeDevice) {
auto mbuffer = std::make_shared<StrictMock<MBuffer>>();
EXPECT_CALL(*mbuffer, getType).WillOnce(Return(memoryType));
ASSERT_EQ(Fallback().score(mfile, mbuffer, io_size, file_offset, buffer_offset), -1);
}
for (const auto memoryType : UnsupportedHipMemoryTypes) {
auto mbuffer = std::make_shared<StrictMock<MBuffer>>();
EXPECT_CALL(*mbuffer, getType).WillOnce(Return(memoryType));
ASSERT_EQ(Fallback().score(mfile, mbuffer, io_size, file_offset, buffer_offset), -1);
}
}

Expand Down Expand Up @@ -372,21 +370,18 @@ TEST_F(RocFileWrite, write_handles_pointer_get_attributes_error)
ASSERT_EQ(rocFileWrite(fh, nonnull_ptr, 0, 0, 0), -static_cast<ssize_t>(hipErrorUnknown));
}

TEST_F(RocFileWrite, write_handles_invalid_memory_type)
TEST_F(RocFileWrite, write_handles_unsupported_hip_memory_type)
{
StrictMock<MSys> msys;
EXPECT_CALL(msys, fstat);
EXPECT_CALL(msys, fcntl);
auto fh = Context<DriverState>::get()->registerFile(0xBADCAFE);
for (const auto memoryType : HipMemoryTypes) {
if (memoryType != hipMemoryTypeDevice) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileWrite(fh, nonnull_ptr, 0, 0, 0),
-static_cast<ssize_t>(rocFileHipMemoryTypeInvalid));
}
for (const auto memoryType : UnsupportedHipMemoryTypes) {
StrictMock<MHip> mhip;
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileWrite(fh, nonnull_ptr, 0, 0, 0), -static_cast<ssize_t>(rocFileHipMemoryTypeInvalid));
}
}

Expand Down Expand Up @@ -699,21 +694,18 @@ TEST_F(RocFileRead, read_handles_pointer_get_attributes_error)
ASSERT_EQ(rocFileRead(fh, nonnull_ptr, 0, 0, 0), -static_cast<ssize_t>(hipErrorUnknown));
}

TEST_F(RocFileRead, read_handles_invalid_memory_type)
TEST_F(RocFileRead, read_handles_unsupported_hip_memory_type)
{
StrictMock<MHip> mhip;
StrictMock<MSys> msys;
EXPECT_CALL(msys, fstat);
EXPECT_CALL(msys, fcntl);
auto fh{Context<DriverState>::get()->registerFile(0xBADCAFE)};
for (const auto memoryType : HipMemoryTypes) {
if (memoryType != hipMemoryTypeDevice) {
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileRead(fh, nonnull_ptr, 0, 0, 0),
-static_cast<ssize_t>(rocFileHipMemoryTypeInvalid));
}
for (const auto memoryType : UnsupportedHipMemoryTypes) {
hipPointerAttribute_t attrs;
attrs.type = memoryType;
EXPECT_CALL(mhip, hipPointerGetAttributes).WillOnce(testing::Return(attrs));
ASSERT_EQ(rocFileRead(fh, nonnull_ptr, 0, 0, 0), -static_cast<ssize_t>(rocFileHipMemoryTypeInvalid));
}
}

Expand Down
15 changes: 10 additions & 5 deletions rocfile/test/rocfile-test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,15 @@ struct RocFileUnopened : public ::testing::Test {
// BUFFER FUNCTIONALITY
// ***********************************************************************

constexpr std::array<hipMemoryType, 6> HipMemoryTypes{
hipMemoryTypeArray, hipMemoryTypeDevice, hipMemoryTypeHost,
hipMemoryTypeManaged, hipMemoryTypeUnified, hipMemoryTypeUnregistered,
};

/// @brief Set up mocks for buffer registration
void expect_buffer_registration(rocFile::MHip &mhip, hipMemoryType memory_type);

// ***********************************************************************
// ENUM VALUE HELPERS
// ***********************************************************************

constexpr std::array<hipMemoryType, 1> SupportedHipMemoryTypes{hipMemoryTypeDevice};
constexpr std::array<hipMemoryType, 5> UnsupportedHipMemoryTypes{
hipMemoryTypeArray, hipMemoryTypeHost, hipMemoryTypeManaged,
hipMemoryTypeUnified, hipMemoryTypeUnregistered,
};