Skip to content

Commit 4267694

Browse files
winner245winner245
committed
Optimize ranges::swap_ranges for vector<bool>::iterator
1 parent 70965ef commit 4267694

File tree

6 files changed

+424
-299
lines changed

6 files changed

+424
-299
lines changed

‎libcxx/include/__algorithm/swap_ranges.h

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
#define _LIBCPP___ALGORITHM_SWAP_RANGES_H
1111

1212
#include <__algorithm/iterator_operations.h>
13+
#include <__algorithm/min.h>
1314
#include <__config>
15+
#include <__fwd/bit_reference.h>
1416
#include <__utility/move.h>
1517
#include <__utility/pair.h>
18+
#include <__utility/swap.h>
1619

1720
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1821
# pragma GCC system_header
@@ -23,6 +26,165 @@ _LIBCPP_PUSH_MACROS
2326

2427
_LIBCPP_BEGIN_NAMESPACE_STD
2528

29+
template <class _Cl, class _Cr>
30+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __swap_ranges_aligned(
31+
__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
32+
using _I1 = __bit_iterator<_Cl, false>;
33+
using difference_type = typename _I1::difference_type;
34+
using __storage_type = typename _I1::__storage_type;
35+
36+
const int __bits_per_word = _I1::__bits_per_word;
37+
difference_type __n = __last - __first;
38+
if (__n > 0) {
39+
// do first word
40+
if (__first.__ctz_ != 0) {
41+
unsigned __clz = __bits_per_word - __first.__ctz_;
42+
difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
43+
__n -= __dn;
44+
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
45+
__storage_type __b1 = *__first.__seg_ & __m;
46+
*__first.__seg_ &= ~__m;
47+
__storage_type __b2 = *__result.__seg_ & __m;
48+
*__result.__seg_ &= ~__m;
49+
*__result.__seg_ |= __b1;
50+
*__first.__seg_ |= __b2;
51+
__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
52+
__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
53+
++__first.__seg_;
54+
// __first.__ctz_ = 0;
55+
}
56+
// __first.__ctz_ == 0;
57+
// do middle words
58+
for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
59+
swap(*__first.__seg_, *__result.__seg_);
60+
// do last word
61+
if (__n > 0) {
62+
__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
63+
__storage_type __b1 = *__first.__seg_ & __m;
64+
*__first.__seg_ &= ~__m;
65+
__storage_type __b2 = *__result.__seg_ & __m;
66+
*__result.__seg_ &= ~__m;
67+
*__result.__seg_ |= __b1;
68+
*__first.__seg_ |= __b2;
69+
__result.__ctz_ = static_cast<unsigned>(__n);
70+
}
71+
}
72+
return __result;
73+
}
74+
75+
template <class _Cl, class _Cr>
76+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __swap_ranges_unaligned(
77+
__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
78+
using _I1 = __bit_iterator<_Cl, false>;
79+
using difference_type = typename _I1::difference_type;
80+
using __storage_type = typename _I1::__storage_type;
81+
82+
const int __bits_per_word = _I1::__bits_per_word;
83+
difference_type __n = __last - __first;
84+
if (__n > 0) {
85+
// do first word
86+
if (__first.__ctz_ != 0) {
87+
unsigned __clz_f = __bits_per_word - __first.__ctz_;
88+
difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
89+
__n -= __dn;
90+
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
91+
__storage_type __b1 = *__first.__seg_ & __m;
92+
*__first.__seg_ &= ~__m;
93+
unsigned __clz_r = __bits_per_word - __result.__ctz_;
94+
__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
95+
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
96+
__storage_type __b2 = *__result.__seg_ & __m;
97+
*__result.__seg_ &= ~__m;
98+
if (__result.__ctz_ > __first.__ctz_) {
99+
unsigned __s = __result.__ctz_ - __first.__ctz_;
100+
*__result.__seg_ |= __b1 << __s;
101+
*__first.__seg_ |= __b2 >> __s;
102+
} else {
103+
unsigned __s = __first.__ctz_ - __result.__ctz_;
104+
*__result.__seg_ |= __b1 >> __s;
105+
*__first.__seg_ |= __b2 << __s;
106+
}
107+
__result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
108+
__result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_) % __bits_per_word);
109+
__dn -= __ddn;
110+
if (__dn > 0) {
111+
__m = ~__storage_type(0) >> (__bits_per_word - __dn);
112+
__b2 = *__result.__seg_ & __m;
113+
*__result.__seg_ &= ~__m;
114+
unsigned __s = __first.__ctz_ + __ddn;
115+
*__result.__seg_ |= __b1 >> __s;
116+
*__first.__seg_ |= __b2 << __s;
117+
__result.__ctz_ = static_cast<unsigned>(__dn);
118+
}
119+
++__first.__seg_;
120+
// __first.__ctz_ = 0;
121+
}
122+
// __first.__ctz_ == 0;
123+
// do middle words
124+
__storage_type __m = ~__storage_type(0) << __result.__ctz_;
125+
unsigned __clz_r = __bits_per_word - __result.__ctz_;
126+
for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_) {
127+
__storage_type __b1 = *__first.__seg_;
128+
__storage_type __b2 = *__result.__seg_ & __m;
129+
*__result.__seg_ &= ~__m;
130+
*__result.__seg_ |= __b1 << __result.__ctz_;
131+
*__first.__seg_ = __b2 >> __result.__ctz_;
132+
++__result.__seg_;
133+
__b2 = *__result.__seg_ & ~__m;
134+
*__result.__seg_ &= __m;
135+
*__result.__seg_ |= __b1 >> __clz_r;
136+
*__first.__seg_ |= __b2 << __clz_r;
137+
}
138+
// do last word
139+
if (__n > 0) {
140+
__m = ~__storage_type(0) >> (__bits_per_word - __n);
141+
__storage_type __b1 = *__first.__seg_ & __m;
142+
*__first.__seg_ &= ~__m;
143+
__storage_type __dn = std::min<__storage_type>(__n, __clz_r);
144+
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
145+
__storage_type __b2 = *__result.__seg_ & __m;
146+
*__result.__seg_ &= ~__m;
147+
*__result.__seg_ |= __b1 << __result.__ctz_;
148+
*__first.__seg_ |= __b2 >> __result.__ctz_;
149+
__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
150+
__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
151+
__n -= __dn;
152+
if (__n > 0) {
153+
__m = ~__storage_type(0) >> (__bits_per_word - __n);
154+
__b2 = *__result.__seg_ & __m;
155+
*__result.__seg_ &= ~__m;
156+
*__result.__seg_ |= __b1 >> __dn;
157+
*__first.__seg_ |= __b2 << __dn;
158+
__result.__ctz_ = static_cast<unsigned>(__n);
159+
}
160+
}
161+
}
162+
return __result;
163+
}
164+
165+
// 2+1 iterators: size2 >= size1; used by std::swap_ranges.
166+
template <class, class _Cl, class _Cr>
167+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
168+
__swap_ranges(__bit_iterator<_Cl, false> __first1,
169+
__bit_iterator<_Cl, false> __last1,
170+
__bit_iterator<_Cr, false> __first2) {
171+
if (__first1.__ctz_ == __first2.__ctz_)
172+
return std::make_pair(__last1, std::__swap_ranges_aligned(__first1, __last1, __first2));
173+
return std::make_pair(__last1, std::__swap_ranges_unaligned(__first1, __last1, __first2));
174+
}
175+
176+
// 2+2 iterators: used by std::ranges::swap_ranges.
177+
template <class _AlgPolicy, class _Cl, class _Cr>
178+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
179+
__swap_ranges(__bit_iterator<_Cl, false> __first1,
180+
__bit_iterator<_Cl, false> __last1,
181+
__bit_iterator<_Cr, false> __first2,
182+
__bit_iterator<_Cr, false> __last2) {
183+
if (__last1 - __first1 < __last2 - __first2)
184+
return std::make_pair(__last1, std::__swap_ranges<_AlgPolicy>(__first1, __last1, __first2).second);
185+
return std::make_pair(std::__swap_ranges<_AlgPolicy>(__first2, __last2, __first1).second, __last2);
186+
}
187+
26188
// 2+2 iterators: the shorter size will be used.
27189
template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2, class _Sentinel2>
28190
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator1, _ForwardIterator2>

