Skip to content

Commit da4198d

Browse files
philnik777philnik777
committed
[libc++] Introduce __specialized_algorithms
1 parent e9f74df commit da4198d

File tree

5 files changed

+102
-44
lines changed

5 files changed

+102
-44
lines changed

‎libcxx/include/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ set(files
194194
__algorithm/simd_utils.h
195195
__algorithm/sort.h
196196
__algorithm/sort_heap.h
197+
__algorithm/specialized_algorithms.h
197198
__algorithm/stable_partition.h
198199
__algorithm/stable_sort.h
199200
__algorithm/swap_ranges.h

‎libcxx/include/__algorithm/fill_n.h‎

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#define _LIBCPP___ALGORITHM_FILL_N_H
1111

1212
#include <__algorithm/for_each_n_segment.h>
13-
#include <__algorithm/min.h>
13+
#include <__algorithm/specialized_algorithms.h>
1414
#include <__config>
15-
#include <__fwd/bit_reference.h>
1615
#include <__iterator/iterator_traits.h>
1716
#include <__iterator/segmented_iterator.h>
18-
#include <__memory/pointer_traits.h>
17+
#include <__type_traits/enable_if.h>
1918
#include <__utility/convert_to_integral.h>
19+
#include <__utility/move.h>
2020

2121
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2222
# pragma GCC system_header
@@ -29,7 +29,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2929

3030
// fill_n isn't specialized for std::memset, because the compiler already optimizes the loop to a call to std::memset.
3131

32-
template <class _OutputIterator, class _Size, class _Tp>
32+
template <
33+
class _OutputIterator,
34+
class _Size,
35+
class _Tp,
36+
__enable_if_t<!__specialized_algorithm<_Algorithm::__fill_n, __single_iterator<_OutputIterator> >::__has_algorithm,
37+
int> = 0>
3338
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
3439
__fill_n(_OutputIterator __first, _Size __n, const _Tp& __value) {
3540
#ifndef _LIBCPP_CXX03_LANG
@@ -47,42 +52,14 @@ __fill_n(_OutputIterator __first, _Size __n, const _Tp& __value) {
4752
return __first;
4853
}
4954

50-
template <bool _FillVal, class _Cp>
51-
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
52-
__fill_n_bool(__bit_iterator<_Cp, false> __first, typename __size_difference_type_traits<_Cp>::size_type __n) {
53-
using _It = __bit_iterator<_Cp, false>;
54-
using __storage_type = typename _It::__storage_type;
55-
56-
const int __bits_per_word = _It::__bits_per_word;
57-
// do first partial word
58-
if (__first.__ctz_ != 0) {
59-
__storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
60-
__storage_type __dn = std::min(__clz_f, __n);
61-
std::__fill_masked_range(std::__to_address(__first.__seg_), __clz_f - __dn, __first.__ctz_, _FillVal);
62-
__n -= __dn;
63-
++__first.__seg_;
64-
}
65-
// do middle whole words
66-
__storage_type __nw = __n / __bits_per_word;
67-
std::__fill_n(std::__to_address(__first.__seg_), __nw, _FillVal ? static_cast<__storage_type>(-1) : 0);
68-
__n -= __nw * __bits_per_word;
69-
// do last partial word
70-
if (__n > 0) {
71-
__first.__seg_ += __nw;
72-
std::__fill_masked_range(std::__to_address(__first.__seg_), __bits_per_word - __n, 0u, _FillVal);
73-
}
74-
}
75-
76-
template <class _Cp, class _Size>
77-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, false>
78-
__fill_n(__bit_iterator<_Cp, false> __first, _Size __n, const bool& __value) {
79-
if (__n > 0) {
80-
if (__value)
81-
std::__fill_n_bool<true>(__first, __n);
82-
else
83-
std::__fill_n_bool<false>(__first, __n);
84-
}
85-
return __first + __n;
55+
template <class _OutIter,
56+
class _Size,
57+
class _Tp,
58+
__enable_if_t<__specialized_algorithm<_Algorithm::__fill_n, __single_iterator<_OutIter> >::__has_algorithm,
59+
int> = 0>
60+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutIter __fill_n(_OutIter __first, _Size __n, const _Tp& __value) {
61+
return __specialized_algorithm<_Algorithm::__fill_n, __single_iterator<_OutIter> >()(
62+
std::move(__first), __n, __value);
8663
}
8764

8865
template <class _OutputIterator, class _Size, class _Tp>

‎libcxx/include/__algorithm/specialized_algorithms.h‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef _LIBCPP___ALGORITHM_SPECIALIZED_ALGORITHMS_H
10+
#define _LIBCPP___ALGORITHM_SPECIALIZED_ALGORITHMS_H
11+
12+
#include <__config>
13+
14+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15+
# pragma GCC system_header
16+
#endif
17+
18+
_LIBCPP_BEGIN_NAMESPACE_STD
19+
20+
// FIXME: This should really be an enum
21+
namespace _Algorithm {
22+
struct __fill_n {};
23+
} // namespace _Algorithm
24+
25+
template <class>
26+
struct __single_iterator;
27+
28+
template <class _Alg, class... _Ranges>
29+
struct __specialized_algorithm {
30+
static const bool __has_algorithm = false;
31+
};
32+
33+
_LIBCPP_END_NAMESPACE_STD
34+
35+
#endif // _LIBCPP___ALGORITHM_SPECIALIZED_ALGORITHMS_H

‎libcxx/include/__bit_reference‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
#include <__algorithm/copy_backward.h>
1616
#include <__algorithm/copy_n.h>
1717
#include <__algorithm/equal.h>
18+
#include <__algorithm/fill_n.h>
1819
#include <__algorithm/min.h>
1920
#include <__algorithm/rotate.h>
21+
#include <__algorithm/specialized_algorithms.h>
2022
#include <__algorithm/swap_ranges.h>
2123
#include <__assert>
2224
#include <__bit/countr.h>
@@ -467,10 +469,6 @@ private:
467469
template <class _Dp>
468470
friend struct __bit_array;
469471

470-
template <bool _FillVal, class _Dp>
471-
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend void
472-
__fill_n_bool(__bit_iterator<_Dp, false> __first, typename __size_difference_type_traits<_Dp>::size_type __n);
473-
474472
template <class _Dp, bool _IC>
475473
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Dp, false> __copy_aligned(
476474
__bit_iterator<_Dp, _IC> __first, __bit_iterator<_Dp, _IC> __last, __bit_iterator<_Dp, false> __result);
@@ -537,6 +535,52 @@ private:
537535
template <bool _ToCount, class _Dp, bool _IC>
538536
friend typename __bit_iterator<_Dp, _IC>::difference_type _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
539537
__count_bool(__bit_iterator<_Dp, _IC>, typename __size_difference_type_traits<_Dp>::size_type);
538+
539+
template <class, class...>
540+
friend struct __specialized_algorithm;
541+
};
542+
543+
template <class _Cp>
544+
struct __specialized_algorithm<_Algorithm::__fill_n, __single_iterator<__bit_iterator<_Cp, false> > > {
545+
static const bool __has_algorithm = true;
546+
547+
template <bool _FillVal>
548+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static void
549+
__impl(__bit_iterator<_Cp, false> __first, typename __size_difference_type_traits<_Cp>::size_type __n) {
550+
using _It = __bit_iterator<_Cp, false>;
551+
using __storage_type = typename _It::__storage_type;
552+
553+
const int __bits_per_word = _It::__bits_per_word;
554+
// do first partial word
555+
if (__first.__ctz_ != 0) {
556+
__storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
557+
__storage_type __dn = std::min(__clz_f, __n);
558+
std::__fill_masked_range(std::__to_address(__first.__seg_), __clz_f - __dn, __first.__ctz_, _FillVal);
559+
__n -= __dn;
560+
++__first.__seg_;
561+
}
562+
// do middle whole words
563+
__storage_type __nw = __n / __bits_per_word;
564+
std::__fill_n(std::__to_address(__first.__seg_), __nw, _FillVal ? static_cast<__storage_type>(-1) : 0);
565+
__n -= __nw * __bits_per_word;
566+
// do last partial word
567+
if (__n > 0) {
568+
__first.__seg_ += __nw;
569+
std::__fill_masked_range(std::__to_address(__first.__seg_), __bits_per_word - __n, 0u, _FillVal);
570+
}
571+
}
572+
573+
template <class _Size, class _Tp>
574+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static __bit_iterator<_Cp, false>
575+
operator()(__bit_iterator<_Cp, false> __first, _Size __n, const _Tp& __value) {
576+
if (__n > 0) {
577+
if (__value)
578+
__impl<true>(__first, __n);
579+
else
580+
__impl<false>(__first, __n);
581+
}
582+
return __first + __n;
583+
}
540584
};
541585

542586
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/module.modulemap.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,7 @@ module std [system] {
829829
module simd_utils { header "__algorithm/simd_utils.h" }
830830
module sort_heap { header "__algorithm/sort_heap.h" }
831831
module sort { header "__algorithm/sort.h" }
832+
module specialized_algorithms { header "__algorithm/specialized_algorithms.h" }
832833
module stable_partition { header "__algorithm/stable_partition.h" }
833834
module stable_sort {
834835
header "__algorithm/stable_sort.h"

0 commit comments

Comments
 (0)