f32ee8a25e
Rename PSTL macro's consistent with libstdc++ (and llvm upstream project) standards. * include/bits/c++config: Rename all macros of the form __PSTL* to _PSTL*. * include/std/algorithm: Likewise. * include/std/execution: Likewise. * include/std/numeric: Likewise. * include/std/memory: Likewise. * include/pstl/glue_memory_impl.h: Likewise. * include/pstl/numeric_impl.h: Likewise. * include/pstl/glue_memory_defs.h: Likewise. * include/pstl/execution_defs.h: Likewise. * include/pstl/utils.h: Likewise. * include/pstl/algorithm_fwd.h: Likewise. * include/pstl/unseq_backend_simd.h: Likewise. * include/pstl/glue_execution_defs.h: Likewise. * include/pstl/algorithm_impl.h: Likewise. * include/pstl/parallel_impl.h: Likewise. * include/pstl/memory_impl.h: Likewise. * include/pstl/glue_numeric_defs.h: Likewise. * include/pstl/parallel_backend_utils.h: Likewise. * include/pstl/glue_algorithm_defs.h: Likewise. * include/pstl/parallel_backend.h: Likewise. * include/pstl/glue_numeric_impl.h: Likewise. * include/pstl/parallel_backend_tbb.h: Likewise. * include/pstl/numeric_fwd.h: Likewise. * include/pstl/glue_algorithm_impl.h: Likewise. * include/pstl/execution_impl.h: Likewise. * include/pstl/pstl_config.h: Likewise. * testsuite/util/pstl/pstl_test_config.h: Likewise. * testsuite/util/pstl/test_utils.h: Likewise. * testsuite/20_util/specialized_algorithms/pstl/uninitialized_construct.cc: Likewise. * testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc: Likewise. * testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc: Likewise. * testsuite/26_numerics/pstl/numeric_ops/scan.cc: Likewise. * testsuite/26_numerics/pstl/numeric_ops/transform_scan.cc: Likewise. * testsuite/26_numerics/pstl/numeric_ops/reduce.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/none_of.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/count.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/equal.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/all_of.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc: Likewise. * testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc: Likewise. * testsuite/25_algorithms/pstl/alg_sorting/partial_sort.cc: Likewise. * testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc: Likewise. * testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc: Likewise. * testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc: Likewise. * testsuite/25_algorithms/pstl/alg_merge/merge.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/replace_copy.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc: Likewise. * testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc: Likewise. * testsuite/25_algorithms/pstl/alg_nonmodifying/any_of.cc: Likewise. Rename header guards to be consistent with upstream project's conventions. * include/pstl/glue_memory_impl.h: Rename all macros of the form _PSTL_(.*)_H to _PSTL_\U\1_H. * include/pstl/numeric_impl.h: Likewise. * include/pstl/glue_memory_defs.h: Likewise. * include/pstl/execution_defs.h: Likewise. * include/pstl/utils.h: Likewise. * include/pstl/algorithm_fwd.h: Likewise. * include/pstl/unseq_backend_simd.h: Likewise. * include/pstl/glue_execution_defs.h: Likewise. * include/pstl/algorithm_impl.h: Likewise. * include/pstl/parallel_impl.h: Likewise. * include/pstl/memory_impl.h: Likewise. * include/pstl/glue_numeric_defs.h: Likewise. * include/pstl/parallel_backend_utils.h: Likewise. * include/pstl/glue_algorithm_defs.h: Likewise. * include/pstl/parallel_backend.h: Likewise. * include/pstl/glue_numeric_impl.h: Likewise. * include/pstl/parallel_backend_tbb.h: Likewise. * include/pstl/numeric_fwd.h: Likewise. * include/pstl/glue_algorithm_impl.h: Likewise. * include/pstl/execution_impl.h: Likewise. * include/pstl/pstl_config.h: Likewise. * testsuite/util/pstl/pstl_test_config.h: Likewise. Synchronize libstdc++ parallel algorithms with upstream project. * include/pstl/algorithm_fwd.h: Synchronize with upstream PSTL project. * include/pstl/algorithm_impl.h: Likewise. * include/pstl/execution_defs.h: Likewise. * include/pstl/execution_impl.h: Likewise. * include/pstl/glue_algorithm_impl.h: Likewise. * include/pstl/glue_execution_defs.h: Likewise. * include/pstl/numeric_fwd.h: Likewise. * include/pstl/numeric_impl.h: Likewise. * include/pstl/parallel_backend.h: Likewise. * include/pstl/pstl_config.h: Likewise. * include/pstl/unseq_backend_simd.h: Likewise. * include/pstl/parallel_backend_serial.h: New file. * include/Makefile.am (pstl_headers): Add parallel_backend_serial.h. * include/Makefile.in: Regenerate. Clean up non-conforming names * include/pstl/algorithm_impl.h (__parallel_set_union_op): Uglfiy copy_range1 and copy_range2 (__pattern_walk2_n): Rename local n to __n * include/pstl/parallel_backend_tbb.h (struct __binary_no_op): Rename parameter _T to _Tp. Integrate non-TBB serial backend support * include/bits/c++config: Adjust TBB detection logic to select serial PSTL backend if no TBB present. * testsuite/utils/pstl/test_utils.h: Remove check for _PSTL_USE_PAR_POLICIES From-SVN: r272056
196 lines
5.5 KiB
C++
196 lines
5.5 KiB
C++
// -*- C++ -*-
|
|
//===-- parallel_backend_utils.h ------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef _PSTL_PARALLEL_BACKEND_UTILS_H
|
|
#define _PSTL_PARALLEL_BACKEND_UTILS_H
|
|
|
|
#include <iterator>
|
|
#include <utility>
|
|
#include "utils.h"
|
|
|
|
namespace __pstl
|
|
{
|
|
namespace __par_backend
|
|
{
|
|
|
|
//! Destroy sequence [xs,xe)
|
|
struct __serial_destroy
|
|
{
|
|
template <typename _RandomAccessIterator>
|
|
void
|
|
operator()(_RandomAccessIterator __zs, _RandomAccessIterator __ze)
|
|
{
|
|
typedef typename std::iterator_traits<_RandomAccessIterator>::value_type _ValueType;
|
|
while (__zs != __ze)
|
|
{
|
|
--__ze;
|
|
(*__ze).~_ValueType();
|
|
}
|
|
}
|
|
};
|
|
|
|
//! Merge sequences [__xs,__xe) and [__ys,__ye) to output sequence [__zs,(__xe-__xs)+(__ye-__ys)), using std::move
|
|
template <class _MoveValues, class _MoveSequences>
|
|
struct __serial_move_merge
|
|
{
|
|
const std::size_t _M_nmerge;
|
|
_MoveValues _M_move_values;
|
|
_MoveSequences _M_move_sequences;
|
|
|
|
explicit __serial_move_merge(std::size_t __nmerge, _MoveValues __move_values, _MoveSequences __move_sequences)
|
|
: _M_nmerge(__nmerge), _M_move_values(__move_values), _M_move_sequences(__move_sequences)
|
|
{
|
|
}
|
|
template <class _RandomAccessIterator1, class _RandomAccessIterator2, class _RandomAccessIterator3, class _Compare>
|
|
void
|
|
operator()(_RandomAccessIterator1 __xs, _RandomAccessIterator1 __xe, _RandomAccessIterator2 __ys,
|
|
_RandomAccessIterator2 __ye, _RandomAccessIterator3 __zs, _Compare __comp)
|
|
{
|
|
auto __n = _M_nmerge;
|
|
_PSTL_ASSERT(__n > 0);
|
|
if (__xs != __xe)
|
|
{
|
|
if (__ys != __ye)
|
|
{
|
|
for (;;)
|
|
{
|
|
if (__comp(*__ys, *__xs))
|
|
{
|
|
_M_move_values(__ys, __zs);
|
|
++__zs, --__n;
|
|
if (++__ys == __ye)
|
|
{
|
|
break;
|
|
}
|
|
else if (__n == 0)
|
|
{
|
|
__zs = _M_move_sequences(__ys, __ye, __zs);
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
}
|
|
}
|
|
else
|
|
{
|
|
_M_move_values(__xs, __zs);
|
|
++__zs, --__n;
|
|
if (++__xs == __xe)
|
|
{
|
|
_M_move_sequences(__ys, __ye, __zs);
|
|
return;
|
|
}
|
|
else if (__n == 0)
|
|
{
|
|
__zs = _M_move_sequences(__xs, __xe, __zs);
|
|
_M_move_sequences(__ys, __ye, __zs);
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
__ys = __xs;
|
|
__ye = __xe;
|
|
}
|
|
_M_move_sequences(__ys, __ye, __zs);
|
|
}
|
|
};
|
|
|
|
template <typename _RandomAccessIterator1, typename _OutputIterator>
|
|
void
|
|
__init_buf(_RandomAccessIterator1 __xs, _RandomAccessIterator1 __xe, _OutputIterator __zs, bool __bMove)
|
|
{
|
|
const _OutputIterator __ze = __zs + (__xe - __xs);
|
|
typedef typename std::iterator_traits<_OutputIterator>::value_type _ValueType;
|
|
if (__bMove)
|
|
{
|
|
// Initialize the temporary buffer and move keys to it.
|
|
for (; __zs != __ze; ++__xs, ++__zs)
|
|
new (&*__zs) _ValueType(std::move(*__xs));
|
|
}
|
|
else
|
|
{
|
|
// Initialize the temporary buffer
|
|
for (; __zs != __ze; ++__zs)
|
|
new (&*__zs) _ValueType;
|
|
}
|
|
}
|
|
|
|
// TODO is this actually used anywhere?
|
|
template <typename _Buf>
|
|
class __stack
|
|
{
|
|
typedef typename std::iterator_traits<decltype(_Buf(0).get())>::value_type _ValueType;
|
|
typedef typename std::iterator_traits<_ValueType*>::difference_type _DifferenceType;
|
|
|
|
_Buf _M_buf;
|
|
_ValueType* _M_ptr;
|
|
_DifferenceType _M_maxsize;
|
|
|
|
__stack(const __stack&) = delete;
|
|
void
|
|
operator=(const __stack&) = delete;
|
|
|
|
public:
|
|
__stack(_DifferenceType __max_size) : _M_buf(__max_size), _M_maxsize(__max_size) { _M_ptr = _M_buf.get(); }
|
|
|
|
~__stack()
|
|
{
|
|
_PSTL_ASSERT(size() <= _M_maxsize);
|
|
while (!empty())
|
|
pop();
|
|
}
|
|
|
|
const _Buf&
|
|
buffer() const
|
|
{
|
|
return _M_buf;
|
|
}
|
|
size_t
|
|
size() const
|
|
{
|
|
_PSTL_ASSERT(_M_ptr - _M_buf.get() <= _M_maxsize);
|
|
_PSTL_ASSERT(_M_ptr - _M_buf.get() >= 0);
|
|
return _M_ptr - _M_buf.get();
|
|
}
|
|
bool
|
|
empty() const
|
|
{
|
|
_PSTL_ASSERT(_M_ptr >= _M_buf.get());
|
|
return _M_ptr == _M_buf.get();
|
|
}
|
|
void
|
|
push(const _ValueType& __v)
|
|
{
|
|
_PSTL_ASSERT(size() < _M_maxsize);
|
|
new (_M_ptr) _ValueType(__v);
|
|
++_M_ptr;
|
|
}
|
|
const _ValueType&
|
|
top() const
|
|
{
|
|
return *(_M_ptr - 1);
|
|
}
|
|
void
|
|
pop()
|
|
{
|
|
_PSTL_ASSERT(_M_ptr > _M_buf.get());
|
|
--_M_ptr;
|
|
(*_M_ptr).~_ValueType();
|
|
}
|
|
};
|
|
|
|
} // namespace __par_backend
|
|
} // namespace __pstl
|
|
|
|
#endif /* _PSTL_PARALLEL_BACKEND_UTILS_H */
|