Skip to content
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

Jump to bottom

Fix communicator categorization #1645

Merged
merged 4 commits into from
Jul 18, 2024
Merged

Fix communicator categorization #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db6fc1a
Add additional tests for the communicator group
thoasm Jul 10, 2024
dc951c3
Fix visibility of HIP specialization
thoasm Jul 11, 2024
e39ccdb
Fix the communicator group categorization
thoasm Jul 10, 2024
14f0e24
Format files
ginkgo-bot Jul 11, 2024
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: 1 addition & 1 deletion cuda/components/cooperative_groups.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct is_synchronizable_group_impl : std::false_type {};


template <typename T>
struct is_communicator_group_impl : std::true_type {};
struct is_communicator_group_impl : std::false_type {};

} // namespace detail

Expand Down
36 changes: 36 additions & 0 deletions cuda/test/components/cooperative_groups.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,40 @@ TEST_F(CooperativeGroups, SubwarpBallot) { test(cg_subwarp_ballot); }
TEST_F(CooperativeGroups, SubwarpBallot2) { test_subwarp(cg_subwarp_ballot); }


__global__ void cg_communicator_categorization(bool*)
{
auto this_block = group::this_thread_block();
auto tiled_partition =
group::tiled_partition<config::warp_size>(this_block);
auto subwarp_partition = group::tiled_partition<subwarp_size>(this_block);

using not_group = int;
using this_block_t = decltype(this_block);
using tiled_partition_t = decltype(tiled_partition);
using subwarp_partition_t = decltype(subwarp_partition);

static_assert(!group::is_group<not_group>::value &&
group::is_group<this_block_t>::value &&
group::is_group<tiled_partition_t>::value &&
group::is_group<subwarp_partition_t>::value,
"Group check doesn't work.");
static_assert(
!group::is_synchronizable_group<not_group>::value &&
group::is_synchronizable_group<this_block_t>::value &&
group::is_synchronizable_group<tiled_partition_t>::value &&
group::is_synchronizable_group<subwarp_partition_t>::value,
"Synchronizable group check doesn't work.");
static_assert(!group::is_communicator_group<not_group>::value &&
!group::is_communicator_group<this_block_t>::value &&
group::is_communicator_group<tiled_partition_t>::value &&
group::is_communicator_group<subwarp_partition_t>::value,
"Communicator group check doesn't work.");
}

TEST_F(CooperativeGroups, CorrectCategorization)
{
test(cg_communicator_categorization);
}


} // namespace
2 changes: 1 addition & 1 deletion dpcpp/components/cooperative_groups.dp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ struct is_synchronizable_group_impl : std::false_type {};


template <typename T>
struct is_communicator_group_impl : std::true_type {};
struct is_communicator_group_impl : std::false_type {};


} // namespace detail
Expand Down
43 changes: 43 additions & 0 deletions dpcpp/test/components/cooperative_groups.dp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,49 @@ GKO_ENABLE_DEFAULT_CONFIG_CALL(cg_ballot_call, cg_ballot, default_config_list)
TEST_P(CooperativeGroups, Ballot) { test_all_subgroup(cg_ballot_call<bool*>); }


template <typename cfg>
void cg_communicator_categorization(bool* s, sycl::nd_item<3> item_ct1)
{
auto this_block = group::this_thread_block(item_ct1);
auto tiled_partition =
group::tiled_partition<cfg::subgroup_size>(this_block);

using not_group = int;
using this_block_t = decltype(this_block);
using tiled_partition_t = decltype(tiled_partition);

static_assert(!group::is_group<not_group>::value &&
group::is_group<this_block_t>::value &&
group::is_group<tiled_partition_t>::value,
"Group check doesn't work.");
static_assert(!group::is_synchronizable_group<not_group>::value &&
group::is_synchronizable_group<this_block_t>::value &&
group::is_synchronizable_group<tiled_partition_t>::value,
"Synchronizable group check doesn't work.");
static_assert(!group::is_communicator_group<not_group>::value &&
!group::is_communicator_group<this_block_t>::value &&
group::is_communicator_group<tiled_partition_t>::value,
"Communicator group check doesn't work.");
// Make it work with the test framework, which performs 3 tests
s[this_block.thread_rank()] = true;
s[this_block.thread_rank() + cfg::subgroup_size] = true;
s[this_block.thread_rank() + 2 * cfg::subgroup_size] = true;
}

GKO_ENABLE_DEFAULT_HOST_CONFIG_TYPE(cg_communicator_categorization,
cg_communicator_categorization)
GKO_ENABLE_IMPLEMENTATION_CONFIG_SELECTION_TOTYPE(
cg_communicator_categorization, cg_communicator_categorization, DCFG_1D)
GKO_ENABLE_DEFAULT_CONFIG_CALL(cg_communicator_categorization_call,
cg_communicator_categorization,
default_config_list)

TEST_P(CooperativeGroups, CorrectCategorization)
{
test_all_subgroup(cg_communicator_categorization_call<bool*>);
}


INSTANTIATE_TEST_SUITE_P(DifferentSubgroup, CooperativeGroups,
testing::Values(4, 8, 16, 32, 64),
testing::PrintToStringParamName());
Expand Down
11 changes: 6 additions & 5 deletions hip/components/cooperative_groups.hip.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ struct is_synchronizable_group_impl : std::false_type {};


template <typename T>
struct is_communicator_group_impl : std::true_type {};
struct is_communicator_group_impl : std::false_type {};

} // namespace detail

Expand Down Expand Up @@ -370,12 +370,13 @@ namespace detail {


template <unsigned Size>
struct is_group_impl<thread_block_tile<Size>> : std::true_type {};
struct is_group_impl<group::thread_block_tile<Size>> : std::true_type {};
template <unsigned Size>
struct is_synchronizable_group_impl<thread_block_tile<Size>> : std::true_type {
};
struct is_synchronizable_group_impl<group::thread_block_tile<Size>>
: std::true_type {};
template <unsigned Size>
struct is_communicator_group_impl<thread_block_tile<Size>> : std::true_type {};
struct is_communicator_group_impl<group::thread_block_tile<Size>>
: std::true_type {};


} // namespace detail
Expand Down
36 changes: 36 additions & 0 deletions hip/test/components/cooperative_groups.hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,42 @@ TEST_F(CooperativeGroups, SubwarpBallot) { test(cg_subwarp_ballot); }
TEST_F(CooperativeGroups, SubwarpBallot2) { test_subwarp(cg_subwarp_ballot); }


__global__ void cg_communicator_categorization(bool*)
{
auto this_block = group::this_thread_block();
auto tiled_partition =
group::tiled_partition<config::warp_size>(this_block);
auto subwarp_partition = group::tiled_partition<subwarp_size>(this_block);

using not_group = int;
using this_block_t = decltype(this_block);
using tiled_partition_t = decltype(tiled_partition);
using subwarp_partition_t = decltype(subwarp_partition);

static_assert(!group::is_group<not_group>::value &&
group::is_group<this_block_t>::value &&
group::is_group<tiled_partition_t>::value &&
group::is_group<subwarp_partition_t>::value,
"Group check doesn't work.");
static_assert(
!group::is_synchronizable_group<not_group>::value &&
group::is_synchronizable_group<this_block_t>::value &&
group::is_synchronizable_group<tiled_partition_t>::value &&
group::is_synchronizable_group<subwarp_partition_t>::value,
"Synchronizable group check doesn't work.");
static_assert(!group::is_communicator_group<not_group>::value &&
!group::is_communicator_group<this_block_t>::value &&
group::is_communicator_group<tiled_partition_t>::value &&
group::is_communicator_group<subwarp_partition_t>::value,
"Communicator group check doesn't work.");
}

TEST_F(CooperativeGroups, CorrectCategorization)
{
test(cg_communicator_categorization);
}


template <typename ValueType>
__global__ void cg_shuffle_sum(const int num, ValueType* __restrict__ value)
{
Expand Down
Loading