
2007-09-11 Johannes Singler <singler@ira.uka.de> Leonor Frias Moya <lfrias@lsi.upc.edu> Felix Putze <kontakt@felix-putze.de> Marius Elvert <marius.elvert@ira.uka.de> Felix Bondarenko <f.bondarenko@web.de> Robert Geisberger <robert.geisberger@stud.uni-karlsruhe.de> Robin Dapp <r.dapp@freenet.de> Benjamin Kosnik <bkoz@redhat.com> Add parallel mode. * include/parallel: New. * include/parallel/iterator.h: New. * include/parallel/multiway_merge.h: New. * include/parallel/parallel.h: New. * include/parallel/algorithm * include/parallel/find_selectors.h: New. * include/parallel/losertree.h: New. * include/parallel/list_partition.h: New. * include/parallel/types.h: New. * include/parallel/for_each.h: New. * include/parallel/multiseq_selection.h: New. * include/parallel/workstealing.h: New. * include/parallel/base.h: New. * include/parallel/par_loop.h: New. * include/parallel/numeric * include/parallel/features.h: New. * include/parallel/quicksort.h: New. * include/parallel/algorithmfwd.h: New. * include/parallel/equally_split.h: New. * include/parallel/compiletime_settings.h: New. * include/parallel/for_each_selectors.h: New. * include/parallel/basic_iterator.h: New. * include/parallel/omp_loop_static.h: New. * include/parallel/random_shuffle.h: New. * include/parallel/balanced_quicksort.h: New. * include/parallel/set_operations.h: New. * include/parallel/tags.h: New. * include/parallel/merge.h: New. * include/parallel/tree.h: New. * include/parallel/settings.h: New. * include/parallel/unique_copy.h: New. * include/parallel/multiway_mergesort.h: New. * include/parallel/numericfwd.h: New. * include/parallel/search.h: New. * include/parallel/partition.h: New. * include/parallel/compatibility.h: New. * include/parallel/algobase.h: New. * include/parallel/find.h: New. * include/parallel/partial_sum.h: New. * include/parallel/algo.h: New. * include/parallel/omp_loop.h: New. * include/parallel/queue.h: New. * include/parallel/timing.h: New. * include/parallel/sort.h: New. * include/parallel/checkers.h: New. * include/parallel/random_number.h: New. * include/bits/algorithmfwd.h: New. * acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): New. * configure.host: Add atomic_flags. * configure.ac: Export ATOMIC_FLAGS, call GLIBCXX_ENABLE_PARALLEL. * src/Makefile.am: Add parallel_list rules. * include/Makefile.am: Add parallel files. * testsuite/Makefile.am (check-parallel): Add. (check-performance-parallel): Add. * config.h.in: Regenerate. * configure: Same. * libsupc++/Makefile.in: Same. * testsuite/Makefile.in: Same. * Makefile.in: Same. * libmath/Makefile.in: Same. * include/Makefile.in: Same. * src/Makefile.in: Same. * po/Makefile.in: Same. * config/abi/pre/gnu.ver: Export parallel list bits. * docs/html/parallel_mode.html: New. * docs/html/documentation.html: Add link. * docs/doxygen/user.cfg.in: Adjust for new files and directory. * docs/doxygen/doxygroups.cc: Adjust namespace markup. * include/debug/set.h: Adjust for _GLIBCXX_STD_D or _P change. * include/debug/bitset: Same. * include/debug/multiset.h: Same. * include/debug/vector: Same. * include/debug/map.h: Same. * include/debug/deque: Same. * include/debug/list: Same. * include/debug/debug.h: Same. * include/debug/multimap.h: Same. * include/std/algorithm: Same. * include/std/numeric: Same. * include/std/bitset: Same. * include/std/string: Same. * include/ext/hash_map: Same. * include/ext/hash_set: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_algobase.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_vector.h: Same. * include/bits/stl_numeric.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/char_traits.h: Same. * include/bits/stl_algo.h: Same. * include/bits/c++config: Same. * include/bits/vector.tcc: Same. * include/bits/deque.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/list.tcc: Same. * src/list.cc: Same. * src/parallel_list.cc: New. * testsuite/lib/libstdc++.exp (check_v3_target_parallel_mode): New. * testsuite/lib/dg-options.exp (dg-require-parallel-mode): New. * scripts/testsuite_flags.in (--cxxparallelflags): New. * scripts/check_performance: Adjust. * testsuite/25_algorithms/headers/parallel_algorithm.cc: New. * testsuite/25_algorithms/headers/algorithm_parallel_mode.cc: New. * testsuite/25_algorithms/headers/parallel_algorithm_mixed1.cc: New. * testsuite/25_algorithms/headers/parallel_algorithm_mixed2.cc: New. * testsuite/26_numerics/headers/numeric/parallel_numeric.cc: New. * testsuite/26_numerics/headers/numeric/numeric_parallel_mode.cc: New. * testsuite/26_numerics/headers/numeric/ parallel_numeric_mixed1.cc: New. * testsuite/26_numerics/headers/numeric/ parallel_numeric_mixed2.cc: New. Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com> Co-Authored-By: Felix Bondarenko <f.bondarenko@web.de> Co-Authored-By: Felix Putze <kontakt@felix-putze.de> Co-Authored-By: Leonor Frias Moya <lfrias@lsi.upc.edu> Co-Authored-By: Marius Elvert <marius.elvert@ira.uka.de> Co-Authored-By: Robert Geisberger <robert.geisberger@stud.uni-karlsruhe.de> Co-Authored-By: Robin Dapp <r.dapp@freenet.de> From-SVN: r128395
230 lines
9.1 KiB
C++
230 lines
9.1 KiB
C++
// -*- C++ -*-
|
|
|
|
// Copyright (C) 2007 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the terms
|
|
// of the GNU General Public License as published by the Free Software
|
|
// Foundation; either version 2, or (at your option) any later
|
|
// version.
|
|
|
|
// This library is distributed in the hope that it will be useful, but
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this library; see the file COPYING. If not, write to
|
|
// the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
|
|
// MA 02111-1307, USA.
|
|
|
|
// As a special exception, you may use this file as part of a free
|
|
// software library without restriction. Specifically, if other files
|
|
// instantiate templates or use macros or inline functions from this
|
|
// file, or you compile this file and link it with other files to
|
|
// produce an executable, this file does not by itself cause the
|
|
// resulting executable to be covered by the GNU General Public
|
|
// License. This exception does not however invalidate any other
|
|
// reasons why the executable file might be covered by the GNU General
|
|
// Public License.
|
|
|
|
/** @file parallel/merge.h
|
|
* @brief Parallel implementation of std::merge().
|
|
* This file is a GNU parallel extension to the Standard C++ Library.
|
|
*/
|
|
|
|
// Written by Johannes Singler.
|
|
|
|
#ifndef _GLIBCXX_PARALLEL_MERGE_H
|
|
#define _GLIBCXX_PARALLEL_MERGE_H 1
|
|
|
|
#include <parallel/basic_iterator.h>
|
|
#include <bits/stl_algo.h>
|
|
|
|
namespace __gnu_parallel
|
|
{
|
|
/** @brief Merge routine being able to merge only the @c max_length
|
|
* smallest elements.
|
|
*
|
|
* The @c begin iterators are advanced accordingly, they might not
|
|
* reach @c end, in contrast to the usual variant.
|
|
* @param begin1 Begin iterator of first sequence.
|
|
* @param end1 End iterator of first sequence.
|
|
* @param begin2 Begin iterator of second sequence.
|
|
* @param end2 End iterator of second sequence.
|
|
* @param target Target begin iterator.
|
|
* @param max_length Maximum number of elements to merge.
|
|
* @param comp Comparator.
|
|
* @return Output end iterator. */
|
|
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename OutputIterator, typename _DifferenceTp, typename Comparator>
|
|
OutputIterator
|
|
merge_advance_usual(RandomAccessIterator1& begin1, RandomAccessIterator1 end1, RandomAccessIterator2& begin2, RandomAccessIterator2 end2, OutputIterator target, _DifferenceTp max_length, Comparator comp)
|
|
{
|
|
typedef _DifferenceTp difference_type;
|
|
while (begin1 != end1 && begin2 != end2 && max_length > 0)
|
|
{
|
|
// array1[i1] < array0[i0]
|
|
if (comp(*begin2, *begin1))
|
|
*target++ = *begin2++;
|
|
else
|
|
*target++ = *begin1++;
|
|
max_length--;
|
|
}
|
|
|
|
if (begin1 != end1)
|
|
{
|
|
target = std::copy(begin1, begin1 + max_length, target);
|
|
begin1 += max_length;
|
|
}
|
|
else
|
|
{
|
|
target = std::copy(begin2, begin2 + max_length, target);
|
|
begin2 += max_length;
|
|
}
|
|
return target;
|
|
}
|
|
|
|
/** @brief Merge routine being able to merge only the @c max_length
|
|
* smallest elements.
|
|
*
|
|
* The @c begin iterators are advanced accordingly, they might not
|
|
* reach @c end, in contrast to the usual variant.
|
|
* Specially designed code should allow the compiler to generate
|
|
* conditional moves instead of branches.
|
|
* @param begin1 Begin iterator of first sequence.
|
|
* @param end1 End iterator of first sequence.
|
|
* @param begin2 Begin iterator of second sequence.
|
|
* @param end2 End iterator of second sequence.
|
|
* @param target Target begin iterator.
|
|
* @param max_length Maximum number of elements to merge.
|
|
* @param comp Comparator.
|
|
* @return Output end iterator. */
|
|
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename OutputIterator, typename _DifferenceTp, typename Comparator>
|
|
OutputIterator
|
|
merge_advance_movc(RandomAccessIterator1& begin1, RandomAccessIterator1 end1, RandomAccessIterator2& begin2, RandomAccessIterator2 end2, OutputIterator target, _DifferenceTp max_length, Comparator comp)
|
|
{
|
|
typedef _DifferenceTp difference_type;
|
|
typedef typename std::iterator_traits<RandomAccessIterator1>::value_type value_type1;
|
|
typedef typename std::iterator_traits<RandomAccessIterator2>::value_type value_type2;
|
|
|
|
#if _GLIBCXX_ASSERTIONS
|
|
_GLIBCXX_PARALLEL_ASSERT(max_length >= 0);
|
|
#endif
|
|
|
|
while (begin1 != end1 && begin2 != end2 && max_length > 0)
|
|
{
|
|
value_type1 element1;
|
|
value_type2 element2;
|
|
RandomAccessIterator1 next1;
|
|
RandomAccessIterator2 next2;
|
|
|
|
next1 = begin1 + 1;
|
|
next2 = begin2 + 1;
|
|
element1 = *begin1;
|
|
element2 = *begin2;
|
|
|
|
if (comp(element2, element1))
|
|
{
|
|
element1 = element2;
|
|
begin2 = next2;
|
|
}
|
|
else
|
|
{
|
|
begin1 = next1;
|
|
}
|
|
|
|
*target = element1;
|
|
|
|
target++;
|
|
max_length--;
|
|
}
|
|
if (begin1 != end1)
|
|
{
|
|
target = std::copy(begin1, begin1 + max_length, target);
|
|
begin1 += max_length;
|
|
}
|
|
else
|
|
{
|
|
target = std::copy(begin2, begin2 + max_length, target);
|
|
begin2 += max_length;
|
|
}
|
|
return target;
|
|
}
|
|
|
|
/** @brief Merge routine being able to merge only the @c max_length
|
|
* smallest elements.
|
|
*
|
|
* The @c begin iterators are advanced accordingly, they might not
|
|
* reach @c end, in contrast to the usual variant.
|
|
* Static switch on whether to use the conditional-move variant.
|
|
* @param begin1 Begin iterator of first sequence.
|
|
* @param end1 End iterator of first sequence.
|
|
* @param begin2 Begin iterator of second sequence.
|
|
* @param end2 End iterator of second sequence.
|
|
* @param target Target begin iterator.
|
|
* @param max_length Maximum number of elements to merge.
|
|
* @param comp Comparator.
|
|
* @return Output end iterator. */
|
|
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename OutputIterator, typename _DifferenceTp, typename Comparator>
|
|
inline OutputIterator
|
|
merge_advance(RandomAccessIterator1& begin1, RandomAccessIterator1 end1, RandomAccessIterator2& begin2, RandomAccessIterator2 end2, OutputIterator target, _DifferenceTp max_length, Comparator comp)
|
|
{
|
|
_GLIBCXX_CALL(max_length)
|
|
|
|
return merge_advance_movc(begin1, end1, begin2, end2, target, max_length, comp);
|
|
}
|
|
|
|
/** @brief Merge routine fallback to sequential in case the
|
|
iterators of the two input sequences are of different type.
|
|
* @param begin1 Begin iterator of first sequence.
|
|
* @param end1 End iterator of first sequence.
|
|
* @param begin2 Begin iterator of second sequence.
|
|
* @param end2 End iterator of second sequence.
|
|
* @param target Target begin iterator.
|
|
* @param max_length Maximum number of elements to merge.
|
|
* @param comp Comparator.
|
|
* @return Output end iterator. */
|
|
template<typename RandomAccessIterator1, typename RandomAccessIterator2, typename RandomAccessIterator3, typename Comparator>
|
|
inline RandomAccessIterator3
|
|
parallel_merge_advance(RandomAccessIterator1& begin1, RandomAccessIterator1 end1,
|
|
RandomAccessIterator2& begin2, RandomAccessIterator2 end2, //different iterators, parallel implementation not available
|
|
RandomAccessIterator3 target,
|
|
typename std::iterator_traits<RandomAccessIterator1>::difference_type max_length, Comparator comp)
|
|
{
|
|
return merge_advance(begin1, end1, begin2, end2, target, max_length, comp);
|
|
}
|
|
|
|
/** @brief Parallel merge routine being able to merge only the @c
|
|
* max_length smallest elements.
|
|
*
|
|
* The @c begin iterators are advanced accordingly, they might not
|
|
* reach @c end, in contrast to the usual variant.
|
|
* The functionality is projected onto parallel_multiway_merge.
|
|
* @param begin1 Begin iterator of first sequence.
|
|
* @param end1 End iterator of first sequence.
|
|
* @param begin2 Begin iterator of second sequence.
|
|
* @param end2 End iterator of second sequence.
|
|
* @param target Target begin iterator.
|
|
* @param max_length Maximum number of elements to merge.
|
|
* @param comp Comparator.
|
|
* @return Output end iterator.
|
|
*/
|
|
template<typename RandomAccessIterator1, typename RandomAccessIterator3, typename Comparator>
|
|
inline RandomAccessIterator3
|
|
parallel_merge_advance(RandomAccessIterator1& begin1, RandomAccessIterator1 end1, RandomAccessIterator1& begin2, RandomAccessIterator1 end2, RandomAccessIterator3 target, typename std::iterator_traits<RandomAccessIterator1>::difference_type max_length, Comparator comp)
|
|
{
|
|
typedef typename std::iterator_traits<RandomAccessIterator1>::value_type
|
|
value_type;
|
|
typedef typename std::iterator_traits<RandomAccessIterator1>::difference_type
|
|
difference_type1 /* == difference_type2 */;
|
|
typedef typename std::iterator_traits<RandomAccessIterator3>::difference_type
|
|
difference_type3;
|
|
|
|
std::pair<RandomAccessIterator1, RandomAccessIterator1> seqs[2] = { std::make_pair(begin1, end1), std::make_pair(begin2, end2) };
|
|
RandomAccessIterator3 target_end = parallel_multiway_merge(seqs, seqs + 2, target, comp, max_length, true, false);
|
|
|
|
return target_end;
|
|
}
|
|
} //namespace __gnu_parallel
|
|
|
|
#endif
|