Skip to content

refactor(rocrand): replace hip vector accessor macro and use underlying native vector #446

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
umfranzw merged 1 commit into from
Jul 7, 2025
Merged

refactor(rocrand): replace hip vector accessor macro and use underlying native vector #446

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
63 changes: 37 additions & 26 deletions projects/rocrand/library/include/rocrand/rocrand_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,32 +87,6 @@
#define ROCRAND_DEPRECATED(msg)
#endif

// This is an accessor macro for HIP vector types (eg. int2, float4, etc.).
// Prior to HIP 7.0, individual elements could be accessed through the
// data member:
//
// int2 vec;
// vec.data[0] = 1;
//
// Beginning with HIP 7.0, the data member is hidden, and individual
// elements must be accessed like this:
//
// int2 vec;
// vec[0] = 1;
//
// You can use the macro like this:
//
// int2 vec;
// ROCRAND_HIPVEC_ACCESS(vec)[0];
//
#if defined(__HIP_PLATFORM_AMD__)
#if HIP_VERSION_MAJOR < 7
#define ROCRAND_HIPVEC_ACCESS(x) x.data
#else
#define ROCRAND_HIPVEC_ACCESS(x) x
#endif
#endif

namespace rocrand_device {
namespace detail {

Expand Down Expand Up @@ -188,6 +162,43 @@ __forceinline__ __device__ __host__ void
hi = 0;
}

template<typename T, typename = void>
struct has_data : std::false_type
{};

template<typename T>
struct has_data<T, decltype(std::declval<T>().data, void())> : std::true_type
{};

template<typename T>
static constexpr bool has_data_v = has_data<T>::value;

/// This is an accessor utility for HIP vector types (eg. int2, float4, etc.).
/// Prior to HIP 7.0, individual elements could be accessed through the
/// data member:
/// int2 vec;
/// vec.data[0] = 1;
///
/// Beginning with HIP 7.0, the data member is hidden, and individual
/// elements can instead be accessed through the underlaying native vector.
template<typename V, typename Index>
__forceinline__ __device__ __host__
auto get_element_at(V vector, Index i)
{
#if defined(__HIP_PLATFORM_AMD__)
if constexpr(has_data_v<V>)
{
return vector.data[i];
}
else
{
return get_native_vector(vector)[i];
}
#else
return (&vector.x)[i];
#endif
}

} // end namespace detail
} // end namespace rocrand_device

Expand Down
7 changes: 2 additions & 5 deletions projects/rocrand/library/include/rocrand/rocrand_philox4x32_10.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,8 @@ class philox4x32_10_engine

__forceinline__ __device__ __host__ unsigned int next()
{
#if defined(__HIP_PLATFORM_AMD__)
unsigned int ret = ROCRAND_HIPVEC_ACCESS(m_state.result)[m_state.substate];
#else
unsigned int ret = (&m_state.result.x)[m_state.substate];
#endif
unsigned int ret = detail::get_element_at(m_state.result, m_state.substate);

m_state.substate++;
if(m_state.substate == 4)
{
Expand Down
10 changes: 4 additions & 6 deletions projects/rocrand/library/include/rocrand/rocrand_threefry2_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,11 @@ class threefry_engine2_base
return this->next();
}

__forceinline__ __device__ __host__ value next()
__forceinline__ __device__ __host__
value next()
{
#if defined(__HIP_PLATFORM_AMD__)
value ret = ROCRAND_HIPVEC_ACCESS(m_state.result)[m_state.substate];
#else
value ret = (&m_state.result.x)[m_state.substate];
#endif
value ret = detail::get_element_at(m_state.result, m_state.substate);

m_state.substate++;
if(m_state.substate == 2)
{
Expand Down
7 changes: 2 additions & 5 deletions projects/rocrand/library/include/rocrand/rocrand_threefry4_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,8 @@ class threefry_engine4_base

__forceinline__ __device__ __host__ value next()
{
#if defined(__HIP_PLATFORM_AMD__)
value ret = ROCRAND_HIPVEC_ACCESS(m_state.result)[m_state.substate];
#else
value ret = (&m_state.result.x)[m_state.substate];
#endif
value ret = detail::get_element_at(m_state.result, m_state.substate);

m_state.substate++;
if(m_state.substate == 4)
{
Expand Down