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

Improve submdspan testing #342

Merged
merged 4 commits into from
Jun 10, 2024
+42 −21
Merged

Improve submdspan testing #342

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
769eeb5
Improve submdspan testing
crtrott Jun 6, 2024
5eb2aa5
Guard test use of bracket operator, by more targeted pragma
crtrott Jun 10, 2024
b3b186b
Avoid illegal access for degenerated subslices of length 0
crtrott Jun 10, 2024
565a896
Disable [] operator for ICPX 2023 which crashes for the submdspan test
crtrott Jun 10, 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
1 change: 1 addition & 0 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
# To get new URL, look here:
# https://www.intel.com/content/www/us/en/developer/articles/tool/oneapi-standalone-components.html#inpage-nav-6-undefined
compiler_url: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/ebf5d9aa-17a7-46a4-b5df-ace004227c0e/l_dpcpp-cpp-compiler_p_2023.2.1.8_offline.sh
cxx_flags_extra: "-DMDSPAN_USE_BRACKET_OPERATOR=0"
- enable_benchmark: ON
- stdcxx: 14
enable_benchmark: OFF
Expand Down
2 changes: 1 addition & 1 deletion tests/foo_customizations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class layout_foo::mapping {
template<class Indx0, class Indx1>
MDSPAN_INLINE_FUNCTION
constexpr index_type operator()(Indx0 idx0, Indx1 idx1) const noexcept {
return static_cast<index_type>(idx0 * __extents.extent(0) + idx1);
return static_cast<index_type>(idx0 * __extents.extent(1) + idx1);
}

MDSPAN_INLINE_FUNCTION static constexpr bool is_always_unique() noexcept { return true; }
Expand Down
60 changes: 40 additions & 20 deletions tests/test_submdspan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,38 +224,58 @@ struct TestSubMDSpan<
return Kokkos::full_extent;
}

