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

Prefer atomic_inc to atomic_increment #1183

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Prefer atomic_inc to atomic_increment #1183

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a78f6b
Prefer atomic_inc to atomic_increment
aprokop Oct 15, 2024
e9286b0
Minor change to unify atomic_inc with consecutive fetch
aprokop Oct 15, 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 benchmarks/bvh_driver/benchmark_registration.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ struct CountCallback
KOKKOS_FUNCTION void operator()(Query const &query, Value) const
{
auto const i = ArborX::getData(query);
Kokkos::atomic_increment(&count_(i));
Kokkos::atomic_inc(&count_(i));
}
};

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/dbscan/dbscan_timpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void sortAndFilterClusters(ExecutionSpace const &exec_space,
if (labels(i) < 0)
return;

Kokkos::atomic_increment(&cluster_sizes(labels(i)));
Kokkos::atomic_inc(&cluster_sizes(labels(i)));
});

// This kernel serves dual purpose:
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/execution_space_instances/execution_space_instances_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct CountCallback
KOKKOS_FUNCTION void operator()(Query const &query, Value const &) const
{
auto const i = ArborX::getData(query);
Kokkos::atomic_increment(&_counts(i));
Kokkos::atomic_inc(&_counts(i));
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/cluster/ArborX_DBSCAN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ dbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
if (vstat != old)
labels(i) = vstat;

Kokkos::atomic_increment(&cluster_sizes(labels(i)));
Kokkos::atomic_inc(&cluster_sizes(labels(i)));
});
if (is_special_case)
{
Expand Down
2 changes: 1 addition & 1 deletion src/cluster/detail/ArborX_FDBSCAN.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct CountUpToN
KOKKOS_FUNCTION auto operator()(Query const &query, Value const &) const
{
auto i = getData(query);
Kokkos::atomic_increment(&_counts(i));
Kokkos::atomic_inc(&_counts(i));

if (_counts(i) < _n)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks super sketchy

Suggested change
Kokkos::atomic_inc(&_counts(i));
if (_counts(i) < _n)
auto const counts_i = Kokkos::atomic_inc_fetch(&_counts(i));
if (counts_i < _n)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not really sketchy, but you are right, it is could be suboptimal in the case of threads sharing a query (which they currently don't when running BVH). I'll fix it.

return ArborX::CallbackTreeTraversalControl::normal_continuation;
Expand Down
4 changes: 2 additions & 2 deletions src/cluster/detail/ArborX_FDBSCANDenseBox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ struct CountUpToN_DenseBox
int j = _permute(jj);
if (distance(query_point, _primitives(j)) <= eps)
{
Kokkos::atomic_increment(&count);
Kokkos::atomic_inc(&count);
if (count >= _n)
return ArborX::CallbackTreeTraversalControl::early_exit;
}
}
}
else
{
Kokkos::atomic_increment(&count);
Kokkos::atomic_inc(&count);
if (count >= _n)
return ArborX::CallbackTreeTraversalControl::early_exit;
}
Expand Down
5 changes: 2 additions & 3 deletions src/distributed/detail/ArborX_DistributedTreeUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ void countResults(ExecutionSpace const &space, int n_queries,

Kokkos::parallel_for(
"ArborX::DistributedTree::query::count_results_per_query",
Kokkos::RangePolicy(space, 0, nnz), KOKKOS_LAMBDA(int i) {
Kokkos::atomic_increment(&offset(query_ids(i)));
});
Kokkos::RangePolicy(space, 0, nnz),
KOKKOS_LAMBDA(int i) { Kokkos::atomic_inc(&offset(query_ids(i))); });

KokkosExt::exclusive_scan(space, offset, offset, 0);
}
Expand Down
5 changes: 2 additions & 3 deletions src/spatial/detail/ArborX_CrsGraphWrapperImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ struct InsertGenerator
else if constexpr (std::is_same_v<PassTag,
FirstPassNoBufferOptimizationTag>)
{
return _callback(raw_predicate, value, [&](ValueType const &) {
Kokkos::atomic_increment(&count);
});
return _callback(raw_predicate, value,
[&](ValueType const &) { Kokkos::atomic_inc(&count); });
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions src/spatial/detail/ArborX_ExpandHalfToFull.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ void expandHalfToFull(ExecutionSpace const &space, Offsets &offsets,
for (int j = offsets_orig(i); j < offsets_orig(i + 1); ++j)
{
int const k = indices_orig(j);
Kokkos::atomic_increment(&offsets(i));
Kokkos::atomic_increment(&offsets(k));
Kokkos::atomic_inc(&offsets(i));
Kokkos::atomic_inc(&offsets(k));
}
});
KokkosExt::exclusive_scan(space, offsets, offsets, 0);
Expand Down
6 changes: 3 additions & 3 deletions src/spatial/detail/ArborX_NeighborList.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void findHalfNeighborList(ExecutionSpace const &space,
HalfTraversal(
space, bvh,
KOKKOS_LAMBDA(Value const &, Value const &value) {
Kokkos::atomic_increment(&offsets(value.index));
Kokkos::atomic_inc(&offsets(value.index));
},
NeighborListPredicateGetter{radius});
KokkosExt::exclusive_scan(space, offsets, offsets, 0);
Expand Down Expand Up @@ -136,8 +136,8 @@ void findFullNeighborList(ExecutionSpace const &space,
HalfTraversal(
space, bvh,
KOKKOS_LAMBDA(Value const &value1, Value const &value2) {
Kokkos::atomic_increment(&offsets(value1.index));
Kokkos::atomic_increment(&offsets(value2.index));
Kokkos::atomic_inc(&offsets(value1.index));
Kokkos::atomic_inc(&offsets(value2.index));
},
NeighborListPredicateGetter{radius});
KokkosExt::exclusive_scan(space, offsets, offsets, 0);
Expand Down
2 changes: 1 addition & 1 deletion test/tstDetailsHalfTraversal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(half_traversal, DeviceType, ARBORX_DEVICE_TYPES)
int i = value1.index;
int j = value2.index;
auto [min_ij, max_ij] = Kokkos::minmax(i, j);
Kokkos::atomic_increment(&count(max_ij * (max_ij + 1) / 2 + min_ij));
Kokkos::atomic_inc(&count(max_ij * (max_ij + 1) / 2 + min_ij));
},
Test::PredicateGetter{});

Expand Down
Loading