Skip to content

F
folly
Commit ae59c690 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot
Browse files
Options

rename atomic_fetch_set, atomic_fetch_reset impls 

Summary: Choose `_native` and `_fallback` suffixes nstead of `_x86` and `_deafult` suffixes. `_native` instead of `_x86` since the intention is broader than x86; `_fallback` instead of `_default` since fallback is a clear word.

Reviewed By: luciang

Differential Revision: D32160396

fbshipit-source-id: 08d064aae670ea7e93a098b16a511ff43ca8a7e1
parent d1e4e4d4
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 28 deletions
folly/synchronization/AtomicUtil-inl.h
View file @ ae59c690
......@@ -113,7 +113,7 @@ namespace detail {
// this optimization and clang cannot - https://gcc.godbolt.org/z/Q83rxX
template <typename Atomic>
bool atomic_fetch_set_default(
bool atomic_fetch_set_fallback(
Atomic& atomic, std::size_t bit, std::memory_order order) {
using Integer = decltype(atomic.load());
auto mask = Integer{0b1} << static_cast<Integer>(bit);
......@@ -121,7 +121,7 @@ bool atomic_fetch_set_default(
}
template <typename Atomic>
bool atomic_fetch_reset_default(
bool atomic_fetch_reset_fallback(
Atomic& atomic, std::size_t bit, std::memory_order order) {
using Integer = decltype(atomic.load());
auto mask = Integer{0b1} << static_cast<Integer>(bit);
......@@ -142,7 +142,7 @@ constexpr auto is_atomic<std::atomic<Integer>> = true;
#if defined(_MSC_VER)
template <typename Integer>
inline bool atomic_fetch_set_x86(
inline bool atomic_fetch_set_native(
std::atomic<Integer>& atomic, std::size_t bit, std::memory_order order) {
static_assert(alignof(std::atomic<Integer>) == alignof(Integer), "");
static_assert(sizeof(std::atomic<Integer>) == sizeof(Integer), "");
......@@ -157,20 +157,20 @@ inline bool atomic_fetch_set_x86(
static_cast<long long>(bit));
} else {
assert(sizeof(Integer) != 4 && sizeof(Integer) != 8);
return atomic_fetch_set_default(atomic, bit, order);
return atomic_fetch_set_fallback(atomic, bit, order);
}
}
template <typename Atomic>
inline bool atomic_fetch_set_x86(
inline bool atomic_fetch_set_native(
Atomic& atomic, std::size_t bit, std::memory_order order) {
static_assert(!std::is_same<Atomic, std::atomic<std::uint32_t>>{}, "");
static_assert(!std::is_same<Atomic, std::atomic<std::uint64_t>>{}, "");
return atomic_fetch_set_default(atomic, bit, order);
return atomic_fetch_set_fallback(atomic, bit, order);
}
template <typename Integer>
inline bool atomic_fetch_reset_x86(
inline bool atomic_fetch_reset_native(
std::atomic<Integer>& atomic, std::size_t bit, std::memory_order order) {
static_assert(alignof(std::atomic<Integer>) == alignof(Integer), "");
static_assert(sizeof(std::atomic<Integer>) == sizeof(Integer), "");
......@@ -185,22 +185,22 @@ inline bool atomic_fetch_reset_x86(
static_cast<long long>(bit));
} else {
assert(sizeof(Integer) != 4 && sizeof(Integer) != 8);
return atomic_fetch_reset_default(atomic, bit, order);
return atomic_fetch_reset_fallback(atomic, bit, order);
}
}
template <typename Atomic>
inline bool atomic_fetch_reset_x86(
inline bool atomic_fetch_reset_native(
Atomic& atomic, std::size_t bit, std::memory_order mo) {
static_assert(!std::is_same<Atomic, std::atomic<std::uint32_t>>{}, "");
static_assert(!std::is_same<Atomic, std::atomic<std::uint64_t>>{}, "");
return atomic_fetch_reset_default(atomic, bit, mo);
return atomic_fetch_reset_fallback(atomic, bit, mo);
}
#else
template <typename Integer>
inline bool atomic_fetch_set_x86(
inline bool atomic_fetch_set_native(
std::atomic<Integer>& atomic, std::size_t bit, std::memory_order order) {
auto previous = false;
......@@ -224,21 +224,21 @@ inline bool atomic_fetch_set_x86(
: "memory", "flags");
} else {
assert(sizeof(Integer) == 1);
return atomic_fetch_set_default(atomic, bit, order);
return atomic_fetch_set_fallback(atomic, bit, order);
}
return previous;
}
template <typename Atomic>
inline bool atomic_fetch_set_x86(
inline bool atomic_fetch_set_native(
Atomic& atomic, std::size_t bit, std::memory_order order) {
static_assert(!is_atomic<Atomic>, "");
return atomic_fetch_set_default(atomic, bit, order);
return atomic_fetch_set_fallback(atomic, bit, order);
}
template <typename Integer>
inline bool atomic_fetch_reset_x86(
inline bool atomic_fetch_reset_native(
std::atomic<Integer>& atomic, std::size_t bit, std::memory_order order) {
auto previous = false;
......@@ -262,17 +262,17 @@ inline bool atomic_fetch_reset_x86(
: "memory", "flags");
} else {
assert(sizeof(Integer) == 1);
return atomic_fetch_reset_default(atomic, bit, order);
return atomic_fetch_reset_fallback(atomic, bit, order);
}
return previous;
}
template <typename Atomic>
bool atomic_fetch_reset_x86(
bool atomic_fetch_reset_native(
Atomic& atomic, std::size_t bit, std::memory_order order) {
static_assert(!is_atomic<Atomic>, "");
return atomic_fetch_reset_default(atomic, bit, order);
return atomic_fetch_reset_fallback(atomic, bit, order);
}
#endif
......@@ -280,12 +280,13 @@ bool atomic_fetch_reset_x86(
#else
template <typename Atomic>
bool atomic_fetch_set_x86(Atomic&, std::size_t, std::memory_order) noexcept {
bool atomic_fetch_set_native(Atomic&, std::size_t, std::memory_order) noexcept {
// This should never be called on non x86_64 platforms.
std::terminate();
}
template <typename Atomic>
bool atomic_fetch_reset_x86(Atomic&, std::size_t, std::memory_order) noexcept {
bool atomic_fetch_reset_native(
Atomic&, std::size_t, std::memory_order) noexcept {
// This should never be called on non x86_64 platforms.
std::terminate();
}
......@@ -304,10 +305,10 @@ bool atomic_fetch_set(Atomic& atomic, std::size_t bit, std::memory_order mo) {
// do the optimized thing on x86 builds. Also, some versions of TSAN do not
// properly instrument the inline assembly, so avoid it when TSAN is enabled
if (folly::kIsArchAmd64 && !folly::kIsSanitizeThread) {
return detail::atomic_fetch_set_x86(atomic, bit, mo);
return detail::atomic_fetch_set_native(atomic, bit, mo);
} else {
// otherwise default to the default implementation using fetch_or()
return detail::atomic_fetch_set_default(atomic, bit, mo);
return detail::atomic_fetch_set_fallback(atomic, bit, mo);
}
}
......@@ -321,10 +322,10 @@ bool atomic_fetch_reset(Atomic& atomic, std::size_t bit, std::memory_order mo) {
// do the optimized thing on x86 builds. Also, some versions of TSAN do not
// properly instrument the inline assembly, so avoid it when TSAN is enabled
if (folly::kIsArchAmd64 && !folly::kIsSanitizeThread) {
return detail::atomic_fetch_reset_x86(atomic, bit, mo);
return detail::atomic_fetch_reset_native(atomic, bit, mo);
} else {
// otherwise default to the default implementation using fetch_and()
return detail::atomic_fetch_reset_default(atomic, bit, mo);
return detail::atomic_fetch_reset_fallback(atomic, bit, mo);
}
}
......
folly/synchronization/test/AtomicUtilTest.cpp
View file @ ae59c690
......@@ -270,7 +270,8 @@ TEST_F(AtomicFetchResetTest, EnsureFetchAndUsed) {
TEST_F(AtomicFetchSetTest, FetchSetDefault) {
auto fetch_set = [](auto&&... args) {
return detail::atomic_fetch_set_default(args..., std::memory_order_seq_cst);
return detail::atomic_fetch_set_fallback(
args..., std::memory_order_seq_cst);
};
atomic_fetch_set_basic<std::uint16_t>(fetch_set);
......@@ -286,7 +287,7 @@ TEST_F(AtomicFetchSetTest, FetchSetDefault) {
TEST_F(AtomicFetchSetTest, FetchResetDefault) {
auto fetch_reset = [](auto&&... args) {
return detail::atomic_fetch_reset_default(
return detail::atomic_fetch_reset_fallback(
args..., std::memory_order_seq_cst);
};
......@@ -304,7 +305,8 @@ TEST_F(AtomicFetchSetTest, FetchResetDefault) {
TEST_F(AtomicFetchSetTest, FetchSetX86) {
if (folly::kIsArchAmd64) {
auto fetch_set = [](auto&&... args) {
return detail::atomic_fetch_set_x86(args..., std::memory_order_seq_cst);
return detail::atomic_fetch_set_native(
args..., std::memory_order_seq_cst);
};
atomic_fetch_set_basic<std::uint16_t>(fetch_set);
......@@ -322,7 +324,8 @@ TEST_F(AtomicFetchSetTest, FetchSetX86) {
TEST_F(AtomicFetchResetTest, FetchResetX86) {
if (folly::kIsArchAmd64) {
auto fetch_reset = [](auto&&... args) {
return detail::atomic_fetch_reset_x86(args..., std::memory_order_seq_cst);
return detail::atomic_fetch_reset_native(
args..., std::memory_order_seq_cst);
};
atomic_fetch_reset_basic<std::uint16_t>(fetch_reset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment