Skip to content

R
riscv-gcc-1
Commit 15ac3c72 by Johannes Singler Committed by Johannes Singler
Options

algobase.h: Replace tabs by spaces; correct line breaks. 

2009-09-17  Johannes Singler  <singler@ira.uka.de>

        * include/parallel/algobase.h: Replace tabs by spaces;
        correct line breaks.
        * include/parallel/algorithmfwd.h: Likewise.
        * include/parallel/balanced_quicksort.h: Likewise.
        * include/parallel/base.h: Likewise.
        * include/parallel/checkers.h: Likewise.
        * include/parallel/compatibility.h: Likewise.
        * include/parallel/equally_split.h: Likewise.
        * include/parallel/find.h: Likewise.
        * include/parallel/for_each.h: Likewise.
        * include/parallel/for_each_selectors.h: Likewise.
        * include/parallel/iterator.h: Likewise.
        * include/parallel/list_partition.h: Likewise.
        * include/parallel/losertree.h: Likewise.
        * include/parallel/merge.h: Likewise.
        * include/parallel/multiseq_selection.h: Likewise.
        * include/parallel/multiway_merge.h: Likewise.
        * include/parallel/multiway_mergesort.h: Likewise.
        * include/parallel/numeric: Likewise.
        * include/parallel/numericfwd.h: Likewise.
        * include/parallel/omp_loop.h: Likewise.
        * include/parallel/omp_loop_static.h: Likewise.
        * include/parallel/par_loop.h: Likewise.
        * include/parallel/partial_sum.h: Likewise.
        * include/parallel/partition.h: Likewise.
        * include/parallel/queue.h: Likewise.
        * include/parallel/quicksort.h: Likewise.
        * include/parallel/random_number.h: Likewise.
        * include/parallel/random_shuffle.h: Likewise.
        * include/parallel/search.h: Likewise.
        * include/parallel/set_operations.h: Likewise.
        * include/parallel/settings.h: Likewise.
        * include/parallel/sort.h: Likewise.
        * include/parallel/types.h: Likewise.
        * include/parallel/unique_copy.h: Likewise.
        * include/parallel/workstealing.h: Likewise.
        * include/parallel/algo.h: Likewise;
        shorten _ForwardIterator to _FIterator.
        * include/parallel/find_selectors.h: Likewise.