‎libcxx/include/__bit_reference

Lines changed: 7 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <__algorithm/copy_n.h>
1414
#include <__algorithm/min.h>
15+
#include <__algorithm/swap_ranges.h>
1516
#include <__bit/countr.h>
1617
#include <__compare/ordering.h>
1718
#include <__config>
@@ -22,6 +23,7 @@
2223
#include <__memory/pointer_traits.h>
2324
#include <__type_traits/conditional.h>
2425
#include <__type_traits/is_constant_evaluated.h>
26+
#include <__utility/pair.h>
2527
#include <__utility/swap.h>
2628

2729
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -437,152 +439,6 @@ inline _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> move_backward(
437439
return std::copy_backward(__first, __last, __result);
438440
}
439441

440-
// swap_ranges
441-
442-
template <class _Cl, class _Cr>
443-
_LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cr, false> __swap_ranges_aligned(
444-
__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
445-
using _I1 = __bit_iterator<_Cl, false>;
446-
using difference_type = typename _I1::difference_type;
447-
using __storage_type = typename _I1::__storage_type;
448-
449-
const int __bits_per_word = _I1::__bits_per_word;
450-
difference_type __n = __last - __first;
451-
if (__n > 0) {
452-
// do first word
453-
if (__first.__ctz_ != 0) {
454-
unsigned __clz = __bits_per_word - __first.__ctz_;
455-
difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
456-
__n -= __dn;
457-
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
458-
__storage_type __b1 = *__first.__seg_ & __m;
459-
*__first.__seg_ &= ~__m;
460-
__storage_type __b2 = *__result.__seg_ & __m;
461-
*__result.__seg_ &= ~__m;
462-
*__result.__seg_ |= __b1;
463-
*__first.__seg_ |= __b2;
464-
__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
465-
__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
466-
++__first.__seg_;
467-
// __first.__ctz_ = 0;
468-
}
469-
// __first.__ctz_ == 0;
470-
// do middle words
471-
for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
472-
swap(*__first.__seg_, *__result.__seg_);
473-
// do last word
474-
if (__n > 0) {
475-
__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
476-
__storage_type __b1 = *__first.__seg_ & __m;
477-
*__first.__seg_ &= ~__m;
478-
__storage_type __b2 = *__result.__seg_ & __m;
479-
*__result.__seg_ &= ~__m;
480-
*__result.__seg_ |= __b1;
481-
*__first.__seg_ |= __b2;
482-
__result.__ctz_ = static_cast<unsigned>(__n);
483-
}
484-
}
485-
return __result;
486-
}
487-
488-
template <class _Cl, class _Cr>
489-
_LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cr, false> __swap_ranges_unaligned(
490-
__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
491-
using _I1 = __bit_iterator<_Cl, false>;
492-
using difference_type = typename _I1::difference_type;
493-
using __storage_type = typename _I1::__storage_type;
494-
495-
const int __bits_per_word = _I1::__bits_per_word;
496-
difference_type __n = __last - __first;
497-
if (__n > 0) {
498-
// do first word
499-
if (__first.__ctz_ != 0) {
500-
unsigned __clz_f = __bits_per_word - __first.__ctz_;
501-
difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
502-
__n -= __dn;
503-
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
504-
__storage_type __b1 = *__first.__seg_ & __m;
505-
*__first.__seg_ &= ~__m;
506-
unsigned __clz_r = __bits_per_word - __result.__ctz_;
507-
__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
508-
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
509-
__storage_type __b2 = *__result.__seg_ & __m;
510-
*__result.__seg_ &= ~__m;
511-
if (__result.__ctz_ > __first.__ctz_) {
512-
unsigned __s = __result.__ctz_ - __first.__ctz_;
513-
*__result.__seg_ |= __b1 << __s;
514-
*__first.__seg_ |= __b2 >> __s;
515-
} else {
516-
unsigned __s = __first.__ctz_ - __result.__ctz_;
517-
*__result.__seg_ |= __b1 >> __s;
518-
*__first.__seg_ |= __b2 << __s;
519-
}
520-
__result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
521-
__result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_) % __bits_per_word);
522-
__dn -= __ddn;
523-
if (__dn > 0) {
524-
__m = ~__storage_type(0) >> (__bits_per_word - __dn);
525-
__b2 = *__result.__seg_ & __m;
526-
*__result.__seg_ &= ~__m;
527-
unsigned __s = __first.__ctz_ + __ddn;
528-
*__result.__seg_ |= __b1 >> __s;
529-
*__first.__seg_ |= __b2 << __s;
530-
__result.__ctz_ = static_cast<unsigned>(__dn);
531-
}
532-
++__first.__seg_;
533-
// __first.__ctz_ = 0;
534-
}
535-
// __first.__ctz_ == 0;
536-
// do middle words
537-
__storage_type __m = ~__storage_type(0) << __result.__ctz_;
538-
unsigned __clz_r = __bits_per_word - __result.__ctz_;
539-
for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_) {
540-
__storage_type __b1 = *__first.__seg_;
541-
__storage_type __b2 = *__result.__seg_ & __m;
542-
*__result.__seg_ &= ~__m;
543-
*__result.__seg_ |= __b1 << __result.__ctz_;
544-
*__first.__seg_ = __b2 >> __result.__ctz_;
545-
++__result.__seg_;
546-
__b2 = *__result.__seg_ & ~__m;
547-
*__result.__seg_ &= __m;
548-
*__result.__seg_ |= __b1 >> __clz_r;
549-
*__first.__seg_ |= __b2 << __clz_r;
550-
}
551-
// do last word
552-
if (__n > 0) {
553-
__m = ~__storage_type(0) >> (__bits_per_word - __n);
554-
__storage_type __b1 = *__first.__seg_ & __m;
555-
*__first.__seg_ &= ~__m;
556-
__storage_type __dn = std::min<__storage_type>(__n, __clz_r);
557-
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
558-
__storage_type __b2 = *__result.__seg_ & __m;
559-
*__result.__seg_ &= ~__m;
560-
*__result.__seg_ |= __b1 << __result.__ctz_;
561-
*__first.__seg_ |= __b2 >> __result.__ctz_;
562-
__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
563-
__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
564-
__n -= __dn;
565-
if (__n > 0) {
566-
__m = ~__storage_type(0) >> (__bits_per_word - __n);
567-
__b2 = *__result.__seg_ & __m;
568-
*__result.__seg_ &= ~__m;
569-
*__result.__seg_ |= __b1 >> __dn;
570-
*__first.__seg_ |= __b2 << __dn;
571-
__result.__ctz_ = static_cast<unsigned>(__n);
572-
}
573-
}
574-
}
575-
return __result;
576-
}
577-
578-
template <class _Cl, class _Cr>
579-
inline _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cr, false> swap_ranges(
580-
__bit_iterator<_Cl, false> __first1, __bit_iterator<_Cl, false> __last1, __bit_iterator<_Cr, false> __first2) {
581-
if (__first1.__ctz_ == __first2.__ctz_)
582-
return std::__swap_ranges_aligned(__first1, __last1, __first2);
583-
return std::__swap_ranges_unaligned(__first1, __last1, __first2);
584-
}
585-
586442
// rotate
587443

588444
template <class _Cp>
@@ -987,14 +843,14 @@ private:
987843
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Dp, false>
988844
copy_backward(__bit_iterator<_Dp, _IC> __first, __bit_iterator<_Dp, _IC> __last, __bit_iterator<_Dp, false> __result);
989845
template <class _Cl, class _Cr>
990-
friend __bit_iterator<_Cr, false>
846+
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Cr, false>
991847
__swap_ranges_aligned(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
992848
template <class _Cl, class _Cr>
993-
friend __bit_iterator<_Cr, false>
849+
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Cr, false>
994850
__swap_ranges_unaligned(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
995-
template <class _Cl, class _Cr>
996-
friend __bit_iterator<_Cr, false>
997-
swap_ranges(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
851+
template <class, class _Cl, class _Cr>
852+
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
853+
__swap_ranges(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
998854
template <class _Dp>
999855
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Dp, false>
1000856
rotate(__bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>);

0 commit comments

Comments
 (0)