Move assume_aligned to opthelpers.h and define force_inline
This commit is contained in:
parent
325c992bea
commit
51796ccbed
@ -101,42 +101,6 @@ constexpr bool operator==(const allocator<T,N>&, const allocator<U,M>&) noexcept
|
||||
template<typename T, std::size_t N, typename U, std::size_t M>
|
||||
constexpr bool operator!=(const allocator<T,N>&, const allocator<U,M>&) noexcept { return false; }
|
||||
|
||||
#ifdef __cpp_lib_assume_aligned
|
||||
template<std::size_t alignment, typename T>
|
||||
using assume_aligned = std::assume_aligned<alignment,T>;
|
||||
|
||||
#elif defined(__clang__) || (defined(__GNUC__) && !defined(__ICC))
|
||||
|
||||
template<std::size_t alignment, typename T>
|
||||
[[gnu::always_inline/*,nodiscard*/]] constexpr T* assume_aligned(T *ptr) noexcept
|
||||
{ return static_cast<T*>(__builtin_assume_aligned(ptr, alignment)); }
|
||||
|
||||
#elif defined(_MSC_VER)
|
||||
|
||||
template<std::size_t alignment, typename T>
|
||||
__forceinline /*[[nodiscard]]*/ constexpr T* assume_aligned(T *ptr) noexcept
|
||||
{
|
||||
static constexpr std::size_t alignment_mask{(1<<alignment) - 1};
|
||||
if((reinterpret_cast<std::uintptr_t>(ptr)&alignment_mask) == 0)
|
||||
return ptr;
|
||||
__assume(0);
|
||||
}
|
||||
|
||||
#elif defined(__ICC)
|
||||
|
||||
template<std::size_t alignment, typename T>
|
||||
/*[[nodiscard]]*/ constexpr T* assume_aligned(T *ptr) noexcept
|
||||
{
|
||||
__assume_aligned(ptr, alignment);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
template<std::size_t alignment, typename T>
|
||||
/*[[nodiscard]]*/ constexpr T* assume_aligned(T *ptr) noexcept { return ptr; }
|
||||
#endif
|
||||
|
||||
|
||||
template<typename T, typename ...Args>
|
||||
constexpr T* construct_at(T *ptr, Args&& ...args)
|
||||
|
@ -10,27 +10,37 @@
|
||||
#define HAS_BUILTIN(x) (0)
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define force_inline [[gnu::always_inline]]
|
||||
#elif defined(_MSC_VER)
|
||||
#define force_inline __forceinline
|
||||
#else
|
||||
#define force_inline inline
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) || HAS_BUILTIN(__builtin_expect)
|
||||
/* likely() optimizes for the case where the condition is true. The condition
|
||||
* is not required to be true, but it can result in more optimal code for the
|
||||
* true path at the expense of a less optimal false path.
|
||||
*/
|
||||
template<typename T>
|
||||
constexpr bool likely(T&& expr) noexcept
|
||||
force_inline constexpr bool likely(T&& expr) noexcept
|
||||
{ return __builtin_expect(static_cast<bool>(std::forward<T>(expr)), true); }
|
||||
/* The opposite of likely(), optimizing for the case where the condition is
|
||||
* false.
|
||||
*/
|
||||
template<typename T>
|
||||
constexpr bool unlikely(T&& expr) noexcept
|
||||
force_inline constexpr bool unlikely(T&& expr) noexcept
|
||||
{ return __builtin_expect(static_cast<bool>(std::forward<T>(expr)), false); }
|
||||
|
||||
#else
|
||||
|
||||
template<typename T>
|
||||
constexpr bool likely(T&& expr) noexcept { return static_cast<bool>(std::forward<T>(expr)); }
|
||||
force_inline constexpr bool likely(T&& expr) noexcept
|
||||
{ return static_cast<bool>(std::forward<T>(expr)); }
|
||||
template<typename T>
|
||||
constexpr bool unlikely(T&& expr) noexcept { return static_cast<bool>(std::forward<T>(expr)); }
|
||||
force_inline constexpr bool unlikely(T&& expr) noexcept
|
||||
{ return static_cast<bool>(std::forward<T>(expr)); }
|
||||
#endif
|
||||
#define LIKELY(x) (likely(x))
|
||||
#define UNLIKELY(x) (unlikely(x))
|
||||
@ -49,4 +59,28 @@ constexpr bool unlikely(T&& expr) noexcept { return static_cast<bool>(std::forwa
|
||||
#define ASSUME(x) ((void)0)
|
||||
#endif
|
||||
|
||||
namespace al {
|
||||
|
||||
template<std::size_t alignment, typename T>
|
||||
force_inline constexpr auto assume_aligned(T *ptr) noexcept
|
||||
{
|
||||
#ifdef __cpp_lib_assume_aligned
|
||||
return std::assume_aligned<alignment,T>(ptr);
|
||||
#elif defined(__clang__) || (defined(__GNUC__) && !defined(__ICC))
|
||||
return static_cast<T*>(__builtin_assume_aligned(ptr, alignment));
|
||||
#elif defined(_MSC_VER)
|
||||
constexpr std::size_t alignment_mask{(1<<alignment) - 1};
|
||||
if((reinterpret_cast<std::uintptr_t>(ptr)&alignment_mask) == 0)
|
||||
return ptr;
|
||||
__assume(0);
|
||||
#elif defined(__ICC)
|
||||
__assume_aligned(ptr, alignment);
|
||||
return ptr;
|
||||
#else
|
||||
return ptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace al
|
||||
|
||||
#endif /* OPTHELPERS_H */
|
||||
|
Loading…
x
Reference in New Issue
Block a user