diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2018-07-03 22:04:45 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-07-03 22:04:45 +0100 |
commit | f3e91052bd7e5af791ca720cd14e9ac9227e3801 (patch) | |
tree | 93c8036d608b1b66477816d43343955cc80e6940 /libstdc++-v3/include | |
parent | cf3e6e9f15e11273083517ebfd7d0a94213d70f5 (diff) | |
download | gcc-f3e91052bd7e5af791ca720cd14e9ac9227e3801.zip gcc-f3e91052bd7e5af791ca720cd14e9ac9227e3801.tar.gz gcc-f3e91052bd7e5af791ca720cd14e9ac9227e3801.tar.bz2 |
P0556R3 Integral power-of-2 operations, P0553R2 Bit operations
P0553R2 is not in the C++2a working draft yet, but is likely to be
approved soon. Neither proposal supports std::byte but this adds
overloads of each function for std::byte, assuming that will also get
added.
* include/Makefile.am: Add new header.
* include/Makefile.in: Regenerate.
* include/precompiled/stdc++.h: Include new header.
* include/std/bit: New header.
(__rotl, __rotr, __countl_zero, __countl_one, __countr_zero)
(__countr_one, __popcount, __ispow2, __ceil2, __floor2, __log2p1):
Define for C++14.
[!__STRICT_ANSI__] (rotl, rotr, countl_zero, countl_one, countr_zero)
(countr_one, popcount): Define for C++2a. Also overload for std::byte.
(ispow2, ceil2, floor2, log2p1): Define for C++2a.
[!__STRICT_ANSI__] (ispow2, ceil2, floor2, log2p1): Overload for
std::byte.
* testsuite/26_numerics/bit/bit.pow.two/ceil2.cc: New.
* testsuite/26_numerics/bit/bit.pow.two/floor2.cc: New.
* testsuite/26_numerics/bit/bit.pow.two/ispow2.cc: New.
* testsuite/26_numerics/bit/bit.pow.two/log2p1.cc: New.
* testsuite/26_numerics/bit/bitops.rot/rotl.cc: New.
* testsuite/26_numerics/bit/bitops.rot/rotr.cc: New.
* testsuite/26_numerics/bit/bitops.count/countl_one.cc: New.
* testsuite/26_numerics/bit/bitops.count/countl_zero.cc: New.
* testsuite/26_numerics/bit/bitops.count/countr_one.cc: New.
* testsuite/26_numerics/bit/bitops.count/countr_zero.cc: New.
From-SVN: r262360
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r-- | libstdc++-v3/include/Makefile.am | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/Makefile.in | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/precompiled/stdc++.h | 1 | ||||
-rw-r--r-- | libstdc++-v3/include/std/bit | 359 |
4 files changed, 362 insertions, 0 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index f91907d..d1453a5 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -30,6 +30,7 @@ std_headers = \ ${std_srcdir}/any \ ${std_srcdir}/array \ ${std_srcdir}/atomic \ + ${std_srcdir}/bit \ ${std_srcdir}/bitset \ ${std_srcdir}/charconv \ ${std_srcdir}/chrono \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index aa8a0a4..1a4dbbf 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -324,6 +324,7 @@ std_headers = \ ${std_srcdir}/any \ ${std_srcdir}/array \ ${std_srcdir}/atomic \ + ${std_srcdir}/bit \ ${std_srcdir}/bitset \ ${std_srcdir}/charconv \ ${std_srcdir}/chrono \ diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h index 9b056bb..8076923 100644 --- a/libstdc++-v3/include/precompiled/stdc++.h +++ b/libstdc++-v3/include/precompiled/stdc++.h @@ -134,6 +134,7 @@ #endif #if __cplusplus > 201703L +#include <bit> // #include <compare> // #include <span> // #include <syncstream> diff --git a/libstdc++-v3/include/std/bit b/libstdc++-v3/include/std/bit new file mode 100644 index 0000000..76aa095 --- /dev/null +++ b/libstdc++-v3/include/std/bit @@ -0,0 +1,359 @@ +// <bit> -*- C++ -*- + +// Copyright (C) 2018 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// <http://www.gnu.org/licenses/>. + +/** @file include/bit + * This is a Standard C++ Library header. + */ + +#ifndef _GLIBCXX_BIT +#define _GLIBCXX_BIT 1 + +#pragma GCC system_header + +#if __cplusplus >= 201402L + +#include <type_traits> +#include <limits> + +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template<typename _Tp> + constexpr _Tp + __rotl(_Tp __x, unsigned int __s) noexcept + { + constexpr auto _Nd = numeric_limits<_Tp>::digits; + const unsigned __sN = __s % _Nd; + if (__sN) + return (__x << __sN) | (__x >> (_Nd - __sN)); + return __x; + } + + template<typename _Tp> + constexpr _Tp + __rotr(_Tp __x, unsigned int __s) noexcept + { + constexpr auto _Nd = numeric_limits<_Tp>::digits; + const unsigned __sN = __s % _Nd; + if (__sN) + return (__x >> __sN) | (__x << (_Nd - __sN)); + return __x; + } + + template<typename _Tp> + constexpr int + __countl_zero(_Tp __x) noexcept + { + using __limits = numeric_limits<_Tp>; + + if (__x == 0) + return __limits::digits; + + using __limits_ull = numeric_limits<unsigned long long>; + using __limits_ul = numeric_limits<unsigned long>; + using __limits_u = numeric_limits<unsigned>; + + if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_u::digits) + { + constexpr int __diff = __limits_u::digits - __limits::digits; + return __builtin_clz(__x) - __diff; + } + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ul::digits) + { + constexpr int __diff = __limits_ul::digits - __limits::digits; + return __builtin_clzl(__x) - __diff; + } + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ull::digits) + { + constexpr int __diff = __limits_ull::digits - __limits::digits; + return __builtin_clzll(__x) - __diff; + } + else // (__limits::digits > __limits_ull::digits) + { + static_assert(__limits::digits <= (2 * __limits_ull::digits), + "Maximum supported integer size is 128-bit"); + + unsigned long long __high = __x >> __limits_ull::digits; + if (__high != 0) + { + constexpr int __diff + = (2 * __limits_ull::digits) - __limits::digits; + return __builtin_clzll(__high) - __diff; + } + unsigned long long __low = __x & __limits_ull::max(); + return (__limits::digits - __limits_ull::digits) + + __builtin_clzll(__low); + } + } + + template<typename _Tp> + constexpr int + __countl_one(_Tp __x) noexcept + { + if (__x == numeric_limits<_Tp>::max()) + return numeric_limits<_Tp>::digits; + return std::__countl_zero<_Tp>((_Tp)~__x); + } + + template<typename _Tp> + constexpr int + __countr_zero(_Tp __x) noexcept + { + using __limits = numeric_limits<_Tp>; + + if (__x == 0) + return __limits::digits; + + using __limits_ull = numeric_limits<unsigned long long>; + using __limits_ul = numeric_limits<unsigned long>; + using __limits_u = numeric_limits<unsigned>; + + if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_u::digits) + return __builtin_ctz(__x); + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ul::digits) + return __builtin_ctzl(__x); + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ull::digits) + return __builtin_ctzll(__x); + else // (__limits::digits > __limits_ull::digits) + { + static_assert(__limits::digits <= (2 * __limits_ull::digits), + "Maximum supported integer size is 128-bit"); + + unsigned long long __low = __x & __limits_ull::max(); + if (__low != 0) + return __builtin_ctzll(__low); + unsigned long long __high = __x >> __limits_ull::digits; + return __builtin_ctzll(__high) + __limits_ull::digits; + } + } + + template<typename _Tp> + constexpr int + __countr_one(_Tp __x) noexcept + { + if (__x == numeric_limits<_Tp>::max()) + return numeric_limits<_Tp>::digits; + return std::__countr_zero((_Tp)~__x); + } + + template<typename _Tp> + constexpr int + __popcount(_Tp __x) noexcept + { + using __limits = numeric_limits<_Tp>; + + if (__x == 0) + return 0; + + using __limits_ull = numeric_limits<unsigned long long>; + using __limits_ul = numeric_limits<unsigned long>; + using __limits_u = numeric_limits<unsigned>; + + if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_u::digits) + return __builtin_popcount(__x); + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ul::digits) + return __builtin_popcountl(__x); + else if _GLIBCXX17_CONSTEXPR (__limits::digits <= __limits_ull::digits) + return __builtin_popcountll(__x); + else // (__limits::digits > __limits_ull::digits) + { + static_assert(__limits::digits <= (2 * __limits_ull::digits), + "Maximum supported integer size is 128-bit"); + + unsigned long long __low = __x & __limits_ull::max(); + unsigned long long __high = __x >> __limits_ull::digits; + return __builtin_popcountll(__low) + __builtin_popcountll(__high); + } + } + + template<typename _Tp> + constexpr bool + __ispow2(_Tp __x) noexcept + { return std::__popcount(__x) == 1; } + + template<typename _Tp> + constexpr _Tp + __ceil2(_Tp __x) noexcept + { + constexpr auto _Nd = numeric_limits<_Tp>::digits; + if (__x == 0) + return 1; + return (_Tp)1u << (_Nd - std::__countl_zero((_Tp)(__x - 1u))); + } + + template<typename _Tp> + constexpr _Tp + __floor2(_Tp __x) noexcept + { + constexpr auto _Nd = numeric_limits<_Tp>::digits; + if (__x == 0) + return 0; + return (_Tp)1u << (_Nd - std::__countl_zero((_Tp)(__x >> 1))); + } + + template<typename _Tp> + constexpr _Tp + __log2p1(_Tp __x) noexcept + { + constexpr auto _Nd = numeric_limits<_Tp>::digits; + if (__x == 0) + return 0; + return _Nd - std::__countl_zero(__x); + } + +#if __cplusplus > 201703L + + template<typename _Tp, typename _Up, bool = is_integral_v<_Tp>> + struct _If_is_unsigned_integer_type { }; + + template<typename _Up> + struct _If_is_unsigned_integer_type<bool, _Up, true> { }; + + template<typename _Tp, typename _Up> + struct _If_is_unsigned_integer_type<_Tp, _Up, true> + : enable_if<is_same_v<_Tp, make_unsigned_t<_Tp>>, _Up> { }; + + template<typename _Tp, typename _Up = _Tp> + using _If_is_unsigned_integer + = typename _If_is_unsigned_integer_type<_Tp, _Up>::type; + +#if ! __STRICT_ANSI__ + // [bitops.rot], rotating + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp> + rotl(_Tp __x, unsigned int __s) noexcept + { return std::__rotl(__x, __s); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp> + rotr(_Tp __x, unsigned int __s) noexcept + { return std::__rotr(__x, __s); } + + // [bitops.count], counting + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, int> + countl_zero(_Tp __x) noexcept + { return std::__countl_zero(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, int> + countl_one(_Tp __x) noexcept + { return std::__countl_one(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, int> + countr_zero(_Tp __x) noexcept + { return std::__countr_zero(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, int> + countr_one(_Tp __x) noexcept + { return std::__countr_one(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, int> + popcount(_Tp __x) noexcept + { return std::__popcount(__x); } +#endif + + // Integral power-of-two operations + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp, bool> + ispow2(_Tp __x) noexcept + { return std::__ispow2(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp> + ceil2(_Tp __x) noexcept + { return std::__ceil2(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp> + floor2(_Tp __x) noexcept + { return std::__floor2(__x); } + + template<typename _Tp> + constexpr _If_is_unsigned_integer<_Tp> + log2p1(_Tp __x) noexcept + { return std::__log2p1(__x); } + +#if ! __STRICT_ANSI__ + enum class byte : unsigned char; + + constexpr byte + rotl(byte __x, unsigned int __s) noexcept + { return (byte)std::__rotl((unsigned char)__x, __s); } + + constexpr byte + rotr(byte __x, unsigned int __s) noexcept + { return (byte)std::__rotr((unsigned char)__x, __s); } + + constexpr int + countl_zero(byte __x) noexcept + { return std::__countl_zero((unsigned char)__x); } + + constexpr int + countl_one(byte __x) noexcept + { return std::__countl_one((unsigned char)__x); } + + constexpr int + countr_zero(byte __x) noexcept + { return std::__countr_zero((unsigned char)__x); } + + constexpr int + countr_one(byte __x) noexcept + { return std::__countr_one((unsigned char)__x); } + + constexpr int + popcount(byte __x) noexcept + { return std::__popcount((unsigned char)__x); } + + constexpr bool + ispow2(byte __x) noexcept + { return std::__ispow2((unsigned char)__x); } + + constexpr byte + ceil2(byte __x) noexcept + { return (byte)std::__ceil2((unsigned char)__x); } + + constexpr byte + floor2(byte __x) noexcept + { return (byte)std::__floor2((unsigned char)__x); } + + constexpr byte + log2p1(byte __x) noexcept + { return (byte)std::__log2p1((unsigned char)__x); } +#endif + +#endif // C++2a + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std + +#endif // C++14 +#endif // _GLIBCXX_BIT |