From-SVN: r151791
parent 10e154df
Showing with 953 additions and 721 deletions
libstdc++-v3/ChangeLog
2009-09-17 Johannes Singler <singler@ira.uka.de>
* include/parallel/algobase.h: Replace tabs by spaces;
correct line breaks.
* include/parallel/algorithmfwd.h: Likewise.
* include/parallel/balanced_quicksort.h: Likewise.
* include/parallel/base.h: Likewise.
* include/parallel/checkers.h: Likewise.
* include/parallel/compatibility.h: Likewise.
* include/parallel/equally_split.h: Likewise.
* include/parallel/find.h: Likewise.
* include/parallel/for_each.h: Likewise.
* include/parallel/for_each_selectors.h: Likewise.
* include/parallel/iterator.h: Likewise.
* include/parallel/list_partition.h: Likewise.
* include/parallel/losertree.h: Likewise.
* include/parallel/merge.h: Likewise.
* include/parallel/multiseq_selection.h: Likewise.
* include/parallel/multiway_merge.h: Likewise.
* include/parallel/multiway_mergesort.h: Likewise.
* include/parallel/numeric: Likewise.
* include/parallel/numericfwd.h: Likewise.
* include/parallel/omp_loop.h: Likewise.
* include/parallel/omp_loop_static.h: Likewise.
* include/parallel/par_loop.h: Likewise.
* include/parallel/partial_sum.h: Likewise.
* include/parallel/partition.h: Likewise.
* include/parallel/queue.h: Likewise.
* include/parallel/quicksort.h: Likewise.
* include/parallel/random_number.h: Likewise.
* include/parallel/random_shuffle.h: Likewise.
* include/parallel/search.h: Likewise.
* include/parallel/set_operations.h: Likewise.
* include/parallel/settings.h: Likewise.
* include/parallel/sort.h: Likewise.
* include/parallel/types.h: Likewise.
* include/parallel/unique_copy.h: Likewise.
* include/parallel/workstealing.h: Likewise.
* include/parallel/algo.h: Likewise;
shorten _ForwardIterator to _FIterator.
* include/parallel/find_selectors.h: Likewise.
2009-09-16 Johannes Singler <singler@ira.uka.de> 2009-09-16 Johannes Singler <singler@ira.uka.de>
* include/parallel/base.h: Correct some comments accidentally changed * include/parallel/base.h: Correct some comments accidentally changed
......
libstdc++-v3/include/parallel/algo.h
...@@ -94,9 +94,10 @@ namespace __parallel ...@@ -94,9 +94,10 @@ namespace __parallel
__gnu_parallel::__for_each_selector<_RAIter> __functionality; __gnu_parallel::__for_each_selector<_RAIter> __functionality;
return __gnu_parallel:: return __gnu_parallel::
__for_each_template_random_access(__begin, __end, __f, __functionality, __for_each_template_random_access(
__gnu_parallel::_DummyReduct(), __begin, __end, __f, __functionality,
true, __dummy, -1, __parallelism_tag); __gnu_parallel::_DummyReduct(), true, __dummy, -1,
__parallelism_tag);
} }
else else
return for_each(__begin, __end, __f, __gnu_parallel::sequential_tag()); return for_each(__begin, __end, __f, __gnu_parallel::sequential_tag());
...@@ -151,9 +152,9 @@ namespace __parallel ...@@ -151,9 +152,9 @@ namespace __parallel
{ {
binder2nd<__gnu_parallel::equal_to<_ValueType, const _Tp&> > binder2nd<__gnu_parallel::equal_to<_ValueType, const _Tp&> >
__comp(__gnu_parallel::equal_to<_ValueType, const _Tp&>(), __val); __comp(__gnu_parallel::equal_to<_ValueType, const _Tp&>(), __val);
return __gnu_parallel::__find_template(__begin, __end, __begin, __comp, return __gnu_parallel::__find_template(
__gnu_parallel:: __begin, __end, __begin, __comp,
__find_if_selector()).first; __gnu_parallel::__find_if_selector()).first;
} }
else else
return _GLIBCXX_STD_P::find(__begin, __end, __val); return _GLIBCXX_STD_P::find(__begin, __end, __val);
...@@ -208,69 +209,71 @@ namespace __parallel ...@@ -208,69 +209,71 @@ namespace __parallel
} }
// Sequential fallback // Sequential fallback
template<typename _IIter, typename _ForwardIterator> template<typename _IIter, typename _FIterator>
inline _IIter inline _IIter
find_first_of(_IIter __begin1, _IIter __end1, find_first_of(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2); } { return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2);
}
// Sequential fallback // Sequential fallback
template<typename _IIter, typename _ForwardIterator, template<typename _IIter, typename _FIterator,
typename _BinaryPredicate> typename _BinaryPredicate>
inline _IIter inline _IIter
find_first_of(_IIter __begin1, _IIter __end1, find_first_of(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
_BinaryPredicate __comp, __gnu_parallel::sequential_tag) _BinaryPredicate __comp, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2, __comp); } { return _GLIBCXX_STD_P::find_first_of(
__begin1, __end1, __begin2, __end2, __comp); }
// Sequential fallback for input iterator type // Sequential fallback for input iterator type
template<typename _IIter, typename _ForwardIterator, template<typename _IIter, typename _FIterator,
typename _IteratorTag1, typename _IteratorTag2> typename _IteratorTag1, typename _IteratorTag2>
inline _IIter inline _IIter
__find_first_of_switch(_IIter __begin1, _IIter __end1, __find_first_of_switch(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
_IteratorTag1, _IteratorTag2) _IteratorTag1, _IteratorTag2)
{ return find_first_of(__begin1, __end1, __begin2, __end2, { return find_first_of(__begin1, __end1, __begin2, __end2,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
// Parallel algorithm for random access iterators // Parallel algorithm for random access iterators
template<typename _RAIter, typename _ForwardIterator, template<typename _RAIter, typename _FIterator,
typename _BinaryPredicate, typename _IteratorTag> typename _BinaryPredicate, typename _IteratorTag>
inline _RAIter inline _RAIter
__find_first_of_switch(_RAIter __begin1, __find_first_of_switch(_RAIter __begin1,
_RAIter __end1, _RAIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
_BinaryPredicate __comp, random_access_iterator_tag, _BinaryPredicate __comp, random_access_iterator_tag,
_IteratorTag) _IteratorTag)
{ {
return __gnu_parallel:: return __gnu_parallel::
__find_template(__begin1, __end1, __begin1, __comp, __find_template(__begin1, __end1, __begin1, __comp,
__gnu_parallel::__find_first_of_selector __gnu_parallel::__find_first_of_selector
<_ForwardIterator>(__begin2, __end2)).first; <_FIterator>(__begin2, __end2)).first;
} }
// Sequential fallback for input iterator type // Sequential fallback for input iterator type
template<typename _IIter, typename _ForwardIterator, template<typename _IIter, typename _FIterator,
typename _BinaryPredicate, typename _IteratorTag1, typename _BinaryPredicate, typename _IteratorTag1,
typename _IteratorTag2> typename _IteratorTag2>
inline _IIter inline _IIter
__find_first_of_switch(_IIter __begin1, _IIter __end1, __find_first_of_switch(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
_BinaryPredicate __comp, _IteratorTag1, _IteratorTag2) _BinaryPredicate __comp, _IteratorTag1, _IteratorTag2)
{ return find_first_of(__begin1, __end1, __begin2, __end2, __comp, { return find_first_of(__begin1, __end1, __begin2, __end2, __comp,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
// Public interface // Public interface
template<typename _IIter, typename _ForwardIterator, template<typename _IIter, typename _FIterator,
typename _BinaryPredicate> typename _BinaryPredicate>
inline _IIter inline _IIter
find_first_of(_IIter __begin1, _IIter __end1, find_first_of(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2, _FIterator __begin2, _FIterator __end2,
_BinaryPredicate __comp) _BinaryPredicate __comp)
{ {
typedef std::iterator_traits<_IIter> _IIterTraits; typedef std::iterator_traits<_IIter> _IIterTraits;
typedef std::iterator_traits<_ForwardIterator> iteratorf_traits; typedef std::iterator_traits<_FIterator> iteratorf_traits;
typedef typename _IIterTraits::iterator_category _IIteratorCategory; typedef typename _IIterTraits::iterator_category _IIteratorCategory;
typedef typename iteratorf_traits::iterator_category iteratorf_category; typedef typename iteratorf_traits::iterator_category iteratorf_category;
...@@ -279,13 +282,13 @@ namespace __parallel ...@@ -279,13 +282,13 @@ namespace __parallel
} }
// Public interface, insert default comparator // Public interface, insert default comparator
template<typename _IIter, typename _ForwardIterator> template<typename _IIter, typename _FIterator>
inline _IIter inline _IIter
find_first_of(_IIter __begin1, _IIter __end1, find_first_of(_IIter __begin1, _IIter __end1,
_ForwardIterator __begin2, _ForwardIterator __end2) _FIterator __begin2, _FIterator __end2)
{ {
typedef std::iterator_traits<_IIter> _IIterTraits; typedef std::iterator_traits<_IIter> _IIterTraits;
typedef std::iterator_traits<_ForwardIterator> iteratorf_traits; typedef std::iterator_traits<_FIterator> iteratorf_traits;
typedef typename _IIterTraits::value_type _IValueType; typedef typename _IIterTraits::value_type _IValueType;
typedef typename iteratorf_traits::value_type _FValueType; typedef typename iteratorf_traits::value_type _FValueType;
...@@ -328,7 +331,8 @@ namespace __parallel ...@@ -328,7 +331,8 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION( if (_GLIBCXX_PARALLEL_CONDITION(
static_cast<__gnu_parallel::_SequenceIndex>(__last - __begin) static_cast<__gnu_parallel::_SequenceIndex>(__last - __begin)
> __gnu_parallel::_Settings::get().unique_copy_minimal_n)) > __gnu_parallel::_Settings::get().unique_copy_minimal_n))
return __gnu_parallel::__parallel_unique_copy(__begin, __last, __out, __pred); return __gnu_parallel::__parallel_unique_copy(
__begin, __last, __out, __pred);
else else
return _GLIBCXX_STD_P::unique_copy(__begin, __last, __out, __pred); return _GLIBCXX_STD_P::unique_copy(__begin, __last, __out, __pred);
} }
...@@ -344,7 +348,8 @@ namespace __parallel ...@@ -344,7 +348,8 @@ namespace __parallel
typedef typename _IIterTraits::value_type _ValueType; typedef typename _IIterTraits::value_type _ValueType;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __unique_copy_switch(__begin1, __end1, __out, equal_to<_ValueType>(), return __unique_copy_switch(
__begin1, __end1, __out, equal_to<_ValueType>(),
_IIteratorCategory(), _OIterCategory()); _IIteratorCategory(), _OIterCategory());
} }
...@@ -359,8 +364,9 @@ namespace __parallel ...@@ -359,8 +364,9 @@ namespace __parallel
typedef typename _IIterTraits::iterator_category _IIteratorCategory; typedef typename _IIterTraits::iterator_category _IIteratorCategory;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __unique_copy_switch(__begin1, __end1, __out, __pred, _IIteratorCategory(), return __unique_copy_switch(
_OIterCategory()); __begin1, __end1, __out, __pred,
_IIteratorCategory(), _OIterCategory());
} }
// Sequential fallback // Sequential fallback
...@@ -370,7 +376,8 @@ namespace __parallel ...@@ -370,7 +376,8 @@ namespace __parallel
set_union(_IIter1 __begin1, _IIter1 __end1, set_union(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __out, __gnu_parallel::sequential_tag) _OutputIterator __out, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::set_union(__begin1, __end1, __begin2, __end2, __out); } { return _GLIBCXX_STD_P::set_union(
__begin1, __end1, __begin2, __end2, __out); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -384,14 +391,14 @@ namespace __parallel ...@@ -384,14 +391,14 @@ namespace __parallel
__begin2, __end2, __out, __pred); } __begin2, __end2, __out, __pred); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate,
typename _Predicate, typename _OutputIterator, typename _OutputIterator, typename _IteratorTag1,
typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3> typename _IteratorTag2, typename _IteratorTag3>
inline _OutputIterator inline _OutputIterator
__set_union_switch(_IIter1 __begin1, _IIter1 __end1, __set_union_switch(
_IIter2 __begin2, _IIter2 __end2, _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __result, _Predicate __pred, _IteratorTag1, _OutputIterator __result, _Predicate __pred,
_IteratorTag2, _IteratorTag3) _IteratorTag1, _IteratorTag2, _IteratorTag3)
{ return _GLIBCXX_STD_P::set_union(__begin1, __end1, { return _GLIBCXX_STD_P::set_union(__begin1, __end1,
__begin2, __end2, __result, __pred); } __begin2, __end2, __result, __pred); }
...@@ -410,8 +417,8 @@ namespace __parallel ...@@ -410,8 +417,8 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().set_union_minimal_n >= __gnu_parallel::_Settings::get().set_union_minimal_n
|| static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2) || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
>= __gnu_parallel::_Settings::get().set_union_minimal_n)) >= __gnu_parallel::_Settings::get().set_union_minimal_n))
return __gnu_parallel::__parallel_set_union(__begin1, __end1, return __gnu_parallel::__parallel_set_union(
__begin2, __end2, __result, __pred); __begin1, __end1, __begin2, __end2, __result, __pred);
else else
return _GLIBCXX_STD_P::set_union(__begin1, __end1, return _GLIBCXX_STD_P::set_union(__begin1, __end1,
__begin2, __end2, __result, __pred); __begin2, __end2, __result, __pred);
...@@ -435,10 +442,10 @@ namespace __parallel ...@@ -435,10 +442,10 @@ namespace __parallel
typedef typename _IIterTraits1::value_type _ValueType1; typedef typename _IIterTraits1::value_type _ValueType1;
typedef typename _IIterTraits2::value_type _ValueType2; typedef typename _IIterTraits2::value_type _ValueType2;
return __set_union_switch(__begin1, __end1, __begin2, __end2, __out, return __set_union_switch(
__begin1, __end1, __begin2, __end2, __out,
__gnu_parallel::_Less<_ValueType1, _ValueType2>(), __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
_IIterCategory1(), _IIterCategory2(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_OIterCategory());
} }
// Public interface // Public interface
...@@ -458,9 +465,9 @@ namespace __parallel ...@@ -458,9 +465,9 @@ namespace __parallel
_IIterCategory2; _IIterCategory2;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __set_union_switch(__begin1, __end1, __begin2, __end2, __out, __pred, return __set_union_switch(
_IIterCategory1(), _IIterCategory2(), __begin1, __end1, __begin2, __end2, __out, __pred,
_OIterCategory()); _IIterCategory1(), _IIterCategory2(), _OIterCategory());
} }
// Sequential fallback. // Sequential fallback.
...@@ -481,8 +488,8 @@ namespace __parallel ...@@ -481,8 +488,8 @@ namespace __parallel
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __out, _Predicate __pred, _OutputIterator __out, _Predicate __pred,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2, __end2, { return _GLIBCXX_STD_P::set_intersection(
__out, __pred); } __begin1, __end1, __begin2, __end2, __out, __pred); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -516,11 +523,11 @@ namespace __parallel ...@@ -516,11 +523,11 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().set_union_minimal_n >= __gnu_parallel::_Settings::get().set_union_minimal_n
|| static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2) || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
>= __gnu_parallel::_Settings::get().set_union_minimal_n)) >= __gnu_parallel::_Settings::get().set_union_minimal_n))
return __gnu_parallel::__parallel_set_intersection(__begin1, __end1, __begin2, return __gnu_parallel::__parallel_set_intersection(
__end2, __result, __pred); __begin1, __end1, __begin2, __end2, __result, __pred);
else else
return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2, return _GLIBCXX_STD_P::set_intersection(
__end2, __result, __pred); __begin1, __end1, __begin2, __end2, __result, __pred);
} }
// Public interface // Public interface
...@@ -542,12 +549,10 @@ namespace __parallel ...@@ -542,12 +549,10 @@ namespace __parallel
typedef typename _IIterTraits1::value_type _ValueType1; typedef typename _IIterTraits1::value_type _ValueType1;
typedef typename _IIterTraits2::value_type _ValueType2; typedef typename _IIterTraits2::value_type _ValueType2;
return __set_intersection_switch(__begin1, __end1, __begin2, __end2, __out, return __set_intersection_switch(
__gnu_parallel:: __begin1, __end1, __begin2, __end2, __out,
_Less<_ValueType1, _ValueType2>(), __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
_IIterCategory1(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_IIterCategory2(),
_OIterCategory());
} }
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -566,10 +571,9 @@ namespace __parallel ...@@ -566,10 +571,9 @@ namespace __parallel
_IIterCategory2; _IIterCategory2;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __set_intersection_switch(__begin1, __end1, __begin2, __end2, __out, __pred, return __set_intersection_switch(
_IIterCategory1(), __begin1, __end1, __begin2, __end2, __out, __pred,
_IIterCategory2(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_OIterCategory());
} }
// Sequential fallback // Sequential fallback
...@@ -580,8 +584,8 @@ namespace __parallel ...@@ -580,8 +584,8 @@ namespace __parallel
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __out, _OutputIterator __out,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::set_symmetric_difference(__begin1,__end1, { return _GLIBCXX_STD_P::set_symmetric_difference(
__begin2, __end2, __out); } __begin1, __end1, __begin2, __end2, __out); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -591,8 +595,8 @@ namespace __parallel ...@@ -591,8 +595,8 @@ namespace __parallel
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __out, _Predicate __pred, _OutputIterator __out, _Predicate __pred,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1, __begin2, { return _GLIBCXX_STD_P::set_symmetric_difference(
__end2, __out, __pred); } __begin1, __end1, __begin2, __end2, __out, __pred); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -600,15 +604,12 @@ namespace __parallel ...@@ -600,15 +604,12 @@ namespace __parallel
typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag1, typename _IteratorTag2,
typename _IteratorTag3> typename _IteratorTag3>
inline _OutputIterator inline _OutputIterator
__set_symmetric_difference_switch(_IIter1 __begin1, __set_symmetric_difference_switch(
_IIter1 __end1, _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
_IIter2 __begin2,
_IIter2 __end2,
_OutputIterator __result, _Predicate __pred, _OutputIterator __result, _Predicate __pred,
_IteratorTag1, _IteratorTag2, _IteratorTag3) _IteratorTag1, _IteratorTag2, _IteratorTag3)
{ return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1, { return _GLIBCXX_STD_P::set_symmetric_difference(
__begin2, __end2, __begin1, __end1, __begin2, __end2, __result, __pred); }
__result, __pred); }
// Parallel set_symmetric_difference for random access iterators // Parallel set_symmetric_difference for random access iterators
template<typename _RAIter1, typename _RAIter2, template<typename _RAIter1, typename _RAIter2,
...@@ -629,13 +630,11 @@ namespace __parallel ...@@ -629,13 +630,11 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n
|| static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2) || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
>= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n)) >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n))
return __gnu_parallel::__parallel_set_symmetric_difference(__begin1, __end1, return __gnu_parallel::__parallel_set_symmetric_difference(
__begin2, __end2, __begin1, __end1, __begin2, __end2, __result, __pred);
__result, __pred);
else else
return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1, return _GLIBCXX_STD_P::set_symmetric_difference(
__begin2, __end2, __begin1, __end1, __begin2, __end2, __result, __pred);
__result, __pred);
} }
// Public interface. // Public interface.
...@@ -657,12 +656,10 @@ namespace __parallel ...@@ -657,12 +656,10 @@ namespace __parallel
typedef typename _IIterTraits1::value_type _ValueType1; typedef typename _IIterTraits1::value_type _ValueType1;
typedef typename _IIterTraits2::value_type _ValueType2; typedef typename _IIterTraits2::value_type _ValueType2;
return __set_symmetric_difference_switch(__begin1, __end1, __begin2, __end2, __out, return __set_symmetric_difference_switch(
__gnu_parallel:: __begin1, __end1, __begin2, __end2, __out,
_Less<_ValueType1, _ValueType2>(), __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
_IIterCategory1(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_IIterCategory2(),
_OIterCategory());
} }
// Public interface. // Public interface.
...@@ -682,10 +679,9 @@ namespace __parallel ...@@ -682,10 +679,9 @@ namespace __parallel
_IIterCategory2; _IIterCategory2;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __set_symmetric_difference_switch(__begin1, __end1, __begin2, __end2, __out, return __set_symmetric_difference_switch(
__pred, _IIterCategory1(), __begin1, __end1, __begin2, __end2, __out, __pred,
_IIterCategory2(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_OIterCategory());
} }
// Sequential fallback. // Sequential fallback.
...@@ -695,7 +691,8 @@ namespace __parallel ...@@ -695,7 +691,8 @@ namespace __parallel
set_difference(_IIter1 __begin1, _IIter1 __end1, set_difference(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __out, __gnu_parallel::sequential_tag) _OutputIterator __out, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::set_difference(__begin1,__end1, __begin2, __end2, __out); } { return _GLIBCXX_STD_P::set_difference(
__begin1,__end1, __begin2, __end2, __out); }
// Sequential fallback. // Sequential fallback.
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -709,16 +706,16 @@ namespace __parallel ...@@ -709,16 +706,16 @@ namespace __parallel
__begin2, __end2, __out, __pred); } __begin2, __end2, __out, __pred); }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate,
typename _Predicate, typename _OutputIterator, typename _OutputIterator, typename _IteratorTag1,
typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3> typename _IteratorTag2, typename _IteratorTag3>
inline _OutputIterator inline _OutputIterator
__set_difference_switch(_IIter1 __begin1, _IIter1 __end1, __set_difference_switch(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_OutputIterator __result, _Predicate __pred, _OutputIterator __result, _Predicate __pred,
_IteratorTag1, _IteratorTag2, _IteratorTag3) _IteratorTag1, _IteratorTag2, _IteratorTag3)
{ return _GLIBCXX_STD_P::set_difference(__begin1, __end1, { return _GLIBCXX_STD_P::set_difference(
__begin2, __end2, __result, __pred); } __begin1, __end1, __begin2, __end2, __result, __pred); }
// Parallel set_difference for random access iterators // Parallel set_difference for random access iterators
template<typename _RAIter1, typename _RAIter2, template<typename _RAIter1, typename _RAIter2,
...@@ -738,12 +735,11 @@ namespace __parallel ...@@ -738,12 +735,11 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().set_difference_minimal_n >= __gnu_parallel::_Settings::get().set_difference_minimal_n
|| static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2) || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
>= __gnu_parallel::_Settings::get().set_difference_minimal_n)) >= __gnu_parallel::_Settings::get().set_difference_minimal_n))
return __gnu_parallel::__parallel_set_difference(__begin1, __end1, return __gnu_parallel::__parallel_set_difference(
__begin2, __end2, __begin1, __end1, __begin2, __end2, __result, __pred);
__result, __pred);
else else
return _GLIBCXX_STD_P::set_difference(__begin1, __end1, return _GLIBCXX_STD_P::set_difference(
__begin2, __end2, __result, __pred); __begin1, __end1, __begin2, __end2, __result, __pred);
} }
// Public interface // Public interface
...@@ -765,12 +761,10 @@ namespace __parallel ...@@ -765,12 +761,10 @@ namespace __parallel
typedef typename _IIterTraits1::value_type _ValueType1; typedef typename _IIterTraits1::value_type _ValueType1;
typedef typename _IIterTraits2::value_type _ValueType2; typedef typename _IIterTraits2::value_type _ValueType2;
return __set_difference_switch(__begin1, __end1, __begin2, __end2, __out, return __set_difference_switch(
__gnu_parallel:: __begin1, __end1, __begin2, __end2, __out,
_Less<_ValueType1, _ValueType2>(), __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
_IIterCategory1(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_IIterCategory2(),
_OIterCategory());
} }
// Public interface // Public interface
...@@ -790,24 +784,24 @@ namespace __parallel ...@@ -790,24 +784,24 @@ namespace __parallel
_IIterCategory2; _IIterCategory2;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __set_difference_switch(__begin1, __end1, __begin2, __end2, __out, __pred, return __set_difference_switch(
_IIterCategory1(), __begin1, __end1, __begin2, __end2, __out, __pred,
_IIterCategory2(), _IIterCategory1(), _IIterCategory2(), _OIterCategory());
_OIterCategory());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, adjacent_find(_FIterator __begin, _FIterator __end,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::adjacent_find(__begin, __end); } { return _GLIBCXX_STD_P::adjacent_find(__begin, __end); }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _BinaryPredicate> template<typename _FIterator, typename _BinaryPredicate>
inline _ForwardIterator inline _FIterator
adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, adjacent_find(_FIterator __begin, _FIterator __end,
_BinaryPredicate __binary_pred, __gnu_parallel::sequential_tag) _BinaryPredicate __binary_pred,
__gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::adjacent_find(__begin, __end, __binary_pred); } { return _GLIBCXX_STD_P::adjacent_find(__begin, __end, __binary_pred); }
// Parallel algorithm for random access iterators // Parallel algorithm for random access iterators
...@@ -822,8 +816,10 @@ namespace __parallel ...@@ -822,8 +816,10 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION(true)) if (_GLIBCXX_PARALLEL_CONDITION(true))
{ {
_RAIter spot = __gnu_parallel:: _RAIter spot = __gnu_parallel::
__find_template(__begin, __end - 1, __begin, equal_to<_ValueType>(), __find_template(
__gnu_parallel::__adjacent_find_selector()).first; __begin, __end - 1, __begin, equal_to<_ValueType>(),
__gnu_parallel::__adjacent_find_selector())
.first;
if (spot == (__end - 1)) if (spot == (__end - 1))
return __end; return __end;
else else
...@@ -834,27 +830,27 @@ namespace __parallel ...@@ -834,27 +830,27 @@ namespace __parallel
} }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _IteratorTag> template<typename _FIterator, typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__adjacent_find_switch(_ForwardIterator __begin, _ForwardIterator __end, __adjacent_find_switch(_FIterator __begin, _FIterator __end,
_IteratorTag) _IteratorTag)
{ return adjacent_find(__begin, __end, __gnu_parallel::sequential_tag()); } { return adjacent_find(__begin, __end, __gnu_parallel::sequential_tag()); }
// Public interface // Public interface
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
adjacent_find(_ForwardIterator __begin, _ForwardIterator __end) adjacent_find(_FIterator __begin, _FIterator __end)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __adjacent_find_switch(__begin, __end, _IteratorCategory()); return __adjacent_find_switch(__begin, __end, _IteratorCategory());
} }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _BinaryPredicate, template<typename _FIterator, typename _BinaryPredicate,
typename _IteratorTag> typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__adjacent_find_switch(_ForwardIterator __begin, _ForwardIterator __end, __adjacent_find_switch(_FIterator __begin, _FIterator __end,
_BinaryPredicate __pred, _IteratorTag) _BinaryPredicate __pred, _IteratorTag)
{ return adjacent_find(__begin, __end, __pred, { return adjacent_find(__begin, __end, __pred,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
...@@ -875,14 +871,15 @@ namespace __parallel ...@@ -875,14 +871,15 @@ namespace __parallel
} }
// Public interface // Public interface
template<typename _ForwardIterator, typename _BinaryPredicate> template<typename _FIterator, typename _BinaryPredicate>
inline _ForwardIterator inline _FIterator
adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, adjacent_find(_FIterator __begin, _FIterator __end,
_BinaryPredicate __pred) _BinaryPredicate __pred)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __adjacent_find_switch(__begin, __end, __pred, _IteratorCategory()); return __adjacent_find_switch(__begin, __end, __pred,
_IteratorCategory());
} }
// Sequential fallback // Sequential fallback
...@@ -914,14 +911,15 @@ namespace __parallel ...@@ -914,14 +911,15 @@ namespace __parallel
__functionality; __functionality;
_DifferenceType __res = 0; _DifferenceType __res = 0;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __value, __for_each_template_random_access(
__functionality, __begin, __end, __value, __functionality,
std::plus<_SequenceIndex>(), std::plus<_SequenceIndex>(), __res, __res, -1,
__res, __res, -1, __parallelism_tag); __parallelism_tag);
return __res; return __res;
} }
else else
return count(__begin, __end, __value, __gnu_parallel::sequential_tag()); return count(__begin, __end, __value,
__gnu_parallel::sequential_tag());
} }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
...@@ -929,7 +927,8 @@ namespace __parallel ...@@ -929,7 +927,8 @@ namespace __parallel
inline typename iterator_traits<_IIter>::difference_type inline typename iterator_traits<_IIter>::difference_type
__count_switch(_IIter __begin, _IIter __end, const _Tp& __value, __count_switch(_IIter __begin, _IIter __end, const _Tp& __value,
_IteratorTag) _IteratorTag)
{ return count(__begin, __end, __value, __gnu_parallel::sequential_tag()); } { return count(__begin, __end, __value, __gnu_parallel::sequential_tag());
}
// Public interface. // Public interface.
template<typename _IIter, typename _Tp> template<typename _IIter, typename _Tp>
...@@ -983,14 +982,15 @@ namespace __parallel ...@@ -983,14 +982,15 @@ namespace __parallel
__count_if_selector<_RAIter, _DifferenceType> __count_if_selector<_RAIter, _DifferenceType>
__functionality; __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __pred, __for_each_template_random_access(
__functionality, __begin, __end, __pred, __functionality,
std::plus<_SequenceIndex>(), std::plus<_SequenceIndex>(), __res, __res, -1,
__res, __res, -1, __parallelism_tag); __parallelism_tag);
return __res; return __res;
} }
else else
return count_if(__begin, __end, __pred, __gnu_parallel::sequential_tag()); return count_if(__begin, __end, __pred,
__gnu_parallel::sequential_tag());
} }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
...@@ -998,7 +998,8 @@ namespace __parallel ...@@ -998,7 +998,8 @@ namespace __parallel
inline typename iterator_traits<_IIter>::difference_type inline typename iterator_traits<_IIter>::difference_type
__count_if_switch(_IIter __begin, _IIter __end, _Predicate __pred, __count_if_switch(_IIter __begin, _IIter __end, _Predicate __pred,
_IteratorTag) _IteratorTag)
{ return count_if(__begin, __end, __pred, __gnu_parallel::sequential_tag()); } { return count_if(__begin, __end, __pred,
__gnu_parallel::sequential_tag()); }
// Public interface. // Public interface.
template<typename _IIter, typename _Predicate> template<typename _IIter, typename _Predicate>
...@@ -1023,10 +1024,10 @@ namespace __parallel ...@@ -1023,10 +1024,10 @@ namespace __parallel
// Sequential fallback. // Sequential fallback.
template<typename ForwardIterator1, typename ForwardIterator2> template<typename _FIterator1, typename _FIterator2>
inline ForwardIterator1 inline _FIterator1
search(ForwardIterator1 __begin1, ForwardIterator1 __end1, search(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2, _FIterator2 __begin2, _FIterator2 __end2,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::search(__begin1, __end1, __begin2, __end2); } { return _GLIBCXX_STD_P::search(__begin1, __end1, __begin2, __end2); }
...@@ -1044,32 +1045,33 @@ namespace __parallel ...@@ -1044,32 +1045,33 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION(true)) if (_GLIBCXX_PARALLEL_CONDITION(true))
return __gnu_parallel:: return __gnu_parallel::
__search_template(__begin1, __end1, __begin2, __end2, __gnu_parallel:: __search_template(
equal_to<_ValueType1, _ValueType2>()); __begin1, __end1, __begin2, __end2,
__gnu_parallel::equal_to<_ValueType1, _ValueType2>());
else else
return search(__begin1, __end1, __begin2, __end2, return search(__begin1, __end1, __begin2, __end2,
__gnu_parallel::sequential_tag()); __gnu_parallel::sequential_tag());
} }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename ForwardIterator1, typename ForwardIterator2, template<typename _FIterator1, typename _FIterator2,
typename _IteratorTag1, typename _IteratorTag2> typename _IteratorTag1, typename _IteratorTag2>
inline ForwardIterator1 inline _FIterator1
__search_switch(ForwardIterator1 __begin1, ForwardIterator1 __end1, __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2, _FIterator2 __begin2, _FIterator2 __end2,
_IteratorTag1, _IteratorTag2) _IteratorTag1, _IteratorTag2)
{ return search(__begin1, __end1, __begin2, __end2, { return search(__begin1, __end1, __begin2, __end2,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
// Public interface. // Public interface.
template<typename ForwardIterator1, typename ForwardIterator2> template<typename _FIterator1, typename _FIterator2>
inline ForwardIterator1 inline _FIterator1
search(ForwardIterator1 __begin1, ForwardIterator1 __end1, search(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2) _FIterator2 __begin2, _FIterator2 __end2)
{ {
typedef std::iterator_traits<ForwardIterator1> iterator1_traits; typedef std::iterator_traits<_FIterator1> iterator1_traits;
typedef typename iterator1_traits::iterator_category _IteratorCategory1; typedef typename iterator1_traits::iterator_category _IteratorCategory1;
typedef std::iterator_traits<ForwardIterator2> iterator2_traits; typedef std::iterator_traits<_FIterator2> iterator2_traits;
typedef typename iterator2_traits::iterator_category _IteratorCategory2; typedef typename iterator2_traits::iterator_category _IteratorCategory2;
return __search_switch(__begin1, __end1, __begin2, __end2, return __search_switch(__begin1, __end1, __begin2, __end2,
...@@ -1077,13 +1079,14 @@ namespace __parallel ...@@ -1077,13 +1079,14 @@ namespace __parallel
} }
// Public interface. // Public interface.
template<typename ForwardIterator1, typename ForwardIterator2, template<typename _FIterator1, typename _FIterator2,
typename _BinaryPredicate> typename _BinaryPredicate>
inline ForwardIterator1 inline _FIterator1
search(ForwardIterator1 __begin1, ForwardIterator1 __end1, search(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2, _FIterator2 __begin2, _FIterator2 __end2,
_BinaryPredicate __pred, __gnu_parallel::sequential_tag) _BinaryPredicate __pred, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::search(__begin1, __end1, __begin2, __end2, __pred); } { return _GLIBCXX_STD_P::search(
__begin1, __end1, __begin2, __end2, __pred); }
// Parallel algorithm for random access iterator. // Parallel algorithm for random access iterator.
template<typename _RAIter1, typename _RAIter2, template<typename _RAIter1, typename _RAIter2,
...@@ -1103,55 +1106,56 @@ namespace __parallel ...@@ -1103,55 +1106,56 @@ namespace __parallel
} }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename ForwardIterator1, typename ForwardIterator2, template<typename _FIterator1, typename _FIterator2,
typename _BinaryPredicate, typename _IteratorTag1, typename _BinaryPredicate, typename _IteratorTag1,
typename _IteratorTag2> typename _IteratorTag2>
inline ForwardIterator1 inline _FIterator1
__search_switch(ForwardIterator1 __begin1, ForwardIterator1 __end1, __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2, _FIterator2 __begin2, _FIterator2 __end2,
_BinaryPredicate __pred, _IteratorTag1, _IteratorTag2) _BinaryPredicate __pred, _IteratorTag1, _IteratorTag2)
{ return search(__begin1, __end1, __begin2, __end2, __pred, { return search(__begin1, __end1, __begin2, __end2, __pred,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
// Public interface // Public interface
template<typename ForwardIterator1, typename ForwardIterator2, template<typename _FIterator1, typename _FIterator2,
typename _BinaryPredicate> typename _BinaryPredicate>
inline ForwardIterator1 inline _FIterator1
search(ForwardIterator1 __begin1, ForwardIterator1 __end1, search(_FIterator1 __begin1, _FIterator1 __end1,
ForwardIterator2 __begin2, ForwardIterator2 __end2, _FIterator2 __begin2, _FIterator2 __end2,
_BinaryPredicate __pred) _BinaryPredicate __pred)
{ {
typedef std::iterator_traits<ForwardIterator1> iterator1_traits; typedef std::iterator_traits<_FIterator1> iterator1_traits;
typedef typename iterator1_traits::iterator_category _IteratorCategory1; typedef typename iterator1_traits::iterator_category _IteratorCategory1;
typedef std::iterator_traits<ForwardIterator2> iterator2_traits; typedef std::iterator_traits<_FIterator2> iterator2_traits;
typedef typename iterator2_traits::iterator_category _IteratorCategory2; typedef typename iterator2_traits::iterator_category _IteratorCategory2;
return __search_switch(__begin1, __end1, __begin2, __end2, __pred, return __search_switch(__begin1, __end1, __begin2, __end2, __pred,
_IteratorCategory1(), _IteratorCategory2()); _IteratorCategory1(), _IteratorCategory2());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Integer, typename _Tp> template<typename _FIterator, typename _Integer, typename _Tp>
inline _ForwardIterator inline _FIterator
search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count, search_n(_FIterator __begin, _FIterator __end, _Integer count,
const _Tp& __val, __gnu_parallel::sequential_tag) const _Tp& __val, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::search_n(__begin, __end, count, __val); } { return _GLIBCXX_STD_P::search_n(__begin, __end, count, __val); }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Integer, typename _Tp, template<typename _FIterator, typename _Integer, typename _Tp,
typename _BinaryPredicate> typename _BinaryPredicate>
inline _ForwardIterator inline _FIterator
search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count, search_n(_FIterator __begin, _FIterator __end, _Integer count,
const _Tp& __val, _BinaryPredicate __binary_pred, const _Tp& __val, _BinaryPredicate __binary_pred,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::search_n(__begin, __end, count, __val, __binary_pred); } { return _GLIBCXX_STD_P::search_n(
__begin, __end, count, __val, __binary_pred); }
// Public interface. // Public interface.
template<typename _ForwardIterator, typename _Integer, typename _Tp> template<typename _FIterator, typename _Integer, typename _Tp>
inline _ForwardIterator inline _FIterator
search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count, search_n(_FIterator __begin, _FIterator __end, _Integer count,
const _Tp& __val) const _Tp& __val)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_FIterator>::value_type _ValueType;
return search_n(__begin, __end, count, __val, return search_n(__begin, __end, count, __val,
__gnu_parallel::equal_to<_ValueType, _Tp>()); __gnu_parallel::equal_to<_ValueType, _Tp>());
} }
...@@ -1160,15 +1164,15 @@ namespace __parallel ...@@ -1160,15 +1164,15 @@ namespace __parallel
template<typename _RAIter, typename _Integer, template<typename _RAIter, typename _Integer,
typename _Tp, typename _BinaryPredicate> typename _Tp, typename _BinaryPredicate>
_RAIter _RAIter
__search_n_switch(_RAIter __begin, _RAIter __end, __search_n_switch(_RAIter __begin, _RAIter __end, _Integer count,
_Integer count, const _Tp& __val, _BinaryPredicate __binary_pred, const _Tp& __val, _BinaryPredicate __binary_pred,
random_access_iterator_tag) random_access_iterator_tag)
{ {
if (_GLIBCXX_PARALLEL_CONDITION(true)) if (_GLIBCXX_PARALLEL_CONDITION(true))
{ {
__gnu_parallel::_PseudoSequence<_Tp, _Integer> __ps(__val, count); __gnu_parallel::_PseudoSequence<_Tp, _Integer> __ps(__val, count);
return __gnu_parallel::__search_template(__begin, __end, __ps.begin(), return __gnu_parallel::__search_template(
__ps.end(), __binary_pred); __begin, __end, __ps.begin(), __ps.end(), __binary_pred);
} }
else else
return std::__search_n(__begin, __end, count, __val, return std::__search_n(__begin, __end, count, __val,
...@@ -1176,22 +1180,24 @@ namespace __parallel ...@@ -1176,22 +1180,24 @@ namespace __parallel
} }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
template<typename _ForwardIterator, typename _Integer, typename _Tp, template<typename _FIterator, typename _Integer, typename _Tp,
typename _BinaryPredicate, typename _IteratorTag> typename _BinaryPredicate, typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__search_n_switch(_ForwardIterator __begin, _ForwardIterator __end, _Integer count, __search_n_switch(_FIterator __begin, _FIterator __end, _Integer count,
const _Tp& __val, _BinaryPredicate __binary_pred, _IteratorTag) const _Tp& __val, _BinaryPredicate __binary_pred,
{ return __search_n(__begin, __end, count, __val, __binary_pred, _IteratorTag()); } _IteratorTag)
{ return __search_n(__begin, __end, count, __val, __binary_pred,
_IteratorTag()); }
// Public interface. // Public interface.
template<typename _ForwardIterator, typename _Integer, typename _Tp, template<typename _FIterator, typename _Integer, typename _Tp,
typename _BinaryPredicate> typename _BinaryPredicate>
inline _ForwardIterator inline _FIterator
search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count, search_n(_FIterator __begin, _FIterator __end, _Integer count,
const _Tp& __val, _BinaryPredicate __binary_pred) const _Tp& __val, _BinaryPredicate __binary_pred)
{ {
return __search_n_switch(__begin, __end, count, __val, __binary_pred, return __search_n_switch(__begin, __end, count, __val, __binary_pred,
typename std::iterator_traits<_ForwardIterator>:: typename std::iterator_traits<_FIterator>::
iterator_category()); iterator_category());
} }
...@@ -1222,11 +1228,12 @@ namespace __parallel ...@@ -1222,11 +1228,12 @@ namespace __parallel
bool __dummy = true; bool __dummy = true;
typedef __gnu_parallel::_IteratorPair<_RAIter1, typedef __gnu_parallel::_IteratorPair<_RAIter1,
_RAIter2, random_access_iterator_tag> _ItTrip; _RAIter2, random_access_iterator_tag> _ItTrip;
_ItTrip begin_pair(__begin, __result), end_pair(__end, __result + (__end - __begin)); _ItTrip begin_pair(__begin, __result),
end_pair(__end, __result + (__end - __begin));
__gnu_parallel::__transform1_selector<_ItTrip> __functionality; __gnu_parallel::__transform1_selector<_ItTrip> __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(begin_pair, end_pair, __for_each_template_random_access(
unary_op, __functionality, begin_pair, end_pair, unary_op, __functionality,
__gnu_parallel::_DummyReduct(), __gnu_parallel::_DummyReduct(),
__dummy, __dummy, -1, __parallelism_tag); __dummy, __dummy, -1, __parallelism_tag);
return __functionality._M_finish_iterator; return __functionality._M_finish_iterator;
...@@ -1358,9 +1365,10 @@ namespace __parallel ...@@ -1358,9 +1365,10 @@ namespace __parallel
typedef std::iterator_traits<_OutputIterator> _OIterTraits; typedef std::iterator_traits<_OutputIterator> _OIterTraits;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __transform2_switch(__begin1, __end1, __begin2, __result, __binary_op, return __transform2_switch(
_IIterCategory1(), _IIterCategory2(), __begin1, __end1, __begin2, __result, __binary_op,
_OIterCategory(), __parallelism_tag); _IIterCategory1(), _IIterCategory2(), _OIterCategory(),
__parallelism_tag);
} }
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -1379,23 +1387,24 @@ namespace __parallel ...@@ -1379,23 +1387,24 @@ namespace __parallel
typedef std::iterator_traits<_OutputIterator> _OIterTraits; typedef std::iterator_traits<_OutputIterator> _OIterTraits;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __transform2_switch(__begin1, __end1, __begin2, __result, __binary_op, return __transform2_switch(
_IIterCategory1(), _IIterCategory2(), __begin1, __end1, __begin2, __result, __binary_op,
_OIterCategory()); _IIterCategory1(), _IIterCategory2(), _OIterCategory());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Tp> template<typename _FIterator, typename _Tp>
inline void inline void
replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value,
const _Tp& __new_value, __gnu_parallel::sequential_tag) const _Tp& __new_value, __gnu_parallel::sequential_tag)
{ _GLIBCXX_STD_P::replace(__begin, __end, __old_value, __new_value); } { _GLIBCXX_STD_P::replace(__begin, __end, __old_value, __new_value); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _Tp, typename _IteratorTag> template<typename _FIterator, typename _Tp, typename _IteratorTag>
inline void inline void
__replace_switch(_ForwardIterator __begin, _ForwardIterator __end, __replace_switch(_FIterator __begin, _FIterator __end,
const _Tp& __old_value, const _Tp& __new_value, _IteratorTag) const _Tp& __old_value, const _Tp& __new_value,
_IteratorTag)
{ replace(__begin, __end, __old_value, __new_value, { replace(__begin, __end, __old_value, __new_value,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
...@@ -1414,40 +1423,43 @@ namespace __parallel ...@@ -1414,40 +1423,43 @@ namespace __parallel
} }
// Public interface // Public interface
template<typename _ForwardIterator, typename _Tp> template<typename _FIterator, typename _Tp>
inline void inline void
replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value,
const _Tp& __new_value, __gnu_parallel::_Parallelism __parallelism_tag) const _Tp& __new_value,
__gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
__replace_switch(__begin, __end, __old_value, __new_value, _IteratorCategory(), __replace_switch(__begin, __end, __old_value, __new_value,
_IteratorCategory(),
__parallelism_tag); __parallelism_tag);
} }
template<typename _ForwardIterator, typename _Tp> template<typename _FIterator, typename _Tp>
inline void inline void
replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value,
const _Tp& __new_value) const _Tp& __new_value)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
__replace_switch(__begin, __end, __old_value, __new_value, _IteratorCategory()); __replace_switch(__begin, __end, __old_value, __new_value,
_IteratorCategory());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Predicate, typename _Tp> template<typename _FIterator, typename _Predicate, typename _Tp>
inline void inline void
replace_if(_ForwardIterator __begin, _ForwardIterator __end, _Predicate __pred, replace_if(_FIterator __begin, _FIterator __end, _Predicate __pred,
const _Tp& __new_value, __gnu_parallel::sequential_tag) const _Tp& __new_value, __gnu_parallel::sequential_tag)
{ _GLIBCXX_STD_P::replace_if(__begin, __end, __pred, __new_value); } { _GLIBCXX_STD_P::replace_if(__begin, __end, __pred, __new_value); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _Predicate, typename _Tp, template<typename _FIterator, typename _Predicate, typename _Tp,
typename _IteratorTag> typename _IteratorTag>
inline void inline void
__replace_if_switch(_ForwardIterator __begin, _ForwardIterator __end, __replace_if_switch(_FIterator __begin, _FIterator __end,
_Predicate __pred, const _Tp& __new_value, _IteratorTag) _Predicate __pred, const _Tp& __new_value, _IteratorTag)
{ replace_if(__begin, __end, __pred, __new_value, { replace_if(__begin, __end, __pred, __new_value,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
...@@ -1471,8 +1483,8 @@ namespace __parallel ...@@ -1471,8 +1483,8 @@ namespace __parallel
__replace_if_selector<_RAIter, _Predicate, _Tp> __replace_if_selector<_RAIter, _Predicate, _Tp>
__functionality(__new_value); __functionality(__new_value);
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __pred, __for_each_template_random_access(
__functionality, __begin, __end, __pred, __functionality,
__gnu_parallel::_DummyReduct(), __gnu_parallel::_DummyReduct(),
true, __dummy, -1, __parallelism_tag); true, __dummy, -1, __parallelism_tag);
} }
...@@ -1482,39 +1494,40 @@ namespace __parallel ...@@ -1482,39 +1494,40 @@ namespace __parallel
} }
// Public interface. // Public interface.
template<typename _ForwardIterator, typename _Predicate, typename _Tp> template<typename _FIterator, typename _Predicate, typename _Tp>
inline void inline void
replace_if(_ForwardIterator __begin, _ForwardIterator __end, replace_if(_FIterator __begin, _FIterator __end,
_Predicate __pred, const _Tp& __new_value, _Predicate __pred, const _Tp& __new_value,
__gnu_parallel::_Parallelism __parallelism_tag) __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef std::iterator_traits<_ForwardIterator> _IteratorTraits; typedef std::iterator_traits<_FIterator> _IteratorTraits;
typedef typename _IteratorTraits::iterator_category _IteratorCategory; typedef typename _IteratorTraits::iterator_category _IteratorCategory;
__replace_if_switch(__begin, __end, __pred, __new_value, _IteratorCategory(), __replace_if_switch(__begin, __end, __pred, __new_value,
__parallelism_tag); _IteratorCategory(), __parallelism_tag);
} }
template<typename _ForwardIterator, typename _Predicate, typename _Tp> template<typename _FIterator, typename _Predicate, typename _Tp>
inline void inline void
replace_if(_ForwardIterator __begin, _ForwardIterator __end, replace_if(_FIterator __begin, _FIterator __end,
_Predicate __pred, const _Tp& __new_value) _Predicate __pred, const _Tp& __new_value)
{ {
typedef std::iterator_traits<_ForwardIterator> _IteratorTraits; typedef std::iterator_traits<_FIterator> _IteratorTraits;
typedef typename _IteratorTraits::iterator_category _IteratorCategory; typedef typename _IteratorTraits::iterator_category _IteratorCategory;
__replace_if_switch(__begin, __end, __pred, __new_value, _IteratorCategory()); __replace_if_switch(__begin, __end, __pred, __new_value,
_IteratorCategory());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename Generator> template<typename _FIterator, typename Generator>
inline void inline void
generate(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen, generate(_FIterator __begin, _FIterator __end, Generator __gen,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ _GLIBCXX_STD_P::generate(__begin, __end, __gen); } { _GLIBCXX_STD_P::generate(__begin, __end, __gen); }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
template<typename _ForwardIterator, typename Generator, typename _IteratorTag> template<typename _FIterator, typename Generator, typename _IteratorTag>
inline void inline void
__generate_switch(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen, __generate_switch(_FIterator __begin, _FIterator __end, Generator __gen,
_IteratorTag) _IteratorTag)
{ generate(__begin, __end, __gen, __gnu_parallel::sequential_tag()); } { generate(__begin, __end, __gen, __gnu_parallel::sequential_tag()); }
...@@ -1535,7 +1548,8 @@ namespace __parallel ...@@ -1535,7 +1548,8 @@ namespace __parallel
__gnu_parallel::__generate_selector<_RAIter> __gnu_parallel::__generate_selector<_RAIter>
__functionality; __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __gen, __functionality, __for_each_template_random_access(
__begin, __end, __gen, __functionality,
__gnu_parallel::_DummyReduct(), __gnu_parallel::_DummyReduct(),
true, __dummy, -1, __parallelism_tag); true, __dummy, -1, __parallelism_tag);
} }
...@@ -1544,21 +1558,22 @@ namespace __parallel ...@@ -1544,21 +1558,22 @@ namespace __parallel
} }
// Public interface. // Public interface.
template<typename _ForwardIterator, typename Generator> template<typename _FIterator, typename Generator>
inline void inline void
generate(_ForwardIterator __begin, _ForwardIterator __end, generate(_FIterator __begin, _FIterator __end,
Generator __gen, __gnu_parallel::_Parallelism __parallelism_tag) Generator __gen, __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef std::iterator_traits<_ForwardIterator> _IteratorTraits; typedef std::iterator_traits<_FIterator> _IteratorTraits;
typedef typename _IteratorTraits::iterator_category _IteratorCategory; typedef typename _IteratorTraits::iterator_category _IteratorCategory;
__generate_switch(__begin, __end, __gen, _IteratorCategory(), __parallelism_tag); __generate_switch(__begin, __end, __gen, _IteratorCategory(),
__parallelism_tag);
} }
template<typename _ForwardIterator, typename Generator> template<typename _FIterator, typename Generator>
inline void inline void
generate(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen) generate(_FIterator __begin, _FIterator __end, Generator __gen)
{ {
typedef std::iterator_traits<_ForwardIterator> _IteratorTraits; typedef std::iterator_traits<_FIterator> _IteratorTraits;
typedef typename _IteratorTraits::iterator_category _IteratorCategory; typedef typename _IteratorTraits::iterator_category _IteratorCategory;
__generate_switch(__begin, __end, __gen, _IteratorCategory()); __generate_switch(__begin, __end, __gen, _IteratorCategory());
} }
...@@ -1575,8 +1590,10 @@ namespace __parallel ...@@ -1575,8 +1590,10 @@ namespace __parallel
template<typename _OutputIterator, typename _Size, typename Generator, template<typename _OutputIterator, typename _Size, typename Generator,
typename _IteratorTag> typename _IteratorTag>
inline _OutputIterator inline _OutputIterator
__generate_n_switch(_OutputIterator __begin, _Size __n, Generator __gen, _IteratorTag) __generate_n_switch(_OutputIterator __begin, _Size __n, Generator __gen,
{ return generate_n(__begin, __n, __gen, __gnu_parallel::sequential_tag()); } _IteratorTag)
{ return generate_n(__begin, __n, __gen,
__gnu_parallel::sequential_tag()); }
// Parallel algorithm for random access iterators. // Parallel algorithm for random access iterators.
template<typename _RAIter, typename _Size, typename Generator> template<typename _RAIter, typename _Size, typename Generator>
...@@ -1623,7 +1640,8 @@ namespace __parallel ...@@ -1623,7 +1640,8 @@ namespace __parallel
template<typename _RAIter, typename RandomNumberGenerator> template<typename _RAIter, typename RandomNumberGenerator>
inline void inline void
random_shuffle(_RAIter __begin, _RAIter __end, random_shuffle(_RAIter __begin, _RAIter __end,
RandomNumberGenerator& __rand, __gnu_parallel::sequential_tag) RandomNumberGenerator& __rand,
__gnu_parallel::sequential_tag)
{ _GLIBCXX_STD_P::random_shuffle(__begin, __end, __rand); } { _GLIBCXX_STD_P::random_shuffle(__begin, __end, __rand); }
...@@ -1663,18 +1681,19 @@ namespace __parallel ...@@ -1663,18 +1681,19 @@ namespace __parallel
} }
// Sequential fallback. // Sequential fallback.
template<typename _ForwardIterator, typename _Predicate> template<typename _FIterator, typename _Predicate>
inline _ForwardIterator inline _FIterator
partition(_ForwardIterator __begin, _ForwardIterator __end, partition(_FIterator __begin, _FIterator __end,
_Predicate __pred, __gnu_parallel::sequential_tag) _Predicate __pred, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::partition(__begin, __end, __pred); } { return _GLIBCXX_STD_P::partition(__begin, __end, __pred); }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
template<typename _ForwardIterator, typename _Predicate, typename _IteratorTag> template<typename _FIterator, typename _Predicate, typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__partition_switch(_ForwardIterator __begin, _ForwardIterator __end, __partition_switch(_FIterator __begin, _FIterator __end,
_Predicate __pred, _IteratorTag) _Predicate __pred, _IteratorTag)
{ return partition(__begin, __end, __pred, __gnu_parallel::sequential_tag()); } { return partition(__begin, __end, __pred,
__gnu_parallel::sequential_tag()); }
// Parallel algorithm for random access iterators. // Parallel algorithm for random access iterators.
template<typename _RAIter, typename _Predicate> template<typename _RAIter, typename _Predicate>
...@@ -1694,15 +1713,16 @@ namespace __parallel ...@@ -1694,15 +1713,16 @@ namespace __parallel
return __begin + __middle; return __begin + __middle;
} }
else else
return partition(__begin, __end, __pred, __gnu_parallel::sequential_tag()); return partition(__begin, __end, __pred,
__gnu_parallel::sequential_tag());
} }
// Public interface. // Public interface.
template<typename _ForwardIterator, typename _Predicate> template<typename _FIterator, typename _Predicate>
inline _ForwardIterator inline _FIterator
partition(_ForwardIterator __begin, _ForwardIterator __end, _Predicate __pred) partition(_FIterator __begin, _FIterator __end, _Predicate __pred)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __partition_switch(__begin, __end, __pred, _IteratorCategory()); return __partition_switch(__begin, __end, __pred, _IteratorCategory());
} }
...@@ -1739,7 +1759,8 @@ namespace __parallel ...@@ -1739,7 +1759,8 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION( if (_GLIBCXX_PARALLEL_CONDITION(
static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >= static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
__gnu_parallel::_Settings::get().sort_minimal_n)) __gnu_parallel::_Settings::get().sort_minimal_n))
__gnu_parallel::parallel_sort<false>(__begin, __end, __comp, __parallelism); __gnu_parallel::parallel_sort<false>(
__begin, __end, __comp, __parallelism);
else else
sort(__begin, __end, __comp, __gnu_parallel::sequential_tag()); sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
} }
...@@ -1877,9 +1898,11 @@ namespace __parallel ...@@ -1877,9 +1898,11 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION( if (_GLIBCXX_PARALLEL_CONDITION(
static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >= static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
__gnu_parallel::_Settings::get().sort_minimal_n)) __gnu_parallel::_Settings::get().sort_minimal_n))
__gnu_parallel::parallel_sort<true>(__begin, __end, __comp, __parallelism); __gnu_parallel::parallel_sort<true>(
__begin, __end, __comp, __parallelism);
else else
stable_sort(__begin, __end, __comp, __gnu_parallel::sequential_tag()); stable_sort(__begin, __end, __comp,
__gnu_parallel::sequential_tag());
} }
} }
...@@ -1957,51 +1980,10 @@ namespace __parallel ...@@ -1957,51 +1980,10 @@ namespace __parallel
{ {
typedef iterator_traits<_RAIter> _TraitsType; typedef iterator_traits<_RAIter> _TraitsType;
typedef typename _TraitsType::value_type _ValueType; typedef typename _TraitsType::value_type _ValueType;
stable_sort(__begin, __end, __comp, __gnu_parallel::default_parallel_tag()); stable_sort(
__begin, __end, __comp, __gnu_parallel::default_parallel_tag());
} }
// // Sequential fallback
// template<typename _RAIter>
// inline void
// stable_sort(_RAIter __begin, _RAIter __end,
// __gnu_parallel::sequential_tag)
// { return _GLIBCXX_STD_P::stable_sort(__begin, __end); }
//
// // Sequential fallback
// template<typename _RAIter, typename _Compare>
// inline void
// stable_sort(_RAIter __begin, _RAIter __end,
// _Compare __comp, __gnu_parallel::sequential_tag)
// { return _GLIBCXX_STD_P::stable_sort(__begin, __end, __comp); }
//
// template<typename _RAIter>
// void
// stable_sort(_RAIter __begin, _RAIter __end)
// {
// typedef iterator_traits<_RAIter> _TraitsType;
// typedef typename _TraitsType::value_type _ValueType;
// stable_sort(__begin, __end, std::less<_ValueType>());
// }
//
// // Parallel algorithm for random access iterators
// template<typename _RAIter, typename _Compare>
// void
// stable_sort(_RAIter __begin, _RAIter __end,
// _Compare __comp)
// {
// if (__begin != __end)
// {
// if (_GLIBCXX_PARALLEL_CONDITION(
// static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
// __gnu_parallel::_Settings::get().sort_minimal_n))
// __gnu_parallel::parallel_sort(__begin, __end, __comp,
// __gnu_parallel::parallel_tag());
// else
// stable_sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
// }
// }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
typename _OutputIterator> typename _OutputIterator>
...@@ -2009,7 +1991,8 @@ namespace __parallel ...@@ -2009,7 +1991,8 @@ namespace __parallel
merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_IIter2 __end2, _OutputIterator __result, _IIter2 __end2, _OutputIterator __result,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::merge(__begin1, __end1, __begin2, __end2, __result); } { return _GLIBCXX_STD_P::merge(
__begin1, __end1, __begin2, __end2, __result); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -2018,12 +2001,13 @@ namespace __parallel ...@@ -2018,12 +2001,13 @@ namespace __parallel
merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_IIter2 __end2, _OutputIterator __result, _Compare __comp, _IIter2 __end2, _OutputIterator __result, _Compare __comp,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::merge(__begin1, __end1, __begin2, __end2, __result, __comp); } { return _GLIBCXX_STD_P::merge(
__begin1, __end1, __begin2, __end2, __result, __comp); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _OutputIterator,
typename _OutputIterator, typename _Compare, typename _Compare, typename _IteratorTag1,
typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3> typename _IteratorTag2, typename _IteratorTag3>
inline _OutputIterator inline _OutputIterator
__merge_switch(_IIter1 __begin1, _IIter1 __end1, __merge_switch(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
...@@ -2047,14 +2031,13 @@ namespace __parallel ...@@ -2047,14 +2031,13 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().merge_minimal_n >= __gnu_parallel::_Settings::get().merge_minimal_n
|| static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2) || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
>= __gnu_parallel::_Settings::get().merge_minimal_n))) >= __gnu_parallel::_Settings::get().merge_minimal_n)))
return __gnu_parallel::__parallel_merge_advance(__begin1, __end1, return __gnu_parallel::__parallel_merge_advance(
__begin2, __end2, __begin1, __end1, __begin2, __end2, __result,
__result, (__end1 - __begin1) (__end1 - __begin1) + (__end2 - __begin2), __comp);
+ (__end2 - __begin2), __comp);
else else
return __gnu_parallel::__merge_advance(__begin1, __end1, __begin2, __end2, return __gnu_parallel::__merge_advance(
__result, (__end1 - __begin1) __begin1, __end1, __begin2, __end2, __result,
+ (__end2 - __begin2), __comp); (__end1 - __begin1) + (__end2 - __begin2), __comp);
} }
// Public interface // Public interface
...@@ -2075,9 +2058,9 @@ namespace __parallel ...@@ -2075,9 +2058,9 @@ namespace __parallel
_IIterCategory2; _IIterCategory2;
typedef typename _OIterTraits::iterator_category _OIterCategory; typedef typename _OIterTraits::iterator_category _OIterCategory;
return __merge_switch(__begin1, __end1, __begin2, __end2, __result, __comp, return __merge_switch(
_IIterCategory1(), _IIterCategory2(), __begin1, __end1, __begin2, __end2, __result, __comp,
_OIterCategory()); _IIterCategory1(), _IIterCategory2(), _OIterCategory());
} }
...@@ -2123,7 +2106,8 @@ namespace __parallel ...@@ -2123,7 +2106,8 @@ namespace __parallel
>= __gnu_parallel::_Settings::get().nth_element_minimal_n)) >= __gnu_parallel::_Settings::get().nth_element_minimal_n))
__gnu_parallel::parallel_nth_element(__begin, __nth, __end, __comp); __gnu_parallel::parallel_nth_element(__begin, __nth, __end, __comp);
else else
nth_element(__begin, __nth, __end, __comp, __gnu_parallel::sequential_tag()); nth_element(__begin, __nth, __end, __comp,
__gnu_parallel::sequential_tag());
} }
// Public interface, insert default comparator // Public interface, insert default comparator
...@@ -2161,7 +2145,8 @@ namespace __parallel ...@@ -2161,7 +2145,8 @@ namespace __parallel
if (_GLIBCXX_PARALLEL_CONDITION( if (_GLIBCXX_PARALLEL_CONDITION(
static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
>= __gnu_parallel::_Settings::get().partial_sort_minimal_n)) >= __gnu_parallel::_Settings::get().partial_sort_minimal_n))
__gnu_parallel::parallel_partial_sort(__begin, __middle, __end, __comp); __gnu_parallel::
parallel_partial_sort(__begin, __middle, __end, __comp);
else else
partial_sort(__begin, __middle, __end, __comp, partial_sort(__begin, __middle, __end, __comp,
__gnu_parallel::sequential_tag()); __gnu_parallel::sequential_tag());
...@@ -2179,25 +2164,26 @@ namespace __parallel ...@@ -2179,25 +2164,26 @@ namespace __parallel
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end, max_element(_FIterator __begin, _FIterator __end,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::max_element(__begin, __end); } { return _GLIBCXX_STD_P::max_element(__begin, __end); }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, max_element(_FIterator __begin, _FIterator __end, _Compare __comp,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::max_element(__begin, __end, __comp); } { return _GLIBCXX_STD_P::max_element(__begin, __end, __comp); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _Compare, typename _IteratorTag> template<typename _FIterator, typename _Compare, typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__max_element_switch(_ForwardIterator __begin, _ForwardIterator __end, __max_element_switch(_FIterator __begin, _FIterator __end,
_Compare __comp, _IteratorTag) _Compare __comp, _IteratorTag)
{ return max_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); } { return max_element(__begin, __end, __comp,
__gnu_parallel::sequential_tag()); }
// Parallel algorithm for random access iterators // Parallel algorithm for random access iterators
template<typename _RAIter, typename _Compare> template<typename _RAIter, typename _Compare>
...@@ -2216,79 +2202,79 @@ namespace __parallel ...@@ -2216,79 +2202,79 @@ namespace __parallel
__gnu_parallel::__identity_selector<_RAIter> __gnu_parallel::__identity_selector<_RAIter>
__functionality; __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __for_each_template_random_access(
__gnu_parallel::_Nothing(), __begin, __end, __gnu_parallel::_Nothing(), __functionality,
__functionality, __gnu_parallel::__max_element_reduct<_Compare, _RAIter>(__comp),
__gnu_parallel::
__max_element_reduct<_Compare,
_RAIter>(__comp),
__res, __res, -1, __parallelism_tag); __res, __res, -1, __parallelism_tag);
return __res; return __res;
} }
else else
return max_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); return max_element(__begin, __end, __comp,
__gnu_parallel::sequential_tag());
} }
// Public interface, insert default comparator // Public interface, insert default comparator
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end, max_element(_FIterator __begin, _FIterator __end,
__gnu_parallel::_Parallelism __parallelism_tag) __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_FIterator>::value_type _ValueType;
return max_element(__begin, __end, std::less<_ValueType>(), __parallelism_tag); return max_element(__begin, __end, std::less<_ValueType>(),
__parallelism_tag);
} }
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end) max_element(_FIterator __begin, _FIterator __end)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_FIterator>::value_type _ValueType;
return max_element(__begin, __end, std::less<_ValueType>()); return max_element(__begin, __end, std::less<_ValueType>());
} }
// Public interface // Public interface
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, max_element(_FIterator __begin, _FIterator __end, _Compare __comp,
__gnu_parallel::_Parallelism __parallelism_tag) __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __max_element_switch(__begin, __end, __comp, _IteratorCategory(), return __max_element_switch(__begin, __end, __comp, _IteratorCategory(),
__parallelism_tag); __parallelism_tag);
} }
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp) max_element(_FIterator __begin, _FIterator __end, _Compare __comp)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __max_element_switch(__begin, __end, __comp, _IteratorCategory()); return __max_element_switch(__begin, __end, __comp, _IteratorCategory());
} }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end, min_element(_FIterator __begin, _FIterator __end,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::min_element(__begin, __end); } { return _GLIBCXX_STD_P::min_element(__begin, __end); }
// Sequential fallback // Sequential fallback
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, min_element(_FIterator __begin, _FIterator __end, _Compare __comp,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::min_element(__begin, __end, __comp); } { return _GLIBCXX_STD_P::min_element(__begin, __end, __comp); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _ForwardIterator, typename _Compare, typename _IteratorTag> template<typename _FIterator, typename _Compare, typename _IteratorTag>
inline _ForwardIterator inline _FIterator
__min_element_switch(_ForwardIterator __begin, _ForwardIterator __end, __min_element_switch(_FIterator __begin, _FIterator __end,
_Compare __comp, _IteratorTag) _Compare __comp, _IteratorTag)
{ return min_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); } { return min_element(__begin, __end, __comp,
__gnu_parallel::sequential_tag()); }
// Parallel algorithm for random access iterators // Parallel algorithm for random access iterators
template<typename _RAIter, typename _Compare> template<typename _RAIter, typename _Compare>
...@@ -2307,54 +2293,53 @@ namespace __parallel ...@@ -2307,54 +2293,53 @@ namespace __parallel
__gnu_parallel::__identity_selector<_RAIter> __gnu_parallel::__identity_selector<_RAIter>
__functionality; __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access(__begin, __end, __for_each_template_random_access(
__gnu_parallel::_Nothing(), __begin, __end, __gnu_parallel::_Nothing(), __functionality,
__functionality, __gnu_parallel::__min_element_reduct<_Compare, _RAIter>(__comp),
__gnu_parallel::
__min_element_reduct<_Compare,
_RAIter>(__comp),
__res, __res, -1, __parallelism_tag); __res, __res, -1, __parallelism_tag);
return __res; return __res;
} }
else else
return min_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); return min_element(__begin, __end, __comp,
__gnu_parallel::sequential_tag());
} }
// Public interface, insert default comparator // Public interface, insert default comparator
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end, min_element(_FIterator __begin, _FIterator __end,
__gnu_parallel::_Parallelism __parallelism_tag) __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_FIterator>::value_type _ValueType;
return min_element(__begin, __end, std::less<_ValueType>(), __parallelism_tag); return min_element(__begin, __end, std::less<_ValueType>(),
__parallelism_tag);
} }
template<typename _ForwardIterator> template<typename _FIterator>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end) min_element(_FIterator __begin, _FIterator __end)
{ {
typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_FIterator>::value_type _ValueType;
return min_element(__begin, __end, std::less<_ValueType>()); return min_element(__begin, __end, std::less<_ValueType>());
} }
// Public interface // Public interface
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, min_element(_FIterator __begin, _FIterator __end, _Compare __comp,
__gnu_parallel::_Parallelism __parallelism_tag) __gnu_parallel::_Parallelism __parallelism_tag)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __min_element_switch(__begin, __end, __comp, _IteratorCategory(), return __min_element_switch(__begin, __end, __comp, _IteratorCategory(),
__parallelism_tag); __parallelism_tag);
} }
template<typename _ForwardIterator, typename _Compare> template<typename _FIterator, typename _Compare>
inline _ForwardIterator inline _FIterator
min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp) min_element(_FIterator __begin, _FIterator __end, _Compare __comp)
{ {
typedef iterator_traits<_ForwardIterator> _TraitsType; typedef iterator_traits<_FIterator> _TraitsType;
typedef typename _TraitsType::iterator_category _IteratorCategory; typedef typename _TraitsType::iterator_category _IteratorCategory;
return __min_element_switch(__begin, __end, __comp, _IteratorCategory()); return __min_element_switch(__begin, __end, __comp, _IteratorCategory());
} }
......
libstdc++-v3/include/parallel/algobase.h
...@@ -57,8 +57,7 @@ namespace __parallel ...@@ -57,8 +57,7 @@ namespace __parallel
{ return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2); } { return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline pair<_IIter1, _IIter2> inline pair<_IIter1, _IIter2>
mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_Predicate __pred, __gnu_parallel::sequential_tag) _Predicate __pred, __gnu_parallel::sequential_tag)
...@@ -68,14 +67,12 @@ namespace __parallel ...@@ -68,14 +67,12 @@ namespace __parallel
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
typename _Predicate, typename _IteratorTag1, typename _IteratorTag2> typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
inline pair<_IIter1, _IIter2> inline pair<_IIter1, _IIter2>
__mismatch_switch(_IIter1 __begin1, _IIter1 __end1, __mismatch_switch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_IIter2 __begin2, _Predicate __pred, _IteratorTag1, _Predicate __pred, _IteratorTag1, _IteratorTag2)
_IteratorTag2)
{ return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred); } { return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred); }
// Parallel mismatch for random access iterators // Parallel mismatch for random access iterators
template<typename _RAIter1, typename _RAIter2, template<typename _RAIter1, typename _RAIter2, typename _Predicate>
typename _Predicate>
pair<_RAIter1, _RAIter2> pair<_RAIter1, _RAIter2>
__mismatch_switch(_RAIter1 __begin1, _RAIter1 __end1, __mismatch_switch(_RAIter1 __begin1, _RAIter1 __end1,
_RAIter2 __begin2, _Predicate __pred, _RAIter2 __begin2, _Predicate __pred,
...@@ -112,8 +109,7 @@ namespace __parallel ...@@ -112,8 +109,7 @@ namespace __parallel
} }
// Public interface // Public interface
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline pair<_IIter1, _IIter2> inline pair<_IIter1, _IIter2>
mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_Predicate __pred) _Predicate __pred)
...@@ -123,8 +119,8 @@ namespace __parallel ...@@ -123,8 +119,8 @@ namespace __parallel
typedef typename iterator1_traits::iterator_category _IteratorCategory1; typedef typename iterator1_traits::iterator_category _IteratorCategory1;
typedef typename iterator2_traits::iterator_category _IteratorCategory2; typedef typename iterator2_traits::iterator_category _IteratorCategory2;
return __mismatch_switch(__begin1, __end1, __begin2, __pred, _IteratorCategory1(), return __mismatch_switch(__begin1, __end1, __begin2, __pred,
_IteratorCategory2()); _IteratorCategory1(), _IteratorCategory2());
} }
// Sequential fallback // Sequential fallback
...@@ -135,8 +131,7 @@ namespace __parallel ...@@ -135,8 +131,7 @@ namespace __parallel
{ return _GLIBCXX_STD_P::equal(__begin1, __end1, __begin2); } { return _GLIBCXX_STD_P::equal(__begin1, __end1, __begin2); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline bool inline bool
equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_Predicate __pred, __gnu_parallel::sequential_tag) _Predicate __pred, __gnu_parallel::sequential_tag)
...@@ -149,8 +144,7 @@ namespace __parallel ...@@ -149,8 +144,7 @@ namespace __parallel
{ return mismatch(__begin1, __end1, __begin2).first == __end1; } { return mismatch(__begin1, __end1, __begin2).first == __end1; }
// Public interface // Public interface
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline bool inline bool
equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
_Predicate __pred) _Predicate __pred)
...@@ -166,14 +160,13 @@ namespace __parallel ...@@ -166,14 +160,13 @@ namespace __parallel
__begin2, __end2); } __begin2, __end2); }
// Sequential fallback // Sequential fallback
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline bool inline bool
lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_Predicate __pred, __gnu_parallel::sequential_tag) _Predicate __pred, __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1, { return _GLIBCXX_STD_P::lexicographical_compare(
__begin2, __end2, __pred); } __begin1, __end1, __begin2, __end2, __pred); }
// Sequential fallback for input iterator case // Sequential fallback for input iterator case
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2,
...@@ -181,19 +174,18 @@ namespace __parallel ...@@ -181,19 +174,18 @@ namespace __parallel
inline bool inline bool
__lexicographical_compare_switch(_IIter1 __begin1, _IIter1 __end1, __lexicographical_compare_switch(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
_Predicate __pred, _IteratorTag1, _IteratorTag2) _Predicate __pred,
{ return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1, _IteratorTag1, _IteratorTag2)
__begin2, __end2, __pred); } { return _GLIBCXX_STD_P::lexicographical_compare(
__begin1, __end1, __begin2, __end2, __pred); }
// Parallel lexicographical_compare for random access iterators // Parallel lexicographical_compare for random access iterators
// Limitation: Both valuetypes must be the same // Limitation: Both valuetypes must be the same
template<typename _RAIter1, typename _RAIter2, template<typename _RAIter1, typename _RAIter2, typename _Predicate>
typename _Predicate>
bool bool
__lexicographical_compare_switch(_RAIter1 __begin1, __lexicographical_compare_switch(_RAIter1 __begin1, _RAIter1 __end1,
_RAIter1 __end1, _RAIter2 __begin2, _RAIter2 __end2,
_RAIter2 __begin2, _Predicate __pred,
_RAIter2 __end2, _Predicate __pred,
random_access_iterator_tag, random_access_iterator_tag,
random_access_iterator_tag) random_access_iterator_tag)
{ {
...@@ -205,36 +197,37 @@ namespace __parallel ...@@ -205,36 +197,37 @@ namespace __parallel
typedef iterator_traits<_RAIter2> _TraitsType2; typedef iterator_traits<_RAIter2> _TraitsType2;
typedef typename _TraitsType2::value_type _ValueType2; typedef typename _TraitsType2::value_type _ValueType2;
typedef __gnu_parallel::_EqualFromLess<_Predicate, _ValueType1, typedef __gnu_parallel::
_ValueType2> _EqualFromLessCompare; _EqualFromLess<_Predicate, _ValueType1, _ValueType2>
_EqualFromLessCompare;
// Longer sequence in first place. // Longer sequence in first place.
if ((__end1 - __begin1) < (__end2 - __begin2)) if ((__end1 - __begin1) < (__end2 - __begin2))
{ {
typedef pair<_RAIter1, _RAIter2> typedef pair<_RAIter1, _RAIter2> _SpotType;
_SpotType;
_SpotType __mm = __mismatch_switch(__begin1, __end1, __begin2, _SpotType __mm = __mismatch_switch(__begin1, __end1, __begin2,
_EqualFromLessCompare(__pred), _EqualFromLessCompare(__pred),
random_access_iterator_tag(), random_access_iterator_tag(),
random_access_iterator_tag()); random_access_iterator_tag());
return (__mm.first == __end1) || bool(__pred(*__mm.first, *__mm.second)); return (__mm.first == __end1)
|| bool(__pred(*__mm.first, *__mm.second));
} }
else else
{ {
typedef pair<_RAIter2, _RAIter1> typedef pair<_RAIter2, _RAIter1> _SpotType;
_SpotType;
_SpotType __mm = __mismatch_switch(__begin2, __end2, __begin1, _SpotType __mm = __mismatch_switch(__begin2, __end2, __begin1,
_EqualFromLessCompare(__pred), _EqualFromLessCompare(__pred),
random_access_iterator_tag(), random_access_iterator_tag(),
random_access_iterator_tag()); random_access_iterator_tag());
return (__mm.first != __end2) && bool(__pred(*__mm.second, *__mm.first)); return (__mm.first != __end2)
&& bool(__pred(*__mm.second, *__mm.first));
} }
} }
else else
return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1, return _GLIBCXX_STD_P::lexicographical_compare(
__begin2, __end2, __pred); __begin1, __end1, __begin2, __end2, __pred);
} }
// Public interface // Public interface
...@@ -252,14 +245,13 @@ namespace __parallel ...@@ -252,14 +245,13 @@ namespace __parallel
typedef typename _TraitsType2::iterator_category _IteratorCategory2; typedef typename _TraitsType2::iterator_category _IteratorCategory2;
typedef __gnu_parallel::_Less<_ValueType1, _ValueType2> _LessType; typedef __gnu_parallel::_Less<_ValueType1, _ValueType2> _LessType;
return __lexicographical_compare_switch(__begin1, __end1, __begin2, __end2, return __lexicographical_compare_switch(
_LessType(), _IteratorCategory1(), __begin1, __end1, __begin2, __end2, _LessType(),
_IteratorCategory2()); _IteratorCategory1(), _IteratorCategory2());
} }
// Public interface // Public interface
template<typename _IIter1, typename _IIter2, template<typename _IIter1, typename _IIter2, typename _Predicate>
typename _Predicate>
inline bool inline bool
lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
_IIter2 __begin2, _IIter2 __end2, _IIter2 __begin2, _IIter2 __end2,
...@@ -271,9 +263,9 @@ namespace __parallel ...@@ -271,9 +263,9 @@ namespace __parallel
typedef iterator_traits<_IIter2> _TraitsType2; typedef iterator_traits<_IIter2> _TraitsType2;
typedef typename _TraitsType2::iterator_category _IteratorCategory2; typedef typename _TraitsType2::iterator_category _IteratorCategory2;
return __lexicographical_compare_switch(__begin1, __end1, __begin2, __end2, __pred, return __lexicographical_compare_switch(
_IteratorCategory1(), __begin1, __end1, __begin2, __end2, __pred,
_IteratorCategory2()); _IteratorCategory1(), _IteratorCategory2());
} }
} // end namespace } // end namespace
} // end namespace } // end namespace
......
libstdc++-v3/include/parallel/algorithmfwd.h
...@@ -190,7 +190,8 @@ namespace __parallel ...@@ -190,7 +190,8 @@ namespace __parallel
template<typename _IIter, typename _FIter, template<typename _IIter, typename _FIter,
typename _IterTag1, typename _IterTag2> typename _IterTag1, typename _IterTag2>
_IIter _IIter
__find_first_of_switch(_IIter, _IIter, _FIter, _FIter, _IterTag1, _IterTag2); __find_first_of_switch(
_IIter, _IIter, _FIter, _FIter, _IterTag1, _IterTag2);
template<typename _RAIter, typename _FIter, typename _BiPredicate, template<typename _RAIter, typename _FIter, typename _BiPredicate,
typename _IterTag> typename _IterTag>
...@@ -546,7 +547,8 @@ namespace __parallel ...@@ -546,7 +547,8 @@ namespace __parallel
template<typename _RAIter, typename _Compare> template<typename _RAIter, typename _Compare>
_RAIter _RAIter
__max_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, __max_element_switch(
_RAIter, _RAIter, _Compare, random_access_iterator_tag,
__gnu_parallel::_Parallelism __parallelism __gnu_parallel::_Parallelism __parallelism
= __gnu_parallel::parallel_balanced); = __gnu_parallel::parallel_balanced);
...@@ -596,7 +598,8 @@ namespace __parallel ...@@ -596,7 +598,8 @@ namespace __parallel
template<typename _FIter> template<typename _FIter>
_FIter _FIter
min_element(_FIter, _FIter, __gnu_parallel::_Parallelism __parallelism_tag); min_element(_FIter, _FIter,
__gnu_parallel::_Parallelism __parallelism_tag);
template<typename _FIter, typename _Compare> template<typename _FIter, typename _Compare>
_FIter _FIter
...@@ -616,7 +619,8 @@ namespace __parallel ...@@ -616,7 +619,8 @@ namespace __parallel
template<typename _RAIter, typename _Compare> template<typename _RAIter, typename _Compare>
_RAIter _RAIter
__min_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, __min_element_switch(
_RAIter, _RAIter, _Compare, random_access_iterator_tag,
__gnu_parallel::_Parallelism __parallelism __gnu_parallel::_Parallelism __parallelism
= __gnu_parallel::parallel_balanced); = __gnu_parallel::parallel_balanced);
...@@ -668,7 +672,8 @@ namespace __parallel ...@@ -668,7 +672,8 @@ namespace __parallel
template<typename _RAIter, typename _Predicate> template<typename _RAIter, typename _Predicate>
_RAIter _RAIter
__partition_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag); __partition_switch(
_RAIter, _RAIter, _Predicate, random_access_iterator_tag);
template<typename _RAIter> template<typename _RAIter>
void void
......
libstdc++-v3/include/parallel/balanced_quicksort.h
...@@ -115,12 +115,18 @@ template<typename _RAIter, typename _Compare> ...@@ -115,12 +115,18 @@ template<typename _RAIter, typename _Compare>
_DifferenceType __n = __end - __begin; _DifferenceType __n = __end - __begin;
_GLIBCXX_PARALLEL_ASSERT( _GLIBCXX_PARALLEL_ASSERT(
(!__comp(*__pivot_pos, *__begin) && !__comp(*(__begin + __n / 2), *__pivot_pos)) (!__comp(*__pivot_pos, *__begin) &&
|| (!__comp(*__pivot_pos, *__begin) && !__comp(*(__end - 1), *__pivot_pos)) !__comp(*(__begin + __n / 2), *__pivot_pos))
|| (!__comp(*__pivot_pos, *(__begin + __n / 2)) && !__comp(*__begin, *__pivot_pos)) || (!__comp(*__pivot_pos, *__begin) &&
|| (!__comp(*__pivot_pos, *(__begin + __n / 2)) && !__comp(*(__end - 1), *__pivot_pos)) !__comp(*(__end - 1), *__pivot_pos))
|| (!__comp(*__pivot_pos, *(__end - 1)) && !__comp(*__begin, *__pivot_pos)) || (!__comp(*__pivot_pos, *(__begin + __n / 2)) &&
|| (!__comp(*__pivot_pos, *(__end - 1)) && !__comp(*(__begin + __n / 2), *__pivot_pos))); !__comp(*__begin, *__pivot_pos))
|| (!__comp(*__pivot_pos, *(__begin + __n / 2)) &&
!__comp(*(__end - 1), *__pivot_pos))
|| (!__comp(*__pivot_pos, *(__end - 1)) &&
!__comp(*__begin, *__pivot_pos))
|| (!__comp(*__pivot_pos, *(__end - 1)) &&
!__comp(*(__begin + __n / 2), *__pivot_pos)));
#endif #endif
// Swap pivot value to end. // Swap pivot value to end.
...@@ -183,10 +189,12 @@ template<typename _RAIter, typename _Compare> ...@@ -183,10 +189,12 @@ template<typename _RAIter, typename _Compare>
} }
// Divide step. // Divide step.
_DifferenceType __split_pos = __qsb_divide(__begin, __end, __comp, __num_threads); _DifferenceType __split_pos =
__qsb_divide(__begin, __end, __comp, __num_threads);
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(0 <= __split_pos && __split_pos < (__end - __begin)); _GLIBCXX_PARALLEL_ASSERT(0 <= __split_pos &&
__split_pos < (__end - __begin));
#endif #endif
_ThreadIndex __num_threads_leftside = _ThreadIndex __num_threads_leftside =
...@@ -284,11 +292,13 @@ template<typename _RAIter, typename _Compare> ...@@ -284,11 +292,13 @@ template<typename _RAIter, typename _Compare>
// Divide, leave pivot unchanged in last place. // Divide, leave pivot unchanged in last place.
_RAIter __split_pos1, __split_pos2; _RAIter __split_pos1, __split_pos2;
__split_pos1 = __gnu_sequential::partition(__begin, __end - 1, __pred); __split_pos1 =
__gnu_sequential::partition(__begin, __end - 1, __pred);
// Left side: < __pivot_pos; __right side: >= __pivot_pos. // Left side: < __pivot_pos; __right side: >= __pivot_pos.
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(__begin <= __split_pos1 && __split_pos1 < __end); _GLIBCXX_PARALLEL_ASSERT(__begin <= __split_pos1
&& __split_pos1 < __end);
#endif #endif
// Swap pivot back to middle. // Swap pivot back to middle.
if (__split_pos1 != __pivot_pos) if (__split_pos1 != __pivot_pos)
...@@ -304,8 +314,8 @@ template<typename _RAIter, typename _Compare> ...@@ -304,8 +314,8 @@ template<typename _RAIter, typename _Compare>
__gnu_parallel::__unary_negate<__gnu_parallel::__binder1st __gnu_parallel::__unary_negate<__gnu_parallel::__binder1st
<_Compare, _ValueType, _ValueType, bool>, _ValueType> <_Compare, _ValueType, _ValueType, bool>, _ValueType>
__pred(__gnu_parallel::__binder1st __pred(__gnu_parallel::__binder1st
<_Compare, _ValueType, _ValueType, bool>(__comp, <_Compare, _ValueType, _ValueType, bool>(
*__pivot_pos)); __comp, *__pivot_pos));
// Find other end of pivot-equal range. // Find other end of pivot-equal range.
__split_pos2 = __gnu_sequential::partition(__split_pos1 + 1, __split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
...@@ -325,8 +335,8 @@ template<typename _RAIter, typename _Compare> ...@@ -325,8 +335,8 @@ template<typename _RAIter, typename _Compare>
{ {
// Right side larger. // Right side larger.
if ((__split_pos2) != __end) if ((__split_pos2) != __end)
__tl._M_leftover_parts.push_front(std::make_pair(__split_pos2, __tl._M_leftover_parts.push_front(
__end)); std::make_pair(__split_pos2, __end));
//__current.first = __begin; //already set anyway //__current.first = __begin; //already set anyway
__current.second = __split_pos1; __current.second = __split_pos1;
...@@ -367,7 +377,8 @@ template<typename _RAIter, typename _Compare> ...@@ -367,7 +377,8 @@ template<typename _RAIter, typename _Compare>
// Look for new work. // Look for new work.
bool __successfully_stolen = false; bool __successfully_stolen = false;
while (__wait && *__tl._M_elements_leftover > 0 && !__successfully_stolen while (__wait && *__tl._M_elements_leftover > 0
&& !__successfully_stolen
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// Possible dead-lock. // Possible dead-lock.
&& (omp_get_wtime() < (__search_start + 1.0)) && (omp_get_wtime() < (__search_start + 1.0))
...@@ -439,11 +450,13 @@ template<typename _RAIter, typename _Compare> ...@@ -439,11 +450,13 @@ template<typename _RAIter, typename _Compare>
// Initialize thread local storage // Initialize thread local storage
_TLSType** __tls = new _TLSType*[__num_threads]; _TLSType** __tls = new _TLSType*[__num_threads];
_DifferenceType __queue_size = __num_threads * (_ThreadIndex)(log2(__n) + 1); _DifferenceType __queue_size =
__num_threads * (_ThreadIndex)(log2(__n) + 1);
for (_ThreadIndex __t = 0; __t < __num_threads; ++__t) for (_ThreadIndex __t = 0; __t < __num_threads; ++__t)
__tls[__t] = new _QSBThreadLocal<_RAIter>(__queue_size); __tls[__t] = new _QSBThreadLocal<_RAIter>(__queue_size);
// There can never be more than ceil(log2(__n)) ranges on the stack, because // There can never be more than ceil(log2(__n)) ranges on the stack,
// because
// 1. Only one processor pushes onto the stack // 1. Only one processor pushes onto the stack
// 2. The largest range has at most length __n // 2. The largest range has at most length __n
// 3. Each range is larger than half of the range remaining // 3. Each range is larger than half of the range remaining
...@@ -459,13 +472,15 @@ template<typename _RAIter, typename _Compare> ...@@ -459,13 +472,15 @@ template<typename _RAIter, typename _Compare>
} }
// Main recursion call. // Main recursion call.
__qsb_conquer(__tls, __begin, __begin + __n, __comp, 0, __num_threads, true); __qsb_conquer(
__tls, __begin, __begin + __n, __comp, 0, __num_threads, true);
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// All stack must be empty. // All stack must be empty.
_Piece __dummy; _Piece __dummy;
for (int __i = 1; __i < __num_threads; ++__i) for (int __i = 1; __i < __num_threads; ++__i)
_GLIBCXX_PARALLEL_ASSERT(!__tls[__i]->_M_leftover_parts.pop_back(__dummy)); _GLIBCXX_PARALLEL_ASSERT(
!__tls[__i]->_M_leftover_parts.pop_back(__dummy));
#endif #endif
for (int __i = 0; __i < __num_threads; ++__i) for (int __i = 0; __i < __num_threads; ++__i)
......
libstdc++-v3/include/parallel/checkers.h
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
namespace __gnu_parallel namespace __gnu_parallel
{ {
/** /**
* @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp. * @brief Check whether @__c [__begin, @__c __end) is sorted according
* to @__c __comp.
* @param __begin Begin iterator of sequence. * @param __begin Begin iterator of sequence.
* @param __end End iterator of sequence. * @param __end End iterator of sequence.
* @param __comp Comparator. * @param __comp Comparator.
...@@ -75,7 +76,8 @@ namespace __gnu_parallel ...@@ -75,7 +76,8 @@ namespace __gnu_parallel
} }
/** /**
* @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp. * @brief Check whether @__c [__begin, @__c __end) is sorted according to
* @__c __comp.
* Prints the position in case an unordered pair is found. * Prints the position in case an unordered pair is found.
* @param __begin Begin iterator of sequence. * @param __begin Begin iterator of sequence.
* @param __end End iterator of sequence. * @param __end End iterator of sequence.
...@@ -116,7 +118,8 @@ namespace __gnu_parallel ...@@ -116,7 +118,8 @@ namespace __gnu_parallel
} }
/** /**
* @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp. * @brief Check whether @__c [__begin, @__c __end) is sorted according to
* @__c __comp.
* Prints all unordered pair, including the surrounding two elements. * Prints all unordered pair, including the surrounding two elements.
* @param __begin Begin iterator of sequence. * @param __begin Begin iterator of sequence.
* @param __end End iterator of sequence. * @param __end End iterator of sequence.
......
libstdc++-v3/include/parallel/compatibility.h
...@@ -202,7 +202,8 @@ namespace __gnu_parallel ...@@ -202,7 +202,8 @@ namespace __gnu_parallel
int32 __before; int32 __before;
__asm__ __volatile__("lock; cmpxchgl %1,%2" __asm__ __volatile__("lock; cmpxchgl %1,%2"
: "=a"(__before) : "=a"(__before)
: "q"(__nw), "__m"(*(volatile long long*)(__ptr)), "0"(__old) : "q"(__nw), "__m"(*(volatile long long*)(__ptr)),
"0"(__old)
: "memory"); : "memory");
return __before; return __before;
} }
...@@ -215,7 +216,8 @@ namespace __gnu_parallel ...@@ -215,7 +216,8 @@ namespace __gnu_parallel
int64 __before; int64 __before;
__asm__ __volatile__("lock; cmpxchgq %1,%2" __asm__ __volatile__("lock; cmpxchgq %1,%2"
: "=a"(__before) : "=a"(__before)
: "q"(__nw), "__m"(*(volatile long long*)(__ptr)), "0"(__old) : "q"(__nw), "__m"(*(volatile long long*)(__ptr)),
"0"(__old)
: "memory"); : "memory");
return __before; return __before;
} }
...@@ -232,7 +234,8 @@ namespace __gnu_parallel ...@@ -232,7 +234,8 @@ namespace __gnu_parallel
* @param __replacement Replacement value. * @param __replacement Replacement value.
*/ */
inline bool inline bool
__compare_and_swap_32(volatile int32* __ptr, int32 __comparand, int32 __replacement) __compare_and_swap_32(volatile int32* __ptr, int32 __comparand,
int32 __replacement)
{ {
#if defined(__ICC) //x86 version #if defined(__ICC) //x86 version
return _InterlockedCompareExchange((void*)__ptr, __replacement, return _InterlockedCompareExchange((void*)__ptr, __replacement,
...@@ -241,8 +244,10 @@ namespace __gnu_parallel ...@@ -241,8 +244,10 @@ namespace __gnu_parallel
return _InterlockedCompareExchange((void*)__ptr, __replacement, return _InterlockedCompareExchange((void*)__ptr, __replacement,
__comparand) == __comparand; __comparand) == __comparand;
#elif defined(__ICL) || defined(_MSC_VER) #elif defined(__ICL) || defined(_MSC_VER)
return _InterlockedCompareExchange(reinterpret_cast<volatile long*>(__ptr), return _InterlockedCompareExchange(
__replacement, __comparand) == __comparand; reinterpret_cast<volatile long*>(__ptr),
__replacement, __comparand)
== __comparand;
#elif defined(__GNUC__) #elif defined(__GNUC__)
return __sync_bool_compare_and_swap(__ptr, __comparand, __replacement); return __sync_bool_compare_and_swap(__ptr, __comparand, __replacement);
#elif defined(__SUNPRO_CC) && defined(__sparc) #elif defined(__SUNPRO_CC) && defined(__sparc)
...@@ -272,7 +277,8 @@ namespace __gnu_parallel ...@@ -272,7 +277,8 @@ namespace __gnu_parallel
* @param __replacement Replacement value. * @param __replacement Replacement value.
*/ */
inline bool inline bool
__compare_and_swap_64(volatile int64* __ptr, int64 __comparand, int64 __replacement) __compare_and_swap_64(volatile int64* __ptr, int64 __comparand,
int64 __replacement)
{ {
#if defined(__ICC) && defined(__x86_64) //x86 version #if defined(__ICC) && defined(__x86_64) //x86 version
return __cas64<int>(__ptr, __comparand, __replacement) == __comparand; return __cas64<int>(__ptr, __comparand, __replacement) == __comparand;
...@@ -327,9 +333,11 @@ namespace __gnu_parallel ...@@ -327,9 +333,11 @@ namespace __gnu_parallel
__compare_and_swap(volatile _Tp* __ptr, _Tp __comparand, _Tp __replacement) __compare_and_swap(volatile _Tp* __ptr, _Tp __comparand, _Tp __replacement)
{ {
if (sizeof(_Tp) == sizeof(int32)) if (sizeof(_Tp) == sizeof(int32))
return __compare_and_swap_32((volatile int32*) __ptr, (int32)__comparand, (int32)__replacement); return __compare_and_swap_32((volatile int32*) __ptr, (int32)__comparand,
(int32)__replacement);
else if (sizeof(_Tp) == sizeof(int64)) else if (sizeof(_Tp) == sizeof(int64))
return __compare_and_swap_64((volatile int64*) __ptr, (int64)__comparand, (int64)__replacement); return __compare_and_swap_64((volatile int64*) __ptr, (int64)__comparand,
(int64)__replacement);
else else
_GLIBCXX_PARALLEL_ASSERT(false); _GLIBCXX_PARALLEL_ASSERT(false);
} }
......
libstdc++-v3/include/parallel/equally_split.h
...@@ -45,7 +45,8 @@ namespace __gnu_parallel ...@@ -45,7 +45,8 @@ namespace __gnu_parallel
* @returns End of splitter sequence, i.e. @__c __s+__num_threads+1 */ * @returns End of splitter sequence, i.e. @__c __s+__num_threads+1 */
template<typename _DifferenceType, typename _OutputIterator> template<typename _DifferenceType, typename _OutputIterator>
_OutputIterator _OutputIterator
equally_split(_DifferenceType __n, _ThreadIndex __num_threads, _OutputIterator __s) equally_split(_DifferenceType __n, _ThreadIndex __num_threads,
_OutputIterator __s)
{ {
_DifferenceType __chunk_length = __n / __num_threads; _DifferenceType __chunk_length = __n / __num_threads;
_DifferenceType __num_longer_chunks = __n % __num_threads; _DifferenceType __num_longer_chunks = __n % __num_threads;
...@@ -53,7 +54,8 @@ template<typename _DifferenceType, typename _OutputIterator> ...@@ -53,7 +54,8 @@ template<typename _DifferenceType, typename _OutputIterator>
for (_ThreadIndex __i = 0; __i < __num_threads; ++__i) for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
{ {
*__s++ = __pos; *__s++ = __pos;
__pos += (__i < __num_longer_chunks) ? (__chunk_length + 1) : __chunk_length; __pos += (__i < __num_longer_chunks) ?
(__chunk_length + 1) : __chunk_length;
} }
*__s++ = __n; *__s++ = __n;
return __s; return __s;
......
libstdc++-v3/include/parallel/find.h
...@@ -125,7 +125,8 @@ template<typename _RAIter1, ...@@ -125,7 +125,8 @@ template<typename _RAIter1,
} //single } //single
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
_DifferenceType __start = __borders[__iam], __stop = __borders[__iam + 1]; _DifferenceType __start = __borders[__iam],
__stop = __borders[__iam + 1];
_RAIter1 __i1 = __begin1 + __start; _RAIter1 __i1 = __begin1 + __start;
_RAIter2 __i2 = __begin2 + __start; _RAIter2 __i2 = __begin2 + __start;
...@@ -153,8 +154,7 @@ template<typename _RAIter1, ...@@ -153,8 +154,7 @@ template<typename _RAIter1,
delete[] __borders; delete[] __borders;
return return
std::pair<_RAIter1, _RAIter2>(__begin1 + __result, std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
__begin2 + __result);
} }
#endif #endif
...@@ -178,7 +178,6 @@ template<typename _RAIter1, ...@@ -178,7 +178,6 @@ template<typename _RAIter1,
* There are two main differences between the growing blocks and * There are two main differences between the growing blocks and
* the constant-size blocks variants. * the constant-size blocks variants.
* 1. For GB, the block size grows; for CSB, the block size is fixed. * 1. For GB, the block size grows; for CSB, the block size is fixed.
* 2. For GB, the blocks are allocated dynamically; * 2. For GB, the blocks are allocated dynamically;
* for CSB, the blocks are allocated in a predetermined manner, * for CSB, the blocks are allocated in a predetermined manner,
* namely spacial round-robin. * namely spacial round-robin.
...@@ -250,7 +249,8 @@ template<typename _RAIter1, ...@@ -250,7 +249,8 @@ template<typename _RAIter1,
} }
__local_result = __selector._M_sequential_algorithm( __local_result = __selector._M_sequential_algorithm(
__begin1 + __start, __begin1 + __stop, __begin2 + __start, __pred); __begin1 + __start, __begin1 + __stop,
__begin2 + __start, __pred);
if (__local_result.first != (__begin1 + __stop)) if (__local_result.first != (__begin1 + __stop))
{ {
omp_set_lock(&__result_lock); omp_set_lock(&__result_lock);
...@@ -259,18 +259,20 @@ template<typename _RAIter1, ...@@ -259,18 +259,20 @@ template<typename _RAIter1,
__result = __local_result.first - __begin1; __result = __local_result.first - __begin1;
// Result cannot be in future blocks, stop algorithm. // Result cannot be in future blocks, stop algorithm.
__fetch_and_add<_DifferenceType>(&__next_block_start, __length); __fetch_and_add<_DifferenceType>(
&__next_block_start, __length);
} }
omp_unset_lock(&__result_lock); omp_unset_lock(&__result_lock);
} }
__block_size = __block_size = std::min<_DifferenceType>(
std::min<_DifferenceType>(__block_size * __s.find_increasing_factor, __block_size * __s.find_increasing_factor,
__s.find_maximum_block_size); __s.find_maximum_block_size);
// Get new block, update pointer to next block. // Get new block, update pointer to next block.
__start = __start =
__fetch_and_add<_DifferenceType>(&__next_block_start, __block_size); __fetch_and_add<_DifferenceType>(
&__next_block_start, __block_size);
__stop = ((__length < (__start + __block_size)) __stop = ((__length < (__start + __block_size))
? __length : (__start + __block_size)); ? __length : (__start + __block_size));
} }
...@@ -280,8 +282,7 @@ template<typename _RAIter1, ...@@ -280,8 +282,7 @@ template<typename _RAIter1,
// Return iterator on found element. // Return iterator on found element.
return return
std::pair<_RAIter1, _RAIter2>(__begin1 + __result, std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
__begin2 + __result);
} }
#endif #endif
...@@ -329,8 +330,8 @@ template<typename _RAIter1, ...@@ -329,8 +330,8 @@ template<typename _RAIter1,
// Try it sequentially first. // Try it sequentially first.
std::pair<_RAIter1, _RAIter2> __find_seq_result = std::pair<_RAIter1, _RAIter2> __find_seq_result =
__selector._M_sequential_algorithm(__begin1, __begin1 + __sequential_search_size, __selector._M_sequential_algorithm(
__begin2, __pred); __begin1, __begin1 + __sequential_search_size, __begin2, __pred);
if (__find_seq_result.first != (__begin1 + __sequential_search_size)) if (__find_seq_result.first != (__begin1 + __sequential_search_size))
return __find_seq_result; return __find_seq_result;
...@@ -384,7 +385,8 @@ template<typename _RAIter1, ...@@ -384,7 +385,8 @@ template<typename _RAIter1,
// Where to work. // Where to work.
__start = __iteration_start + __iam * __block_size; __start = __iteration_start + __iam * __block_size;
__stop = std::min<_DifferenceType>(__length, __start + __block_size); __stop = std::min<_DifferenceType>(
__length, __start + __block_size);
} }
} //parallel } //parallel
...@@ -392,8 +394,7 @@ template<typename _RAIter1, ...@@ -392,8 +394,7 @@ template<typename _RAIter1,
// Return iterator on found element. // Return iterator on found element.
return return
std::pair<_RAIter1, _RAIter2>(__begin1 + __result, std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
__begin2 + __result);
} }
#endif #endif
} // end namespace } // end namespace
......
libstdc++-v3/include/parallel/find_selectors.h
...@@ -143,18 +143,19 @@ namespace __gnu_parallel ...@@ -143,18 +143,19 @@ namespace __gnu_parallel
_M_sequential_algorithm(_RAIter1 __begin1, _M_sequential_algorithm(_RAIter1 __begin1,
_RAIter1 __end1, _RAIter1 __end1,
_RAIter2 __begin2, _Pred __pred) _RAIter2 __begin2, _Pred __pred)
{ return mismatch(__begin1, __end1, __begin2, __pred, sequential_tag()); } { return mismatch(__begin1, __end1, __begin2, __pred, sequential_tag());
}
}; };
/** @brief Test predicate on several elements. */ /** @brief Test predicate on several elements. */
template<typename _ForwardIterator> template<typename _FIterator>
struct __find_first_of_selector : public __generic_find_selector struct __find_first_of_selector : public __generic_find_selector
{ {
_ForwardIterator _M_begin; _FIterator _M_begin;
_ForwardIterator _M_end; _FIterator _M_end;
explicit __find_first_of_selector(_ForwardIterator __begin, _ForwardIterator __end) explicit __find_first_of_selector(_FIterator __begin, _FIterator __end)
: _M_begin(__begin), _M_end(__end) { } : _M_begin(__begin), _M_end(__end) { }
/** @brief Test on one position. /** @brief Test on one position.
...@@ -166,7 +167,7 @@ namespace __gnu_parallel ...@@ -166,7 +167,7 @@ namespace __gnu_parallel
bool bool
operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred) operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
{ {
for (_ForwardIterator __pos_in_candidates = _M_begin; for (_FIterator __pos_in_candidates = _M_begin;
__pos_in_candidates != _M_end; ++__pos_in_candidates) __pos_in_candidates != _M_end; ++__pos_in_candidates)
if (__pred(*__i1, *__pos_in_candidates)) if (__pred(*__i1, *__pos_in_candidates))
return true; return true;
...@@ -184,8 +185,11 @@ namespace __gnu_parallel ...@@ -184,8 +185,11 @@ namespace __gnu_parallel
_M_sequential_algorithm(_RAIter1 __begin1, _M_sequential_algorithm(_RAIter1 __begin1,
_RAIter1 __end1, _RAIter1 __end1,
_RAIter2 __begin2, _Pred __pred) _RAIter2 __begin2, _Pred __pred)
{ return std::make_pair(find_first_of(__begin1, __end1, _M_begin, _M_end, __pred, {
sequential_tag()), __begin2); } return std::make_pair(
find_first_of(__begin1, __end1, _M_begin, _M_end, __pred,
sequential_tag()), __begin2);
}
}; };
} }
......
libstdc++-v3/include/parallel/for_each.h
...@@ -61,7 +61,8 @@ namespace __gnu_parallel ...@@ -61,7 +61,8 @@ namespace __gnu_parallel
__for_each_template_random_access(_IIter __begin, _IIter __end, __for_each_template_random_access(_IIter __begin, _IIter __end,
_UserOp __user_op, _UserOp __user_op,
_Functionality& __functionality, _Functionality& __functionality,
_Red __reduction, _Result __reduction_start, _Red __reduction,
_Result __reduction_start,
_Result& __output, typename _Result& __output, typename
std::iterator_traits<_IIter>:: std::iterator_traits<_IIter>::
difference_type __bound, difference_type __bound,
...@@ -73,13 +74,15 @@ namespace __gnu_parallel ...@@ -73,13 +74,15 @@ namespace __gnu_parallel
__reduction_start, __reduction_start,
__output, __bound); __output, __bound);
else if (__parallelism_tag == parallel_omp_loop) else if (__parallelism_tag == parallel_omp_loop)
return for_each_template_random_access_omp_loop(__begin, __end, __user_op, return for_each_template_random_access_omp_loop(
__begin, __end, __user_op,
__functionality, __functionality,
__reduction, __reduction,
__reduction_start, __reduction_start,
__output, __bound); __output, __bound);
else if (__parallelism_tag == parallel_omp_loop_static) else if (__parallelism_tag == parallel_omp_loop_static)
return for_each_template_random_access_omp_loop(__begin, __end, __user_op, return for_each_template_random_access_omp_loop(
__begin, __end, __user_op,
__functionality, __functionality,
__reduction, __reduction,
__reduction_start, __reduction_start,
......
libstdc++-v3/include/parallel/for_each_selectors.h
...@@ -214,7 +214,8 @@ namespace __gnu_parallel ...@@ -214,7 +214,8 @@ namespace __gnu_parallel
* @param __i iterator referencing object. * @param __i iterator referencing object.
* @return The current value. */ * @return The current value. */
template<typename _Op> template<typename _Op>
typename std::iterator_traits<_It>::value_type operator()(_Op __o, _It __i) typename std::iterator_traits<_It>::value_type
operator()(_Op __o, _It __i)
{ return *__i; } { return *__i; }
}; };
...@@ -267,7 +268,8 @@ namespace __gnu_parallel ...@@ -267,7 +268,8 @@ namespace __gnu_parallel
* __elements. * __elements.
*/ */
template<typename _It> template<typename _It>
struct __adjacent_difference_selector : public __generic_for_each_selector<_It> struct __adjacent_difference_selector :
public __generic_for_each_selector<_It>
{ {
template<typename _Op> template<typename _Op>
bool bool
......
libstdc++-v3/include/parallel/iterator.h
...@@ -40,7 +40,8 @@ namespace __gnu_parallel ...@@ -40,7 +40,8 @@ namespace __gnu_parallel
/** @brief A pair of iterators. The usual iterator operations are /** @brief A pair of iterators. The usual iterator operations are
* applied to both child iterators. * applied to both child iterators.
*/ */
template<typename _Iterator1, typename _Iterator2, typename _IteratorCategory> template<typename _Iterator1, typename _Iterator2,
typename _IteratorCategory>
class _IteratorPair : public std::pair<_Iterator1, _Iterator2> class _IteratorPair : public std::pair<_Iterator1, _Iterator2>
{ {
private: private:
...@@ -102,7 +103,8 @@ namespace __gnu_parallel ...@@ -102,7 +103,8 @@ namespace __gnu_parallel
_IteratorPair _IteratorPair
operator+(difference_type __delta) const operator+(difference_type __delta) const
{ return _IteratorPair(_Base::first + __delta, _Base::second + __delta); } { return _IteratorPair(_Base::first + __delta, _Base::second + __delta);
}
difference_type difference_type
operator-(const _IteratorPair& __other) const operator-(const _IteratorPair& __other) const
...@@ -184,7 +186,8 @@ namespace __gnu_parallel ...@@ -184,7 +186,8 @@ namespace __gnu_parallel
_IteratorTriple _IteratorTriple
operator+(difference_type __delta) const operator+(difference_type __delta) const
{ return _IteratorTriple(_M_first + __delta, _M_second + __delta, _M_third + __delta); } { return _IteratorTriple(_M_first + __delta, _M_second + __delta,
_M_third + __delta); }
difference_type difference_type
operator-(const _IteratorTriple& __other) const operator-(const _IteratorTriple& __other) const
......
libstdc++-v3/include/parallel/list_partition.h
...@@ -137,7 +137,8 @@ namespace __gnu_parallel ...@@ -137,7 +137,8 @@ namespace __gnu_parallel
if (__it == __end) if (__it == __end)
break; break;
__shrink_and_double(__os_starts, __count_to_two, __range_length, __make_twice); __shrink_and_double(__os_starts, __count_to_two, __range_length,
__make_twice);
__next = __os_starts.size() / 2 + 1; __next = __os_starts.size() / 2 + 1;
} }
...@@ -159,7 +160,8 @@ namespace __gnu_parallel ...@@ -159,7 +160,8 @@ namespace __gnu_parallel
} }
// Biggest partitions. // Biggest partitions.
for (int __i = __num_parts + 1 - __size_greater; __i <= __num_parts; ++__i) for (int __i = __num_parts + 1 - __size_greater; __i <= __num_parts;
++__i)
{ {
__lengths[__i - 1] = (__size_part+1) * __range_length; __lengths[__i - 1] = (__size_part+1) * __range_length;
__index += (__size_part+1); __index += (__size_part+1);
......
libstdc++-v3/include/parallel/losertree.h
...@@ -106,7 +106,8 @@ public: ...@@ -106,7 +106,8 @@ public:
_M_offset = _M_k; _M_offset = _M_k;
// Avoid default-constructing _M_losers[]._M_key // Avoid default-constructing _M_losers[]._M_key
_M_losers = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser))); _M_losers
= static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
for (unsigned int __i = _M_ik - 1; __i < _M_k; ++__i) for (unsigned int __i = _M_ik - 1; __i < _M_k; ++__i)
_M_losers[__i + _M_k]._M_sup = true; _M_losers[__i + _M_k]._M_sup = true;
...@@ -223,7 +224,8 @@ public: ...@@ -223,7 +224,8 @@ public:
for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2) for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
{ {
// The smaller one gets promoted, ties are broken by _M_source. // The smaller one gets promoted, ties are broken by _M_source.
if ((_M_sup && (!_M_losers[__pos]._M_sup || _M_losers[__pos]._M_source < _M_source)) if ((_M_sup && (!_M_losers[__pos]._M_sup
|| _M_losers[__pos]._M_source < _M_source))
|| (!_M_sup && !_M_losers[__pos]._M_sup || (!_M_sup && !_M_losers[__pos]._M_sup
&& ((_M_comp(_M_losers[__pos]._M_key, _M_key)) && ((_M_comp(_M_losers[__pos]._M_key, _M_key))
|| (!_M_comp(_M_key, _M_losers[__pos]._M_key) || (!_M_comp(_M_key, _M_losers[__pos]._M_key)
...@@ -280,8 +282,8 @@ public: ...@@ -280,8 +282,8 @@ public:
{ {
unsigned int __left = __init_winner (2 * __root); unsigned int __left = __init_winner (2 * __root);
unsigned int __right = __init_winner (2 * __root + 1); unsigned int __right = __init_winner (2 * __root + 1);
if (_M_losers[__right]._M_sup || if (_M_losers[__right]._M_sup
(!_M_losers[__left]._M_sup || (!_M_losers[__left]._M_sup
&& !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key))) && !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key)))
{ {
// Left one is less or equal. // Left one is less or equal.
...@@ -320,7 +322,8 @@ public: ...@@ -320,7 +322,8 @@ public:
for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2) for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
{ {
// The smaller one gets promoted. // The smaller one gets promoted.
if (_M_sup || (!_M_losers[__pos]._M_sup && _M_comp(_M_losers[__pos]._M_key, _M_key))) if (_M_sup || (!_M_losers[__pos]._M_sup
&& _M_comp(_M_losers[__pos]._M_key, _M_key)))
{ {
// The other one is smaller. // The other one is smaller.
std::swap(_M_losers[__pos]._M_sup, _M_sup); std::swap(_M_losers[__pos]._M_sup, _M_sup);
...@@ -414,7 +417,8 @@ public: ...@@ -414,7 +417,8 @@ public:
unsigned int __left = __init_winner (2 * __root); unsigned int __left = __init_winner (2 * __root);
unsigned int __right = __init_winner (2 * __root + 1); unsigned int __right = __init_winner (2 * __root + 1);
if (_M_losers[__right]._M_sup if (_M_losers[__right]._M_sup
|| (!_M_losers[__left]._M_sup && !_M_comp(*_M_losers[__right]._M_keyp, || (!_M_losers[__left]._M_sup
&& !_M_comp(*_M_losers[__right]._M_keyp,
*_M_losers[__left]._M_keyp))) *_M_losers[__left]._M_keyp)))
{ {
// Left one is less or equal. // Left one is less or equal.
...@@ -445,7 +449,8 @@ public: ...@@ -445,7 +449,8 @@ public:
for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2) for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
{ {
// The smaller one gets promoted, ties are broken by _M_source. // The smaller one gets promoted, ties are broken by _M_source.
if ((_M_sup && (!_M_losers[__pos]._M_sup || _M_losers[__pos]._M_source < _M_source)) || if ((_M_sup && (!_M_losers[__pos]._M_sup ||
_M_losers[__pos]._M_source < _M_source)) ||
(!_M_sup && !_M_losers[__pos]._M_sup && (!_M_sup && !_M_losers[__pos]._M_sup &&
((_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)) || ((_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)) ||
(!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp) (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp)
...@@ -495,7 +500,8 @@ public: ...@@ -495,7 +500,8 @@ public:
unsigned int __right = __init_winner (2 * __root + 1); unsigned int __right = __init_winner (2 * __root + 1);
if (_M_losers[__right]._M_sup if (_M_losers[__right]._M_sup
|| (!_M_losers[__left]._M_sup || (!_M_losers[__left]._M_sup
&& !_M_comp(*_M_losers[__right]._M_keyp, *_M_losers[__left]._M_keyp))) && !_M_comp(*_M_losers[__right]._M_keyp,
*_M_losers[__left]._M_keyp)))
{ {
// Left one is less or equal. // Left one is less or equal.
_M_losers[__root] = _M_losers[__right]; _M_losers[__root] = _M_losers[__right];
...@@ -525,7 +531,8 @@ public: ...@@ -525,7 +531,8 @@ public:
for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2) for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
{ {
// The smaller one gets promoted. // The smaller one gets promoted.
if (_M_sup || (!_M_losers[__pos]._M_sup && _M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp))) if (_M_sup || (!_M_losers[__pos]._M_sup
&& _M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)))
{ {
// The other one is smaller. // The other one is smaller.
std::swap(_M_losers[__pos]._M_sup, _M_sup); std::swap(_M_losers[__pos]._M_sup, _M_sup);
...@@ -576,7 +583,8 @@ public: ...@@ -576,7 +583,8 @@ public:
_M_k = 1 << (__log2(_M_ik - 1) + 1); _M_k = 1 << (__log2(_M_ik - 1) + 1);
_M_offset = _M_k; _M_offset = _M_k;
// Avoid default-constructing _M_losers[]._M_key // Avoid default-constructing _M_losers[]._M_key
_M_losers = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser))); _M_losers
= static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
for (unsigned int __i = _M_k + _M_ik - 1; __i < (2 * _M_k); ++__i) for (unsigned int __i = _M_k + _M_ik - 1; __i < (2 * _M_k); ++__i)
{ {
...@@ -677,7 +685,8 @@ public: ...@@ -677,7 +685,8 @@ public:
{ {
// The smaller one gets promoted, ties are broken by _M_source. // The smaller one gets promoted, ties are broken by _M_source.
if (_M_comp(_M_losers[__pos]._M_key, _M_key) if (_M_comp(_M_losers[__pos]._M_key, _M_key)
|| (!_M_comp(_M_key, _M_losers[__pos]._M_key) && _M_losers[__pos]._M_source < _M_source)) || (!_M_comp(_M_key, _M_losers[__pos]._M_key)
&& _M_losers[__pos]._M_source < _M_source))
{ {
// The other one is smaller. // The other one is smaller.
std::swap(_M_losers[__pos]._M_source, _M_source); std::swap(_M_losers[__pos]._M_source, _M_source);
...@@ -914,7 +923,8 @@ public: ...@@ -914,7 +923,8 @@ public:
{ {
// The smaller one gets promoted, ties are broken by _M_source. // The smaller one gets promoted, ties are broken by _M_source.
if (_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp) if (_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)
|| (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp) && _M_losers[__pos]._M_source < _M_source)) || (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp)
&& _M_losers[__pos]._M_source < _M_source))
{ {
// The other one is smaller. // The other one is smaller.
std::swap(_M_losers[__pos]._M_source, _M_source); std::swap(_M_losers[__pos]._M_source, _M_source);
......
libstdc++-v3/include/parallel/multiseq_selection.h
...@@ -53,7 +53,8 @@ namespace __gnu_parallel ...@@ -53,7 +53,8 @@ namespace __gnu_parallel
/** @brief Compare __a pair of types lexicographically, ascending. */ /** @brief Compare __a pair of types lexicographically, ascending. */
template<typename _T1, typename _T2, typename _Compare> template<typename _T1, typename _T2, typename _Compare>
class _Lexicographic class _Lexicographic
: public std::binary_function<std::pair<_T1, _T2>, std::pair<_T1, _T2>, bool> : public std::binary_function<
std::pair<_T1, _T2>, std::pair<_T1, _T2>, bool>
{ {
private: private:
_Compare& _M_comp; _Compare& _M_comp;
...@@ -146,9 +147,11 @@ namespace __gnu_parallel ...@@ -146,9 +147,11 @@ namespace __gnu_parallel
for (int __i = 0; __i < __m; __i++) for (int __i = 0; __i < __m; __i++)
{ {
__N += std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second); __N += std::distance(__begin_seqs[__i].first,
__begin_seqs[__i].second);
_GLIBCXX_PARALLEL_ASSERT( _GLIBCXX_PARALLEL_ASSERT(
std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second) > 0); std::distance(__begin_seqs[__i].first,
__begin_seqs[__i].second) > 0);
} }
if (__rank == __N) if (__rank == __N)
...@@ -173,7 +176,8 @@ namespace __gnu_parallel ...@@ -173,7 +176,8 @@ namespace __gnu_parallel
__nmax = __ns[0]; __nmax = __ns[0];
for (int __i = 0; __i < __m; __i++) for (int __i = 0; __i < __m; __i++)
{ {
__ns[__i] = std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second); __ns[__i] = std::distance(__begin_seqs[__i].first,
__begin_seqs[__i].second);
__nmax = std::max(__nmax, __ns[__i]); __nmax = std::max(__nmax, __ns[__i]);
} }
...@@ -208,12 +212,14 @@ namespace __gnu_parallel ...@@ -208,12 +212,14 @@ namespace __gnu_parallel
for (int __i = 0; __i < __m; __i++) //conceptual infinity for (int __i = 0; __i < __m; __i++) //conceptual infinity
if (__n >= __ns[__i]) //__sequence too short, conceptual infinity if (__n >= __ns[__i]) //__sequence too short, conceptual infinity
__sample.push_back(std::make_pair(__S(__i)[0] /*__dummy element*/, __i)); __sample.push_back(
std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
_DifferenceType localrank = __rank * __m / __N ; _DifferenceType localrank = __rank * __m / __N ;
int __j; int __j;
for (__j = 0; __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j) for (__j = 0;
__j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
__a[__sample[__j].second] += __n + 1; __a[__sample[__j].second] += __n + 1;
for (; __j < __m; __j++) for (; __j < __m; __j++)
__b[__sample[__j].second] -= __n + 1; __b[__sample[__j].second] -= __n + 1;
...@@ -289,7 +295,8 @@ namespace __gnu_parallel ...@@ -289,7 +295,8 @@ namespace __gnu_parallel
__b[source] += __n + 1; __b[source] += __n + 1;
if (__b[source] < __ns[source]) if (__b[source] < __ns[source])
__pq.push(std::make_pair(__S(source)[__b[source]], source)); __pq.push(
std::make_pair(__S(source)[__b[source]], source));
} }
} }
else if (__skew < 0) else if (__skew < 0)
...@@ -312,14 +319,15 @@ namespace __gnu_parallel ...@@ -312,14 +319,15 @@ namespace __gnu_parallel
__b[source] -= __n + 1; __b[source] -= __n + 1;
if (__a[source] > 0) if (__a[source] > 0)
__pq.push(std::make_pair(__S(source)[__a[source] - 1], source)); __pq.push(
std::make_pair(__S(source)[__a[source] - 1], source));
} }
} }
} }
// Postconditions: // Postconditions:
// __a[__i] == __b[__i] in most cases, except when __a[__i] has been clamped // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
// because of having reached the boundary // clamped because of having reached the boundary
// Now return the result, calculate the offset. // Now return the result, calculate the offset.
...@@ -381,7 +389,8 @@ namespace __gnu_parallel ...@@ -381,7 +389,8 @@ namespace __gnu_parallel
template<typename _Tp, typename _RanSeqs, typename _RankType, template<typename _Tp, typename _RanSeqs, typename _RankType,
typename _Compare> typename _Compare>
_Tp _Tp
multiseq_selection(_RanSeqs __begin_seqs, _RanSeqs __end_seqs, _RankType __rank, multiseq_selection(_RanSeqs __begin_seqs, _RanSeqs __end_seqs,
_RankType __rank,
_RankType& __offset, _Compare __comp = std::less<_Tp>()) _RankType& __offset, _Compare __comp = std::less<_Tp>())
{ {
_GLIBCXX_CALL(__end_seqs - __begin_seqs) _GLIBCXX_CALL(__end_seqs - __begin_seqs)
...@@ -401,11 +410,12 @@ namespace __gnu_parallel ...@@ -401,11 +410,12 @@ namespace __gnu_parallel
_DifferenceType __nmax, __n, __r; _DifferenceType __nmax, __n, __r;
for (int __i = 0; __i < __m; __i++) for (int __i = 0; __i < __m; __i++)
__N += std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second); __N += std::distance(__begin_seqs[__i].first,
__begin_seqs[__i].second);
if (__m == 0 || __N == 0 || __rank < 0 || __rank >= __N) if (__m == 0 || __N == 0 || __rank < 0 || __rank >= __N)
{ {
// _Result undefined when there is no data or __rank is outside bounds. // result undefined if there is no data or __rank is outside bounds
throw std::exception(); throw std::exception();
} }
...@@ -419,7 +429,8 @@ namespace __gnu_parallel ...@@ -419,7 +429,8 @@ namespace __gnu_parallel
__nmax = __ns[0]; __nmax = __ns[0];
for (int __i = 0; __i < __m; ++__i) for (int __i = 0; __i < __m; ++__i)
{ {
__ns[__i] = std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second); __ns[__i] = std::distance(__begin_seqs[__i].first,
__begin_seqs[__i].second);
__nmax = std::max(__nmax, __ns[__i]); __nmax = std::max(__nmax, __ns[__i]);
} }
...@@ -456,12 +467,14 @@ namespace __gnu_parallel ...@@ -456,12 +467,14 @@ namespace __gnu_parallel
// Conceptual infinity. // Conceptual infinity.
for (int __i = 0; __i < __m; __i++) for (int __i = 0; __i < __m; __i++)
if (__n >= __ns[__i]) if (__n >= __ns[__i])
__sample.push_back(std::make_pair(__S(__i)[0] /*__dummy element*/, __i)); __sample.push_back(
std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
_DifferenceType localrank = __rank * __m / __N ; _DifferenceType localrank = __rank * __m / __N ;
int __j; int __j;
for (__j = 0; __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j) for (__j = 0;
__j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
__a[__sample[__j].second] += __n + 1; __a[__sample[__j].second] += __n + 1;
for (; __j < __m; ++__j) for (; __j < __m; ++__j)
__b[__sample[__j].second] -= __n + 1; __b[__sample[__j].second] -= __n + 1;
...@@ -490,7 +503,8 @@ namespace __gnu_parallel ...@@ -490,7 +503,8 @@ namespace __gnu_parallel
for (__i = 0; __i < __m; __i++) for (__i = 0; __i < __m; __i++)
{ {
_DifferenceType __middle = (__b[__i] + __a[__i]) / 2; _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
if (__lmax && __middle < __ns[__i] && __comp(__S(__i)[__middle], *__lmax)) if (__lmax && __middle < __ns[__i]
&& __comp(__S(__i)[__middle], *__lmax))
__a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]); __a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
else else
__b[__i] -= __n + 1; __b[__i] -= __n + 1;
...@@ -526,7 +540,8 @@ namespace __gnu_parallel ...@@ -526,7 +540,8 @@ namespace __gnu_parallel
__b[source] += __n + 1; __b[source] += __n + 1;
if (__b[source] < __ns[source]) if (__b[source] < __ns[source])
__pq.push(std::make_pair(__S(source)[__b[source]], source)); __pq.push(
std::make_pair(__S(source)[__b[source]], source));
} }
} }
else if (__skew < 0) else if (__skew < 0)
...@@ -549,14 +564,15 @@ namespace __gnu_parallel ...@@ -549,14 +564,15 @@ namespace __gnu_parallel
__b[source] -= __n + 1; __b[source] -= __n + 1;
if (__a[source] > 0) if (__a[source] > 0)
__pq.push(std::make_pair(__S(source)[__a[source] - 1], source)); __pq.push(
std::make_pair(__S(source)[__a[source] - 1], source));
} }
} }
} }
// Postconditions: // Postconditions:
// __a[__i] == __b[__i] in most cases, except when __a[__i] has been clamped // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
// because of having reached the boundary // clamped because of having reached the boundary
// Now return the result, calculate the offset. // Now return the result, calculate the offset.
...@@ -613,7 +629,8 @@ namespace __gnu_parallel ...@@ -613,7 +629,8 @@ namespace __gnu_parallel
for (int __i = 0; __i < __m; ++__i) for (int __i = 0; __i < __m; ++__i)
{ {
_DifferenceType lb = std::lower_bound(__S(__i), __S(__i) + __ns[__i], _DifferenceType lb
= std::lower_bound(__S(__i), __S(__i) + __ns[__i],
__minright, __minright,
__comp) - __S(__i); __comp) - __S(__i);
__offset += __a[__i] - lb; __offset += __a[__i] - lb;
......
libstdc++-v3/include/parallel/multiway_merge.h
...@@ -638,7 +638,8 @@ template<typename LT, ...@@ -638,7 +638,8 @@ template<typename LT,
for (int __t = 0; __t < __k; ++__t) for (int __t = 0; __t < __k; ++__t)
{ {
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(__seqs_begin[__t].first != __seqs_begin[__t].second); _GLIBCXX_PARALLEL_ASSERT(__seqs_begin[__t].first
!= __seqs_begin[__t].second);
#endif #endif
__lt.__insert_start(*__seqs_begin[__t].first, __t, false); __lt.__insert_start(*__seqs_begin[__t].first, __t, false);
} }
...@@ -914,7 +915,8 @@ struct __multiway_merge_k_variant_sentinel_switch ...@@ -914,7 +915,8 @@ struct __multiway_merge_k_variant_sentinel_switch
_LoserTreeTraits<_ValueType>::_M_use_pointer _LoserTreeTraits<_ValueType>::_M_use_pointer
, LoserTreePointerUnguarded<__stable, _ValueType, _Compare> , LoserTreePointerUnguarded<__stable, _ValueType, _Compare>
, _LoserTreeUnguarded<__stable, _ValueType, _Compare> , _LoserTreeUnguarded<__stable, _ValueType, _Compare>
>::__type>(__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp); >::__type>(
__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
} }
}; };
...@@ -997,7 +999,8 @@ template< ...@@ -997,7 +999,8 @@ template<
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s) for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
{ {
_GLIBCXX_PARALLEL_ASSERT(__is_sorted((*__s).first, (*__s).second, __comp)); _GLIBCXX_PARALLEL_ASSERT(
__is_sorted((*__s).first, (*__s).second, __comp));
} }
#endif #endif
...@@ -1053,11 +1056,13 @@ template< ...@@ -1053,11 +1056,13 @@ template<
, _RAIterIterator , _RAIterIterator
, _RAIter3 , _RAIter3
, _DifferenceTp , _DifferenceTp
, _Compare>()(__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp); , _Compare>()(__seqs_begin, __seqs_end, __target, __sentinel,
__length, __comp);
break; break;
} }
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(__is_sorted(__target, __target + __length, __comp)); _GLIBCXX_PARALLEL_ASSERT(
__is_sorted(__target, __target + __length, __comp));
#endif #endif
return __return_target; return __return_target;
...@@ -1163,7 +1168,8 @@ void multiway_merge_sampling_splitting( ...@@ -1163,7 +1168,8 @@ void multiway_merge_sampling_splitting(
- __seqs_begin[__seq].first; - __seqs_begin[__seq].first;
else else
// Absolute end. // Absolute end.
__pieces[__slab][__seq].second = _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]); __pieces[__slab][__seq].second
= _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]);
} }
::operator delete(__samples); ::operator delete(__samples);
} }
...@@ -1379,7 +1385,8 @@ template< ...@@ -1379,7 +1385,8 @@ template<
} // parallel } // parallel
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(__is_sorted(__target, __target + __length, __comp)); _GLIBCXX_PARALLEL_ASSERT(
__is_sorted(__target, __target + __length, __comp));
#endif #endif
__k = 0; __k = 0;
...@@ -1490,7 +1497,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1490,7 +1497,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin
// Execute multiway merge *sequentially*. // Execute multiway merge *sequentially*.
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ false, /* __sentinels = */ false> </* __stable = */ false, /* __sentinels = */ false>
(__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp); (__seqs_begin, __seqs_end, __target,
*(__seqs_begin->second), __length, __comp);
} }
// public interface // public interface
...@@ -1528,11 +1536,13 @@ multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1528,11 +1536,13 @@ multiway_merge(_RAIterPairIterator __seqs_begin
multiway_merge_exact_splitting</* __stable = */ false, multiway_merge_exact_splitting</* __stable = */ false,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ false, /* __sentinels = */ false>( </* __stable = */ false, /* __sentinels = */ false>(
__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp); __seqs_begin, __seqs_end, __target, *(__seqs_begin->second),
__length, __comp);
} }
// public interface // public interface
...@@ -1571,7 +1581,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1571,7 +1581,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin
multiway_merge_exact_splitting</* __stable = */ false, multiway_merge_exact_splitting</* __stable = */ false,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ false, /* __sentinels = */ false>( </* __stable = */ false, /* __sentinels = */ false>(
...@@ -1637,7 +1648,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1637,7 +1648,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
// Execute multiway merge *sequentially*. // Execute multiway merge *sequentially*.
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ true, /* __sentinels = */ false> </* __stable = */ true, /* __sentinels = */ false>
(__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp); (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length,
__comp);
} }
// public interface // public interface
...@@ -1676,7 +1688,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1676,7 +1688,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
multiway_merge_exact_splitting</* __stable = */ true, multiway_merge_exact_splitting</* __stable = */ true,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge</* __stable = */ true, return __sequential_multiway_merge</* __stable = */ true,
/* __sentinels = */ false>( /* __sentinels = */ false>(
...@@ -1720,7 +1733,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1720,7 +1733,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
multiway_merge_sampling_splitting</* __stable = */ true, multiway_merge_sampling_splitting</* __stable = */ true,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ true, /* __sentinels = */ false>( </* __stable = */ true, /* __sentinels = */ false>(
...@@ -1742,7 +1756,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1742,7 +1756,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, parallel_tag __tag = parallel_tag(0)) , parallel_tag __tag = parallel_tag(0))
{ {
return stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length, __comp, return stable_multiway_merge(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
...@@ -1759,7 +1774,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin ...@@ -1759,7 +1774,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, default_parallel_tag __tag) , default_parallel_tag __tag)
{ {
return stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length, __comp, return stable_multiway_merge(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
...@@ -1902,7 +1918,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -1902,7 +1918,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
multiway_merge_exact_splitting</* __stable = */ false, multiway_merge_exact_splitting</* __stable = */ false,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ false, /* __sentinels = */ true>( </* __stable = */ false, /* __sentinels = */ true>(
...@@ -1945,7 +1962,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -1945,7 +1962,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
multiway_merge_sampling_splitting</* __stable = */ false, multiway_merge_sampling_splitting</* __stable = */ false,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */false, /* __sentinels = */ true>( </* __stable = */false, /* __sentinels = */ true>(
...@@ -1966,7 +1984,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -1966,7 +1984,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, parallel_tag __tag = parallel_tag(0)) , parallel_tag __tag = parallel_tag(0))
{ {
return multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp, return multiway_merge_sentinels(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
...@@ -1983,7 +2002,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -1983,7 +2002,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, default_parallel_tag __tag) , default_parallel_tag __tag)
{ {
return multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp, return multiway_merge_sentinels(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
...@@ -2011,7 +2031,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -2011,7 +2031,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
// Execute multiway merge *sequentially*. // Execute multiway merge *sequentially*.
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ true, /* __sentinels = */ true> </* __stable = */ true, /* __sentinels = */ true>
(__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp); (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length,
__comp);
} }
// public interface // public interface
...@@ -2050,11 +2071,13 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -2050,11 +2071,13 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
multiway_merge_exact_splitting</* __stable = */ true, multiway_merge_exact_splitting</* __stable = */ true,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ true, /* __sentinels = */ true>( </* __stable = */ true, /* __sentinels = */ true>(
__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp); __seqs_begin, __seqs_end, __target, *(__seqs_begin->second),
__length, __comp);
} }
// public interface // public interface
...@@ -2093,7 +2116,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -2093,7 +2116,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
multiway_merge_sampling_splitting</* __stable = */ true, multiway_merge_sampling_splitting</* __stable = */ true,
typename std::iterator_traits<_RAIterPairIterator> typename std::iterator_traits<_RAIterPairIterator>
::value_type*, _Compare, _DifferenceTp>, ::value_type*, _Compare, _DifferenceTp>,
static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads()); static_cast<_DifferenceType>(__length), __comp,
__tag.__get_num_threads());
else else
return __sequential_multiway_merge return __sequential_multiway_merge
</* __stable = */ true, /* __sentinels = */ true>( </* __stable = */ true, /* __sentinels = */ true>(
...@@ -2114,7 +2138,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -2114,7 +2138,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, parallel_tag __tag = parallel_tag(0)) , parallel_tag __tag = parallel_tag(0))
{ {
return stable_multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp, return stable_multiway_merge_sentinels(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
...@@ -2131,7 +2156,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin ...@@ -2131,7 +2156,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
, _DifferenceTp __length, _Compare __comp , _DifferenceTp __length, _Compare __comp
, default_parallel_tag __tag) , default_parallel_tag __tag)
{ {
return stable_multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp, return stable_multiway_merge_sentinels(
__seqs_begin, __seqs_end, __target, __length, __comp,
exact_tag(__tag.__get_num_threads())); exact_tag(__tag.__get_num_threads()));
} }
......
libstdc++-v3/include/parallel/multiway_mergesort.h
...@@ -145,20 +145,23 @@ template<typename _RAIter, typename _Compare, ...@@ -145,20 +145,23 @@ template<typename _RAIter, typename _Compare,
for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++) for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
seqs[__s] = std::make_pair(__sd->_M_temporary[__s], seqs[__s] = std::make_pair(__sd->_M_temporary[__s],
__sd->_M_temporary[__s] __sd->_M_temporary[__s]
+ (__sd->_M_starts[__s + 1] - __sd->_M_starts[__s])); + (__sd->_M_starts[__s + 1]
- __sd->_M_starts[__s]));
std::vector<_SortingPlacesIterator> _M_offsets(__sd->_M_num_threads); std::vector<_SortingPlacesIterator> _M_offsets(__sd->_M_num_threads);
// if not last thread // if not last thread
if (__iam < __sd->_M_num_threads - 1) if (__iam < __sd->_M_num_threads - 1)
multiseq_partition(seqs.begin(), seqs.end(), multiseq_partition(seqs.begin(), seqs.end(),
__sd->_M_starts[__iam + 1], _M_offsets.begin(), __comp); __sd->_M_starts[__iam + 1], _M_offsets.begin(),
__comp);
for (int __seq = 0; __seq < __sd->_M_num_threads; __seq++) for (int __seq = 0; __seq < __sd->_M_num_threads; __seq++)
{ {
// for each sequence // for each sequence
if (__iam < (__sd->_M_num_threads - 1)) if (__iam < (__sd->_M_num_threads - 1))
__sd->_M_pieces[__iam][__seq]._M_end = _M_offsets[__seq] - seqs[__seq].first; __sd->_M_pieces[__iam][__seq]._M_end
= _M_offsets[__seq] - seqs[__seq].first;
else else
// very end of this sequence // very end of this sequence
__sd->_M_pieces[__iam][__seq]._M_end = __sd->_M_pieces[__iam][__seq]._M_end =
...@@ -171,7 +174,8 @@ template<typename _RAIter, typename _Compare, ...@@ -171,7 +174,8 @@ template<typename _RAIter, typename _Compare,
{ {
// For each sequence. // For each sequence.
if (__iam > 0) if (__iam > 0)
__sd->_M_pieces[__iam][__seq]._M_begin = __sd->_M_pieces[__iam - 1][__seq]._M_end; __sd->_M_pieces[__iam][__seq]._M_begin =
__sd->_M_pieces[__iam - 1][__seq]._M_end;
else else
// Absolute beginning. // Absolute beginning.
__sd->_M_pieces[__iam][__seq]._M_begin = 0; __sd->_M_pieces[__iam][__seq]._M_begin = 0;
...@@ -204,7 +208,8 @@ template<typename _RAIter, typename _Compare, ...@@ -204,7 +208,8 @@ template<typename _RAIter, typename _Compare,
# pragma omp single # pragma omp single
__gnu_sequential::sort(__sd->_M_samples, __gnu_sequential::sort(__sd->_M_samples,
__sd->_M_samples + (__num_samples * __sd->_M_num_threads), __sd->_M_samples
+ (__num_samples * __sd->_M_num_threads),
__comp); __comp);
# pragma omp barrier # pragma omp barrier
...@@ -224,7 +229,8 @@ template<typename _RAIter, typename _Compare, ...@@ -224,7 +229,8 @@ template<typename _RAIter, typename _Compare,
// Absolute beginning. // Absolute beginning.
__sd->_M_pieces[__iam][__s]._M_begin = 0; __sd->_M_pieces[__iam][__s]._M_begin = 0;
if ((__num_samples * (__iam + 1)) < (__num_samples * __sd->_M_num_threads)) if ((__num_samples * (__iam + 1)) <
(__num_samples * __sd->_M_num_threads))
__sd->_M_pieces[__iam][__s]._M_end = __sd->_M_pieces[__iam][__s]._M_end =
std::lower_bound(__sd->_M_temporary[__s], std::lower_bound(__sd->_M_temporary[__s],
__sd->_M_temporary[__s] __sd->_M_temporary[__s]
...@@ -234,7 +240,8 @@ template<typename _RAIter, typename _Compare, ...@@ -234,7 +240,8 @@ template<typename _RAIter, typename _Compare,
- __sd->_M_temporary[__s]; - __sd->_M_temporary[__s];
else else
// Absolute end. // Absolute end.
__sd->_M_pieces[__iam][__s]._M_end = __sd->_M_starts[__s + 1] - __sd->_M_starts[__s]; __sd->_M_pieces[__iam][__s]._M_end = __sd->_M_starts[__s + 1]
- __sd->_M_starts[__s];
} }
} }
}; };
...@@ -283,8 +290,8 @@ template<typename Seq_RAIter, typename _RAIter, ...@@ -283,8 +290,8 @@ template<typename Seq_RAIter, typename _RAIter,
_Compare& __comp, _Compare& __comp,
DiffType __length_am) const DiffType __length_am) const
{ {
stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length_am, __comp, stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length_am,
sequential_tag()); __comp, sequential_tag());
} }
}; };
...@@ -322,7 +329,8 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -322,7 +329,8 @@ template<bool __stable, bool __exact, typename _RAIter,
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
// Length of this thread's chunk, before merging. // Length of this thread's chunk, before merging.
_DifferenceType __length_local = __sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam]; _DifferenceType __length_local
= __sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam];
// Sort in temporary storage, leave space for sentinel. // Sort in temporary storage, leave space for sentinel.
...@@ -333,12 +341,15 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -333,12 +341,15 @@ template<bool __stable, bool __exact, typename _RAIter,
::operator new(sizeof(_ValueType) * (__length_local + 1))); ::operator new(sizeof(_ValueType) * (__length_local + 1)));
// Copy there. // Copy there.
std::uninitialized_copy(__sd->_M_source + __sd->_M_starts[__iam], std::uninitialized_copy(
__sd->_M_source + __sd->_M_starts[__iam],
__sd->_M_source + __sd->_M_starts[__iam] + __length_local, __sd->_M_source + __sd->_M_starts[__iam] + __length_local,
__sd->_M_temporary[__iam]); __sd->_M_temporary[__iam]);
__possibly_stable_sort<__stable, _SortingPlacesIterator, _Compare>() __possibly_stable_sort<__stable, _SortingPlacesIterator, _Compare>()
(__sd->_M_temporary[__iam], __sd->_M_temporary[__iam] + __length_local, __comp); (__sd->_M_temporary[__iam],
__sd->_M_temporary[__iam] + __length_local,
__comp);
// Invariant: locally sorted subsequence in sd->_M_temporary[__iam], // Invariant: locally sorted subsequence in sd->_M_temporary[__iam],
// __sd->_M_temporary[__iam] + __length_local. // __sd->_M_temporary[__iam] + __length_local.
...@@ -355,7 +366,8 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -355,7 +366,8 @@ template<bool __stable, bool __exact, typename _RAIter,
_DifferenceType __offset = 0, __length_am = 0; _DifferenceType __offset = 0, __length_am = 0;
for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++) for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
{ {
__length_am += __sd->_M_pieces[__iam][__s]._M_end - __sd->_M_pieces[__iam][__s]._M_begin; __length_am += __sd->_M_pieces[__iam][__s]._M_end
- __sd->_M_pieces[__iam][__s]._M_begin;
__offset += __sd->_M_pieces[__iam][__s]._M_begin; __offset += __sd->_M_pieces[__iam][__s]._M_begin;
} }
...@@ -367,7 +379,8 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -367,7 +379,8 @@ template<bool __stable, bool __exact, typename _RAIter,
for (int __s = 0; __s < __sd->_M_num_threads; ++__s) for (int __s = 0; __s < __sd->_M_num_threads; ++__s)
{ {
seqs[__s] = seqs[__s] =
std::make_pair(__sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_begin, std::make_pair(
__sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_begin,
__sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_end); __sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_end);
} }
...@@ -441,10 +454,12 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -441,10 +454,12 @@ template<bool __stable, bool __exact, typename _RAIter,
__sd._M_samples = NULL; __sd._M_samples = NULL;
__sd._M_offsets = new _DifferenceType[__num_threads - 1]; __sd._M_offsets = new _DifferenceType[__num_threads - 1];
__sd._M_pieces = new std::vector<_Piece<_DifferenceType> >[__num_threads]; __sd._M_pieces
= new std::vector<_Piece<_DifferenceType> >[__num_threads];
for (int __s = 0; __s < __num_threads; ++__s) for (int __s = 0; __s < __num_threads; ++__s)
__sd._M_pieces[__s].resize(__num_threads); __sd._M_pieces[__s].resize(__num_threads);
_M_starts = __sd._M_starts = new _DifferenceType[__num_threads + 1]; _M_starts = __sd._M_starts
= new _DifferenceType[__num_threads + 1];
_DifferenceType __chunk_length = __n / __num_threads; _DifferenceType __chunk_length = __n / __num_threads;
_DifferenceType __split = __n % __num_threads; _DifferenceType __split = __n % __num_threads;
...@@ -452,7 +467,8 @@ template<bool __stable, bool __exact, typename _RAIter, ...@@ -452,7 +467,8 @@ template<bool __stable, bool __exact, typename _RAIter,
for (int __i = 0; __i < __num_threads; ++__i) for (int __i = 0; __i < __num_threads; ++__i)
{ {
_M_starts[__i] = __pos; _M_starts[__i] = __pos;
__pos += (__i < __split) ? (__chunk_length + 1) : __chunk_length; __pos += (__i < __split)
? (__chunk_length + 1) : __chunk_length;
} }
_M_starts[__num_threads] = __pos; _M_starts[__num_threads] = __pos;
} //single } //single
......
libstdc++-v3/include/parallel/numeric
...@@ -68,7 +68,8 @@ namespace __parallel ...@@ -68,7 +68,8 @@ namespace __parallel
inline _Tp inline _Tp
__accumulate_switch(_IIter __begin, _IIter __end, __accumulate_switch(_IIter __begin, _IIter __end,
_Tp __init, _IteratorTag) _Tp __init, _IteratorTag)
{ return accumulate(__begin, __end, __init, __gnu_parallel::sequential_tag()); } { return accumulate(__begin, __end, __init,
__gnu_parallel::sequential_tag()); }
template<typename _IIter, typename _Tp, typename _BinaryOperation, template<typename _IIter, typename _Tp, typename _BinaryOperation,
typename _IteratorTag> typename _IteratorTag>
...@@ -169,7 +170,8 @@ namespace __parallel ...@@ -169,7 +170,8 @@ namespace __parallel
inner_product(_IIter1 __first1, _IIter1 __last1, inner_product(_IIter1 __first1, _IIter1 __last1,
_IIter2 __first2, _Tp __init, _IIter2 __first2, _Tp __init,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init); } { return _GLIBCXX_STD_P::inner_product(
__first1, __last1, __first2, __init); }
template<typename _IIter1, typename _IIter2, typename _Tp, template<typename _IIter1, typename _IIter2, typename _Tp,
typename BinaryFunction1, typename BinaryFunction2> typename BinaryFunction1, typename BinaryFunction2>
...@@ -243,9 +245,10 @@ namespace __parallel ...@@ -243,9 +245,10 @@ namespace __parallel
typedef iterator_traits<_IIter2> _TraitsType2; typedef iterator_traits<_IIter2> _TraitsType2;
typedef typename _TraitsType2::iterator_category _IteratorCategory2; typedef typename _TraitsType2::iterator_category _IteratorCategory2;
return __inner_product_switch(__first1, __last1, __first2, __init, __binary_op1, return __inner_product_switch(
__binary_op2, _IteratorCategory1(), __first1, __last1, __first2, __init, __binary_op1,
_IteratorCategory2(), __parallelism_tag); __binary_op2, _IteratorCategory1(), _IteratorCategory2(),
__parallelism_tag);
} }
template<typename _IIter1, typename _IIter2, typename _Tp, template<typename _IIter1, typename _IIter2, typename _Tp,
...@@ -261,9 +264,9 @@ namespace __parallel ...@@ -261,9 +264,9 @@ namespace __parallel
typedef iterator_traits<_IIter2> _TraitsType2; typedef iterator_traits<_IIter2> _TraitsType2;
typedef typename _TraitsType2::iterator_category _IteratorCategory2; typedef typename _TraitsType2::iterator_category _IteratorCategory2;
return __inner_product_switch(__first1, __last1, __first2, __init, __binary_op1, return __inner_product_switch(
__binary_op2, _IteratorCategory1(), __first1, __last1, __first2, __init, __binary_op1, __binary_op2,
_IteratorCategory2()); _IteratorCategory1(), _IteratorCategory2());
} }
template<typename _IIter1, typename _IIter2, typename _Tp> template<typename _IIter1, typename _IIter2, typename _Tp>
...@@ -378,8 +381,8 @@ namespace __parallel ...@@ -378,8 +381,8 @@ namespace __parallel
// Sequential fallback. // Sequential fallback.
template<typename _IIter, typename _OutputIterator> template<typename _IIter, typename _OutputIterator>
inline _OutputIterator inline _OutputIterator
adjacent_difference(_IIter __begin, _IIter __end, adjacent_difference(_IIter __begin, _IIter __end, _OutputIterator __result,
_OutputIterator __result, __gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::adjacent_difference(__begin, __end, __result); } { return _GLIBCXX_STD_P::adjacent_difference(__begin, __end, __result); }
// Sequential fallback. // Sequential fallback.
...@@ -389,16 +392,17 @@ namespace __parallel ...@@ -389,16 +392,17 @@ namespace __parallel
adjacent_difference(_IIter __begin, _IIter __end, adjacent_difference(_IIter __begin, _IIter __end,
_OutputIterator __result, _BinaryOperation __bin_op, _OutputIterator __result, _BinaryOperation __bin_op,
__gnu_parallel::sequential_tag) __gnu_parallel::sequential_tag)
{ return _GLIBCXX_STD_P::adjacent_difference(__begin, __end, __result, __bin_op); } { return _GLIBCXX_STD_P::adjacent_difference(
__begin, __end, __result, __bin_op); }
// Sequential fallback for input iterator case. // Sequential fallback for input iterator case.
template<typename _IIter, typename _OutputIterator, template<typename _IIter, typename _OutputIterator,
typename _BinaryOperation, typename _IteratorTag1, typename _BinaryOperation, typename _IteratorTag1,
typename _IteratorTag2> typename _IteratorTag2>
inline _OutputIterator inline _OutputIterator
__adjacent_difference_switch(_IIter __begin, _IIter __end, __adjacent_difference_switch(
_OutputIterator __result, _BinaryOperation __bin_op, _IIter __begin, _IIter __end, _OutputIterator __result,
_IteratorTag1, _IteratorTag2) _BinaryOperation __bin_op, _IteratorTag1, _IteratorTag2)
{ return adjacent_difference(__begin, __end, __result, __bin_op, { return adjacent_difference(__begin, __end, __result, __bin_op,
__gnu_parallel::sequential_tag()); } __gnu_parallel::sequential_tag()); }
...@@ -406,10 +410,10 @@ namespace __parallel ...@@ -406,10 +410,10 @@ namespace __parallel
template<typename _IIter, typename _OutputIterator, template<typename _IIter, typename _OutputIterator,
typename _BinaryOperation> typename _BinaryOperation>
_OutputIterator _OutputIterator
__adjacent_difference_switch(_IIter __begin, _IIter __end, __adjacent_difference_switch(
_OutputIterator __result, _BinaryOperation __bin_op, _IIter __begin, _IIter __end, _OutputIterator __result,
random_access_iterator_tag, _BinaryOperation __bin_op,
random_access_iterator_tag, random_access_iterator_tag, random_access_iterator_tag,
__gnu_parallel::_Parallelism __parallelism_tag __gnu_parallel::_Parallelism __parallelism_tag
= __gnu_parallel::parallel_balanced) = __gnu_parallel::parallel_balanced)
{ {
...@@ -424,7 +428,8 @@ namespace __parallel ...@@ -424,7 +428,8 @@ namespace __parallel
*__result = *__begin; *__result = *__begin;
_ItTrip begin_pair(__begin + 1, __result + 1), _ItTrip begin_pair(__begin + 1, __result + 1),
end_pair(__end, __result + (__end - __begin)); end_pair(__end, __result + (__end - __begin));
__gnu_parallel::__adjacent_difference_selector<_ItTrip> __functionality; __gnu_parallel::__adjacent_difference_selector<_ItTrip>
__functionality;
__gnu_parallel:: __gnu_parallel::
for_each_template_random_access_ed(begin_pair, end_pair, __bin_op, for_each_template_random_access_ed(begin_pair, end_pair, __bin_op,
__functionality, __functionality,
...@@ -446,7 +451,8 @@ namespace __parallel ...@@ -446,7 +451,8 @@ namespace __parallel
{ {
typedef iterator_traits<_IIter> _TraitsType; typedef iterator_traits<_IIter> _TraitsType;
typedef typename _TraitsType::value_type _ValueType; typedef typename _TraitsType::value_type _ValueType;
return adjacent_difference(__begin, __end, __result, std::minus<_ValueType>(), return adjacent_difference(
__begin, __end, __result, std::minus<_ValueType>(),
__parallelism_tag); __parallelism_tag);
} }
...@@ -457,7 +463,8 @@ namespace __parallel ...@@ -457,7 +463,8 @@ namespace __parallel
{ {
typedef iterator_traits<_IIter> _TraitsType; typedef iterator_traits<_IIter> _TraitsType;
typedef typename _TraitsType::value_type _ValueType; typedef typename _TraitsType::value_type _ValueType;
return adjacent_difference(__begin, __end, __result, std::minus<_ValueType>()); return adjacent_difference(__begin, __end, __result,
std::minus<_ValueType>());
} }
template<typename _IIter, typename _OutputIterator, template<typename _IIter, typename _OutputIterator,
...@@ -473,9 +480,9 @@ namespace __parallel ...@@ -473,9 +480,9 @@ namespace __parallel
typedef iterator_traits<_OutputIterator> _OTraitsType; typedef iterator_traits<_OutputIterator> _OTraitsType;
typedef typename _OTraitsType::iterator_category _OIterCategory; typedef typename _OTraitsType::iterator_category _OIterCategory;
return __adjacent_difference_switch(__begin, __end, __result, __binary_op, return __adjacent_difference_switch(
_IIteratorCategory(), __begin, __end, __result, __binary_op,
_OIterCategory(), __parallelism_tag); _IIteratorCategory(), _OIterCategory(), __parallelism_tag);
} }
template<typename _IIter, typename _OutputIterator, template<typename _IIter, typename _OutputIterator,
...@@ -490,9 +497,9 @@ namespace __parallel ...@@ -490,9 +497,9 @@ namespace __parallel
typedef iterator_traits<_OutputIterator> _OTraitsType; typedef iterator_traits<_OutputIterator> _OTraitsType;
typedef typename _OTraitsType::iterator_category _OIterCategory; typedef typename _OTraitsType::iterator_category _OIterCategory;
return __adjacent_difference_switch(__begin, __end, __result, __binary_op, return __adjacent_difference_switch(
_IIteratorCategory(), __begin, __end, __result, __binary_op,
_OIterCategory()); _IIteratorCategory(), _OIterCategory());
} }
} // end namespace } // end namespace
} // end namespace } // end namespace
......
libstdc++-v3/include/parallel/omp_loop.h
...@@ -64,13 +64,10 @@ template<typename _RAIter, ...@@ -64,13 +64,10 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_omp_loop(_RAIter __begin, for_each_template_random_access_omp_loop(
_RAIter __end, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Op __o, _Fu& __f, _Red __r, _Result __base, _Result __base, _Result& __output,
_Result& __output, typename std::iterator_traits<_RAIter>::difference_type __bound)
typename std::iterator_traits
<_RAIter>::
difference_type __bound)
{ {
typedef typename typedef typename
std::iterator_traits<_RAIter>::difference_type std::iterator_traits<_RAIter>::difference_type
...@@ -95,7 +92,7 @@ template<typename _RAIter, ...@@ -95,7 +92,7 @@ template<typename _RAIter,
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
# pragma omp for schedule(dynamic, _Settings::get().workstealing_chunk_size) #pragma omp for schedule(dynamic, _Settings::get().workstealing_chunk_size)
for (_DifferenceType __pos = 0; __pos < __length; ++__pos) for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
__thread_results[__iam] = __thread_results[__iam] =
__r(__thread_results[__iam], __f(__o, __begin+__pos)); __r(__thread_results[__iam], __f(__o, __begin+__pos));
......
libstdc++-v3/include/parallel/omp_loop_static.h
...@@ -64,13 +64,10 @@ template<typename _RAIter, ...@@ -64,13 +64,10 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_omp_loop_static(_RAIter __begin, for_each_template_random_access_omp_loop_static(
_RAIter __end, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Op __o, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits typename std::iterator_traits<_RAIter>::difference_type __bound)
<_RAIter>::
difference_type __bound)
{ {
typedef typename typedef typename
std::iterator_traits<_RAIter>::difference_type std::iterator_traits<_RAIter>::difference_type
...@@ -95,9 +92,10 @@ template<typename _RAIter, ...@@ -95,9 +92,10 @@ template<typename _RAIter,
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
# pragma omp for schedule(static, _Settings::get().workstealing_chunk_size) #pragma omp for schedule(static, _Settings::get().workstealing_chunk_size)
for (_DifferenceType __pos = 0; __pos < __length; ++__pos) for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
__thread_results[__iam] = __r(__thread_results[__iam], __f(__o, __begin+__pos)); __thread_results[__iam] = __r(__thread_results[__iam],
__f(__o, __begin+__pos));
} //parallel } //parallel
for (_ThreadIndex __i = 0; __i < __num_threads; ++__i) for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
......
libstdc++-v3/include/parallel/par_loop.h
...@@ -65,13 +65,10 @@ template<typename _RAIter, ...@@ -65,13 +65,10 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_ed(_RAIter __begin, for_each_template_random_access_ed(
_RAIter __end, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Op __o, _Fu& __f, _Red __r, _Result __base, _Result __base, _Result& __output,
_Result& __output, typename std::iterator_traits<_RAIter>::difference_type __bound)
typename std::iterator_traits
<_RAIter>::
difference_type __bound)
{ {
typedef std::iterator_traits<_RAIter> _TraitsType; typedef std::iterator_traits<_RAIter> _TraitsType;
typedef typename _TraitsType::difference_type _DifferenceType; typedef typename _TraitsType::difference_type _DifferenceType;
...@@ -87,7 +84,8 @@ template<typename _RAIter, ...@@ -87,7 +84,8 @@ template<typename _RAIter,
# pragma omp single # pragma omp single
{ {
__num_threads = omp_get_num_threads(); __num_threads = omp_get_num_threads();
__thread_results = static_cast<_Result*>( __thread_results =
static_cast<_Result*>(
::operator new(__num_threads * sizeof(_Result))); ::operator new(__num_threads * sizeof(_Result)));
__constructed = new bool[__num_threads]; __constructed = new bool[__num_threads];
} }
...@@ -95,7 +93,8 @@ template<typename _RAIter, ...@@ -95,7 +93,8 @@ template<typename _RAIter,
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
// Neutral element. // Neutral element.
_Result* __reduct = static_cast<_Result*>(::operator new(sizeof(_Result))); _Result* __reduct =
static_cast<_Result*>(::operator new(sizeof(_Result)));
_DifferenceType _DifferenceType
__start = equally_split_point(__length, __num_threads, __iam), __start = equally_split_point(__length, __num_threads, __iam),
......
libstdc++-v3/include/parallel/partial_sum.h
...@@ -55,10 +55,10 @@ template<typename _IIter, ...@@ -55,10 +55,10 @@ template<typename _IIter,
typename _OutputIterator, typename _OutputIterator,
typename _BinaryOperation> typename _BinaryOperation>
_OutputIterator _OutputIterator
__parallel_partial_sum_basecase(_IIter __begin, _IIter __end, __parallel_partial_sum_basecase(
_OutputIterator __result, _BinaryOperation __bin_op, _IIter __begin, _IIter __end, _OutputIterator __result,
typename std::iterator_traits _BinaryOperation __bin_op,
<_IIter>::value_type __value) typename std::iterator_traits <_IIter>::value_type __value)
{ {
if (__begin == __end) if (__begin == __end)
return __result; return __result;
...@@ -87,10 +87,10 @@ template<typename _IIter, ...@@ -87,10 +87,10 @@ template<typename _IIter,
typename _OutputIterator, typename _OutputIterator,
typename _BinaryOperation> typename _BinaryOperation>
_OutputIterator _OutputIterator
__parallel_partial_sum_linear(_IIter __begin, _IIter __end, __parallel_partial_sum_linear(
_OutputIterator __result, _BinaryOperation __bin_op, _IIter __begin, _IIter __end, _OutputIterator __result,
typename std::iterator_traits _BinaryOperation __bin_op,
<_IIter>::difference_type __n) typename std::iterator_traits<_IIter>::difference_type __n)
{ {
typedef std::iterator_traits<_IIter> _TraitsType; typedef std::iterator_traits<_IIter> _TraitsType;
typedef typename _TraitsType::value_type _ValueType; typedef typename _TraitsType::value_type _ValueType;
...@@ -148,8 +148,9 @@ template<typename _IIter, ...@@ -148,8 +148,9 @@ template<typename _IIter,
if (__iam == 0) if (__iam == 0)
{ {
*__result = *__begin; *__result = *__begin;
__parallel_partial_sum_basecase(__begin + 1, __begin + __borders[1], __parallel_partial_sum_basecase(
__result + 1, __bin_op, *__begin); __begin + 1, __begin + __borders[1], __result + 1,
__bin_op, *__begin);
::new(&(__sums[__iam])) _ValueType(*(__result + __borders[1] - 1)); ::new(&(__sums[__iam])) _ValueType(*(__result + __borders[1] - 1));
} }
else else
...@@ -165,16 +166,17 @@ template<typename _IIter, ...@@ -165,16 +166,17 @@ template<typename _IIter,
# pragma omp barrier # pragma omp barrier
# pragma omp single # pragma omp single
__parallel_partial_sum_basecase( __parallel_partial_sum_basecase(__sums + 1, __sums + __num_threads,
__sums + 1, __sums + __num_threads, __sums + 1, __bin_op, __sums[0]); __sums + 1, __bin_op, __sums[0]);
# pragma omp barrier # pragma omp barrier
// Still same team. // Still same team.
__parallel_partial_sum_basecase(__begin + __borders[__iam + 1], __parallel_partial_sum_basecase(
__begin + __borders[__iam + 1],
__begin + __borders[__iam + 2], __begin + __borders[__iam + 2],
__result + __borders[__iam + 1], __bin_op, __result + __borders[__iam + 1],
__sums[__iam]); __bin_op, __sums[__iam]);
} //parallel } //parallel
::operator delete(__sums); ::operator delete(__sums);
...@@ -208,7 +210,8 @@ template<typename _IIter, ...@@ -208,7 +210,8 @@ template<typename _IIter,
{ {
case LINEAR: case LINEAR:
// Need an initial offset. // Need an initial offset.
return __parallel_partial_sum_linear(__begin, __end, __result, __bin_op, __n); return __parallel_partial_sum_linear(
__begin, __end, __result, __bin_op, __n);
default: default:
// Partial_sum algorithm not implemented. // Partial_sum algorithm not implemented.
_GLIBCXX_PARALLEL_ASSERT(0); _GLIBCXX_PARALLEL_ASSERT(0);
......
libstdc++-v3/include/parallel/partition.h
...@@ -88,9 +88,10 @@ template<typename _RAIter, typename _Predicate> ...@@ -88,9 +88,10 @@ template<typename _RAIter, typename _Predicate>
__reserved_right = new bool[__num_threads]; __reserved_right = new bool[__num_threads];
if (__s.partition_chunk_share > 0.0) if (__s.partition_chunk_share > 0.0)
__chunk_size = std::max<_DifferenceType>(__s.partition_chunk_size, __chunk_size = std::max<_DifferenceType>(
(double)__n * __s.partition_chunk_share __s.partition_chunk_size,
/ (double)__num_threads); (double)__n * __s.partition_chunk_share /
(double)__num_threads);
else else
__chunk_size = __s.partition_chunk_size; __chunk_size = __s.partition_chunk_size;
} }
...@@ -99,7 +100,8 @@ template<typename _RAIter, typename _Predicate> ...@@ -99,7 +100,8 @@ template<typename _RAIter, typename _Predicate>
{ {
# pragma omp single # pragma omp single
{ {
_DifferenceType __num_chunks = (__right - __left + 1) / __chunk_size; _DifferenceType __num_chunks
= (__right - __left + 1) / __chunk_size;
for (int __r = 0; __r < __num_threads; ++__r) for (int __r = 0; __r < __num_threads; ++__r)
{ {
...@@ -198,7 +200,8 @@ template<typename _RAIter, typename _Predicate> ...@@ -198,7 +200,8 @@ template<typename _RAIter, typename _Predicate>
&& __thread_left_border >= __leftnew) && __thread_left_border >= __leftnew)
{ {
// Chunk already in place, reserve spot. // Chunk already in place, reserve spot.
__reserved_left[(__left - (__thread_left_border + 1)) / __chunk_size] __reserved_left
[(__left - (__thread_left_border + 1)) / __chunk_size]
= true; = true;
} }
...@@ -257,7 +260,8 @@ template<typename _RAIter, typename _Predicate> ...@@ -257,7 +260,8 @@ template<typename _RAIter, typename _Predicate>
_GLIBCXX_PARALLEL_ASSERT(__swapstart != -1); _GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
#endif #endif
std::swap_ranges(__begin + __thread_right_border, std::swap_ranges(
__begin + __thread_right_border,
__begin + __thread_right_border + __chunk_size, __begin + __thread_right_border + __chunk_size,
__begin + __swapstart); __begin + __swapstart);
} }
...@@ -365,7 +369,8 @@ template<typename _RAIter, typename _Compare> ...@@ -365,7 +369,8 @@ template<typename _RAIter, typename _Compare>
// Divide, leave pivot unchanged in last place. // Divide, leave pivot unchanged in last place.
_RAIter __split_pos1, __split_pos2; _RAIter __split_pos1, __split_pos2;
__split_pos1 = __begin + __parallel_partition(__begin, __end - 1, __pred, __split_pos1 = __begin
+ __parallel_partition(__begin, __end - 1, __pred,
__get_max_threads()); __get_max_threads());
// Left side: < __pivot_pos; __right side: >= __pivot_pos // Left side: < __pivot_pos; __right side: >= __pivot_pos
......
libstdc++-v3/include/parallel/queue.h
...@@ -105,9 +105,12 @@ namespace __gnu_parallel ...@@ -105,9 +105,12 @@ namespace __gnu_parallel
while (__former_front > __former_back) while (__former_front > __former_back)
{ {
// Chance. // Chance.
_CASable __former_borders = __encode2(__former_front, __former_back); _CASable
_CASable __new_borders = __encode2(__former_front - 1, __former_back); __former_borders = __encode2(__former_front, __former_back);
if (__compare_and_swap(&_M_borders, __former_borders, __new_borders)) _CASable
__new_borders = __encode2(__former_front - 1, __former_back);
if (__compare_and_swap(
&_M_borders, __former_borders, __new_borders))
{ {
__t = *(_M_base + (__former_front - 1) % _M_max_size); __t = *(_M_base + (__former_front - 1) % _M_max_size);
return true; return true;
...@@ -129,9 +132,12 @@ namespace __gnu_parallel ...@@ -129,9 +132,12 @@ namespace __gnu_parallel
while (__former_front > __former_back) while (__former_front > __former_back)
{ {
// Chance. // Chance.
_CASable __former_borders = __encode2(__former_front, __former_back); _CASable
_CASable __new_borders = __encode2(__former_front, __former_back + 1); __former_borders = __encode2(__former_front, __former_back);
if (__compare_and_swap(&_M_borders, __former_borders, __new_borders)) _CASable
__new_borders = __encode2(__former_front, __former_back + 1);
if (__compare_and_swap(
&_M_borders, __former_borders, __new_borders))
{ {
__t = *(_M_base + __former_back % _M_max_size); __t = *(_M_base + __former_back % _M_max_size);
return true; return true;
......
libstdc++-v3/include/parallel/quicksort.h
...@@ -70,8 +70,8 @@ namespace __gnu_parallel ...@@ -70,8 +70,8 @@ namespace __gnu_parallel
for (_DifferenceType __s = 0; __s < __num_samples; ++__s) for (_DifferenceType __s = 0; __s < __num_samples; ++__s)
{ {
const unsigned long long __index = static_cast<unsigned long long>(__s) const unsigned long long __index
* __n / __num_samples; = static_cast<unsigned long long>(__s) * __n / __num_samples;
::new(&(__samples[__s])) _ValueType(__begin[__index]); ::new(&(__samples[__s])) _ValueType(__begin[__index]);
} }
...@@ -171,7 +171,8 @@ namespace __gnu_parallel ...@@ -171,7 +171,8 @@ namespace __gnu_parallel
if (__num_threads > __n) if (__num_threads > __n)
__num_threads = static_cast<_ThreadIndex>(__n); __num_threads = static_cast<_ThreadIndex>(__n);
__parallel_sort_qs_conquer(__begin, __begin + __n, __comp, __num_threads); __parallel_sort_qs_conquer(
__begin, __begin + __n, __comp, __num_threads);
} }
} //namespace __gnu_parallel } //namespace __gnu_parallel
......
libstdc++-v3/include/parallel/random_shuffle.h
...@@ -131,7 +131,8 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -131,7 +131,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
_DRandomShufflingGlobalData<_RAIter>* _M_sd = d->_M_sd; _DRandomShufflingGlobalData<_RAIter>* _M_sd = d->_M_sd;
// Indexing: _M_dist[bin][processor] // Indexing: _M_dist[bin][processor]
_DifferenceType __length = _M_sd->_M_starts[__iam + 1] - _M_sd->_M_starts[__iam]; _DifferenceType __length = _M_sd->_M_starts[__iam + 1] -
_M_sd->_M_starts[__iam];
_BinIndex* __oracles = new _BinIndex[__length]; _BinIndex* __oracles = new _BinIndex[__length];
_DifferenceType* _M_dist = new _DifferenceType[_M_sd->_M_num_bins + 1]; _DifferenceType* _M_dist = new _DifferenceType[_M_sd->_M_num_bins + 1];
_BinIndex* _M_bin_proc = new _BinIndex[_M_sd->_M_num_bins]; _BinIndex* _M_bin_proc = new _BinIndex[_M_sd->_M_num_bins];
...@@ -161,10 +162,11 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -161,10 +162,11 @@ template<typename _RAIter, typename RandomNumberGenerator>
# pragma omp single # pragma omp single
{ {
// Sum up bins, _M_sd->_M_dist[__s + 1][d->_M_num_threads] now contains the // Sum up bins, _M_sd->_M_dist[__s + 1][d->_M_num_threads] now contains
// total number of items in bin __s // the total number of items in bin __s
for (_BinIndex __s = 0; __s < _M_sd->_M_num_bins; ++__s) for (_BinIndex __s = 0; __s < _M_sd->_M_num_bins; ++__s)
__gnu_sequential::partial_sum(_M_sd->_M_dist[__s + 1], __gnu_sequential::partial_sum(
_M_sd->_M_dist[__s + 1],
_M_sd->_M_dist[__s + 1] + d->_M_num_threads + 1, _M_sd->_M_dist[__s + 1] + d->_M_num_threads + 1,
_M_sd->_M_dist[__s + 1]); _M_sd->_M_dist[__s + 1]);
} }
...@@ -223,12 +225,15 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -223,12 +225,15 @@ template<typename _RAIter, typename RandomNumberGenerator>
{ {
_ValueType* __begin = _ValueType* __begin =
_M_sd->_M_temporaries[__iam] + _M_sd->_M_temporaries[__iam] +
((__b == d->_M_bins_begin) ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]), ((__b == d->_M_bins_begin)
? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]),
* __end = * __end =
_M_sd->_M_temporaries[__iam] + _M_sd->_M_dist[__b + 1][d->_M_num_threads]; _M_sd->_M_temporaries[__iam] +
_M_sd->_M_dist[__b + 1][d->_M_num_threads];
__sequential_random_shuffle(__begin, __end, __rng); __sequential_random_shuffle(__begin, __end, __rng);
std::copy(__begin, __end, _M_sd->_M_source + __global_offset + std::copy(__begin, __end, _M_sd->_M_source + __global_offset +
((__b == d->_M_bins_begin) ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads])); ((__b == d->_M_bins_begin)
? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]));
} }
::operator delete(_M_sd->_M_temporaries[__iam]); ::operator delete(_M_sd->_M_temporaries[__iam]);
...@@ -343,7 +348,8 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -343,7 +348,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
_M_sd._M_dist[0][0] = 0; _M_sd._M_dist[0][0] = 0;
_M_sd._M_dist[__b][0] = 0; _M_sd._M_dist[__b][0] = 0;
} }
_M_starts = _M_sd._M_starts = new _DifferenceType[__num_threads + 1]; _M_starts = _M_sd._M_starts
= new _DifferenceType[__num_threads + 1];
int bin_cursor = 0; int bin_cursor = 0;
_M_sd._M_num_bins = _M_num_bins; _M_sd._M_num_bins = _M_num_bins;
_M_sd._M_num_bits = __log2(_M_num_bins); _M_sd._M_num_bits = __log2(_M_num_bins);
...@@ -355,7 +361,8 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -355,7 +361,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
for (_ThreadIndex __i = 0; __i < __num_threads; ++__i) for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
{ {
_M_starts[__i] = __start; _M_starts[__i] = __start;
__start += (__i < __split) ? (__chunk_length + 1) : __chunk_length; __start += (__i < __split)
? (__chunk_length + 1) : __chunk_length;
int __j = __pus[__i]._M_bins_begin = bin_cursor; int __j = __pus[__i]._M_bins_begin = bin_cursor;
// Range of bins for this processor. // Range of bins for this processor.
...@@ -469,14 +476,16 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -469,14 +476,16 @@ template<typename _RAIter, typename RandomNumberGenerator>
} }
// Sum up bins. // Sum up bins.
__gnu_sequential::partial_sum(__dist0, __dist0 + _M_num_bins + 1, __dist0); __gnu_sequential::
partial_sum(__dist0, __dist0 + _M_num_bins + 1, __dist0);
for (int __b = 0; __b < _M_num_bins + 1; ++__b) for (int __b = 0; __b < _M_num_bins + 1; ++__b)
__dist1[__b] = __dist0[__b]; __dist1[__b] = __dist0[__b];
// Distribute according to oracles. // Distribute according to oracles.
for (_DifferenceType __i = 0; __i < __n; ++__i) for (_DifferenceType __i = 0; __i < __n; ++__i)
::new(&(__target[(__dist0[__oracles[__i]])++])) _ValueType(*(__begin + __i)); ::new(&(__target[(__dist0[__oracles[__i]])++]))
_ValueType(*(__begin + __i));
for (int __b = 0; __b < _M_num_bins; ++__b) for (int __b = 0; __b < _M_num_bins; ++__b)
{ {
...@@ -511,7 +520,8 @@ template<typename _RAIter, typename RandomNumberGenerator> ...@@ -511,7 +520,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
typedef std::iterator_traits<_RAIter> _TraitsType; typedef std::iterator_traits<_RAIter> _TraitsType;
typedef typename _TraitsType::difference_type _DifferenceType; typedef typename _TraitsType::difference_type _DifferenceType;
_DifferenceType __n = __end - __begin; _DifferenceType __n = __end - __begin;
__parallel_random_shuffle_drs(__begin, __end, __n, __get_max_threads(), __rng) ; __parallel_random_shuffle_drs(
__begin, __end, __n, __get_max_threads(), __rng) ;
} }
} }
......
libstdc++-v3/include/parallel/search.h
...@@ -126,7 +126,8 @@ template<typename __RAIter1, ...@@ -126,7 +126,8 @@ template<typename __RAIter1,
_ThreadIndex __iam = omp_get_thread_num(); _ThreadIndex __iam = omp_get_thread_num();
_DifferenceType __start = __splitters[__iam], __stop = __splitters[__iam + 1]; _DifferenceType __start = __splitters[__iam],
__stop = __splitters[__iam + 1];
_DifferenceType __pos_in_pattern = 0; _DifferenceType __pos_in_pattern = 0;
bool __found_pattern = false; bool __found_pattern = false;
...@@ -156,7 +157,8 @@ template<typename __RAIter1, ...@@ -156,7 +157,8 @@ template<typename __RAIter1,
// Make safe jump. // Make safe jump.
__start += (__pos_in_pattern - __advances[__pos_in_pattern]); __start += (__pos_in_pattern - __advances[__pos_in_pattern]);
__pos_in_pattern = __pos_in_pattern =
(__advances[__pos_in_pattern] < 0) ? 0 : __advances[__pos_in_pattern]; (__advances[__pos_in_pattern] < 0) ?
0 : __advances[__pos_in_pattern];
} }
} //parallel } //parallel
......
libstdc++-v3/include/parallel/set_operations.h
...@@ -370,7 +370,7 @@ template<typename _IIter, ...@@ -370,7 +370,7 @@ template<typename _IIter,
const _DifferenceType size = (__end1 - __begin1) + (__end2 - __begin2); const _DifferenceType size = (__end1 - __begin1) + (__end2 - __begin2);
const _IteratorPair __sequence[ 2 ] = const _IteratorPair __sequence[ 2 ] =
{ std::make_pair(__begin1, __end1), std::make_pair(__begin2, __end2) } ; { std::make_pair(__begin1, __end1), std::make_pair(__begin2, __end2) };
_OutputIterator return_value = __result; _OutputIterator return_value = __result;
_DifferenceType *__borders; _DifferenceType *__borders;
_IteratorPair *__block_begins; _IteratorPair *__block_begins;
...@@ -400,7 +400,8 @@ template<typename _IIter, ...@@ -400,7 +400,8 @@ template<typename _IIter,
_IIter __offset[2]; _IIter __offset[2];
const _DifferenceType __rank = __borders[__iam + 1]; const _DifferenceType __rank = __borders[__iam + 1];
multiseq_partition(__sequence, __sequence + 2, __rank, __offset, __op._M_comp); multiseq_partition(__sequence, __sequence + 2,
__rank, __offset, __op._M_comp);
// allowed to read? // allowed to read?
// together // together
...@@ -427,14 +428,15 @@ template<typename _IIter, ...@@ -427,14 +428,15 @@ template<typename _IIter,
if (__iam == 0) if (__iam == 0)
{ {
// The first thread can copy already. // The first thread can copy already.
__lengths[ __iam ] = __op._M_invoke(__block_begin.first, block_end.first, __lengths[ __iam ] =
__block_begin.second, block_end.second, __op._M_invoke(__block_begin.first, block_end.first,
__result) __block_begin.second, block_end.second, __result)
- __result; - __result;
} }
else else
{ {
__lengths[ __iam ] = __op.__count(__block_begin.first, block_end.first, __lengths[ __iam ] =
__op.__count(__block_begin.first, block_end.first,
__block_begin.second, block_end.second); __block_begin.second, block_end.second);
} }
...@@ -478,8 +480,8 @@ template<typename _IIter, ...@@ -478,8 +480,8 @@ template<typename _IIter,
_IIter __begin2, _IIter __end2, _IIter __begin2, _IIter __end2,
_OutputIterator __result, _Compare _M_comp) _OutputIterator __result, _Compare _M_comp)
{ {
return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result, return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
__union_func< _IIter, _OutputIterator, _Compare>(_M_comp)); __result, __union_func< _IIter, _OutputIterator, _Compare>(_M_comp));
} }
template<typename _IIter, template<typename _IIter,
...@@ -490,7 +492,8 @@ template<typename _IIter, ...@@ -490,7 +492,8 @@ template<typename _IIter,
_IIter __begin2, _IIter __end2, _IIter __begin2, _IIter __end2,
_OutputIterator __result, _Compare _M_comp) _OutputIterator __result, _Compare _M_comp)
{ {
return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result, return __parallel_set_operation(
__begin1, __end1, __begin2, __end2, __result,
__intersection_func<_IIter, _OutputIterator, _Compare>(_M_comp)); __intersection_func<_IIter, _OutputIterator, _Compare>(_M_comp));
} }
...@@ -502,7 +505,8 @@ template<typename _IIter, ...@@ -502,7 +505,8 @@ template<typename _IIter,
_IIter __begin2, _IIter __end2, _IIter __begin2, _IIter __end2,
_OutputIterator __result, _Compare _M_comp) _OutputIterator __result, _Compare _M_comp)
{ {
return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result, return __parallel_set_operation(
__begin1, __end1, __begin2, __end2, __result,
__difference_func<_IIter, _OutputIterator, _Compare>(_M_comp)); __difference_func<_IIter, _OutputIterator, _Compare>(_M_comp));
} }
...@@ -512,9 +516,11 @@ template<typename _IIter, ...@@ -512,9 +516,11 @@ template<typename _IIter,
inline _OutputIterator inline _OutputIterator
__parallel_set_symmetric_difference(_IIter __begin1, _IIter __end1, __parallel_set_symmetric_difference(_IIter __begin1, _IIter __end1,
_IIter __begin2, _IIter __end2, _IIter __begin2, _IIter __end2,
_OutputIterator __result, _Compare _M_comp) _OutputIterator __result,
_Compare _M_comp)
{ {
return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result, return __parallel_set_operation(
__begin1, __end1, __begin2, __end2, __result,
symmetric_difference_func<_IIter, _OutputIterator, _Compare> symmetric_difference_func<_IIter, _OutputIterator, _Compare>
(_M_comp)); (_M_comp));
} }
......
libstdc++-v3/include/parallel/settings.h
...@@ -92,7 +92,12 @@ ...@@ -92,7 +92,12 @@
* __gnu_parallel::_Settings::algorithm_strategy. Usually a decision * __gnu_parallel::_Settings::algorithm_strategy. Usually a decision
* based on the input size. * based on the input size.
*/ */
#define _GLIBCXX_PARALLEL_CONDITION(__c) (__gnu_parallel::_Settings::get().algorithm_strategy != __gnu_parallel::force_sequential && ((__gnu_parallel::__get_max_threads() > 1 && (__c)) || __gnu_parallel::_Settings::get().algorithm_strategy == __gnu_parallel::force_parallel)) #define _GLIBCXX_PARALLEL_CONDITION(__c) \
(__gnu_parallel::_Settings::get().algorithm_strategy \
!= __gnu_parallel::force_sequential \
&& ((__gnu_parallel::__get_max_threads() > 1 && (__c)) \
|| __gnu_parallel::_Settings::get().algorithm_strategy \
== __gnu_parallel::force_parallel))
/* /*
inline bool inline bool
...@@ -114,7 +119,7 @@ parallel_condition(bool __c) ...@@ -114,7 +119,7 @@ parallel_condition(bool __c)
namespace __gnu_parallel namespace __gnu_parallel
{ {
/// class _Settings /// class _Settings
/// Run-time settings for the parallel mode, including all tunable parameters. /// Run-time settings for the parallel mode including all tunable parameters.
struct _Settings struct _Settings
{ {
_AlgorithmStrategy algorithm_strategy; _AlgorithmStrategy algorithm_strategy;
...@@ -273,7 +278,56 @@ namespace __gnu_parallel ...@@ -273,7 +278,56 @@ namespace __gnu_parallel
set(_Settings&) throw(); set(_Settings&) throw();
explicit explicit
_Settings() : algorithm_strategy(heuristic), sort_algorithm(MWMS), partial_sum_algorithm(LINEAR), multiway_merge_algorithm(LOSER_TREE), find_algorithm(CONSTANT_SIZE_BLOCKS), sort_splitting(EXACT), merge_splitting(EXACT), multiway_merge_splitting(EXACT), accumulate_minimal_n(1000), adjacent_difference_minimal_n(1000), count_minimal_n(1000), fill_minimal_n(1000), find_increasing_factor(2.0), find_initial_block_size(256), find_maximum_block_size(8192), find_sequential_search_size(256), for_each_minimal_n(1000), generate_minimal_n(1000), max_element_minimal_n(1000), merge_minimal_n(1000), merge_oversampling(10), min_element_minimal_n(1000), multiway_merge_minimal_n(1000), multiway_merge_minimal_k(2), multiway_merge_oversampling(10), nth_element_minimal_n(1000), partition_chunk_size(1000), partition_chunk_share(0.0), partition_minimal_n(1000), partial_sort_minimal_n(1000), partial_sum_dilation(1.0f), partial_sum_minimal_n(1000), random_shuffle_minimal_n(1000), replace_minimal_n(1000), set_difference_minimal_n(1000), set_intersection_minimal_n(1000), set_symmetric_difference_minimal_n(1000), set_union_minimal_n(1000), sort_minimal_n(1000), sort_mwms_oversampling(10), sort_qs_num_samples_preset(100), sort_qsb_base_case_maximal_n(100), transform_minimal_n(1000), unique_copy_minimal_n(10000), workstealing_chunk_size(100), L1_cache_size(16 << 10), L2_cache_size(256 << 10), TLB_size(128), cache_line_size(64), qsb_steals(0) _Settings() :
algorithm_strategy(heuristic),
sort_algorithm(MWMS),
partial_sum_algorithm(LINEAR),
multiway_merge_algorithm(LOSER_TREE),
find_algorithm(CONSTANT_SIZE_BLOCKS),
sort_splitting(EXACT),
merge_splitting(EXACT),
multiway_merge_splitting(EXACT),
accumulate_minimal_n(1000),
adjacent_difference_minimal_n(1000),
count_minimal_n(1000),
fill_minimal_n(1000),
find_increasing_factor(2.0),
find_initial_block_size(256),
find_maximum_block_size(8192),
find_sequential_search_size(256),
for_each_minimal_n(1000),
generate_minimal_n(1000),
max_element_minimal_n(1000),
merge_minimal_n(1000),
merge_oversampling(10),
min_element_minimal_n(1000),
multiway_merge_minimal_n(1000),
multiway_merge_minimal_k(2), multiway_merge_oversampling(10),
nth_element_minimal_n(1000),
partition_chunk_size(1000),
partition_chunk_share(0.0),
partition_minimal_n(1000),
partial_sort_minimal_n(1000),
partial_sum_dilation(1.0f),
partial_sum_minimal_n(1000),
random_shuffle_minimal_n(1000),
replace_minimal_n(1000),
set_difference_minimal_n(1000),
set_intersection_minimal_n(1000),
set_symmetric_difference_minimal_n(1000),
set_union_minimal_n(1000),
sort_minimal_n(1000),
sort_mwms_oversampling(10),
sort_qs_num_samples_preset(100),
sort_qsb_base_case_maximal_n(100),
transform_minimal_n(1000),
unique_copy_minimal_n(10000),
workstealing_chunk_size(100),
L1_cache_size(16 << 10),
L2_cache_size(256 << 10),
TLB_size(128),
cache_line_size(64),
qsb_steals(0)
{ } { }
}; };
} }
......
libstdc++-v3/include/parallel/sort.h
...@@ -138,7 +138,8 @@ namespace __gnu_parallel ...@@ -138,7 +138,8 @@ namespace __gnu_parallel
_GLIBCXX_PARALLEL_ASSERT(__stable == false); _GLIBCXX_PARALLEL_ASSERT(__stable == false);
__parallel_sort_qs(__begin, __end, __comp, __parallelism.__get_num_threads()); __parallel_sort_qs(__begin, __end, __comp,
__parallelism.__get_num_threads());
} }
/** /**
...@@ -158,7 +159,8 @@ namespace __gnu_parallel ...@@ -158,7 +159,8 @@ namespace __gnu_parallel
_GLIBCXX_PARALLEL_ASSERT(__stable == false); _GLIBCXX_PARALLEL_ASSERT(__stable == false);
__parallel_sort_qsb(__begin, __end, __comp, __parallelism.__get_num_threads()); __parallel_sort_qsb(__begin, __end, __comp,
__parallelism.__get_num_threads());
} }
...@@ -215,11 +217,13 @@ namespace __gnu_parallel ...@@ -215,11 +217,13 @@ namespace __gnu_parallel
#endif #endif
#if _GLIBCXX_QUICKSORT #if _GLIBCXX_QUICKSORT
else if (_Settings::get().sort_algorithm == QS) else if (_Settings::get().sort_algorithm == QS)
__parallel_sort_qs(__begin, __end, __comp, __parallelism.__get_num_threads()); __parallel_sort_qs(__begin, __end, __comp,
__parallelism.__get_num_threads());
#endif #endif
#if _GLIBCXX_BAL_QUICKSORT #if _GLIBCXX_BAL_QUICKSORT
else if (_Settings::get().sort_algorithm == QS_BALANCED) else if (_Settings::get().sort_algorithm == QS_BALANCED)
__parallel_sort_qsb(__begin, __end, __comp, __parallelism.__get_num_threads()); __parallel_sort_qsb(__begin, __end, __comp,
__parallelism.__get_num_threads());
#endif #endif
else else
__gnu_sequential::sort(__begin, __end, __comp); __gnu_sequential::sort(__begin, __end, __comp);
......
libstdc++-v3/include/parallel/types.h
...@@ -149,7 +149,8 @@ namespace __gnu_parallel ...@@ -149,7 +149,8 @@ namespace __gnu_parallel
static const int _CASable_bits = sizeof(_CASable) * 8; static const int _CASable_bits = sizeof(_CASable) * 8;
/// ::_CASable with the right half of bits set to 1. /// ::_CASable with the right half of bits set to 1.
static const _CASable _CASable_mask = ((_CASable(1) << (_CASable_bits / 2)) - 1); static const _CASable _CASable_mask =
((_CASable(1) << (_CASable_bits / 2)) - 1);
} }
#endif /* _GLIBCXX_PARALLEL_TYPES_H */ #endif /* _GLIBCXX_PARALLEL_TYPES_H */
libstdc++-v3/include/parallel/workstealing.h
...@@ -96,13 +96,10 @@ template<typename _RAIter, ...@@ -96,13 +96,10 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_workstealing(_RAIter __begin, for_each_template_random_access_workstealing(
_RAIter __end, _RAIter __begin, _RAIter __end, _Op __op, _Fu& __f, _Red __r,
_Op __op, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits typename std::iterator_traits<_RAIter>::difference_type __bound)
<_RAIter>::
difference_type __bound)
{ {
_GLIBCXX_CALL(__end - __begin) _GLIBCXX_CALL(__end - __begin)
...@@ -111,13 +108,15 @@ template<typename _RAIter, ...@@ -111,13 +108,15 @@ template<typename _RAIter,
const _Settings& __s = _Settings::get(); const _Settings& __s = _Settings::get();
_DifferenceType __chunk_size = static_cast<_DifferenceType>(__s.workstealing_chunk_size); _DifferenceType __chunk_size =
static_cast<_DifferenceType>(__s.workstealing_chunk_size);
// How many jobs? // How many jobs?
_DifferenceType __length = (__bound < 0) ? (__end - __begin) : __bound; _DifferenceType __length = (__bound < 0) ? (__end - __begin) : __bound;
// To avoid false sharing in a cache line. // To avoid false sharing in a cache line.
const int __stride = __s.cache_line_size * 10 / sizeof(_Job<_DifferenceType>) + 1; const int __stride =
__s.cache_line_size * 10 / sizeof(_Job<_DifferenceType>) + 1;
// Total number of threads currently working. // Total number of threads currently working.
_ThreadIndex __busy = 0; _ThreadIndex __busy = 0;
...@@ -184,7 +183,7 @@ template<typename _RAIter, ...@@ -184,7 +183,7 @@ template<typename _RAIter,
(__length - 1) : ((__iam + 1) * (__length / __num_threads) - 1); (__length - 1) : ((__iam + 1) * (__length / __num_threads) - 1);
__my_job._M_load = __my_job._M_last - __my_job._M_first + 1; __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
// Init result with _M_first __value (to have a base value for reduction). // Init result with _M_first value (to have a base value for reduction)
if (__my_job._M_first <= __my_job._M_last) if (__my_job._M_first <= __my_job._M_last)
{ {
// Cannot use volatile variable directly. // Cannot use volatile variable directly.
...@@ -211,13 +210,15 @@ template<typename _RAIter, ...@@ -211,13 +210,15 @@ template<typename _RAIter,
// fetch-and-add call // fetch-and-add call
// Reserve current job block (size __chunk_size) in my queue. // Reserve current job block (size __chunk_size) in my queue.
_DifferenceType current_job = _DifferenceType current_job =
__fetch_and_add<_DifferenceType>(&(__my_job._M_first), __chunk_size); __fetch_and_add<_DifferenceType>(
&(__my_job._M_first), __chunk_size);
// Update _M_load, to make the three values consistent, // Update _M_load, to make the three values consistent,
// _M_first might have been changed in the meantime // _M_first might have been changed in the meantime
__my_job._M_load = __my_job._M_last - __my_job._M_first + 1; __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
for (_DifferenceType job_counter = 0; for (_DifferenceType job_counter = 0;
job_counter < __chunk_size && current_job <= __my_job._M_last; job_counter < __chunk_size
&& current_job <= __my_job._M_last;
++job_counter) ++job_counter)
{ {
// Yes: process it! // Yes: process it!
...@@ -254,7 +255,8 @@ template<typename _RAIter, ...@@ -254,7 +255,8 @@ template<typename _RAIter,
} }
while (__busy > 0 while (__busy > 0
&& ((__supposed_load <= 0) && ((__supposed_load <= 0)
|| ((__supposed_first + __supposed_load - 1) != __supposed_last))); || ((__supposed_first + __supposed_load - 1)
!= __supposed_last)));
if (__busy == 0) if (__busy == 0)
break; break;
...@@ -273,7 +275,8 @@ template<typename _RAIter, ...@@ -273,7 +275,8 @@ template<typename _RAIter,
__stolen_first + __steal - _DifferenceType(1); __stolen_first + __steal - _DifferenceType(1);
__my_job._M_first = __stolen_first; __my_job._M_first = __stolen_first;
__my_job._M_last = __gnu_parallel::min(stolen_try, __supposed_last); __my_job._M_last =
__gnu_parallel::min(stolen_try, __supposed_last);
__my_job._M_load = __my_job._M_last - __my_job._M_first + 1; __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
// Has potential work again. // Has potential work again.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment