Move folly/Bits.h to folly/lang/
authorYedidya Feldblum <yfeldblum@fb.com>
Fri, 8 Dec 2017 08:24:44 +0000 (00:24 -0800)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Fri, 8 Dec 2017 08:36:54 +0000 (00:36 -0800)
Summary: [Folly] Move `folly/Bits.h` to `folly/lang/`.

Reviewed By: phoad, Orvid

Differential Revision: D6495547

fbshipit-source-id: a93159321df8277f8a4b4f10a5e4e0fc58cb6022

27 files changed:
CMakeLists.txt
folly/AtomicHashArray-inl.h
folly/AtomicUnorderedMap.h
folly/BitIterator.h
folly/Bits.h
folly/GroupVarint.h
folly/MacAddress.h
folly/Makefile.am
folly/compression/Compression.cpp
folly/compression/Utils.h
folly/experimental/BitVectorCoding.h
folly/experimental/Bits.h
folly/experimental/EliasFanoCoding.h
folly/experimental/EventCount.h
folly/hash/Hash.h
folly/io/Cursor.h
folly/io/async/AsyncSSLSocket.cpp
folly/io/async/AsyncSSLSocket.h
folly/io/async/HHWheelTimer.cpp
folly/json.cpp
folly/lang/Bits.h [new file with mode: 0644]
folly/lang/test/BitsTest.cpp [new file with mode: 0644]
folly/test/BitsBenchmark.cpp
folly/test/BitsTest.cpp [deleted file]
folly/test/EndianTest.cpp
folly/test/IPAddressTest.cpp
folly/tracing/test/StaticTracepointTest.cpp

index fc0084dc13d6ae2fbaceea69975ed522038c3382..ae6ab6d01dc44e182284260a72a89f402a75ed8d 100755 (executable)
@@ -517,6 +517,9 @@ if (BUILD_TESTS)
     DIRECTORY io/async/ssl/test/
       TEST ssl_errors_test SOURCES SSLErrorsTest.cpp
 
     DIRECTORY io/async/ssl/test/
       TEST ssl_errors_test SOURCES SSLErrorsTest.cpp
 
+    DIRECTORY lang/test/
+      TEST bits_test SOURCES BitsTest.cpp
+
     DIRECTORY memory/test/
       TEST arena_test SOURCES ArenaTest.cpp
       TEST thread_cached_arena_test SOURCES ThreadCachedArenaTest.cpp
     DIRECTORY memory/test/
       TEST arena_test SOURCES ArenaTest.cpp
       TEST thread_cached_arena_test SOURCES ThreadCachedArenaTest.cpp
@@ -560,7 +563,6 @@ if (BUILD_TESTS)
       TEST atomic_struct_test SOURCES AtomicStructTest.cpp
       TEST atomic_unordered_map_test SOURCES AtomicUnorderedMapTest.cpp
       TEST bit_iterator_test SOURCES BitIteratorTest.cpp
       TEST atomic_struct_test SOURCES AtomicStructTest.cpp
       TEST atomic_unordered_map_test SOURCES AtomicUnorderedMapTest.cpp
       TEST bit_iterator_test SOURCES BitIteratorTest.cpp
-      TEST bits_test SOURCES BitsTest.cpp
       TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp
       TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp
       TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp
       TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp
       TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp
       TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp
index f8251f338f3e4981fc5c2b3ea7af046a9254bd7a..4333e5a0eb03135c05ded6ad1488a617e410100f 100644 (file)
@@ -20,8 +20,8 @@
 
 #include <type_traits>
 
 
 #include <type_traits>
 
-#include <folly/Bits.h>
 #include <folly/detail/AtomicHashUtils.h>
 #include <folly/detail/AtomicHashUtils.h>
+#include <folly/lang/Bits.h>
 
 namespace folly {
 
 
 namespace folly {
 
index ca867fc1dfa2d0ee71f87418f1e36a655f95ae42..edf3b1dacfe41433b804ea7065c8bfab04f56ba1 100644 (file)
 
 #include <boost/type_traits/has_trivial_destructor.hpp>
 
 
 #include <boost/type_traits/has_trivial_destructor.hpp>
 
-#include <folly/Bits.h>
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Random.h>
 #include <folly/detail/AtomicUnorderedMapUtils.h>
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Random.h>
 #include <folly/detail/AtomicUnorderedMapUtils.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
 
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
 
index b754570124fa28acadd4704186bf6568dec18a44..0446bd13e9085782433fa7c3e73ba5b7a36ab8ee 100644 (file)
@@ -38,9 +38,9 @@
 
 #include <boost/iterator/iterator_adaptor.hpp>
 
 
 #include <boost/iterator/iterator_adaptor.hpp>
 
-#include <folly/Bits.h>
 #include <folly/Portability.h>
 #include <folly/detail/BitIteratorDetail.h>
 #include <folly/Portability.h>
 #include <folly/detail/BitIteratorDetail.h>
+#include <folly/lang/Bits.h>
 
 namespace folly {
 
 
 namespace folly {
 
index 889b3a0b0c2d6852cef8a0c9c623b6806a123ee8..a3cff3ea962f66f3c1ad78d08032833b42a1bb13 100644 (file)
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 
-/**
- * Various low-level, bit-manipulation routines.
- *
- * findFirstSet(x)  [constexpr]
- *    find first (least significant) bit set in a value of an integral type,
- *    1-based (like ffs()).  0 = no bits are set (x == 0)
- *
- * findLastSet(x)  [constexpr]
- *    find last (most significant) bit set in a value of an integral type,
- *    1-based.  0 = no bits are set (x == 0)
- *    for x != 0, findLastSet(x) == 1 + floor(log2(x))
- *
- * nextPowTwo(x)  [constexpr]
- *    Finds the next power of two >= x.
- *
- * isPowTwo(x)  [constexpr]
- *    return true iff x is a power of two
- *
- * popcount(x)
- *    return the number of 1 bits in x
- *
- * Endian
- *    convert between native, big, and little endian representation
- *    Endian::big(x)      big <-> native
- *    Endian::little(x)   little <-> native
- *    Endian::swap(x)     big <-> little
- *
- * @author Tudor Bosman (tudorb@fb.com)
- */
-
-#pragma once
-
-// MSVC does not support intrinsics constexpr
-#if defined(_MSC_VER)
-#define FOLLY_INTRINSIC_CONSTEXPR const
-#else
-#define FOLLY_INTRINSIC_CONSTEXPR constexpr
-#endif
-
-#include <cassert>
-#include <cinttypes>
-#include <cstdint>
-#include <cstring>
-#include <limits>
-#include <type_traits>
-
-#include <folly/Portability.h>
-#include <folly/lang/Assume.h>
-#include <folly/portability/Builtins.h>
-
-namespace folly {
-
-// Generate overloads for findFirstSet as wrappers around
-// appropriate ffs, ffsl, ffsll gcc builtins
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) <= sizeof(unsigned int)),
-  unsigned int>::type
-  findFirstSet(T x) {
-  return static_cast<unsigned int>(__builtin_ffs(static_cast<int>(x)));
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) > sizeof(unsigned int) &&
-   sizeof(T) <= sizeof(unsigned long)),
-  unsigned int>::type
-  findFirstSet(T x) {
-  return static_cast<unsigned int>(__builtin_ffsl(static_cast<long>(x)));
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) > sizeof(unsigned long) &&
-   sizeof(T) <= sizeof(unsigned long long)),
-  unsigned int>::type
-  findFirstSet(T x) {
-  return static_cast<unsigned int>(__builtin_ffsll(static_cast<long long>(x)));
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value && std::is_signed<T>::value),
-  unsigned int>::type
-  findFirstSet(T x) {
-  // Note that conversion from a signed type to the corresponding unsigned
-  // type is technically implementation-defined, but will likely work
-  // on any impementation that uses two's complement.
-  return findFirstSet(static_cast<typename std::make_unsigned<T>::type>(x));
-}
-
-// findLastSet: return the 1-based index of the highest bit set
-// for x > 0, findLastSet(x) == 1 + floor(log2(x))
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) <= sizeof(unsigned int)),
-  unsigned int>::type
-  findLastSet(T x) {
-  // If X is a power of two X - Y = ((X - 1) ^ Y) + 1. Doing this transformation
-  // allows GCC to remove its own xor that it adds to implement clz using bsr
-  return x ? ((8 * sizeof(unsigned int) - 1) ^ __builtin_clz(x)) + 1 : 0;
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) > sizeof(unsigned int) &&
-   sizeof(T) <= sizeof(unsigned long)),
-  unsigned int>::type
-  findLastSet(T x) {
-  return x ? ((8 * sizeof(unsigned long) - 1) ^ __builtin_clzl(x)) + 1 : 0;
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) > sizeof(unsigned long) &&
-   sizeof(T) <= sizeof(unsigned long long)),
-  unsigned int>::type
-  findLastSet(T x) {
-  return x ? ((8 * sizeof(unsigned long long) - 1) ^ __builtin_clzll(x)) + 1
-           : 0;
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_signed<T>::value),
-  unsigned int>::type
-  findLastSet(T x) {
-  return findLastSet(static_cast<typename std::make_unsigned<T>::type>(x));
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR
-typename std::enable_if<
-  std::is_integral<T>::value && std::is_unsigned<T>::value,
-  T>::type
-nextPowTwo(T v) {
-  return v ? (T(1) << findLastSet(v - 1)) : 1;
-}
-
-template <class T>
-inline FOLLY_INTRINSIC_CONSTEXPR typename std::
-    enable_if<std::is_integral<T>::value && std::is_unsigned<T>::value, T>::type
-    prevPowTwo(T v) {
-  return v ? (T(1) << (findLastSet(v) - 1)) : 0;
-}
-
-template <class T>
-inline constexpr typename std::enable_if<
-    std::is_integral<T>::value && std::is_unsigned<T>::value,
-    bool>::type
-isPowTwo(T v) {
-  return (v != 0) && !(v & (v - 1));
-}
-
-/**
- * Population count
- */
-template <class T>
-inline typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) <= sizeof(unsigned int)),
-  size_t>::type
-  popcount(T x) {
-  return size_t(__builtin_popcount(x));
-}
-
-template <class T>
-inline typename std::enable_if<
-  (std::is_integral<T>::value &&
-   std::is_unsigned<T>::value &&
-   sizeof(T) > sizeof(unsigned int) &&
-   sizeof(T) <= sizeof(unsigned long long)),
-  size_t>::type
-  popcount(T x) {
-  return size_t(__builtin_popcountll(x));
-}
-
-/**
- * Endianness detection and manipulation primitives.
- */
-namespace detail {
-
-template <size_t Size>
-struct uint_types_by_size;
-
-#define FB_GEN(sz, fn)                                      \
-  static inline uint##sz##_t byteswap_gen(uint##sz##_t v) { \
-    return fn(v);                                           \
-  }                                                         \
-  template <>                                               \
-  struct uint_types_by_size<sz / 8> {                       \
-    using type = uint##sz##_t;                              \
-  };
-
-FB_GEN(8, uint8_t)
-#ifdef _MSC_VER
-FB_GEN(64, _byteswap_uint64)
-FB_GEN(32, _byteswap_ulong)
-FB_GEN(16, _byteswap_ushort)
-#else
-FB_GEN(64, __builtin_bswap64)
-FB_GEN(32, __builtin_bswap32)
-FB_GEN(16, __builtin_bswap16)
-#endif
-
-#undef FB_GEN
-
-template <class T>
-struct EndianInt {
-  static_assert(
-      (std::is_integral<T>::value && !std::is_same<T, bool>::value) ||
-          std::is_floating_point<T>::value,
-      "template type parameter must be non-bool integral or floating point");
-  static T swap(T x) {
-    // we implement this with memcpy because that is defined behavior in C++
-    // we rely on compilers to optimize away the memcpy calls
-    constexpr auto s = sizeof(T);
-    using B = typename uint_types_by_size<s>::type;
-    B b;
-    std::memcpy(&b, &x, s);
-    b = byteswap_gen(b);
-    std::memcpy(&x, &b, s);
-    return x;
-  }
-  static T big(T x) {
-    return kIsLittleEndian ? EndianInt::swap(x) : x;
-  }
-  static T little(T x) {
-    return kIsBigEndian ? EndianInt::swap(x) : x;
-  }
-};
-
-} // namespace detail
-
-// big* convert between native and big-endian representations
-// little* convert between native and little-endian representations
-// swap* convert between big-endian and little-endian representations
-//
-// ntohs, htons == big16
-// ntohl, htonl == big32
-#define FB_GEN1(fn, t, sz) \
-  static t fn##sz(t x) { return fn<t>(x); } \
-
-#define FB_GEN2(t, sz) \
-  FB_GEN1(swap, t, sz) \
-  FB_GEN1(big, t, sz) \
-  FB_GEN1(little, t, sz)
-
-#define FB_GEN(sz) \
-  FB_GEN2(uint##sz##_t, sz) \
-  FB_GEN2(int##sz##_t, sz)
-
-class Endian {
- public:
-  enum class Order : uint8_t {
-    LITTLE,
-    BIG
-  };
-
-  static constexpr Order order = kIsLittleEndian ? Order::LITTLE : Order::BIG;
-
-  template <class T> static T swap(T x) {
-    return folly::detail::EndianInt<T>::swap(x);
-  }
-  template <class T> static T big(T x) {
-    return folly::detail::EndianInt<T>::big(x);
-  }
-  template <class T> static T little(T x) {
-    return folly::detail::EndianInt<T>::little(x);
-  }
-
-#if !defined(__ANDROID__)
-  FB_GEN(64)
-  FB_GEN(32)
-  FB_GEN(16)
-  FB_GEN(8)
-#endif
-};
-
-#undef FB_GEN
-#undef FB_GEN2
-#undef FB_GEN1
-
-
-template <class T, class Enable=void> struct Unaligned;
-
-/**
- * Representation of an unaligned value of a POD type.
- */
-FOLLY_PACK_PUSH
-template <class T>
-struct Unaligned<
-    T,
-    typename std::enable_if<std::is_pod<T>::value>::type> {
-  Unaligned() = default;  // uninitialized
-  /* implicit */ Unaligned(T v) : value(v) { }
-  T value;
-} FOLLY_PACK_ATTR;
-FOLLY_PACK_POP
-
-/**
- * Read an unaligned value of type T and return it.
- */
-template <class T>
-inline T loadUnaligned(const void* p) {
-  static_assert(sizeof(Unaligned<T>) == sizeof(T), "Invalid unaligned size");
-  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
-  if (kHasUnalignedAccess) {
-    return static_cast<const Unaligned<T>*>(p)->value;
-  } else {
-    T value;
-    memcpy(&value, p, sizeof(T));
-    return value;
-  }
-}
-
-/**
- * Write an unaligned value of type T.
- */
-template <class T>
-inline void storeUnaligned(void* p, T value) {
-  static_assert(sizeof(Unaligned<T>) == sizeof(T), "Invalid unaligned size");
-  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
-  if (kHasUnalignedAccess) {
-    // Prior to C++14, the spec says that a placement new like this
-    // is required to check that p is not nullptr, and to do nothing
-    // if p is a nullptr. By assuming it's not a nullptr, we get a
-    // nice loud segfault in optimized builds if p is nullptr, rather
-    // than just silently doing nothing.
-    folly::assume(p != nullptr);
-    new (p) Unaligned<T>(value);
-  } else {
-    memcpy(p, &value, sizeof(T));
-  }
-}
-
-template <typename T>
-T bitReverse(T n) {
-  auto m = static_cast<typename std::make_unsigned<T>::type>(n);
-  m = ((m & 0xAAAAAAAAAAAAAAAA) >> 1) | ((m & 0x5555555555555555) << 1);
-  m = ((m & 0xCCCCCCCCCCCCCCCC) >> 2) | ((m & 0x3333333333333333) << 2);
-  m = ((m & 0xF0F0F0F0F0F0F0F0) >> 4) | ((m & 0x0F0F0F0F0F0F0F0F) << 4);
-  return static_cast<T>(Endian::swap(m));
-}
-
-} // namespace folly
+#include <folly/lang/Bits.h> // @shim
index ed7dae63192456a486232054511aaef2949ea1df..ad0bb361cf59620e229886ab2696d33152c75618 100644 (file)
@@ -30,9 +30,9 @@
 #if FOLLY_X64 || defined(__i386__) || FOLLY_PPC64 || FOLLY_AARCH64
 #define HAVE_GROUP_VARINT 1
 
 #if FOLLY_X64 || defined(__i386__) || FOLLY_PPC64 || FOLLY_AARCH64
 #define HAVE_GROUP_VARINT 1
 
-#include <folly/Bits.h>
 #include <folly/Range.h>
 #include <folly/detail/GroupVarintDetail.h>
 #include <folly/Range.h>
 #include <folly/detail/GroupVarintDetail.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/Builtins.h>
 
 #if FOLLY_SSE >= 3
 #include <folly/portability/Builtins.h>
 
 #if FOLLY_SSE >= 3
index ef7c3ac1dca7733d21ab18ca499fb8b0a3a0845d..2a2c1fc4465b4b97f9f0d9677c40fc06e26cd269 100644 (file)
@@ -18,8 +18,8 @@
 
 #include <iosfwd>
 
 
 #include <iosfwd>
 
-#include <folly/Bits.h>
 #include <folly/Range.h>
 #include <folly/Range.h>
+#include <folly/lang/Bits.h>
 
 namespace folly {
 
 
 namespace folly {
 
index 121c1eeb9ff89d1862f97ac4ee584de833704601..2b077c754b67a777762e432d27b9f50882b9cadd 100644 (file)
@@ -325,6 +325,7 @@ nobase_follyinclude_HEADERS = \
        io/async/test/Util.h \
        json.h \
        lang/Assume.h \
        io/async/test/Util.h \
        json.h \
        lang/Assume.h \
+       lang/Bits.h \
        lang/ColdClass.h \
        lang/Launder.h \
        lang/RValueReferenceWrapper.h \
        lang/ColdClass.h \
        lang/Launder.h \
        lang/RValueReferenceWrapper.h \
index 6f288b5ce5ade7bdaae9b8db96f5d2e4c4d39c53..f94a381b1b5068ef14bf3e7cd24bf6f4cf71a005 100644 (file)
@@ -48,7 +48,6 @@
 #include <bzlib.h>
 #endif
 
 #include <bzlib.h>
 #endif
 
-#include <folly/Bits.h>
 #include <folly/Conv.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
 #include <folly/Conv.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
@@ -56,6 +55,7 @@
 #include <folly/Varint.h>
 #include <folly/compression/Utils.h>
 #include <folly/io/Cursor.h>
 #include <folly/Varint.h>
 #include <folly/compression/Utils.h>
 #include <folly/io/Cursor.h>
+#include <folly/lang/Bits.h>
 #include <algorithm>
 #include <unordered_set>
 
 #include <algorithm>
 #include <unordered_set>
 
index 8d23723f1cfa615e3957be9148c9802391d208c5..4804548bd268c58fe246b56eaad7df3f7bdf12dc 100644 (file)
@@ -18,9 +18,9 @@
 
 #include <type_traits>
 
 
 #include <type_traits>
 
-#include <folly/Bits.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/IOBuf.h>
+#include <folly/lang/Bits.h>
 
 /**
  * Helper functions for compression codecs.
 
 /**
  * Helper functions for compression codecs.
index 99c9c576265dd7112d14742eab4122d757e93d27..a24b955054f093fb06f2774f3647670595d24565 100644 (file)
@@ -20,7 +20,6 @@
 #include <limits>
 #include <type_traits>
 
 #include <limits>
 #include <type_traits>
 
-#include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
@@ -28,6 +27,7 @@
 #include <folly/experimental/CodingDetail.h>
 #include <folly/experimental/Instructions.h>
 #include <folly/experimental/Select64.h>
 #include <folly/experimental/CodingDetail.h>
 #include <folly/experimental/Instructions.h>
 #include <folly/experimental/Select64.h>
+#include <folly/lang/Bits.h>
 #include <glog/logging.h>
 
 #if !FOLLY_X64
 #include <glog/logging.h>
 
 #if !FOLLY_X64
index 0b1960c26609a8fd207ef4d55fda3fde41ef6047..f6ab45d75dc7419f7df89af291e420dc609cc37b 100644 (file)
@@ -22,9 +22,9 @@
 
 #include <glog/logging.h>
 
 
 #include <glog/logging.h>
 
-#include <folly/Bits.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
+#include <folly/lang/Bits.h>
 
 namespace folly {
 
 
 namespace folly {
 
index 04a0f15881a850216f2f7167ff24a53c9cb0bffb..8936ef0dba0d2d5c2c2db5d4ac6a393d939d15ff 100644 (file)
@@ -28,7 +28,6 @@
 #include <limits>
 #include <type_traits>
 
 #include <limits>
 #include <type_traits>
 
-#include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
@@ -36,6 +35,7 @@
 #include <folly/experimental/Instructions.h>
 #include <folly/experimental/Select64.h>
 #include <folly/lang/Assume.h>
 #include <folly/experimental/Instructions.h>
 #include <folly/experimental/Select64.h>
 #include <folly/lang/Assume.h>
+#include <folly/lang/Bits.h>
 #include <glog/logging.h>
 
 #if !FOLLY_X64
 #include <glog/logging.h>
 
 #if !FOLLY_X64
index 1496b8b17139d6cddc8fdbf1237a306fe427e193..95594f38ad3984d95d95ad4df2224ce23bc6a394 100644 (file)
 
 #include <glog/logging.h>
 
 
 #include <glog/logging.h>
 
-#include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/detail/Futex.h>
 #include <folly/Likely.h>
 #include <folly/detail/Futex.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/SysTime.h>
 #include <folly/portability/Unistd.h>
 
 #include <folly/portability/SysTime.h>
 #include <folly/portability/Unistd.h>
 
-
 namespace folly {
 
 /**
 namespace folly {
 
 /**
index 8f0743dea541f2d1d64b1c92065161b21e8c0515..6b6f137aea48569d4e73b737fa04a6261d8074e4 100644 (file)
 #include <type_traits>
 #include <utility>
 
 #include <type_traits>
 #include <utility>
 
-#include <folly/Bits.h>
 #include <folly/functional/ApplyTuple.h>
 #include <folly/hash/SpookyHashV1.h>
 #include <folly/hash/SpookyHashV2.h>
 #include <folly/functional/ApplyTuple.h>
 #include <folly/hash/SpookyHashV1.h>
 #include <folly/hash/SpookyHashV2.h>
+#include <folly/lang/Bits.h>
 
 /*
  * Various hashing functions.
 
 /*
  * Various hashing functions.
index ba0dd36f64e14a192ed2405953a542f474aa683e..c32e30429ce65087704e2b8d1eb3efa2b4c25401 100644 (file)
 #include <stdexcept>
 #include <type_traits>
 
 #include <stdexcept>
 #include <type_traits>
 
-#include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/Likely.h>
 #include <folly/Memory.h>
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufQueue.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/BitsFunctexcept.h>
 
 /**
 #include <folly/portability/BitsFunctexcept.h>
 
 /**
index 0cb7c73ac649b898c2967e808fa51283f5161f33..bfcb8b9ea7e40556b2482ec4af039f398e3dac88 100644 (file)
 #include <chrono>
 #include <memory>
 
 #include <chrono>
 #include <memory>
 
-#include <folly/Bits.h>
 #include <folly/Format.h>
 #include <folly/SocketAddress.h>
 #include <folly/SpinLock.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/IOBuf.h>
 #include <folly/Format.h>
 #include <folly/SocketAddress.h>
 #include <folly/SpinLock.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/IOBuf.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/OpenSSL.h>
 
 using folly::SocketAddress;
 #include <folly/portability/OpenSSL.h>
 
 using folly::SocketAddress;
index 1f1d679842608889093099661617973e8d646233..c3e38bbea35f146e64e102dedae3994ba3131fb3 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <iomanip>
 
 
 #include <iomanip>
 
-#include <folly/Bits.h>
 #include <folly/Optional.h>
 #include <folly/String.h>
 #include <folly/io/Cursor.h>
 #include <folly/Optional.h>
 #include <folly/String.h>
 #include <folly/io/Cursor.h>
@@ -30,6 +29,7 @@
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/ssl/TLSDefinitions.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/ssl/TLSDefinitions.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
 #include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
 #include <folly/ssl/OpenSSLPtrTypes.h>
index 57bb1ce97d7f3fca69355fbd853c1cd0976923c8..dd7301f5ea785a0f901b0eb91a049faa160b6572 100644 (file)
@@ -22,7 +22,7 @@
 #include <folly/Optional.h>
 #include <folly/ScopeGuard.h>
 
 #include <folly/Optional.h>
 #include <folly/ScopeGuard.h>
 
-#include <folly/Bits.h>
+#include <folly/lang/Bits.h>
 
 #include <cassert>
 
 
 #include <cassert>
 
index 029278e245f5a16b506a21a8e93e9d64a8a4ff00..db80b332a9b0c5825aa1a5f47f886f77993b11e6 100644 (file)
@@ -22,8 +22,8 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/next_prior.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/next_prior.hpp>
-#include <folly/Bits.h>
 #include <folly/Portability.h>
 #include <folly/Portability.h>
+#include <folly/lang/Bits.h>
 
 #include <folly/Conv.h>
 #include <folly/Range.h>
 
 #include <folly/Conv.h>
 #include <folly/Range.h>
diff --git a/folly/lang/Bits.h b/folly/lang/Bits.h
new file mode 100644 (file)
index 0000000..889b3a0
--- /dev/null
@@ -0,0 +1,384 @@
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Various low-level, bit-manipulation routines.
+ *
+ * findFirstSet(x)  [constexpr]
+ *    find first (least significant) bit set in a value of an integral type,
+ *    1-based (like ffs()).  0 = no bits are set (x == 0)
+ *
+ * findLastSet(x)  [constexpr]
+ *    find last (most significant) bit set in a value of an integral type,
+ *    1-based.  0 = no bits are set (x == 0)
+ *    for x != 0, findLastSet(x) == 1 + floor(log2(x))
+ *
+ * nextPowTwo(x)  [constexpr]
+ *    Finds the next power of two >= x.
+ *
+ * isPowTwo(x)  [constexpr]
+ *    return true iff x is a power of two
+ *
+ * popcount(x)
+ *    return the number of 1 bits in x
+ *
+ * Endian
+ *    convert between native, big, and little endian representation
+ *    Endian::big(x)      big <-> native
+ *    Endian::little(x)   little <-> native
+ *    Endian::swap(x)     big <-> little
+ *
+ * @author Tudor Bosman (tudorb@fb.com)
+ */
+
+#pragma once
+
+// MSVC does not support intrinsics constexpr
+#if defined(_MSC_VER)
+#define FOLLY_INTRINSIC_CONSTEXPR const
+#else
+#define FOLLY_INTRINSIC_CONSTEXPR constexpr
+#endif
+
+#include <cassert>
+#include <cinttypes>
+#include <cstdint>
+#include <cstring>
+#include <limits>
+#include <type_traits>
+
+#include <folly/Portability.h>
+#include <folly/lang/Assume.h>
+#include <folly/portability/Builtins.h>
+
+namespace folly {
+
+// Generate overloads for findFirstSet as wrappers around
+// appropriate ffs, ffsl, ffsll gcc builtins
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) <= sizeof(unsigned int)),
+  unsigned int>::type
+  findFirstSet(T x) {
+  return static_cast<unsigned int>(__builtin_ffs(static_cast<int>(x)));
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) > sizeof(unsigned int) &&
+   sizeof(T) <= sizeof(unsigned long)),
+  unsigned int>::type
+  findFirstSet(T x) {
+  return static_cast<unsigned int>(__builtin_ffsl(static_cast<long>(x)));
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) > sizeof(unsigned long) &&
+   sizeof(T) <= sizeof(unsigned long long)),
+  unsigned int>::type
+  findFirstSet(T x) {
+  return static_cast<unsigned int>(__builtin_ffsll(static_cast<long long>(x)));
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value && std::is_signed<T>::value),
+  unsigned int>::type
+  findFirstSet(T x) {
+  // Note that conversion from a signed type to the corresponding unsigned
+  // type is technically implementation-defined, but will likely work
+  // on any impementation that uses two's complement.
+  return findFirstSet(static_cast<typename std::make_unsigned<T>::type>(x));
+}
+
+// findLastSet: return the 1-based index of the highest bit set
+// for x > 0, findLastSet(x) == 1 + floor(log2(x))
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) <= sizeof(unsigned int)),
+  unsigned int>::type
+  findLastSet(T x) {
+  // If X is a power of two X - Y = ((X - 1) ^ Y) + 1. Doing this transformation
+  // allows GCC to remove its own xor that it adds to implement clz using bsr
+  return x ? ((8 * sizeof(unsigned int) - 1) ^ __builtin_clz(x)) + 1 : 0;
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) > sizeof(unsigned int) &&
+   sizeof(T) <= sizeof(unsigned long)),
+  unsigned int>::type
+  findLastSet(T x) {
+  return x ? ((8 * sizeof(unsigned long) - 1) ^ __builtin_clzl(x)) + 1 : 0;
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) > sizeof(unsigned long) &&
+   sizeof(T) <= sizeof(unsigned long long)),
+  unsigned int>::type
+  findLastSet(T x) {
+  return x ? ((8 * sizeof(unsigned long long) - 1) ^ __builtin_clzll(x)) + 1
+           : 0;
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_signed<T>::value),
+  unsigned int>::type
+  findLastSet(T x) {
+  return findLastSet(static_cast<typename std::make_unsigned<T>::type>(x));
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR
+typename std::enable_if<
+  std::is_integral<T>::value && std::is_unsigned<T>::value,
+  T>::type
+nextPowTwo(T v) {
+  return v ? (T(1) << findLastSet(v - 1)) : 1;
+}
+
+template <class T>
+inline FOLLY_INTRINSIC_CONSTEXPR typename std::
+    enable_if<std::is_integral<T>::value && std::is_unsigned<T>::value, T>::type
+    prevPowTwo(T v) {
+  return v ? (T(1) << (findLastSet(v) - 1)) : 0;
+}
+
+template <class T>
+inline constexpr typename std::enable_if<
+    std::is_integral<T>::value && std::is_unsigned<T>::value,
+    bool>::type
+isPowTwo(T v) {
+  return (v != 0) && !(v & (v - 1));
+}
+
+/**
+ * Population count
+ */
+template <class T>
+inline typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) <= sizeof(unsigned int)),
+  size_t>::type
+  popcount(T x) {
+  return size_t(__builtin_popcount(x));
+}
+
+template <class T>
+inline typename std::enable_if<
+  (std::is_integral<T>::value &&
+   std::is_unsigned<T>::value &&
+   sizeof(T) > sizeof(unsigned int) &&
+   sizeof(T) <= sizeof(unsigned long long)),
+  size_t>::type
+  popcount(T x) {
+  return size_t(__builtin_popcountll(x));
+}
+
+/**
+ * Endianness detection and manipulation primitives.
+ */
+namespace detail {
+
+template <size_t Size>
+struct uint_types_by_size;
+
+#define FB_GEN(sz, fn)                                      \
+  static inline uint##sz##_t byteswap_gen(uint##sz##_t v) { \
+    return fn(v);                                           \
+  }                                                         \
+  template <>                                               \
+  struct uint_types_by_size<sz / 8> {                       \
+    using type = uint##sz##_t;                              \
+  };
+
+FB_GEN(8, uint8_t)
+#ifdef _MSC_VER
+FB_GEN(64, _byteswap_uint64)
+FB_GEN(32, _byteswap_ulong)
+FB_GEN(16, _byteswap_ushort)
+#else
+FB_GEN(64, __builtin_bswap64)
+FB_GEN(32, __builtin_bswap32)
+FB_GEN(16, __builtin_bswap16)
+#endif
+
+#undef FB_GEN
+
+template <class T>
+struct EndianInt {
+  static_assert(
+      (std::is_integral<T>::value && !std::is_same<T, bool>::value) ||
+          std::is_floating_point<T>::value,
+      "template type parameter must be non-bool integral or floating point");
+  static T swap(T x) {
+    // we implement this with memcpy because that is defined behavior in C++
+    // we rely on compilers to optimize away the memcpy calls
+    constexpr auto s = sizeof(T);
+    using B = typename uint_types_by_size<s>::type;
+    B b;
+    std::memcpy(&b, &x, s);
+    b = byteswap_gen(b);
+    std::memcpy(&x, &b, s);
+    return x;
+  }
+  static T big(T x) {
+    return kIsLittleEndian ? EndianInt::swap(x) : x;
+  }
+  static T little(T x) {
+    return kIsBigEndian ? EndianInt::swap(x) : x;
+  }
+};
+
+} // namespace detail
+
+// big* convert between native and big-endian representations
+// little* convert between native and little-endian representations
+// swap* convert between big-endian and little-endian representations
+//
+// ntohs, htons == big16
+// ntohl, htonl == big32
+#define FB_GEN1(fn, t, sz) \
+  static t fn##sz(t x) { return fn<t>(x); } \
+
+#define FB_GEN2(t, sz) \
+  FB_GEN1(swap, t, sz) \
+  FB_GEN1(big, t, sz) \
+  FB_GEN1(little, t, sz)
+
+#define FB_GEN(sz) \
+  FB_GEN2(uint##sz##_t, sz) \
+  FB_GEN2(int##sz##_t, sz)
+
+class Endian {
+ public:
+  enum class Order : uint8_t {
+    LITTLE,
+    BIG
+  };
+
+  static constexpr Order order = kIsLittleEndian ? Order::LITTLE : Order::BIG;
+
+  template <class T> static T swap(T x) {
+    return folly::detail::EndianInt<T>::swap(x);
+  }
+  template <class T> static T big(T x) {
+    return folly::detail::EndianInt<T>::big(x);
+  }
+  template <class T> static T little(T x) {
+    return folly::detail::EndianInt<T>::little(x);
+  }
+
+#if !defined(__ANDROID__)
+  FB_GEN(64)
+  FB_GEN(32)
+  FB_GEN(16)
+  FB_GEN(8)
+#endif
+};
+
+#undef FB_GEN
+#undef FB_GEN2
+#undef FB_GEN1
+
+
+template <class T, class Enable=void> struct Unaligned;
+
+/**
+ * Representation of an unaligned value of a POD type.
+ */
+FOLLY_PACK_PUSH
+template <class T>
+struct Unaligned<
+    T,
+    typename std::enable_if<std::is_pod<T>::value>::type> {
+  Unaligned() = default;  // uninitialized
+  /* implicit */ Unaligned(T v) : value(v) { }
+  T value;
+} FOLLY_PACK_ATTR;
+FOLLY_PACK_POP
+
+/**
+ * Read an unaligned value of type T and return it.
+ */
+template <class T>
+inline T loadUnaligned(const void* p) {
+  static_assert(sizeof(Unaligned<T>) == sizeof(T), "Invalid unaligned size");
+  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
+  if (kHasUnalignedAccess) {
+    return static_cast<const Unaligned<T>*>(p)->value;
+  } else {
+    T value;
+    memcpy(&value, p, sizeof(T));
+    return value;
+  }
+}
+
+/**
+ * Write an unaligned value of type T.
+ */
+template <class T>
+inline void storeUnaligned(void* p, T value) {
+  static_assert(sizeof(Unaligned<T>) == sizeof(T), "Invalid unaligned size");
+  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
+  if (kHasUnalignedAccess) {
+    // Prior to C++14, the spec says that a placement new like this
+    // is required to check that p is not nullptr, and to do nothing
+    // if p is a nullptr. By assuming it's not a nullptr, we get a
+    // nice loud segfault in optimized builds if p is nullptr, rather
+    // than just silently doing nothing.
+    folly::assume(p != nullptr);
+    new (p) Unaligned<T>(value);
+  } else {
+    memcpy(p, &value, sizeof(T));
+  }
+}
+
+template <typename T>
+T bitReverse(T n) {
+  auto m = static_cast<typename std::make_unsigned<T>::type>(n);
+  m = ((m & 0xAAAAAAAAAAAAAAAA) >> 1) | ((m & 0x5555555555555555) << 1);
+  m = ((m & 0xCCCCCCCCCCCCCCCC) >> 2) | ((m & 0x3333333333333333) << 2);
+  m = ((m & 0xF0F0F0F0F0F0F0F0) >> 4) | ((m & 0x0F0F0F0F0F0F0F0F) << 4);
+  return static_cast<T>(Endian::swap(m));
+}
+
+} // namespace folly
diff --git a/folly/lang/test/BitsTest.cpp b/folly/lang/test/BitsTest.cpp
new file mode 100644 (file)
index 0000000..e2708f8
--- /dev/null
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @author Tudor Bosman (tudorb@fb.com)
+
+#include <folly/lang/Bits.h>
+
+#include <folly/Random.h>
+#include <random>
+
+#include <folly/portability/GTest.h>
+
+using namespace folly;
+
+// Test constexpr-ness.
+#if !defined(__clang__) && !defined(_MSC_VER)
+static_assert(findFirstSet(2u) == 2, "findFirstSet");
+static_assert(findLastSet(2u) == 2, "findLastSet");
+static_assert(nextPowTwo(2u) == 2, "nextPowTwo");
+#endif
+
+#ifndef __clang__
+static_assert(isPowTwo(2u), "isPowTwo");
+#endif
+
+namespace {
+
+template <class INT>
+void testFFS() {
+  EXPECT_EQ(0, findFirstSet(static_cast<INT>(0)));
+  size_t bits = std::numeric_limits<
+    typename std::make_unsigned<INT>::type>::digits;
+  for (size_t i = 0; i < bits; i++) {
+    INT v = (static_cast<INT>(1) << (bits - 1)) |
+            (static_cast<INT>(1) << i);
+    EXPECT_EQ(i+1, findFirstSet(v));
+  }
+}
+
+template <class INT>
+void testFLS() {
+  typedef typename std::make_unsigned<INT>::type UINT_T;
+  EXPECT_EQ(0, findLastSet(static_cast<INT>(0)));
+  size_t bits = std::numeric_limits<UINT_T>::digits;
+  for (size_t i = 0; i < bits; i++) {
+    INT v1 = static_cast<UINT_T>(1) << i;
+    EXPECT_EQ(i + 1, findLastSet(v1));
+
+    INT v2 = (static_cast<UINT_T>(1) << i) - 1;
+    EXPECT_EQ(i, findLastSet(v2));
+  }
+}
+
+} // namespace
+
+TEST(Bits, FindFirstSet) {
+  testFFS<char>();
+  testFFS<signed char>();
+  testFFS<unsigned char>();
+  testFFS<short>();
+  testFFS<unsigned short>();
+  testFFS<int>();
+  testFFS<unsigned int>();
+  testFFS<long>();
+  testFFS<unsigned long>();
+  testFFS<long long>();
+  testFFS<unsigned long long>();
+}
+
+TEST(Bits, FindLastSet) {
+  testFLS<char>();
+  testFLS<signed char>();
+  testFLS<unsigned char>();
+  testFLS<short>();
+  testFLS<unsigned short>();
+  testFLS<int>();
+  testFLS<unsigned int>();
+  testFLS<long>();
+  testFLS<unsigned long>();
+  testFLS<long long>();
+  testFLS<unsigned long long>();
+}
+
+TEST(Bits, nextPowTwoClz) {
+  EXPECT_EQ(1, nextPowTwo(0u));
+  EXPECT_EQ(1, nextPowTwo(1u));
+  EXPECT_EQ(2, nextPowTwo(2u));
+  EXPECT_EQ(4, nextPowTwo(3u));
+  EXPECT_EQ(4, nextPowTwo(4u));
+  EXPECT_EQ(8, nextPowTwo(5u));
+  EXPECT_EQ(8, nextPowTwo(6u));
+  EXPECT_EQ(8, nextPowTwo(7u));
+  EXPECT_EQ(8, nextPowTwo(8u));
+  EXPECT_EQ(16, nextPowTwo(9u));
+  EXPECT_EQ(16, nextPowTwo(13u));
+  EXPECT_EQ(16, nextPowTwo(16u));
+  EXPECT_EQ(512, nextPowTwo(510u));
+  EXPECT_EQ(512, nextPowTwo(511u));
+  EXPECT_EQ(512, nextPowTwo(512u));
+  EXPECT_EQ(1024, nextPowTwo(513u));
+  EXPECT_EQ(1024, nextPowTwo(777u));
+  EXPECT_EQ(1ul << 31, nextPowTwo((1ul << 31) - 1));
+  EXPECT_EQ(1ull << 32, nextPowTwo((1ull << 32) - 1));
+  EXPECT_EQ(1ull << 63, nextPowTwo((1ull << 62) + 1));
+}
+
+TEST(Bits, prevPowTwoClz) {
+  EXPECT_EQ(0, prevPowTwo(0u));
+  EXPECT_EQ(1, prevPowTwo(1u));
+  EXPECT_EQ(2, prevPowTwo(2u));
+  EXPECT_EQ(2, prevPowTwo(3u));
+  EXPECT_EQ(4, prevPowTwo(4u));
+  EXPECT_EQ(4, prevPowTwo(5u));
+  EXPECT_EQ(4, prevPowTwo(6u));
+  EXPECT_EQ(4, prevPowTwo(7u));
+  EXPECT_EQ(8, prevPowTwo(8u));
+  EXPECT_EQ(8, prevPowTwo(9u));
+  EXPECT_EQ(8, prevPowTwo(13u));
+  EXPECT_EQ(16, prevPowTwo(16u));
+  EXPECT_EQ(256, prevPowTwo(510u));
+  EXPECT_EQ(256, prevPowTwo(511u));
+  EXPECT_EQ(512, prevPowTwo(512u));
+  EXPECT_EQ(512, prevPowTwo(513u));
+  EXPECT_EQ(512, prevPowTwo(777u));
+  EXPECT_EQ(1ul << 30, prevPowTwo((1ul << 31) - 1));
+  EXPECT_EQ(1ull << 31, prevPowTwo((1ull << 32) - 1));
+  EXPECT_EQ(1ull << 62, prevPowTwo((1ull << 62) + 1));
+}
+
+TEST(Bits, isPowTwo) {
+  EXPECT_FALSE(isPowTwo(0u));
+  EXPECT_TRUE(isPowTwo(1ul));
+  EXPECT_TRUE(isPowTwo(2ull));
+  EXPECT_FALSE(isPowTwo(3ul));
+  EXPECT_TRUE(isPowTwo(4ul));
+  EXPECT_FALSE(isPowTwo(5ul));
+  EXPECT_TRUE(isPowTwo(8ul));
+  EXPECT_FALSE(isPowTwo(15u));
+  EXPECT_TRUE(isPowTwo(16u));
+  EXPECT_FALSE(isPowTwo(17u));
+  EXPECT_FALSE(isPowTwo(511ul));
+  EXPECT_TRUE(isPowTwo(512ul));
+  EXPECT_FALSE(isPowTwo(513ul));
+  EXPECT_FALSE(isPowTwo((1ul<<31) - 1));
+  EXPECT_TRUE(isPowTwo(1ul<<31));
+  EXPECT_FALSE(isPowTwo((1ul<<31) + 1));
+  EXPECT_FALSE(isPowTwo((1ull<<63) - 1));
+  EXPECT_TRUE(isPowTwo(1ull<<63));
+  EXPECT_FALSE(isPowTwo((1ull<<63) + 1));
+}
+
+TEST(Bits, popcount) {
+  EXPECT_EQ(0, popcount(0U));
+  EXPECT_EQ(1, popcount(1U));
+  EXPECT_EQ(32, popcount(uint32_t(-1)));
+  EXPECT_EQ(64, popcount(uint64_t(-1)));
+}
+
+TEST(Bits, Endian_swap_uint) {
+  EXPECT_EQ(uint8_t(0xda), Endian::swap(uint8_t(0xda)));
+  EXPECT_EQ(uint16_t(0x4175), Endian::swap(uint16_t(0x7541)));
+  EXPECT_EQ(uint32_t(0x42efb918), Endian::swap(uint32_t(0x18b9ef42)));
+  EXPECT_EQ(
+      uint64_t(0xa244f5e862c71d8a), Endian::swap(uint64_t(0x8a1dc762e8f544a2)));
+}
+
+TEST(Bits, Endian_swap_real) {
+  std::mt19937_64 rng;
+  auto f = std::uniform_real_distribution<float>()(rng);
+  EXPECT_NE(f, Endian::swap(f));
+  EXPECT_EQ(f, Endian::swap(Endian::swap(f)));
+  auto d = std::uniform_real_distribution<double>()(rng);
+  EXPECT_NE(d, Endian::swap(d));
+  EXPECT_EQ(d, Endian::swap(Endian::swap(d)));
+}
+
+uint64_t reverse_simple(uint64_t v) {
+  uint64_t r = 0;
+
+  for (int i = 0; i < 64; i++) {
+    r <<= 1;
+    r |= v & 1;
+    v >>= 1;
+  }
+  return r;
+}
+
+TEST(Bits, BitReverse) {
+  EXPECT_EQ(folly::bitReverse<uint8_t>(0), 0);
+  EXPECT_EQ(folly::bitReverse<uint8_t>(1), 128);
+  for (int i = 0; i < 100; i++) {
+    uint64_t v = folly::Random::rand64();
+    EXPECT_EQ(folly::bitReverse(v), reverse_simple(v));
+    uint32_t b = folly::Random::rand32();
+    EXPECT_EQ(folly::bitReverse(b), reverse_simple(b) >> 32);
+  }
+}
index 5d2ba9e145206cd43082ae0a1ac66c2a6e404da4..da0cab43c07e2105486cf5fa0b9e89eda895e6f6 100644 (file)
@@ -16,7 +16,7 @@
 
 // @author Tudor Bosman (tudorb@fb.com)
 
 
 // @author Tudor Bosman (tudorb@fb.com)
 
-#include <folly/Bits.h>
+#include <folly/lang/Bits.h>
 
 #include <folly/Benchmark.h>
 
 
 #include <folly/Benchmark.h>
 
diff --git a/folly/test/BitsTest.cpp b/folly/test/BitsTest.cpp
deleted file mode 100644 (file)
index 1d722cb..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// @author Tudor Bosman (tudorb@fb.com)
-
-#include <folly/Bits.h>
-
-#include <folly/Random.h>
-#include <random>
-
-#include <folly/portability/GTest.h>
-
-using namespace folly;
-
-// Test constexpr-ness.
-#if !defined(__clang__) && !defined(_MSC_VER)
-static_assert(findFirstSet(2u) == 2, "findFirstSet");
-static_assert(findLastSet(2u) == 2, "findLastSet");
-static_assert(nextPowTwo(2u) == 2, "nextPowTwo");
-#endif
-
-#ifndef __clang__
-static_assert(isPowTwo(2u), "isPowTwo");
-#endif
-
-namespace {
-
-template <class INT>
-void testFFS() {
-  EXPECT_EQ(0, findFirstSet(static_cast<INT>(0)));
-  size_t bits = std::numeric_limits<
-    typename std::make_unsigned<INT>::type>::digits;
-  for (size_t i = 0; i < bits; i++) {
-    INT v = (static_cast<INT>(1) << (bits - 1)) |
-            (static_cast<INT>(1) << i);
-    EXPECT_EQ(i+1, findFirstSet(v));
-  }
-}
-
-template <class INT>
-void testFLS() {
-  typedef typename std::make_unsigned<INT>::type UINT_T;
-  EXPECT_EQ(0, findLastSet(static_cast<INT>(0)));
-  size_t bits = std::numeric_limits<UINT_T>::digits;
-  for (size_t i = 0; i < bits; i++) {
-    INT v1 = static_cast<UINT_T>(1) << i;
-    EXPECT_EQ(i + 1, findLastSet(v1));
-
-    INT v2 = (static_cast<UINT_T>(1) << i) - 1;
-    EXPECT_EQ(i, findLastSet(v2));
-  }
-}
-
-} // namespace
-
-TEST(Bits, FindFirstSet) {
-  testFFS<char>();
-  testFFS<signed char>();
-  testFFS<unsigned char>();
-  testFFS<short>();
-  testFFS<unsigned short>();
-  testFFS<int>();
-  testFFS<unsigned int>();
-  testFFS<long>();
-  testFFS<unsigned long>();
-  testFFS<long long>();
-  testFFS<unsigned long long>();
-}
-
-TEST(Bits, FindLastSet) {
-  testFLS<char>();
-  testFLS<signed char>();
-  testFLS<unsigned char>();
-  testFLS<short>();
-  testFLS<unsigned short>();
-  testFLS<int>();
-  testFLS<unsigned int>();
-  testFLS<long>();
-  testFLS<unsigned long>();
-  testFLS<long long>();
-  testFLS<unsigned long long>();
-}
-
-TEST(Bits, nextPowTwoClz) {
-  EXPECT_EQ(1, nextPowTwo(0u));
-  EXPECT_EQ(1, nextPowTwo(1u));
-  EXPECT_EQ(2, nextPowTwo(2u));
-  EXPECT_EQ(4, nextPowTwo(3u));
-  EXPECT_EQ(4, nextPowTwo(4u));
-  EXPECT_EQ(8, nextPowTwo(5u));
-  EXPECT_EQ(8, nextPowTwo(6u));
-  EXPECT_EQ(8, nextPowTwo(7u));
-  EXPECT_EQ(8, nextPowTwo(8u));
-  EXPECT_EQ(16, nextPowTwo(9u));
-  EXPECT_EQ(16, nextPowTwo(13u));
-  EXPECT_EQ(16, nextPowTwo(16u));
-  EXPECT_EQ(512, nextPowTwo(510u));
-  EXPECT_EQ(512, nextPowTwo(511u));
-  EXPECT_EQ(512, nextPowTwo(512u));
-  EXPECT_EQ(1024, nextPowTwo(513u));
-  EXPECT_EQ(1024, nextPowTwo(777u));
-  EXPECT_EQ(1ul << 31, nextPowTwo((1ul << 31) - 1));
-  EXPECT_EQ(1ull << 32, nextPowTwo((1ull << 32) - 1));
-  EXPECT_EQ(1ull << 63, nextPowTwo((1ull << 62) + 1));
-}
-
-TEST(Bits, prevPowTwoClz) {
-  EXPECT_EQ(0, prevPowTwo(0u));
-  EXPECT_EQ(1, prevPowTwo(1u));
-  EXPECT_EQ(2, prevPowTwo(2u));
-  EXPECT_EQ(2, prevPowTwo(3u));
-  EXPECT_EQ(4, prevPowTwo(4u));
-  EXPECT_EQ(4, prevPowTwo(5u));
-  EXPECT_EQ(4, prevPowTwo(6u));
-  EXPECT_EQ(4, prevPowTwo(7u));
-  EXPECT_EQ(8, prevPowTwo(8u));
-  EXPECT_EQ(8, prevPowTwo(9u));
-  EXPECT_EQ(8, prevPowTwo(13u));
-  EXPECT_EQ(16, prevPowTwo(16u));
-  EXPECT_EQ(256, prevPowTwo(510u));
-  EXPECT_EQ(256, prevPowTwo(511u));
-  EXPECT_EQ(512, prevPowTwo(512u));
-  EXPECT_EQ(512, prevPowTwo(513u));
-  EXPECT_EQ(512, prevPowTwo(777u));
-  EXPECT_EQ(1ul << 30, prevPowTwo((1ul << 31) - 1));
-  EXPECT_EQ(1ull << 31, prevPowTwo((1ull << 32) - 1));
-  EXPECT_EQ(1ull << 62, prevPowTwo((1ull << 62) + 1));
-}
-
-TEST(Bits, isPowTwo) {
-  EXPECT_FALSE(isPowTwo(0u));
-  EXPECT_TRUE(isPowTwo(1ul));
-  EXPECT_TRUE(isPowTwo(2ull));
-  EXPECT_FALSE(isPowTwo(3ul));
-  EXPECT_TRUE(isPowTwo(4ul));
-  EXPECT_FALSE(isPowTwo(5ul));
-  EXPECT_TRUE(isPowTwo(8ul));
-  EXPECT_FALSE(isPowTwo(15u));
-  EXPECT_TRUE(isPowTwo(16u));
-  EXPECT_FALSE(isPowTwo(17u));
-  EXPECT_FALSE(isPowTwo(511ul));
-  EXPECT_TRUE(isPowTwo(512ul));
-  EXPECT_FALSE(isPowTwo(513ul));
-  EXPECT_FALSE(isPowTwo((1ul<<31) - 1));
-  EXPECT_TRUE(isPowTwo(1ul<<31));
-  EXPECT_FALSE(isPowTwo((1ul<<31) + 1));
-  EXPECT_FALSE(isPowTwo((1ull<<63) - 1));
-  EXPECT_TRUE(isPowTwo(1ull<<63));
-  EXPECT_FALSE(isPowTwo((1ull<<63) + 1));
-}
-
-TEST(Bits, popcount) {
-  EXPECT_EQ(0, popcount(0U));
-  EXPECT_EQ(1, popcount(1U));
-  EXPECT_EQ(32, popcount(uint32_t(-1)));
-  EXPECT_EQ(64, popcount(uint64_t(-1)));
-}
-
-TEST(Bits, Endian_swap_uint) {
-  EXPECT_EQ(uint8_t(0xda), Endian::swap(uint8_t(0xda)));
-  EXPECT_EQ(uint16_t(0x4175), Endian::swap(uint16_t(0x7541)));
-  EXPECT_EQ(uint32_t(0x42efb918), Endian::swap(uint32_t(0x18b9ef42)));
-  EXPECT_EQ(
-      uint64_t(0xa244f5e862c71d8a), Endian::swap(uint64_t(0x8a1dc762e8f544a2)));
-}
-
-TEST(Bits, Endian_swap_real) {
-  std::mt19937_64 rng;
-  auto f = std::uniform_real_distribution<float>()(rng);
-  EXPECT_NE(f, Endian::swap(f));
-  EXPECT_EQ(f, Endian::swap(Endian::swap(f)));
-  auto d = std::uniform_real_distribution<double>()(rng);
-  EXPECT_NE(d, Endian::swap(d));
-  EXPECT_EQ(d, Endian::swap(Endian::swap(d)));
-}
-
-uint64_t reverse_simple(uint64_t v) {
-  uint64_t r = 0;
-
-  for (int i = 0; i < 64; i++) {
-    r <<= 1;
-    r |= v & 1;
-    v >>= 1;
-  }
-  return r;
-}
-
-TEST(Bits, BitReverse) {
-  EXPECT_EQ(folly::bitReverse<uint8_t>(0), 0);
-  EXPECT_EQ(folly::bitReverse<uint8_t>(1), 128);
-  for (int i = 0; i < 100; i++) {
-    uint64_t v = folly::Random::rand64();
-    EXPECT_EQ(folly::bitReverse(v), reverse_simple(v));
-    uint32_t b = folly::Random::rand32();
-    EXPECT_EQ(folly::bitReverse(b), reverse_simple(b) >> 32);
-  }
-}
index ab7d21c28f3fdc84a5ae73d326874691eca0eb5b..30809c1e0ea1f3ec3e5c187d3d5393dd664b11a7 100644 (file)
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 
-#include <folly/Bits.h>
+#include <folly/lang/Bits.h>
 
 #include <folly/portability/GTest.h>
 
 
 #include <folly/portability/GTest.h>
 
index 02f54676ea10fb13e9483812b5b9f7461aeb1cce..23ab3c01815f0c5894862ca2bff309f3cd7323a7 100644 (file)
 #include <string>
 
 #include <folly/BitIterator.h>
 #include <string>
 
 #include <folly/BitIterator.h>
-#include <folly/Bits.h>
 #include <folly/Format.h>
 #include <folly/IPAddress.h>
 #include <folly/MacAddress.h>
 #include <folly/String.h>
 #include <folly/detail/IPAddressSource.h>
 #include <folly/Format.h>
 #include <folly/IPAddress.h>
 #include <folly/MacAddress.h>
 #include <folly/String.h>
 #include <folly/detail/IPAddressSource.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 
index d6b76ec8a7b0c26d5743326d75c0212974817a37..75a89b7cc17d6112c70c916d4ed59e2265f331ca 100644 (file)
 #include <vector>
 
 #include <boost/filesystem.hpp>
 #include <vector>
 
 #include <boost/filesystem.hpp>
-#include <folly/Bits.h>
 #include <folly/Conv.h>
 #include <folly/Format.h>
 #include <folly/Random.h>
 #include <folly/String.h>
 #include <folly/Subprocess.h>
 #include <folly/Conv.h>
 #include <folly/Format.h>
 #include <folly/Random.h>
 #include <folly/String.h>
 #include <folly/Subprocess.h>
+#include <folly/lang/Bits.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 #include <folly/tracing/StaticTracepoint.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
 #include <folly/tracing/StaticTracepoint.h>