template<class SrcExtents, class SubExtents, class ... SliceArgs>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx, class ... SliceArgs>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int src_idx, int sub_idx, SrcExtents src_ext, SubExtents sub_ext, int, SliceArgs ... slices) {
return match_expected_extents(++src_idx, sub_idx, src_ext, sub_ext, slices...);
static bool check_submdspan_match(int src_idx, int sub_idx, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>, int, SliceArgs ... slices) {
return check_submdspan_match(++src_idx, sub_idx, src_mds, sub_mds, std::index_sequence<SrcIdx...,2>(), std::index_sequence<SubIdx...>(), slices...);
}
template<class SrcExtents, class SubExtents, class ... SliceArgs>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx, class ... SliceArgs>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int src_idx, int sub_idx, SrcExtents src_ext, SubExtents sub_ext, std::pair<int,int> p, SliceArgs ... slices) {
using idx_t = typename SubExtents::index_type;
return (sub_ext.extent(sub_idx)==static_cast<idx_t>(p.second-p.first)) && match_expected_extents(++src_idx, ++sub_idx, src_ext, sub_ext, slices...);
static bool check_submdspan_match(int src_idx, int sub_idx, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>, std::pair<int,int> p, SliceArgs ... slices) {
using idx_t = typename SubMDSpan::index_type;
return (sub_mds.extent(sub_idx)==static_cast<idx_t>(p.second-p.first)) && check_submdspan_match(++src_idx, ++sub_idx, src_mds, sub_mds, std::index_sequence<SrcIdx...,2>(), std::index_sequence<SubIdx...,1>(), slices...);
}
template<class SrcExtents, class SubExtents, class ... SliceArgs>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx, class ... SliceArgs>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int src_idx, int sub_idx, SrcExtents src_ext, SubExtents sub_ext,
static bool check_submdspan_match(int src_idx, int sub_idx, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>,
Kokkos::strided_slice<int,int,int> p, SliceArgs ... slices) {
using idx_t = typename SubExtents::index_type;
return (sub_ext.extent(sub_idx)==static_cast<idx_t>((p.extent+p.stride-1)/p.stride)) && match_expected_extents(++src_idx, ++sub_idx, src_ext, sub_ext, slices...);
using idx_t = typename SubMDSpan::index_type;
return (sub_mds.extent(sub_idx)==static_cast<idx_t>((p.extent+p.stride-1)/p.stride)) && check_submdspan_match(++src_idx, ++sub_idx, src_mds, sub_mds, std::index_sequence<SrcIdx...,3>(), std::index_sequence<SubIdx...,1>(), slices...);
}
template<class SrcExtents, class SubExtents, class ... SliceArgs>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx, class ... SliceArgs>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int src_idx, int sub_idx, SrcExtents src_ext, SubExtents sub_ext,
static bool check_submdspan_match(int src_idx, int sub_idx, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>,
Kokkos::strided_slice<int,std::integral_constant<int, 0>,std::integral_constant<int,0>>, SliceArgs ... slices) {
return (sub_ext.extent(sub_idx)==0) && match_expected_extents(++src_idx, ++sub_idx, src_ext, sub_ext, slices...);
return (sub_mds.extent(sub_idx)==0) && check_submdspan_match(++src_idx, ++sub_idx, src_mds, sub_mds, std::index_sequence<SrcIdx...,1>(), std::index_sequence<SubIdx...,0>(), slices...);
}
template<class SrcExtents, class SubExtents, class ... SliceArgs>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx, class ... SliceArgs>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int src_idx, int sub_idx, SrcExtents src_ext, SubExtents sub_ext, Kokkos::full_extent_t, SliceArgs ... slices) {
return (sub_ext.extent(sub_idx)==src_ext.extent(src_idx)) && match_expected_extents(++src_idx, ++sub_idx, src_ext, sub_ext, slices...);
static bool check_submdspan_match(int src_idx, int sub_idx, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>, Kokkos::full_extent_t, SliceArgs ... slices) {
return (sub_mds.extent(sub_idx)==src_mds.extent(src_idx)) && check_submdspan_match(++src_idx, ++sub_idx, src_mds, sub_mds, std::index_sequence<SrcIdx...,1>(), std::index_sequence<SubIdx...,1>(), slices...);
}
template<class SrcExtents, class SubExtents>
template<class SrcMDSpan, class SubMDSpan, size_t ... SrcIdx, size_t ... SubIdx>
MDSPAN_INLINE_FUNCTION
static bool match_expected_extents(int, int, SrcExtents, SubExtents) { return true; }
static bool check_submdspan_match(int, int, SrcMDSpan src_mds, SubMDSpan sub_mds, std::index_sequence<SrcIdx...>, std::index_sequence<SubIdx...>) {
#if MDSPAN_USE_BRACKET_OPERATOR
if constexpr (SrcMDSpan::rank() == 0) {
return (&src_mds[]==&sub_mds[]);
} else if constexpr (SubMDSpan::rank() == 0) {
return (&src_mds[SrcIdx...]==&sub_mds[]);
} else {
if(sub_mds.size() == 0) return true;
return (&src_mds[SrcIdx...]==&sub_mds[SubIdx...]);
}
#else
if constexpr (SrcMDSpan::rank() == 0) {
return (&src_mds()==&sub_mds());
} else if constexpr (SubMDSpan::rank() == 0) {
return (&src_mds(SrcIdx...)==&sub_mds());
} else {
if(sub_mds.size() == 0) return true;
return (&src_mds(SrcIdx...)==&sub_mds(SubIdx...));
}
#endif
}

static void run() {
typename mds_org_t::mapping_type map(typename mds_org_t::extents_type(ConstrArgs...));
Expand All @@ -265,7 +285,7 @@ struct TestSubMDSpan<

dispatch([=] _MDSPAN_HOST_DEVICE () {
auto sub = Kokkos::submdspan(src, create_slice_arg(SubArgs())...);
bool match = match_expected_extents(0, 0, src.extents(), sub.extents(), create_slice_arg(SubArgs())...);
bool match = check_submdspan_match(0, 0, src, sub, std::index_sequence<>(), std::index_sequence<>(), create_slice_arg(SubArgs())...);
result[0] = match?1:0;
});
EXPECT_EQ(result[0], 1);
Expand Down
Loading