Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[SYCL] Replace std::fill in single_task with a fill command #1049

Merged
merged 2 commits into from
Feb 1, 2023
Merged

[SYCL] Replace std::fill in single_task with a fill command #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de840b
[SYCL] Replace std::fill in single_task with a fill command
steffenlarsen Jun 9, 2022
8c47e19
Merge remote-tracking branch 'intel/intel' into steffen/fix_nd_reduct…
steffenlarsen Jan 12, 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
12 changes: 5 additions & 7 deletions SYCL/Reduction/reduction_nd_N_queue_shortcut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,18 @@ int test(queue &Q, BOpT1 BOp1, BOpT2 BOp2, const nd_range<Dims> &Range) {
})
.wait();
} else if constexpr (TC == TestCase::Dependency) {
auto E = Q.single_task([=]() {
std::fill(Arr1, Arr1 + NElems, 1);
std::fill(Arr2, Arr2 + NElems, 2);
});
Q.parallel_for(Range, E, R1, R2,
auto E1 = Q.fill<T1>(Arr1, 1, NElems);
auto E2 = Q.fill<T2>(Arr2, 2, NElems, E1);
Q.parallel_for(Range, E2, R1, R2,
[=](nd_item<Dims> It, auto &Sum1, auto &Sum2) {
size_t LinId = It.get_global_linear_id();
Sum1.combine(static_cast<T1>(LinId) + Arr1[LinId]);
Sum2.combine(static_cast<T2>(LinId) + Arr2[LinId]);
})
.wait();
} else {
auto E1 = Q.single_task([=]() { std::fill(Arr1, Arr1 + NElems, 1); });
auto E2 = Q.single_task([=]() { std::fill(Arr2, Arr2 + NElems, 2); });
auto E1 = Q.fill<T1>(Arr1, 1, NElems);
auto E2 = Q.fill<T2>(Arr2, 2, NElems);
std::vector<event> EVec{E1, E2};
Q.parallel_for(Range, EVec, R1, R2,
[=](nd_item<Dims> It, auto &Sum1, auto &Sum2) {
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Reduction/reduction_nd_queue_shortcut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ int test(queue &Q, BinaryOperation BOp, const nd_range<Dims> &Range) {
Sum.combine(static_cast<T>(LinId) + Arr[LinId]);
}).wait();
} else if constexpr (TC == TestCase::Dependency) {
auto E = Q.single_task([=]() { std::fill(Arr, Arr + NElems, 1); });
auto E = Q.fill<T>(Arr, 1, NElems);
Q.parallel_for(Range, E, Redu, [=](nd_item<Dims> It, auto &Sum) {
size_t LinId = It.get_global_linear_id();
Sum.combine(static_cast<T>(LinId) + Arr[LinId]);
}).wait();
} else {
auto E = Q.single_task([=]() { std::fill(Arr, Arr + NElems, 1); });
auto E = Q.fill<T>(Arr, 1, NElems);
std::vector<event> EVec{E};
Q.parallel_for(Range, EVec, Redu, [=](nd_item<Dims> It, auto &Sum) {
size_t LinId = It.get_global_linear_id();
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Reduction/reduction_range_queue_shortcut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ int test(queue &Q, BinaryOperation BOp, const range<Dims> &Range) {
Sum.combine(static_cast<T>(LinId) + Arr[LinId]);
}).wait();
} else if constexpr (TC == TestCase::Dependency) {
auto E = Q.single_task([=]() { std::fill(Arr, Arr + NElems, 1); });
auto E = Q.fill<T>(Arr, 1, NElems);
Q.parallel_for(Range, E, Redu, [=](id<Dims> Id, auto &Sum) {
size_t LinId = linearizeId(Id, Range);
Sum.combine(static_cast<T>(LinId) + Arr[LinId]);
}).wait();
} else {
auto E = Q.single_task([=]() { std::fill(Arr, Arr + NElems, 1); });
auto E = Q.fill<T>(Arr, 1, NElems);
std::vector<event> EVec{E};
Q.parallel_for(Range, EVec, Redu, [=](id<Dims> Id, auto &Sum) {
size_t LinId = linearizeId(Id, Range);
Expand Down