Skip to content

[SYCL] Fix use-after-free in reduction_nd_N_vars.cpp #9112

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
steffenlarsen merged 2 commits into from
Apr 19, 2023
Merged

[SYCL] Fix use-after-free in reduction_nd_N_vars.cpp #9112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6b31c
[SYCL] Fix use-after-free in reduction_nd_N_vars.cpp
aelovikov-intel Apr 18, 2023
74362b1
Simplify more
aelovikov-intel Apr 18, 2023
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
40 changes: 16 additions & 24 deletions sycl/test-e2e/Reduction/reduction_nd_N_vars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,30 +127,22 @@ int test(queue &Q, size_t NWorkItems, size_t WGSize, RedTys... Reds) {
Q.submit([&](handler &CGH) {
auto InAcc = sycl::detail::make_tuple(
accessor(Reds.InBuf, CGH, sycl::read_only)...);
auto SyclReds = std::forward_as_tuple(Reds.createRed(CGH)...);
std::apply(
[&](auto... SyclReds) {
CGH.parallel_for<Name>(
NDR, SyclReds..., [=](nd_item<1> NDIt, auto &...Reducers) {
static_assert(sizeof...(Reducers) == 4 ||
sizeof...(Reducers) == 2);
// No C++20, so don't have explicit template param lists in
// lambda and can't unfold std::integer_sequence to write
// generic code here.
auto ReducersTuple = std::forward_as_tuple(Reducers...);
size_t I = NDIt.get_global_id(0);

std::get<0>(ReducersTuple).combine(std::get<0>(InAcc)[I]);
std::get<1>(ReducersTuple).combine(std::get<1>(InAcc)[I]);
if constexpr (sizeof...(Reds) == 4) {
std::get<2>(ReducersTuple).combine(std::get<2>(InAcc)[I]);
std::get<3>(ReducersTuple).combine(std::get<3>(InAcc)[I]);
}

return;
});
},
SyclReds);
CGH.parallel_for<Name>(
NDR, Reds.createRed(CGH)..., [=](nd_item<1> NDIt, auto &...Reducers) {
static_assert(sizeof...(Reducers) == 4 || sizeof...(Reducers) == 2);
// No C++20, so don't have explicit template param lists in
// lambda and can't unfold std::integer_sequence to write
// generic code here.
auto ReducersTuple = std::forward_as_tuple(Reducers...);
size_t I = NDIt.get_global_id(0);

std::get<0>(ReducersTuple).combine(std::get<0>(InAcc)[I]);
std::get<1>(ReducersTuple).combine(std::get<1>(InAcc)[I]);
if constexpr (sizeof...(Reds) == 4) {
std::get<2>(ReducersTuple).combine(std::get<2>(InAcc)[I]);
std::get<3>(ReducersTuple).combine(std::get<3>(InAcc)[I]);
}
});
}).wait();

int NumErrors = (0 + ... + Reds.checkResult(NDR));
Expand Down