Skip to content

fix(hipcub): Avoid zero-sized allocation when HMM is enabled #9246

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

Open
umfranzw wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −3
Open

fix(hipcub): Avoid zero-sized allocation when HMM is enabled #9246

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
2 changes: 2 additions & 0 deletions projects/hipcub/test/hipcub/common_test_header.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ hipError_t hipMallocHelper(T** devPtr, size_t size)
{
if (use_hmm())
{
if (size == 0)
std::cerr << "Warning: attempting to allocate a buffer of size 0 with hipMallocManaged." << std::endl;
return hipMallocManaged((void**)devPtr, size);
}
else
Expand Down
11 changes: 8 additions & 3 deletions projects/hipcub/test/hipcub/test_hipcub_device_segmented_radix_sort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,12 @@ inline void sort_keys_empty_data()
offsets[0] = 0;
offsets[1] = 0;

key_type* d_keys;
HIP_CHECK(test_common_utils::hipMallocHelper(&d_keys, size * sizeof(key_type)));
key_type* d_keys = nullptr;
// hipMallocManaged will not allocate buffers of size 0.
// If HMM is enabled and size is 0, leave d_keys set to nullptr.
if (!(size == 0 && test_common_utils::use_hmm()))
HIP_CHECK(test_common_utils::hipMallocHelper(&d_keys, size * sizeof(key_type)));

HIP_CHECK(hipMemcpy(d_keys,
keys_input.data(),
size * sizeof(key_type),
Expand Down Expand Up @@ -337,8 +341,9 @@ inline void sort_keys_empty_data()
hipMemcpyDeviceToHost));

HIP_CHECK(hipFree(d_temporary_storage));
HIP_CHECK(hipFree(d_keys));
HIP_CHECK(hipFree(d_offsets));
if (d_keys)
HIP_CHECK(hipFree(d_keys));

// Output should not have changed
ASSERT_NO_FATAL_FAILURE(test_utils::assert_eq(keys_output, keys_input));
Expand Down
Loading