diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-10 19:51:40 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-10 19:51:40 +0000 |
| commit | 3dee12e4a57241e4a53687f4a4e463b581dabf46 (patch) | |
| tree | 67f01614fe364c0f768a0a5961791c7cd28b2a32 /pstl/include | |
| parent | 0352f201dd3cf9ec83bf527eeef0b464214ff243 (diff) | |
| download | bcm5719-llvm-3dee12e4a57241e4a53687f4a4e463b581dabf46.tar.gz bcm5719-llvm-3dee12e4a57241e4a53687f4a4e463b581dabf46.zip | |
[pstl] Move to single underscore-capital for macros and include guards
Summary: Per the LLVM convention.
Reviewers: rodgert
Subscribers: jkorous, dexonsmith, jdoerfert, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60521
llvm-svn: 358131
Diffstat (limited to 'pstl/include')
25 files changed, 390 insertions, 390 deletions
diff --git a/pstl/include/pstl/algorithm b/pstl/include/pstl/algorithm index c76ee53e0fc..684f8eaa2e8 100644 --- a/pstl/include/pstl/algorithm +++ b/pstl/include/pstl/algorithm @@ -7,18 +7,18 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_algorithm -#define __PSTL_algorithm +#ifndef _PSTL_ALGORITHM +#define _PSTL_ALGORITHM #include "internal/pstl_config.h" -#if __PSTL_EXECUTION_POLICIES_DEFINED +#if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations # include "internal/glue_algorithm_impl.h" #else // Otherwise just pull in forward declarations # include "internal/glue_algorithm_defs.h" -# define __PSTL_ALGORITHM_FORWARD_DECLARED 1 +# define _PSTL_ALGORITHM_FORWARD_DECLARED 1 #endif -#endif /* __PSTL_algorithm */ +#endif /* _PSTL_ALGORITHM */ diff --git a/pstl/include/pstl/execution b/pstl/include/pstl/execution index 5e91c75d3c3..333c61fbb17 100644 --- a/pstl/include/pstl/execution +++ b/pstl/include/pstl/execution @@ -7,31 +7,31 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_execution -#define __PSTL_execution +#ifndef _PSTL_EXECUTION +#define _PSTL_EXECUTION #include "internal/pstl_config.h" #include "internal/execution_defs.h" -#define __PSTL_EXECUTION_POLICIES_DEFINED 1 +#define _PSTL_EXECUTION_POLICIES_DEFINED 1 -#if __PSTL_ALGORITHM_FORWARD_DECLARED +#if _PSTL_ALGORITHM_FORWARD_DECLARED # include "internal/glue_algorithm_impl.h" #endif -#if __PSTL_MEMORY_FORWARD_DECLARED +#if _PSTL_MEMORY_FORWARD_DECLARED # include "internal/glue_memory_impl.h" #endif -#if __PSTL_NUMERIC_FORWARD_DECLARED +#if _PSTL_NUMERIC_FORWARD_DECLARED # include "internal/glue_numeric_impl.h" #endif -#if __PSTL_CPP17_EXECUTION_POLICIES_PRESENT -__PSTL_PRAGMA_MESSAGE_POLICIES("The <Parallel STL> execution policies are defined in the namespace __pstl::execution") +#if _PSTL_CPP17_EXECUTION_POLICIES_PRESENT +_PSTL_PRAGMA_MESSAGE_POLICIES("The <Parallel STL> execution policies are defined in the namespace __pstl::execution") #else # include "internal/glue_execution_defs.h" -__PSTL_PRAGMA_MESSAGE_POLICIES( +_PSTL_PRAGMA_MESSAGE_POLICIES( "The <Parallel STL> execution policies are injected into the standard namespace std::execution") #endif @@ -43,6 +43,6 @@ namespace execution { using namespace __pstl::execution; } -} +} // namespace pstl -#endif /* __PSTL_execution */ +#endif /* _PSTL_EXECUTION */ diff --git a/pstl/include/pstl/internal/algorithm_fwd.h b/pstl/include/pstl/internal/algorithm_fwd.h index a293149b7da..d317c221deb 100644 --- a/pstl/include/pstl/internal/algorithm_fwd.h +++ b/pstl/include/pstl/internal/algorithm_fwd.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_algorithm_fwd_H -#define __PSTL_algorithm_fwd_H +#ifndef _PSTL_ALGORITHM_FWD_H +#define _PSTL_ALGORITHM_FWD_H #include <type_traits> #include <utility> @@ -37,7 +37,7 @@ bool __pattern_any_of(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Pred, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Pred, class _IsVector> bool __pattern_any_of(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Pred, _IsVector, @@ -63,7 +63,7 @@ void __pattern_walk1(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Function, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Function, class _IsVector> void __pattern_walk1(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Function, _IsVector, @@ -75,7 +75,7 @@ void __pattern_walk_brick(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Brick, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Brick> void __pattern_walk_brick(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Brick, @@ -99,7 +99,7 @@ _ForwardIterator __pattern_walk1_n(_ExecutionPolicy&&, _ForwardIterator, _Size, _Function, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Function, class _IsVector> _RandomAccessIterator __pattern_walk1_n(_ExecutionPolicy&&, _RandomAccessIterator, _Size, _Function, _IsVector, @@ -111,7 +111,7 @@ _ForwardIterator __pattern_walk_brick_n(_ExecutionPolicy&&, _ForwardIterator, _Size, _Brick, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Brick> _RandomAccessIterator __pattern_walk_brick_n(_ExecutionPolicy&&, _RandomAccessIterator, _Size, _Brick, @@ -145,7 +145,7 @@ _ForwardIterator2 __pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Function, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Function, class _IsVector> _ForwardIterator2 __pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Function, _IsVector, @@ -158,7 +158,7 @@ _ForwardIterator2 __pattern_walk2_n(_ExecutionPolicy&&, _ForwardIterator1, _Size, _ForwardIterator2, _Function, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2, class _Function, class _IsVector> _RandomAccessIterator2 @@ -171,7 +171,7 @@ _ForwardIterator2 __pattern_walk2_brick(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Brick, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Brick> _RandomAccessIterator2 __pattern_walk2_brick(_ExecutionPolicy&&, _RandomAccessIterator1, _RandomAccessIterator1, _RandomAccessIterator2, @@ -184,7 +184,7 @@ _ForwardIterator2 __pattern_walk2_brick_n(_ExecutionPolicy&&, _ForwardIterator1, _Size, _ForwardIterator2, _Brick, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2, class _Brick> _RandomAccessIterator2 __pattern_walk2_brick_n(_ExecutionPolicy&&, _RandomAccessIterator1, _Size, _RandomAccessIterator2, _Brick, @@ -213,7 +213,7 @@ __pattern_walk3(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _Forwa _Function, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _RandomAccessIterator3, class _Function, class _IsVector> _RandomAccessIterator3 @@ -239,7 +239,7 @@ bool __pattern_equal(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _BinaryPredicate, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate, class _IsVector> bool @@ -261,7 +261,7 @@ bool __pattern_equal(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _BinaryPredicate, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate, class _IsVector> bool @@ -286,7 +286,7 @@ _ForwardIterator __pattern_find_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector> _ForwardIterator __pattern_find_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, _IsVector, @@ -314,7 +314,7 @@ __pattern_find_end(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _Fo _BinaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -343,7 +343,7 @@ _ForwardIterator1 __pattern_find_first_of(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _BinaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -372,7 +372,7 @@ __pattern_search(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _Forw _BinaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -402,7 +402,7 @@ __pattern_search_n(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Size IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Tp, class _BinaryPredicate, class IsVector> _RandomAccessIterator @@ -506,7 +506,7 @@ _OutputIterator __pattern_copy_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _OutputIterator, _UnaryPredicate, _IsVector, /*parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryPredicate, class _IsVector> _OutputIterator @@ -533,7 +533,7 @@ typename std::iterator_traits<_ForwardIterator>::difference_type __pattern_count(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, /* is_parallel */ std::false_type, _IsVector) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector> typename std::iterator_traits<_ForwardIterator>::difference_type __pattern_count(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, @@ -557,7 +557,7 @@ _ForwardIterator __pattern_unique(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _BinaryPredicate, class _IsVector> _ForwardIterator __pattern_unique(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate, _IsVector, @@ -592,7 +592,7 @@ _DifferenceType __brick_calc_mask_2(_RandomAccessIterator, _RandomAccessIterator, bool* __restrict, _BinaryPredicate, /*vector=*/std::true_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _BinaryPredicate, class _IsVector> _OutputIterator @@ -625,7 +625,7 @@ void __pattern_reverse(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _IsVector> void __pattern_reverse(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _IsVector, @@ -649,7 +649,7 @@ _OutputIterator __pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _OutputIterator, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _OutputIterator, class _IsVector> _OutputIterator __pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _OutputIterator, _IsVector, @@ -673,7 +673,7 @@ _ForwardIterator __pattern_rotate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _IsVector> _ForwardIterator __pattern_rotate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _IsVector, @@ -698,7 +698,7 @@ __pattern_rotate_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _F _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _IsVector> _OutputIterator __pattern_rotate_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _OutputIterator, @@ -723,7 +723,7 @@ bool __pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> bool __pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, @@ -747,7 +747,7 @@ _ForwardIterator __pattern_partition(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> _ForwardIterator __pattern_partition(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, @@ -772,7 +772,7 @@ __pattern_stable_partition(_ExecutionPolicy&&, _BidirectionalIterator, _Bidirect _IsVector, /*is_parallelization=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _UnaryPredicate, class _IsVector> _BidirectionalIterator __pattern_stable_partition(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _UnaryPredicate, @@ -801,7 +801,7 @@ __pattern_partition_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, /*is_parallelization=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator1, class _OutputIterator2, class _UnaryPredicate, class _IsVector> std::pair<_OutputIterator1, _OutputIterator2> @@ -820,7 +820,7 @@ void __pattern_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector /*is_vector*/, /*is_parallel=*/std::false_type, _IsMoveConstructible) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector /*is_vector*/, @@ -838,7 +838,7 @@ __pattern_stable_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIt _IsVector /*is_vector*/, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_stable_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, @@ -856,7 +856,7 @@ __pattern_partial_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessI _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_partial_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _RandomAccessIterator, @@ -874,7 +874,7 @@ __pattern_partial_sort_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterat _RandomAccessIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _RandomAccessIterator, class _Compare, class _IsVector> _RandomAccessIterator __pattern_partial_sort_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _RandomAccessIterator, @@ -901,7 +901,7 @@ _ForwardIterator __pattern_adjacent_find(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate, /* is_parallel */ std::false_type, _IsVector, bool) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _BinaryPredicate, class _IsVector> _RandomAccessIterator __pattern_adjacent_find(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _BinaryPredicate, @@ -917,7 +917,7 @@ __pattern_nth_element(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIt _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_nth_element(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _RandomAccessIterator, _Compare, @@ -943,7 +943,7 @@ void __pattern_fill(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, const _Tp&, /*is_parallel=*/std::false_type, _IsVector) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _IsVector> _ForwardIterator __pattern_fill(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, const _Tp&, @@ -965,7 +965,7 @@ _OutputIterator __pattern_fill_n(_ExecutionPolicy&&, _OutputIterator, _Size, const _Tp&, /*is_parallel=*/std::false_type, _IsVector) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _OutputIterator, class _Size, class _Tp, class _IsVector> _OutputIterator __pattern_fill_n(_ExecutionPolicy&&, _OutputIterator, _Size, const _Tp&, @@ -989,7 +989,7 @@ void __pattern_generate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Generator, /*is_parallel=*/std::false_type, _IsVector) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Generator, class _IsVector> _ForwardIterator __pattern_generate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Generator, @@ -1009,7 +1009,7 @@ OutputIterator __pattern_generate_n(_ExecutionPolicy&&, OutputIterator, Size, _Generator, /*is_parallel=*/std::false_type, _IsVector) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class OutputIterator, class Size, class _Generator, class _IsVector> OutputIterator __pattern_generate_n(_ExecutionPolicy&&, OutputIterator, Size, _Generator, @@ -1032,7 +1032,7 @@ _ForwardIterator __pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, /*is_parallel*/ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> _ForwardIterator __pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector, @@ -1059,7 +1059,7 @@ _OutputIterator __pattern_merge(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _OutputIterator, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -1086,7 +1086,7 @@ __pattern_inplace_merge(_ExecutionPolicy&&, _BidirectionalIterator, _Bidirection _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _Compare, class _IsVector> void __pattern_inplace_merge(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _BidirectionalIterator, @@ -1104,7 +1104,7 @@ __pattern_includes(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _Fo _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector> bool __pattern_includes(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, @@ -1132,7 +1132,7 @@ _OutputIterator __pattern_set_union(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -1161,7 +1161,7 @@ __pattern_set_intersection(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterat _ForwardIterator2, _OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -1189,7 +1189,7 @@ _OutputIterator __pattern_set_difference(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -1218,7 +1218,7 @@ __pattern_set_symmetric_difference(_ExecutionPolicy&&, _ForwardIterator1, _Forwa _ForwardIterator2, _OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -1244,7 +1244,7 @@ _RandomAccessIterator __pattern_is_heap_until(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> _RandomAccessIterator __pattern_is_heap_until(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector, @@ -1268,7 +1268,7 @@ _ForwardIterator __pattern_min_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <typename _ExecutionPolicy, typename _RandomAccessIterator, typename _Compare, typename _IsVector> _RandomAccessIterator __pattern_min_element(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector, @@ -1292,7 +1292,7 @@ std::pair<_ForwardIterator, _ForwardIterator> __pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <typename _ExecutionPolicy, typename _ForwardIterator, typename _Compare, typename _IsVector> std::pair<_ForwardIterator, _ForwardIterator> __pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector, @@ -1319,7 +1319,7 @@ __pattern_mismatch(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _Fo _Predicate, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Predicate, class _IsVector> std::pair<_RandomAccessIterator1, _RandomAccessIterator2> @@ -1346,7 +1346,7 @@ bool __pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector> bool __pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, @@ -1355,4 +1355,4 @@ __pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _Forwar } // namespace __internal } // namespace __pstl -#endif /* __PSTL_algorithm_fwd_H */ +#endif /* _PSTL_ALGORITHM_FWD_H */ diff --git a/pstl/include/pstl/internal/algorithm_impl.h b/pstl/include/pstl/internal/algorithm_impl.h index 4c59863fe15..64938175868 100644 --- a/pstl/include/pstl/internal/algorithm_impl.h +++ b/pstl/include/pstl/internal/algorithm_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_algorithm_impl_H -#define __PSTL_algorithm_impl_H +#ifndef _PSTL_ALGORITHM_IMPL_H +#define _PSTL_ALGORITHM_IMPL_H #include <iterator> #include <type_traits> @@ -21,7 +21,7 @@ #include "parallel_backend_utils.h" #include "unseq_backend_simd.h" -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES # include "parallel_backend.h" # include "parallel_impl.h" #endif @@ -59,7 +59,7 @@ __pattern_any_of(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator return __internal::__brick_any_of(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Pred, class _IsVector> bool __pattern_any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred, @@ -115,7 +115,7 @@ __pattern_walk1(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator _ __internal::__brick_walk1(__first, __last, __f, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Function, class _IsVector> void __pattern_walk1(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Function __f, @@ -139,7 +139,7 @@ __pattern_walk_brick(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardItera __brick(__first, __last); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Brick> void __pattern_walk_brick(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Brick __brick, @@ -179,7 +179,7 @@ __pattern_walk1_n(_ExecutionPolicy&&, _ForwardIterator __first, _Size __n, _Func return __internal::__brick_walk1_n(__first, __n, __f, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Function, class _IsVector> _RandomAccessIterator __pattern_walk1_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Function __f, @@ -200,7 +200,7 @@ __pattern_walk_brick_n(_ExecutionPolicy&&, _ForwardIterator __first, _Size __n, return __brick(__first, __n); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Brick> _RandomAccessIterator __pattern_walk_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Brick __brick, @@ -264,7 +264,7 @@ __pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator return __internal::__brick_walk2(__first1, __last1, __first2, __f, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Function, class _IsVector> _ForwardIterator2 __pattern_walk2(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, @@ -308,7 +308,7 @@ __pattern_walk2_brick(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIt return __brick(__first1, __last1, __first2); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Brick> _RandomAccessIterator2 __pattern_walk2_brick(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, @@ -325,7 +325,7 @@ __pattern_walk2_brick(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1 } #endif -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2, class _Brick> _RandomAccessIterator2 __pattern_walk2_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _Size __n, @@ -382,7 +382,7 @@ __pattern_walk3(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator return __internal::__brick_walk3(__first1, __last1, __first2, __first3, __f, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _RandomAccessIterator3, class _Function, class _IsVector> _RandomAccessIterator3 @@ -437,7 +437,7 @@ __pattern_equal(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator return __internal::__brick_equal(__first1, __last1, __first2, __last2, __p, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate, class _IsVector> bool @@ -489,7 +489,7 @@ __pattern_equal(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator return __internal::__brick_equal(__first1, __last1, __first2, __p, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate, class _IsVector> bool @@ -538,7 +538,7 @@ __pattern_find_if(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator return __internal::__brick_find_if(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector> _ForwardIterator __pattern_find_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, @@ -681,7 +681,7 @@ __pattern_find_end(_ExecutionPolicy&&, _ForwardIterator1 __first, _ForwardIterat return __internal::__brick_find_end(__first, __last, __s_first, __s_last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -739,7 +739,7 @@ __pattern_find_first_of(_ExecutionPolicy&&, _ForwardIterator1 __first, _ForwardI return __internal::__brick_find_first_of(__first, __last, __s_first, __s_last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -787,7 +787,7 @@ __pattern_search(_ExecutionPolicy&&, _ForwardIterator1 __first, _ForwardIterator return __internal::__brick_search(__first, __last, __s_first, __s_last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate, class _IsVector> _ForwardIterator1 @@ -846,7 +846,7 @@ __pattern_search_n(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterato return __internal::__brick_search_n(__first, __last, __count, __value, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Tp, class _BinaryPredicate, class _IsVector> _RandomAccessIterator @@ -974,7 +974,7 @@ _OutputIterator __brick_copy_if(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _UnaryPredicate __pred, /*vector=*/std::true_type) noexcept { -#if (__PSTL_MONOTONIC_PRESENT) +#if (_PSTL_MONOTONIC_PRESENT) return __unseq_backend::__simd_copy_if(__first, __last - __first, __result, __pred); #else return std::copy_if(__first, __last, __result, __pred); @@ -1033,7 +1033,7 @@ void __brick_copy_by_mask(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, bool* __restrict __mask, _Assigner __assigner, /*vector=*/std::true_type) noexcept { -#if (__PSTL_MONOTONIC_PRESENT) +#if (_PSTL_MONOTONIC_PRESENT) __unseq_backend::__simd_copy_by_mask(__first, __last - __first, __result, __mask, __assigner); #else __internal::__brick_copy_by_mask(__first, __last, __result, __mask, __assigner, std::false_type()); @@ -1065,7 +1065,7 @@ void __brick_partition_by_mask(_RandomAccessIterator __first, _RandomAccessIterator __last, _OutputIterator1 __out_true, _OutputIterator2 __out_false, bool* __mask, /*vector=*/std::true_type) noexcept { -#if (__PSTL_MONOTONIC_PRESENT) +#if (_PSTL_MONOTONIC_PRESENT) __unseq_backend::__simd_partition_by_mask(__first, __last - __first, __out_true, __out_false, __mask); #else __internal::__brick_partition_by_mask(__first, __last, __out_true, __out_false, __mask, std::false_type()); @@ -1080,7 +1080,7 @@ __pattern_copy_if(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator return __internal::__brick_copy_if(__first, __last, __result, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryPredicate, class _IsVector> _OutputIterator @@ -1144,7 +1144,7 @@ __pattern_count(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator _ return __internal::__brick_count(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector> typename std::iterator_traits<_ForwardIterator>::difference_type __pattern_count(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, @@ -1179,7 +1179,7 @@ _ForwardIterator __brick_unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred, /*is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::unique(__first, __last, __pred); } @@ -1191,7 +1191,7 @@ __pattern_unique(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator return __internal::__brick_unique(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES // That function is shared between two algorithms - remove_if (__pattern_remove_if) and unique (pattern unique). But a mask calculation is different. // So, a caller passes _CalcMask brick into remove_elements. template <class _ExecutionPolicy, class _ForwardIterator, class _CalcMask, class _IsVector> @@ -1272,7 +1272,7 @@ __remove_elements(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardI } #endif -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _BinaryPredicate, class _IsVector> _ForwardIterator __pattern_unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred, @@ -1317,7 +1317,7 @@ OutputIterator __brick_unique_copy(_RandomAccessIterator __first, _RandomAccessIterator __last, OutputIterator __result, _BinaryPredicate __pred, /*vector=*/std::true_type) noexcept { -#if (__PSTL_MONOTONIC_PRESENT) +#if (_PSTL_MONOTONIC_PRESENT) return __unseq_backend::__simd_unique_copy(__first, __last - __first, __result, __pred); #else return std::unique_copy(__first, __last, __result, __pred); @@ -1355,7 +1355,7 @@ __brick_calc_mask_2(_RandomAccessIterator __first, _RandomAccessIterator __last, return __unseq_backend::__simd_calc_mask_2(__first, __last - __first, __mask, __pred); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _BinaryPredicate, class _IsVector> _OutputIterator @@ -1468,7 +1468,7 @@ __pattern_reverse(_ExecutionPolicy&&, _BidirectionalIterator __first, _Bidirecti __internal::__brick_reverse(__first, __last, _is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _IsVector> void __pattern_reverse(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, @@ -1514,7 +1514,7 @@ __pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator __first, _Bidi return __internal::__brick_reverse_copy(__first, __last, __d_first, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _OutputIterator, class _IsVector> _OutputIterator __pattern_reverse_copy(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, @@ -1540,7 +1540,7 @@ _ForwardIterator __brick_rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, /*is_vector=*/std::false_type) noexcept { -#if __PSTL_CPP11_STD_ROTATE_BROKEN +#if _PSTL_CPP11_STD_ROTATE_BROKEN std::rotate(__first, __middle, __last); return std::next(__first, std::distance(__middle, __last)); #else @@ -1597,7 +1597,7 @@ __pattern_rotate(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator return __internal::__brick_rotate(__first, __middle, __last, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _IsVector> _ForwardIterator __pattern_rotate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle, @@ -1690,7 +1690,7 @@ __pattern_rotate_copy(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIter return __internal::__brick_rotate_copy(__first, __middle, __last, __result, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _IsVector> _OutputIterator __pattern_rotate_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle, @@ -1769,7 +1769,7 @@ __pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardI return __internal::__brick_is_partitioned(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> bool __pattern_is_partitioned(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, @@ -1885,7 +1885,7 @@ _ForwardIterator __brick_partition(_ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, /*is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::partition(__first, __last, __pred); } @@ -1897,7 +1897,7 @@ __pattern_partition(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterat return __internal::__brick_partition(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> _ForwardIterator __pattern_partition(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, @@ -1984,7 +1984,7 @@ _BidirectionalIterator __brick_stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _UnaryPredicate __pred, /*__is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::stable_partition(__first, __last, __pred); } @@ -1997,7 +1997,7 @@ __pattern_stable_partition(_ExecutionPolicy&&, _BidirectionalIterator __first, _ return __internal::__brick_stable_partition(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _UnaryPredicate, class _IsVector> _BidirectionalIterator __pattern_stable_partition(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, @@ -2068,7 +2068,7 @@ std::pair<_OutputIterator1, _OutputIterator2> __brick_partition_copy(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator1 __out_true, _OutputIterator2 __out_false, _UnaryPredicate __pred, /*is_vector=*/std::true_type) noexcept { -#if (__PSTL_MONOTONIC_PRESENT) +#if (_PSTL_MONOTONIC_PRESENT) return __unseq_backend::__simd_partition_copy(__first, __last - __first, __out_true, __out_false, __pred); #else return std::partition_copy(__first, __last, __out_true, __out_false, __pred); @@ -2085,7 +2085,7 @@ __pattern_partition_copy(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardI return __internal::__brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator1, class _OutputIterator2, class _UnaryPredicate, class _IsVector> std::pair<_OutputIterator1, _OutputIterator2> @@ -2139,7 +2139,7 @@ __pattern_sort(_ExecutionPolicy&&, _RandomAccessIterator __first, _RandomAccessI std::sort(__first, __last, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp, @@ -2166,7 +2166,7 @@ __pattern_stable_sort(_ExecutionPolicy&&, _RandomAccessIterator __first, _Random std::stable_sort(__first, __last, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, @@ -2193,7 +2193,7 @@ __pattern_partial_sort(_ExecutionPolicy&&, _RandomAccessIterator __first, _Rando std::partial_sort(__first, __middle, __last, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle, @@ -2227,7 +2227,7 @@ __pattern_partial_sort_copy(_ExecutionPolicy&&, _ForwardIterator __first, _Forwa return std::partial_sort_copy(__first, __last, __d_first, __d_last, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _RandomAccessIterator, class _Compare, class _IsVector> _RandomAccessIterator __pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, @@ -2251,7 +2251,7 @@ __pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __j1 = __first + (__j - __d_first); // 1. Copy elements from input to output -# if !__PSTL_ICC_18_OMP_SIMD_BROKEN +# if !_PSTL_ICC_18_OMP_SIMD_BROKEN __internal::__brick_copy(__i1, __j1, __i, __is_vector); # else std::copy(__i1, __j1, __i); @@ -2325,7 +2325,7 @@ __pattern_adjacent_find(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIt return __internal::__brick_adjacent_find(__first, __last, __pred, __is_vector, __or_semantic); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _BinaryPredicate, class _IsVector> _RandomAccessIterator __pattern_adjacent_find(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, @@ -2386,7 +2386,7 @@ __pattern_nth_element(_ExecutionPolicy&&, _RandomAccessIterator __first, _Random std::nth_element(__first, __nth, __last, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> void __pattern_nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth, @@ -2462,7 +2462,7 @@ __pattern_fill(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __ __internal::__brick_fill(__first, __last, __value, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _IsVector> _ForwardIterator __pattern_fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, @@ -2536,7 +2536,7 @@ __pattern_generate(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterato __internal::__brick_generate(__first, __last, __g, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Generator, class _IsVector> _ForwardIterator __pattern_generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g, @@ -2574,7 +2574,7 @@ __pattern_generate_n(_ExecutionPolicy&&, _OutputIterator __first, _Size __count, return __internal::__brick_generate_n(__first, __count, __g, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _OutputIterator, class _Size, class _Generator, class _IsVector> _OutputIterator __pattern_generate_n(_ExecutionPolicy&& __exec, _OutputIterator __first, _Size __count, _Generator __g, @@ -2604,7 +2604,7 @@ _RandomAccessIterator __brick_remove_if(_RandomAccessIterator __first, _RandomAccessIterator __last, _UnaryPredicate __pred, /* __is_vector = */ std::true_type) noexcept { -#if __PSTL_MONOTONIC_PRESENT +#if _PSTL_MONOTONIC_PRESENT return __unseq_backend::__simd_remove_if(__first, __last - __first, __pred); #else return std::remove_if(__first, __last, __pred); @@ -2619,7 +2619,7 @@ __pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterat return __internal::__brick_remove_if(__first, __last, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector> _ForwardIterator __pattern_remove_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, @@ -2662,7 +2662,7 @@ __brick_merge(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIte _ForwardIterator2 __last2, _OutputIterator __d_first, _Compare __comp, /* __is_vector = */ std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::merge(__first1, __last1, __first2, __last2, __d_first, __comp); } @@ -2676,7 +2676,7 @@ __pattern_merge(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator return __internal::__brick_merge(__first1, __last1, __first2, __last2, __d_first, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -2710,7 +2710,7 @@ void __brick_inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last, _Compare __comp, /* __is_vector = */ std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial") + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial") std::inplace_merge(__first, __middle, __last, __comp); } @@ -2723,7 +2723,7 @@ __pattern_inplace_merge(_ExecutionPolicy&&, _BidirectionalIterator __first, _Bid __internal::__brick_inplace_merge(__first, __middle, __last, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _BidirectionalIterator, class _Compare, class _IsVector> void __pattern_inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle, @@ -2780,7 +2780,7 @@ __pattern_includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _Forwa return std::includes(__first1, __last1, __first2, __last2, __comp); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector> bool __pattern_includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, @@ -2839,7 +2839,7 @@ __pattern_includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _Forwa constexpr auto __set_algo_cut_off = 1000; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector, class _SizeFunction, class _SetOP> _OutputIterator @@ -2930,7 +2930,7 @@ __parallel_set_op(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _Forwar } #endif -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES //a shared parallel pattern for '__pattern_set_union' and '__pattern_set_symmetric_difference' template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _SetUnionOp, class _IsVector> @@ -3067,7 +3067,7 @@ __brick_set_union(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _Forwar _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, /*__is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::set_union(__first1, __last1, __first2, __last2, __result, __comp); } @@ -3082,7 +3082,7 @@ __pattern_set_union(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIter return __internal::__brick_set_union(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -3127,7 +3127,7 @@ __brick_set_intersection(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, /*__is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::set_intersection(__first1, __last1, __first2, __last2, __result, __comp); } @@ -3141,7 +3141,7 @@ __pattern_set_intersection(_ExecutionPolicy&&, _ForwardIterator1 __first1, _Forw return __internal::__brick_set_intersection(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -3224,7 +3224,7 @@ __brick_set_difference(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _F _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, /*__is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::set_difference(__first1, __last1, __first2, __last2, __result, __comp); } @@ -3238,7 +3238,7 @@ __pattern_set_difference(_ExecutionPolicy&&, _ForwardIterator1 __first1, _Forwar return __internal::__brick_set_difference(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -3320,7 +3320,7 @@ __brick_set_symmetric_difference(_ForwardIterator1 __first1, _ForwardIterator1 _ _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, /*__is_vector=*/std::true_type) noexcept { - __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); + _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial"); return std::set_symmetric_difference(__first1, __last1, __first2, __last2, __result, __comp); } @@ -3335,7 +3335,7 @@ __pattern_set_symmetric_difference(_ExecutionPolicy&&, _ForwardIterator1 __first __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator, class _Compare, class _IsVector> _OutputIterator @@ -3421,7 +3421,7 @@ __is_heap_until_local(_RandomAccessIterator __first, _DifferenceType __begin, _D [&__comp](_RandomAccessIterator __it, _DifferenceType __i) { return __comp(__it[(__i - 1) / 2], __it[__i]); }); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector> _RandomAccessIterator __pattern_is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, @@ -3458,7 +3458,7 @@ _ForwardIterator __brick_min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp, /* __is_vector = */ std::true_type) noexcept { -#if __PSTL_UDR_PRESENT +#if _PSTL_UDR_PRESENT return __unseq_backend::__simd_min_element(__first, __last - __first, __comp); #else return std::min_element(__first, __last, __comp); @@ -3473,7 +3473,7 @@ __pattern_min_element(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIter return __internal::__brick_min_element(__first, __last, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <typename _ExecutionPolicy, typename _RandomAccessIterator, typename _Compare, typename _IsVector> _RandomAccessIterator __pattern_min_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, @@ -3515,7 +3515,7 @@ std::pair<_ForwardIterator, _ForwardIterator> __brick_minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp, /* __is_vector = */ std::true_type) noexcept { -#if __PSTL_UDR_PRESENT +#if _PSTL_UDR_PRESENT return __unseq_backend::__simd_minmax_element(__first, __last - __first, __comp); #else return std::minmax_element(__first, __last, __comp); @@ -3530,7 +3530,7 @@ __pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardI return __internal::__brick_minmax_element(__first, __last, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <typename _ExecutionPolicy, typename _ForwardIterator, typename _Compare, typename _IsVector> std::pair<_ForwardIterator, _ForwardIterator> __pattern_minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp, @@ -3567,7 +3567,7 @@ std::pair<_ForwardIterator1, _ForwardIterator2> __mismatch_serial(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred) { -#if __PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT +#if _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT return std::mismatch(__first1, __last1, __first2, __last2, __pred); #else for (; __first1 != __last1 && __first2 != __last2 && __pred(*__first1, *__first2); ++__first1, ++__first2) @@ -3603,7 +3603,7 @@ __pattern_mismatch(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardItera return __internal::__brick_mismatch(__first1, __last1, __first2, __last2, __pred, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Predicate, class _IsVector> std::pair<_RandomAccessIterator1, _RandomAccessIterator2> @@ -3684,7 +3684,7 @@ __pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1 __first1 return __internal::__brick_lexicographical_compare(__first1, __last1, __first2, __last2, __comp, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector> bool __pattern_lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, @@ -3733,4 +3733,4 @@ __pattern_lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 _ } // namespace __internal } // namespace __pstl -#endif /* __PSTL_algorithm_impl_H */ +#endif /* _PSTL_ALGORITHM_IMPL_H */ diff --git a/pstl/include/pstl/internal/execution_defs.h b/pstl/include/pstl/internal/execution_defs.h index 9a4b49bd46a..b4f984cdcc6 100644 --- a/pstl/include/pstl/internal/execution_defs.h +++ b/pstl/include/pstl/internal/execution_defs.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_execution_policy_defs_H -#define __PSTL_execution_policy_defs_H +#ifndef _PSTL_EXECUTION_POLICY_DEFS_H +#define _PSTL_EXECUTION_POLICY_DEFS_H #include <type_traits> @@ -41,7 +41,7 @@ class sequenced_policy } }; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES // 2.5, Parallel execution policy class parallel_policy { @@ -110,7 +110,7 @@ class unsequenced_policy // 2.8, Execution policy objects constexpr sequenced_policy seq{}; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES constexpr parallel_policy par{}; constexpr parallel_unsequenced_policy par_unseq{}; #endif @@ -126,7 +126,7 @@ template <> struct is_execution_policy<__pstl::execution::sequenced_policy> : std::true_type { }; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <> struct is_execution_policy<__pstl::execution::parallel_policy> : std::true_type { @@ -141,7 +141,7 @@ struct is_execution_policy<__pstl::execution::unsequenced_policy> : std::true_ty { }; -#if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT +#if _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT template <class T> constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<T>::value; #endif @@ -159,4 +159,4 @@ using __enable_if_execution_policy = } // namespace __pstl -#endif /* __PSTL_execution_policy_defs_H */ +#endif /* _PSTL_EXECUTION_POLICY_DEFS_H */ diff --git a/pstl/include/pstl/internal/execution_impl.h b/pstl/include/pstl/internal/execution_impl.h index 4089811bc2c..fdc62825b78 100644 --- a/pstl/include/pstl/internal/execution_impl.h +++ b/pstl/include/pstl/internal/execution_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_execution_impl_H -#define __PSTL_execution_impl_H +#ifndef _PSTL_EXECUTION_IMPL_H +#define _PSTL_EXECUTION_IMPL_H #include <iterator> #include <type_traits> @@ -87,7 +87,7 @@ struct __policy_traits<unsequenced_policy> typedef std::true_type allow_vector; }; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <> struct __policy_traits<parallel_policy> { @@ -160,4 +160,4 @@ struct __prefer_parallel_tag } // namespace __internal } // namespace __pstl -#endif /* __PSTL_execution_impl_H */ +#endif /* _PSTL_EXECUTION_IMPL_H */ diff --git a/pstl/include/pstl/internal/glue_algorithm_defs.h b/pstl/include/pstl/internal/glue_algorithm_defs.h index 14faaaeab53..4cf51bbe724 100644 --- a/pstl/include/pstl/internal/glue_algorithm_defs.h +++ b/pstl/include/pstl/internal/glue_algorithm_defs.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_algorithm_defs_H -#define __PSTL_glue_algorithm_defs_H +#ifndef _PSTL_GLUE_ALGORITHM_DEFS_H +#define _PSTL_GLUE_ALGORITHM_DEFS_H #include <functional> #include <iterator> @@ -549,4 +549,4 @@ lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ _ForwardIterator2 __first2, _ForwardIterator2 __last2); } // namespace std -#endif /* __PSTL_glue_algorithm_defs_H */ +#endif /* _PSTL_GLUE_ALGORITHM_DEFS_H */ diff --git a/pstl/include/pstl/internal/glue_algorithm_impl.h b/pstl/include/pstl/internal/glue_algorithm_impl.h index 56c1194d8e2..388b77f55cf 100644 --- a/pstl/include/pstl/internal/glue_algorithm_impl.h +++ b/pstl/include/pstl/internal/glue_algorithm_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_algorithm_impl_H -#define __PSTL_glue_algorithm_impl_H +#ifndef _PSTL_GLUE_ALGORITHM_IMPL_H +#define _PSTL_GLUE_ALGORITHM_IMPL_H #include <functional> @@ -1181,4 +1181,4 @@ lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ } // namespace std -#endif /* __PSTL_glue_algorithm_impl_H */ +#endif /* _PSTL_GLUE_ALGORITHM_IMPL_H */ diff --git a/pstl/include/pstl/internal/glue_execution_defs.h b/pstl/include/pstl/internal/glue_execution_defs.h index ce684b0ceb2..b02af5547e9 100644 --- a/pstl/include/pstl/internal/glue_execution_defs.h +++ b/pstl/include/pstl/internal/glue_execution_defs.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_execution_defs_H -#define __PSTL_glue_execution_defs_H +#ifndef _PSTL_GLUE_EXECUTION_DEFS_H +#define _PSTL_GLUE_EXECUTION_DEFS_H #include <type_traits> @@ -18,7 +18,7 @@ namespace std { // Type trait using __pstl::execution::is_execution_policy; -#if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT +#if _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT # if __INTEL_COMPILER template <class T> constexpr bool is_execution_policy_v = is_execution_policy<T>::value; @@ -31,13 +31,13 @@ namespace execution { // Standard C++ policy classes using __pstl::execution::sequenced_policy; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES using __pstl::execution::parallel_policy; using __pstl::execution::parallel_unsequenced_policy; #endif // Standard predefined policy instances using __pstl::execution::seq; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES using __pstl::execution::par; using __pstl::execution::par_unseq; #endif @@ -53,4 +53,4 @@ using __pstl::execution::unsequenced_policy; #include "numeric_impl.h" #include "parallel_backend.h" -#endif /* __PSTL_glue_execution_defs_H */ +#endif /* _PSTL_GLUE_EXECUTION_DEFS_H */ diff --git a/pstl/include/pstl/internal/glue_memory_defs.h b/pstl/include/pstl/internal/glue_memory_defs.h index 79e4ed71f7d..6729319a51b 100644 --- a/pstl/include/pstl/internal/glue_memory_defs.h +++ b/pstl/include/pstl/internal/glue_memory_defs.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_memory_defs_H -#define __PSTL_glue_memory_defs_H +#ifndef _PSTL_GLUE_MEMORY_DEFS_H +#define _PSTL_GLUE_MEMORY_DEFS_H #include "execution_defs.h" @@ -76,4 +76,4 @@ __pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardItera uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n); } // namespace std -#endif /* __PSTL_glue_memory_defs_H */ +#endif /* _PSTL_GLUE_MEMORY_DEFS_H */ diff --git a/pstl/include/pstl/internal/glue_memory_impl.h b/pstl/include/pstl/internal/glue_memory_impl.h index 9798b80c8ac..b2f0c25b247 100644 --- a/pstl/include/pstl/internal/glue_memory_impl.h +++ b/pstl/include/pstl/internal/glue_memory_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_memory_impl_H -#define __PSTL_glue_memory_impl_H +#ifndef _PSTL_GLUE_MEMORY_IMPL_H +#define _PSTL_GLUE_MEMORY_IMPL_H #include "execution_defs.h" #include "utils.h" @@ -358,4 +358,4 @@ uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __fi } // namespace std -#endif /* __PSTL_glue_memory_imple_H */ +#endif /* _PSTL_GLUE_MEMORY_IMPL_H */ diff --git a/pstl/include/pstl/internal/glue_numeric_defs.h b/pstl/include/pstl/internal/glue_numeric_defs.h index 03d06c9d0ae..4f3a0951c50 100644 --- a/pstl/include/pstl/internal/glue_numeric_defs.h +++ b/pstl/include/pstl/internal/glue_numeric_defs.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_numeric_defs_H -#define __PSTL_glue_numeric_defs_H +#ifndef _PSTL_GLUE_NUMERIC_DEFS_H +#define _PSTL_GLUE_NUMERIC_DEFS_H #include <iterator> @@ -115,4 +115,4 @@ adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Forwa _ForwardIterator2 __d_first); } // namespace std -#endif /* __PSTL_glue_numeric_defs_H */ +#endif /* _PSTL_GLUE_NUMERIC_DEFS_H */ diff --git a/pstl/include/pstl/internal/glue_numeric_impl.h b/pstl/include/pstl/internal/glue_numeric_impl.h index c462891e104..416134c21b3 100644 --- a/pstl/include/pstl/internal/glue_numeric_impl.h +++ b/pstl/include/pstl/internal/glue_numeric_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_glue_numeric_impl_H -#define __PSTL_glue_numeric_impl_H +#ifndef _PSTL_GLUE_NUMERIC_IMPL_H +#define _PSTL_GLUE_NUMERIC_IMPL_H #include <functional> @@ -222,4 +222,4 @@ adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Forwa } // namespace std -#endif /* __PSTL_glue_numeric_impl_H_ */ +#endif /* _PSTL_GLUE_NUMERIC_IMPL_H_ */ diff --git a/pstl/include/pstl/internal/memory_impl.h b/pstl/include/pstl/internal/memory_impl.h index 0fadbc618d1..d96f021b5ef 100644 --- a/pstl/include/pstl/internal/memory_impl.h +++ b/pstl/include/pstl/internal/memory_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_memory_impl_H -#define __PSTL_memory_impl_H +#ifndef _PSTL_MEMORY_IMPL_H +#define _PSTL_MEMORY_IMPL_H #include <iterator> @@ -53,4 +53,4 @@ __brick_uninitialized_move(_ForwardIterator __first, _ForwardIterator __last, _O } // namespace __internal } // namespace __pstl -#endif /* __PSTL_memory_impl_H */ +#endif /* _PSTL_MEMORY_IMPL_H */ diff --git a/pstl/include/pstl/internal/numeric_fwd.h b/pstl/include/pstl/internal/numeric_fwd.h index 56667968938..726eda99ed3 100644 --- a/pstl/include/pstl/internal/numeric_fwd.h +++ b/pstl/include/pstl/internal/numeric_fwd.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_numeric_fwd_H -#define __PSTL_numeric_fwd_H +#ifndef _PSTL_NUMERIC_FWD_H +#define _PSTL_NUMERIC_FWD_H #include <type_traits> #include <utility> @@ -39,7 +39,7 @@ __pattern_transform_reduce(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterat _BinaryOperation1, _BinaryOperation2, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2, class _IsVector> _Tp @@ -67,7 +67,7 @@ __pattern_transform_reduce(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterato _UnaryOperation, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation, class _UnaryOperation, class _IsVector> _Tp @@ -99,7 +99,7 @@ __pattern_transform_scan(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryOperation, _Inclusive, _IsVector, /*is_parallel=*/std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp, class _BinaryOperation, class _Inclusive, class _IsVector> typename std::enable_if<!std::is_floating_point<_Tp>::value, _OutputIterator>::type @@ -107,7 +107,7 @@ __pattern_transform_scan(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAcces _UnaryOperation, _Tp, _BinaryOperation, _Inclusive, _IsVector, /*is_parallel=*/std::true_type); #endif -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp, class _BinaryOperation, class _Inclusive, class _IsVector> typename std::enable_if<std::is_floating_point<_Tp>::value, _OutputIterator>::type @@ -133,7 +133,7 @@ _OutputIterator __pattern_adjacent_difference(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _OutputIterator, _BinaryOperation, _IsVector, /*is_parallel*/ std::false_type) noexcept; -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _BinaryOperation, class _IsVector> _OutputIterator @@ -143,4 +143,4 @@ __pattern_adjacent_difference(_ExecutionPolicy&&, _ForwardIterator, _ForwardIter } // namespace __internal } // namespace __pstl -#endif /* __PSTL_numeric_fwd_H */ +#endif /* _PSTL_NUMERIC_FWD_H */ diff --git a/pstl/include/pstl/internal/numeric_impl.h b/pstl/include/pstl/internal/numeric_impl.h index e56882c4f37..fe17235e182 100644 --- a/pstl/include/pstl/internal/numeric_impl.h +++ b/pstl/include/pstl/internal/numeric_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_numeric_impl_H -#define __PSTL_numeric_impl_H +#ifndef _PSTL_NUMERIC_IMPL_H +#define _PSTL_NUMERIC_IMPL_H #include <iterator> #include <type_traits> @@ -18,7 +18,7 @@ #include "unseq_backend_simd.h" #include "algorithm_fwd.h" -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES # include "parallel_backend.h" #endif @@ -63,7 +63,7 @@ __pattern_transform_reduce(_ExecutionPolicy&&, _ForwardIterator1 __first1, _Forw return __brick_transform_reduce(__first1, __last1, __first2, __init, __binary_op1, __binary_op2, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2, class _IsVector> _Tp @@ -125,7 +125,7 @@ __pattern_transform_reduce(_ExecutionPolicy&&, _ForwardIterator __first, _Forwar return __internal::__brick_transform_reduce(__first, __last, __init, __binary_op, __unary_op, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation, class _UnaryOperation, class _IsVector> _Tp @@ -160,7 +160,7 @@ __brick_transform_scan(_ForwardIterator __first, _ForwardIterator __last, _Outpu for (; __first != __last; ++__first, ++__result) { *__result = __init; - __PSTL_PRAGMA_FORCEINLINE + _PSTL_PRAGMA_FORCEINLINE __init = __binary_op(__init, __unary_op(*__first)); } return std::make_pair(__result, __init); @@ -175,7 +175,7 @@ __brick_transform_scan(_ForwardIterator __first, _ForwardIterator __last, _Outpu { for (; __first != __last; ++__first, ++__result) { - __PSTL_PRAGMA_FORCEINLINE + _PSTL_PRAGMA_FORCEINLINE __init = __binary_op(__init, __unary_op(*__first)); *__result = __init; } @@ -196,7 +196,7 @@ __brick_transform_scan(_ForwardIterator __first, _ForwardIterator __last, _Outpu _UnaryOperation __unary_op, _Tp __init, _BinaryOperation __binary_op, _Inclusive, /*is_vector=*/std::true_type) noexcept { -#if (__PSTL_UDS_PRESENT) +#if (_PSTL_UDS_PRESENT) return __unseq_backend::__simd_scan(__first, __last - __first, __result, __unary_op, __init, __binary_op, _Inclusive()); #else @@ -229,7 +229,7 @@ __pattern_transform_scan(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardI .first; } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp, class _BinaryOperation, class _Inclusive, class _IsVector> typename std::enable_if<!std::is_floating_point<_Tp>::value, _OutputIterator>::type @@ -261,7 +261,7 @@ __pattern_transform_scan(_ExecutionPolicy&& __exec, _RandomAccessIterator __firs } #endif -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp, class _BinaryOperation, class _Inclusive, class _IsVector> typename std::enable_if<std::is_floating_point<_Tp>::value, _OutputIterator>::type @@ -288,7 +288,7 @@ __pattern_transform_scan(_ExecutionPolicy&& __exec, _RandomAccessIterator __firs [__result, &__binary_op](_DifferenceType __i, _DifferenceType __len, _Tp __initial) { return *(std::transform(__result + __i, __result + __i + __len, __result + __i, [&__initial, &__binary_op](const _Tp& __x) { - __PSTL_PRAGMA_FORCEINLINE + _PSTL_PRAGMA_FORCEINLINE return __binary_op(__initial, __x); }) - 1); @@ -338,7 +338,7 @@ __pattern_adjacent_difference(_ExecutionPolicy&&, _ForwardIterator __first, _For return __internal::__brick_adjacent_difference(__first, __last, __d_first, __op, __is_vector); } -#if __PSTL_USE_PAR_POLICIES +#if _PSTL_USE_PAR_POLICIES template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryOperation, class _IsVector> _ForwardIterator2 @@ -367,4 +367,4 @@ __pattern_adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __fir } // namespace __internal } // namespace __pstl -#endif /* __PSTL_numeric_impl_H */ +#endif /* _PSTL_NUMERIC_IMPL_H */ diff --git a/pstl/include/pstl/internal/parallel_backend.h b/pstl/include/pstl/internal/parallel_backend.h index 8c88966dd0d..438f87e9f0b 100644 --- a/pstl/include/pstl/internal/parallel_backend.h +++ b/pstl/include/pstl/internal/parallel_backend.h @@ -7,13 +7,13 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_parallel_backend_H -#define __PSTL_parallel_backend_H +#ifndef _PSTL_PARALLEL_BACKEND_H +#define _PSTL_PARALLEL_BACKEND_H -#if __PSTL_PAR_BACKEND_TBB +#if _PSTL_PAR_BACKEND_TBB # include "parallel_backend_tbb.h" #else -__PSTL_PRAGMA_MESSAGE("Parallel backend was not specified"); +_PSTL_PRAGMA_MESSAGE("Parallel backend was not specified"); #endif -#endif /* __PSTL_parallel_backend_H */ +#endif /* _PSTL_PARALLEL_BACKEND_H */ diff --git a/pstl/include/pstl/internal/parallel_backend_tbb.h b/pstl/include/pstl/internal/parallel_backend_tbb.h index 1dd6f801ac5..e672ad68be0 100644 --- a/pstl/include/pstl/internal/parallel_backend_tbb.h +++ b/pstl/include/pstl/internal/parallel_backend_tbb.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_parallel_backend_tbb_H -#define __PSTL_parallel_backend_tbb_H +#ifndef _PSTL_PARALLEL_BACKEND_TBB_H +#define _PSTL_PARALLEL_BACKEND_TBB_H #include <cassert> #include <algorithm> @@ -432,7 +432,7 @@ class __merge_task : public tbb::task } }; -#define __PSTL_MERGE_CUT_OFF 2000 +#define _PSTL_MERGE_CUT_OFF 2000 template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _RandomAccessIterator3, typename __M_Compare, typename _Cleanup, typename _LeafMerge> @@ -444,7 +444,7 @@ __merge_task<_RandomAccessIterator1, _RandomAccessIterator2, _RandomAccessIterat typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _DifferenceType2; typedef typename std::common_type<_DifferenceType1, _DifferenceType2>::type _SizeType; const _SizeType __n = (_M_xe - _M_xs) + (_M_ye - _M_ys); - const _SizeType __merge_cut_off = __PSTL_MERGE_CUT_OFF; + const _SizeType __merge_cut_off = _PSTL_MERGE_CUT_OFF; if (__n <= __merge_cut_off) { _M_leaf_merge(_M_xs, _M_xe, _M_ys, _M_ye, _M_zs, _M_comp); @@ -515,7 +515,7 @@ struct __binary_no_op } }; -#define __PSTL_STABLE_SORT_CUT_OFF 500 +#define _PSTL_STABLE_SORT_CUT_OFF 500 template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Compare, typename _LeafSort> tbb::task* @@ -523,7 +523,7 @@ __stable_sort_task<_RandomAccessIterator1, _RandomAccessIterator2, _Compare, _Le { const _SizeType __n = _M_xe - _M_xs; const _SizeType __nmerge = _M_nsort > 0 ? _M_nsort : __n; - const _SizeType __sort_cut_off = __PSTL_STABLE_SORT_CUT_OFF; + const _SizeType __sort_cut_off = _PSTL_STABLE_SORT_CUT_OFF; if (__n <= __sort_cut_off) { _M_leaf_sort(_M_xs, _M_xe, _M_comp); @@ -595,7 +595,7 @@ __parallel_stable_sort(_ExecutionPolicy&&, _RandomAccessIterator __xs, _RandomAc if (__nsort == 0) __nsort = __n; - const _DifferenceType __sort_cut_off = __PSTL_STABLE_SORT_CUT_OFF; + const _DifferenceType __sort_cut_off = _PSTL_STABLE_SORT_CUT_OFF; if (__n > __sort_cut_off) { assert(__nsort > 0 && __nsort <= __n); @@ -626,7 +626,7 @@ __parallel_merge(_ExecutionPolicy&&, _RandomAccessIterator1 __xs, _RandomAccessI typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _DifferenceType2; typedef typename std::common_type<_DifferenceType1, _DifferenceType2>::type _SizeType; const _SizeType __n = (__xe - __xs) + (__ye - __ys); - const _SizeType __merge_cut_off = __PSTL_MERGE_CUT_OFF; + const _SizeType __merge_cut_off = _PSTL_MERGE_CUT_OFF; if (__n <= __merge_cut_off) { // Fall back on serial merge @@ -658,4 +658,4 @@ __parallel_invoke(_ExecutionPolicy&&, _F1&& __f1, _F2&& __f2) } // namespace __par_backend } // namespace __pstl -#endif /* __PSTL_parallel_backend_tbb_H */ +#endif /* _PSTL_PARALLEL_BACKEND_TBB_H */ diff --git a/pstl/include/pstl/internal/parallel_backend_utils.h b/pstl/include/pstl/internal/parallel_backend_utils.h index 6313890144a..4b2e67607c8 100644 --- a/pstl/include/pstl/internal/parallel_backend_utils.h +++ b/pstl/include/pstl/internal/parallel_backend_utils.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_parallel_backend_utils_H -#define __PSTL_parallel_backend_utils_H +#ifndef _PSTL_PARALLEL_BACKEND_UTILS_H +#define _PSTL_PARALLEL_BACKEND_UTILS_H #include <iterator> #include <utility> @@ -193,4 +193,4 @@ class __stack } // namespace __par_backend } // namespace __pstl -#endif /* __PSTL_parallel_backend_utils_H */ +#endif /* _PSTL_PARALLEL_BACKEND_UTILS_H */ diff --git a/pstl/include/pstl/internal/parallel_impl.h b/pstl/include/pstl/internal/parallel_impl.h index 2498003098a..46560c642ea 100644 --- a/pstl/include/pstl/internal/parallel_impl.h +++ b/pstl/include/pstl/internal/parallel_impl.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_parallel_impl_H -#define __PSTL_parallel_impl_H +#ifndef _PSTL_PARALLEL_IMPL_H +#define _PSTL_PARALLEL_IMPL_H #include <atomic> // This header defines the minimum set of parallel routines required to support Parallel STL, @@ -78,4 +78,4 @@ __parallel_or(_ExecutionPolicy&& __exec, _Index __first, _Index __last, _Brick _ } // namespace __internal } // namespace __pstl -#endif /* __PSTL_parallel_impl_H */ +#endif /* _PSTL_PARALLEL_IMPL_H */ diff --git a/pstl/include/pstl/internal/pstl_config.h b/pstl/include/pstl/internal/pstl_config.h index cf3d6b092cc..8d6dd9db961 100644 --- a/pstl/include/pstl/internal/pstl_config.h +++ b/pstl/include/pstl/internal/pstl_config.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_config_H -#define __PSTL_config_H +#ifndef _PSTL_CONFIG_H +#define _PSTL_CONFIG_H #define PSTL_VERSION 203 #define PSTL_VERSION_MAJOR (PSTL_VERSION / 100) @@ -16,115 +16,115 @@ // Check the user-defined macro for parallel policies #if defined(PSTL_USE_PARALLEL_POLICIES) -# undef __PSTL_USE_PAR_POLICIES -# define __PSTL_USE_PAR_POLICIES PSTL_USE_PARALLEL_POLICIES +# undef _PSTL_USE_PAR_POLICIES +# define _PSTL_USE_PAR_POLICIES PSTL_USE_PARALLEL_POLICIES // Check the internal macro for parallel policies -#elif !defined(__PSTL_USE_PAR_POLICIES) -# define __PSTL_USE_PAR_POLICIES 1 +#elif !defined(_PSTL_USE_PAR_POLICIES) +# define _PSTL_USE_PAR_POLICIES 1 #endif -#if __PSTL_USE_PAR_POLICIES -# if !defined(__PSTL_PAR_BACKEND_TBB) -# define __PSTL_PAR_BACKEND_TBB 1 +#if _PSTL_USE_PAR_POLICIES +# if !defined(_PSTL_PAR_BACKEND_TBB) +# define _PSTL_PAR_BACKEND_TBB 1 # endif #else -# undef __PSTL_PAR_BACKEND_TBB +# undef _PSTL_PAR_BACKEND_TBB #endif // Check the user-defined macro for warnings #if defined(PSTL_USAGE_WARNINGS) -# undef __PSTL_USAGE_WARNINGS -# define __PSTL_USAGE_WARNINGS PSTL_USAGE_WARNINGS +# undef _PSTL_USAGE_WARNINGS +# define _PSTL_USAGE_WARNINGS PSTL_USAGE_WARNINGS // Check the internal macro for warnings -#elif !defined(__PSTL_USAGE_WARNINGS) -# define __PSTL_USAGE_WARNINGS 0 +#elif !defined(_PSTL_USAGE_WARNINGS) +# define _PSTL_USAGE_WARNINGS 0 #endif // Portability "#pragma" definition #ifdef _MSC_VER -# define __PSTL_PRAGMA(x) __pragma(x) +# define _PSTL_PRAGMA(x) __pragma(x) #else -# define __PSTL_PRAGMA(x) _Pragma(# x) +# define _PSTL_PRAGMA(x) _Pragma(# x) #endif -#define __PSTL_STRING_AUX(x) #x -#define __PSTL_STRING(x) __PSTL_STRING_AUX(x) -#define __PSTL_STRING_CONCAT(x, y) x #y +#define _PSTL_STRING_AUX(x) #x +#define _PSTL_STRING(x) _PSTL_STRING_AUX(x) +#define _PSTL_STRING_CONCAT(x, y) x #y -// note that when ICC or Clang is in use, __PSTL_GCC_VERSION might not fully match +// note that when ICC or Clang is in use, _PSTL_GCC_VERSION might not fully match // the actual GCC version on the system. -#define __PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +#define _PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #if __clang__ // according to clang documentation, version can be vendor specific -# define __PSTL_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) +# define _PSTL_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) #endif // Enable SIMD for compilers that support OpenMP 4.0 -#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && __PSTL_GCC_VERSION >= 40900) -# define __PSTL_PRAGMA_SIMD __PSTL_PRAGMA(omp simd) -# define __PSTL_PRAGMA_DECLARE_SIMD __PSTL_PRAGMA(omp declare simd) -# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM) __PSTL_PRAGMA(omp simd reduction(PRM)) +#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) +# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd) +# define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd) +# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM)) #elif !defined(_MSC_VER) //#pragma simd -# define __PSTL_PRAGMA_SIMD __PSTL_PRAGMA(simd) -# define __PSTL_PRAGMA_DECLARE_SIMD -# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM) __PSTL_PRAGMA(simd reduction(PRM)) +# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(simd) +# define _PSTL_PRAGMA_DECLARE_SIMD +# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(simd reduction(PRM)) #else //no simd -# define __PSTL_PRAGMA_SIMD -# define __PSTL_PRAGMA_DECLARE_SIMD -# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM) +# define _PSTL_PRAGMA_SIMD +# define _PSTL_PRAGMA_DECLARE_SIMD +# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) #endif //Enable SIMD #if (__INTEL_COMPILER) -# define __PSTL_PRAGMA_FORCEINLINE __PSTL_PRAGMA(forceinline) +# define _PSTL_PRAGMA_FORCEINLINE _PSTL_PRAGMA(forceinline) #else -# define __PSTL_PRAGMA_FORCEINLINE +# define _PSTL_PRAGMA_FORCEINLINE #endif #if (__INTEL_COMPILER >= 1900) -# define __PSTL_PRAGMA_SIMD_SCAN(PRM) __PSTL_PRAGMA(omp simd reduction(inscan, PRM)) -# define __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) __PSTL_PRAGMA(omp scan inclusive(PRM)) -# define __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) __PSTL_PRAGMA(omp scan exclusive(PRM)) +# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM)) +# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM)) +# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM)) #else -# define __PSTL_PRAGMA_SIMD_SCAN(PRM) -# define __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) -# define __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) +# define _PSTL_PRAGMA_SIMD_SCAN(PRM) +# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) +# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) #endif // Should be defined to 1 for environments with a vendor implementation of C++17 execution policies -#define __PSTL_CPP17_EXECUTION_POLICIES_PRESENT (_MSC_VER >= 1912) +#define _PSTL_CPP17_EXECUTION_POLICIES_PRESENT (_MSC_VER >= 1912) -#define __PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT \ +#define _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT \ (_MSC_VER >= 1900 || __cplusplus >= 201300L || __cpp_lib_robust_nonmodifying_seq_ops == 201304) -#define __PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT \ +#define _PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT \ (_MSC_VER >= 1900 || __cplusplus >= 201402L || __cpp_lib_make_reverse_iterator == 201402) -#define __PSTL_CPP14_INTEGER_SEQUENCE_PRESENT (_MSC_VER >= 1900 || __cplusplus >= 201402L) -#define __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT \ +#define _PSTL_CPP14_INTEGER_SEQUENCE_PRESENT (_MSC_VER >= 1900 || __cplusplus >= 201402L) +#define _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT \ (!__INTEL_COMPILER || __INTEL_COMPILER >= 1700) && (_MSC_FULL_VER >= 190023918 || __cplusplus >= 201402L) -#define __PSTL_EARLYEXIT_PRESENT (__INTEL_COMPILER >= 1800) -#define __PSTL_MONOTONIC_PRESENT (__INTEL_COMPILER >= 1800) +#define _PSTL_EARLYEXIT_PRESENT (__INTEL_COMPILER >= 1800) +#define _PSTL_MONOTONIC_PRESENT (__INTEL_COMPILER >= 1800) -#if (__INTEL_COMPILER >= 1900 || !defined(__INTEL_COMPILER) && __PSTL_GCC_VERSION >= 40900 || _OPENMP >= 201307) -# define __PSTL_UDR_PRESENT 1 +#if (__INTEL_COMPILER >= 1900 || !defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900 || _OPENMP >= 201307) +# define _PSTL_UDR_PRESENT 1 #else -# define __PSTL_UDR_PRESENT 0 +# define _PSTL_UDR_PRESENT 0 #endif -#define __PSTL_UDS_PRESENT (__INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626) +#define _PSTL_UDS_PRESENT (__INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626) -#if __PSTL_EARLYEXIT_PRESENT -# define __PSTL_PRAGMA_SIMD_EARLYEXIT __PSTL_PRAGMA(omp simd early_exit) +#if _PSTL_EARLYEXIT_PRESENT +# define _PSTL_PRAGMA_SIMD_EARLYEXIT _PSTL_PRAGMA(omp simd early_exit) #else -# define __PSTL_PRAGMA_SIMD_EARLYEXIT +# define _PSTL_PRAGMA_SIMD_EARLYEXIT #endif -#if __PSTL_MONOTONIC_PRESENT -# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) __PSTL_PRAGMA(omp ordered simd monotonic(PRM)) -# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) __PSTL_PRAGMA(omp ordered simd monotonic(PRM1, PRM2)) +#if _PSTL_MONOTONIC_PRESENT +# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) _PSTL_PRAGMA(omp ordered simd monotonic(PRM)) +# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) _PSTL_PRAGMA(omp ordered simd monotonic(PRM1, PRM2)) #else -# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) -# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) +# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) +# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) #endif // Declaration of reduction functor, where @@ -134,41 +134,41 @@ // omp_out - refers to the final value of the combiner operator // omp_priv - refers to the private copy of the initial value // omp_orig - refers to the original variable to be reduced -#define __PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \ - __PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig)) +#define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \ + _PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig)) #if (__INTEL_COMPILER >= 1600) -# define __PSTL_PRAGMA_VECTOR_UNALIGNED __PSTL_PRAGMA(vector unaligned) +# define _PSTL_PRAGMA_VECTOR_UNALIGNED _PSTL_PRAGMA(vector unaligned) #else -# define __PSTL_PRAGMA_VECTOR_UNALIGNED +# define _PSTL_PRAGMA_VECTOR_UNALIGNED #endif // Check the user-defined macro to use non-temporal stores #if defined(PSTL_USE_NONTEMPORAL_STORES) && (__INTEL_COMPILER >= 1600) -# define __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED __PSTL_PRAGMA(vector nontemporal) +# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED _PSTL_PRAGMA(vector nontemporal) #else -# define __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED +# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED #endif #if _MSC_VER || __INTEL_COMPILER //the preprocessors don't type a message location -# define __PSTL_PRAGMA_LOCATION __FILE__ ":" __PSTL_STRING(__LINE__) ": [Parallel STL message]: " +# define _PSTL_PRAGMA_LOCATION __FILE__ ":" _PSTL_STRING(__LINE__) ": [Parallel STL message]: " #else -# define __PSTL_PRAGMA_LOCATION " [Parallel STL message]: " +# define _PSTL_PRAGMA_LOCATION " [Parallel STL message]: " #endif -#define __PSTL_PRAGMA_MESSAGE_IMPL(x) __PSTL_PRAGMA(message(__PSTL_STRING_CONCAT(__PSTL_PRAGMA_LOCATION, x))) +#define _PSTL_PRAGMA_MESSAGE_IMPL(x) _PSTL_PRAGMA(message(_PSTL_STRING_CONCAT(_PSTL_PRAGMA_LOCATION, x))) -#if __PSTL_USAGE_WARNINGS -# define __PSTL_PRAGMA_MESSAGE(x) __PSTL_PRAGMA_MESSAGE_IMPL(x) -# define __PSTL_PRAGMA_MESSAGE_POLICIES(x) __PSTL_PRAGMA_MESSAGE_IMPL(x) +#if _PSTL_USAGE_WARNINGS +# define _PSTL_PRAGMA_MESSAGE(x) _PSTL_PRAGMA_MESSAGE_IMPL(x) +# define _PSTL_PRAGMA_MESSAGE_POLICIES(x) _PSTL_PRAGMA_MESSAGE_IMPL(x) #else -# define __PSTL_PRAGMA_MESSAGE(x) -# define __PSTL_PRAGMA_MESSAGE_POLICIES(x) +# define _PSTL_PRAGMA_MESSAGE(x) +# define _PSTL_PRAGMA_MESSAGE_POLICIES(x) #endif // broken macros -#define __PSTL_CPP11_STD_ROTATE_BROKEN ((__GLIBCXX__ && __GLIBCXX__ < 20150716) || (_MSC_VER && _MSC_VER < 1800)) +#define _PSTL_CPP11_STD_ROTATE_BROKEN ((__GLIBCXX__ && __GLIBCXX__ < 20150716) || (_MSC_VER && _MSC_VER < 1800)) -#define __PSTL_ICC_18_OMP_SIMD_BROKEN (__INTEL_COMPILER == 1800) +#define _PSTL_ICC_18_OMP_SIMD_BROKEN (__INTEL_COMPILER == 1800) -#endif /* __PSTL_config_H */ +#endif /* _PSTL_CONFIG_H */ diff --git a/pstl/include/pstl/internal/unseq_backend_simd.h b/pstl/include/pstl/internal/unseq_backend_simd.h index fc51f66a7cf..464d747c41b 100644 --- a/pstl/include/pstl/internal/unseq_backend_simd.h +++ b/pstl/include/pstl/internal/unseq_backend_simd.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_unseq_backend_simd_H -#define __PSTL_unseq_backend_simd_H +#ifndef _PSTL_UNSEQ_BACKEND_SIMD_H +#define _PSTL_UNSEQ_BACKEND_SIMD_H #include <type_traits> @@ -28,7 +28,7 @@ template <class _Iterator, class _DifferenceType, class _Function> _Iterator __simd_walk_1(_Iterator __first, _DifferenceType __n, _Function __f) noexcept { - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) __f(__first[__i]); @@ -39,7 +39,7 @@ template <class _Iterator1, class _DifferenceType, class _Iterator2, class _Func _Iterator2 __simd_walk_2(_Iterator1 __first1, _DifferenceType __n, _Iterator2 __first2, _Function __f) noexcept { - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) __f(__first1[__i], __first2[__i]); return __first2 + __n; @@ -50,7 +50,7 @@ _Iterator3 __simd_walk_3(_Iterator1 __first1, _DifferenceType __n, _Iterator2 __first2, _Iterator3 __first3, _Function __f) noexcept { - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) __f(__first1[__i], __first2[__i], __first3[__i]); return __first3 + __n; @@ -61,10 +61,10 @@ template <class _Index, class _DifferenceType, class _Pred> bool __simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept { -#if __PSTL_EARLYEXIT_PRESENT +#if _PSTL_EARLYEXIT_PRESENT _DifferenceType __i; - __PSTL_PRAGMA_VECTOR_UNALIGNED - __PSTL_PRAGMA_SIMD_EARLYEXIT + _PSTL_PRAGMA_VECTOR_UNALIGNED + _PSTL_PRAGMA_SIMD_EARLYEXIT for (__i = 0; __i < __n; ++__i) if (__pred(__first[__i])) break; @@ -75,7 +75,7 @@ __simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept while (__last != __first) { int32_t __flag = 1; - __PSTL_PRAGMA_SIMD_REDUCTION(& : __flag) + _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag) for (_DifferenceType __i = 0; __i < __block_size; ++__i) if (__pred(*(__first + __i))) __flag = 0; @@ -101,10 +101,10 @@ template <class _Index, class _DifferenceType, class _Compare> _Index __simd_first(_Index __first, _DifferenceType __begin, _DifferenceType __end, _Compare __comp) noexcept { -#if __PSTL_EARLYEXIT_PRESENT +#if _PSTL_EARLYEXIT_PRESENT _DifferenceType __i = __begin; - __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part - __PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __end; ++__i) + _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part + _PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __end; ++__i) { if (__comp(__first, __i)) { @@ -119,10 +119,10 @@ __simd_first(_Index __first, _DifferenceType __begin, _DifferenceType __end, _Co while (__end - __begin >= __block_size) { _DifferenceType __found = 0; - __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part - __PSTL_PRAGMA_SIMD_REDUCTION(| - : __found) for (_DifferenceType __i = __begin; __i < __begin + __block_size; - ++__i) + _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part + _PSTL_PRAGMA_SIMD_REDUCTION(| + : __found) for (_DifferenceType __i = __begin; __i < __begin + __block_size; + ++__i) { const _DifferenceType __t = __comp(__first, __i); __lane[__i - __begin] = __t; @@ -154,17 +154,17 @@ __simd_first(_Index __first, _DifferenceType __begin, _DifferenceType __end, _Co ++__begin; } return __first + __end; -#endif //__PSTL_EARLYEXIT_PRESENT +#endif //_PSTL_EARLYEXIT_PRESENT } template <class _Index1, class _DifferenceType, class _Index2, class _Pred> std::pair<_Index1, _Index2> __simd_first(_Index1 __first1, _DifferenceType __n, _Index2 __first2, _Pred __pred) noexcept { -#if __PSTL_EARLYEXIT_PRESENT +#if _PSTL_EARLYEXIT_PRESENT _DifferenceType __i = 0; - __PSTL_PRAGMA_VECTOR_UNALIGNED - __PSTL_PRAGMA_SIMD_EARLYEXIT + _PSTL_PRAGMA_VECTOR_UNALIGNED + _PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __n; ++__i) if (__pred(__first1[__i], __first2[__i])) break; @@ -179,9 +179,9 @@ __simd_first(_Index1 __first1, _DifferenceType __n, _Index2 __first2, _Pred __pr { _DifferenceType __found = 0; _DifferenceType __i; - __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part - __PSTL_PRAGMA_SIMD_REDUCTION(| - : __found) for (__i = 0; __i < __block_size; ++__i) + _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part + _PSTL_PRAGMA_SIMD_REDUCTION(| + : __found) for (__i = 0; __i < __block_size; ++__i) { const _DifferenceType __t = __pred(__first1[__i], __first2[__i]); __lane[__i] = __t; @@ -208,7 +208,7 @@ __simd_first(_Index1 __first1, _DifferenceType __n, _Index2 __first2, _Pred __pr return std::make_pair(__first1, __first2); return std::make_pair(__last1, __last2); -#endif //__PSTL_EARLYEXIT_PRESENT +#endif //_PSTL_EARLYEXIT_PRESENT } template <class _Index, class _DifferenceType, class _Pred> @@ -216,7 +216,7 @@ _DifferenceType __simd_count(_Index __index, _DifferenceType __n, _Pred __pred) noexcept { _DifferenceType __count = 0; - __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) + _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) for (_DifferenceType __i = 0; __i < __n; ++__i) if (__pred(*(__index + __i))) ++__count; @@ -235,10 +235,10 @@ __simd_unique_copy(_InputIterator __first, _DifferenceType __n, _OutputIterator _DifferenceType __cnt = 1; __result[0] = __first[0]; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 1; __i < __n; ++__i) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) if (!__pred(__first[__i], __first[__i - 1])) { __result[__cnt] = __first[__i]; @@ -252,8 +252,8 @@ template <class _InputIterator, class _DifferenceType, class _OutputIterator, cl _OutputIterator __simd_assign(_InputIterator __first, _DifferenceType __n, _OutputIterator __result, _Assigner __assigner) noexcept { - __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED - __PSTL_PRAGMA_SIMD + _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) __assigner(__first + __i, __result + __i); return __result + __n; @@ -265,10 +265,10 @@ __simd_copy_if(_InputIterator __first, _DifferenceType __n, _OutputIterator __re { _DifferenceType __cnt = 0; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) if (__pred(__first[__i])) { __result[__cnt] = __first[__i]; @@ -284,7 +284,7 @@ __simd_calc_mask_2(_InputIterator __first, _DifferenceType __n, bool* __mask, _B { _DifferenceType __count = 0; - __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) + _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) for (_DifferenceType __i = 0; __i < __n; ++__i) { __mask[__i] = !__pred(__first[__i], __first[__i - 1]); @@ -299,7 +299,7 @@ __simd_calc_mask_1(_InputIterator __first, _DifferenceType __n, bool* __mask, _U { _DifferenceType __count = 0; - __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) + _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count) for (_DifferenceType __i = 0; __i < __n; ++__i) { __mask[__i] = __pred(__first[__i]); @@ -314,12 +314,12 @@ __simd_copy_by_mask(_InputIterator __first, _DifferenceType __n, _OutputIterator _Assigner __assigner) noexcept { _DifferenceType __cnt = 0; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) { if (__mask[__i]) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) { __assigner(__first + __i, __result + __cnt); ++__cnt; @@ -334,10 +334,10 @@ __simd_partition_by_mask(_InputIterator __first, _DifferenceType __n, _OutputIte _OutputIterator2 __out_false, bool* __mask) noexcept { _DifferenceType __cnt_true = 0, __cnt_false = 0; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1) if (__mask[__i]) { __out_true[__cnt_true] = __first[__i]; @@ -355,8 +355,8 @@ template <class _Index, class _DifferenceType, class _Tp> _Index __simd_fill_n(_Index __first, _DifferenceType __n, const _Tp& __value) noexcept { - __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED - __PSTL_PRAGMA_SIMD + _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) __first[__i] = __value; return __first + __n; @@ -366,8 +366,8 @@ template <class _Index, class _DifferenceType, class _Generator> _Index __simd_generate_n(_Index __first, _DifferenceType __size, _Generator __g) noexcept { - __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED - __PSTL_PRAGMA_SIMD + _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __size; ++__i) __first[__i] = __g(); return __first + __size; @@ -383,11 +383,11 @@ __simd_adjacent_find(_Index __first, _Index __last, _BinaryPredicate __pred, boo typedef typename std::iterator_traits<_Index>::difference_type _DifferenceType; _DifferenceType __i = 0; -#if __PSTL_EARLYEXIT_PRESENT +#if _PSTL_EARLYEXIT_PRESENT //Some compiler versions fail to compile the following loop when iterators are used. Indices are used instead const _DifferenceType __n = __last - __first - 1; - __PSTL_PRAGMA_VECTOR_UNALIGNED - __PSTL_PRAGMA_SIMD_EARLYEXIT + _PSTL_PRAGMA_VECTOR_UNALIGNED + _PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __n; ++__i) if (__pred(__first[__i], __first[__i + 1])) break; @@ -401,9 +401,9 @@ __simd_adjacent_find(_Index __first, _Index __last, _BinaryPredicate __pred, boo while (__last - __first >= __block_size) { _DifferenceType __found = 0; - __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part - __PSTL_PRAGMA_SIMD_REDUCTION(| - : __found) for (__i = 0; __i < __block_size - 1; ++__i) + _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part + _PSTL_PRAGMA_SIMD_REDUCTION(| + : __found) for (__i = 0; __i < __block_size - 1; ++__i) { //TODO: to improve SIMD vectorization const _DifferenceType __t = __pred(*(__first + __i), *(__first + __i + 1)); @@ -446,7 +446,7 @@ template <typename _DifferenceType, typename _Tp, typename _BinaryOperation, typ typename std::enable_if<is_arithmetic_plus<_Tp, _BinaryOperation>::value, _Tp>::type __simd_transform_reduce(_DifferenceType __n, _Tp __init, _BinaryOperation, _UnaryOperation __f) noexcept { - __PSTL_PRAGMA_SIMD_REDUCTION(+ : __init) + _PSTL_PRAGMA_SIMD_REDUCTION(+ : __init) for (_DifferenceType __i = 0; __i < __n; ++__i) __init += __f(__i); return __init; @@ -463,7 +463,7 @@ __simd_transform_reduce(_Size __n, _Tp __init, _BinaryOperation __binary_op, _Un _Tp* __lane = reinterpret_cast<_Tp*>(__lane_); // initializer - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_Size __i = 0; __i < __block_size; ++__i) { ::new (__lane + __i) _Tp(__binary_op(__f(__i), __f(__block_size + __i))); @@ -473,14 +473,14 @@ __simd_transform_reduce(_Size __n, _Tp __init, _BinaryOperation __binary_op, _Un const _Size last_iteration = __block_size * (__n / __block_size); for (; __i < last_iteration; __i += __block_size) { - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_Size __j = 0; __j < __block_size; ++__j) { __lane[__j] = __binary_op(__lane[__j], __f(__i + __j)); } } // remainder - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_Size __j = 0; __j < __n - last_iteration; ++__j) { __lane[__j] = __binary_op(__lane[__j], __f(last_iteration + __j)); @@ -491,7 +491,7 @@ __simd_transform_reduce(_Size __n, _Tp __init, _BinaryOperation __binary_op, _Un __init = __binary_op(__init, __lane[__i]); } // destroyer - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_Size __i = 0; __i < __block_size; ++__i) { __lane[__i].~_Tp(); @@ -514,11 +514,11 @@ typename std::enable_if<is_arithmetic_plus<_Tp, _BinaryOperation>::value, std::p __simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryOperation __unary_op, _Tp __init, _BinaryOperation, /*Inclusive*/ std::false_type) { - __PSTL_PRAGMA_SIMD_SCAN(+ : __init) + _PSTL_PRAGMA_SIMD_SCAN(+ : __init) for (_Size __i = 0; __i < __n; ++__i) { __result[__i] = __init; - __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init) + _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init) __init += __unary_op(__first[__i]); } return std::make_pair(__result + __n, __init); @@ -552,14 +552,14 @@ __simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryO typedef _Combiner<_Tp, _BinaryOperation> _CombinerType; _CombinerType __init_{__init, &__binary_op}; - __PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType) + _PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType) - __PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_) + _PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_) for (_Size __i = 0; __i < __n; ++__i) { __result[__i] = __init_.__value; - __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init_) - __PSTL_PRAGMA_FORCEINLINE + _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init_) + _PSTL_PRAGMA_FORCEINLINE __init_.__value = __binary_op(__init_.__value, __unary_op(__first[__i])); } return std::make_pair(__result + __n, __init_.__value); @@ -572,11 +572,11 @@ typename std::enable_if<is_arithmetic_plus<_Tp, _BinaryOperation>::value, std::p __simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryOperation __unary_op, _Tp __init, _BinaryOperation, /*Inclusive*/ std::true_type) { - __PSTL_PRAGMA_SIMD_SCAN(+ : __init) + _PSTL_PRAGMA_SIMD_SCAN(+ : __init) for (_Size __i = 0; __i < __n; ++__i) { __init += __unary_op(__first[__i]); - __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init) + _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init) __result[__i] = __init; } return std::make_pair(__result + __n, __init); @@ -592,14 +592,14 @@ __simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryO typedef _Combiner<_Tp, _BinaryOperation> _CombinerType; _CombinerType __init_{__init, &__binary_op}; - __PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType) + _PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType) - __PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_) + _PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_) for (_Size __i = 0; __i < __n; ++__i) { - __PSTL_PRAGMA_FORCEINLINE + _PSTL_PRAGMA_FORCEINLINE __init_.__value = __binary_op(__init_.__value, __unary_op(__first[__i])); - __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init_) + _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init_) __result[__i] = __init_.__value; } return std::make_pair(__result + __n, __init_.__value); @@ -633,7 +633,7 @@ __simd_min_element(_ForwardIterator __first, _Size __n, _Compare __comp) noexcep { } - __PSTL_PRAGMA_DECLARE_SIMD + _PSTL_PRAGMA_DECLARE_SIMD void operator()(const _ComplexType& __obj) { @@ -648,9 +648,9 @@ __simd_min_element(_ForwardIterator __first, _Size __n, _Compare __comp) noexcep _ComplexType __init{*__first, &__comp}; - __PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType) + _PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType) - __PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init) + _PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init) for (_Size __i = 1; __i < __n; ++__i) { const _ValueType __min_val = __init.__min_val; @@ -727,9 +727,9 @@ __simd_minmax_element(_ForwardIterator __first, _Size __n, _Compare __comp) noex _ComplexType __init{*__first, *__first, &__comp}; - __PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType); + _PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType); - __PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init) + _PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init) for (_Size __i = 1; __i < __n; ++__i) { auto __min_val = __init.__min_val; @@ -757,10 +757,10 @@ __simd_partition_copy(_InputIterator __first, _DifferenceType __n, _OutputIterat { _DifferenceType __cnt_true = 0, __cnt_false = 0; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 0; __i < __n; ++__i) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1) if (__pred(__first[__i])) { __out_true[__cnt_true] = __first[__i]; @@ -838,10 +838,10 @@ __simd_remove_if(_RandomAccessIterator __first, _DifferenceType __n, _UnaryPredi } _DifferenceType __cnt = 0; - __PSTL_PRAGMA_SIMD + _PSTL_PRAGMA_SIMD for (_DifferenceType __i = 1; __i < __n; ++__i) { - __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) + _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1) if (!__pred(__current[__i])) { __current[__cnt] = std::move(__current[__i]); @@ -853,4 +853,4 @@ __simd_remove_if(_RandomAccessIterator __first, _DifferenceType __n, _UnaryPredi } // namespace __unseq_backend } // namespace __pstl -#endif /* __PSTL_unseq_backend_simd_H */ +#endif /* _PSTL_UNSEQ_BACKEND_SIMD_H */ diff --git a/pstl/include/pstl/internal/utils.h b/pstl/include/pstl/internal/utils.h index 00ccc62072a..1711f292678 100644 --- a/pstl/include/pstl/internal/utils.h +++ b/pstl/include/pstl/internal/utils.h @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_utils_H -#define __PSTL_utils_H +#ifndef _PSTL_UTILS_H +#define _PSTL_UTILS_H #include <new> #include <iterator> @@ -219,4 +219,4 @@ __cmp_iterators_by_values(_ForwardIterator __a, _ForwardIterator __b, _Compare _ } // namespace __internal } // namespace __pstl -#endif /* __PSTL_utils_H */ +#endif /* _PSTL_UTILS_H */ diff --git a/pstl/include/pstl/memory b/pstl/include/pstl/memory index 69ecb3f24b5..359eaf19f3b 100644 --- a/pstl/include/pstl/memory +++ b/pstl/include/pstl/memory @@ -7,18 +7,18 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_memory -#define __PSTL_memory +#ifndef _PSTL_MEMORY +#define _PSTL_MEMORY #include "internal/pstl_config.h" -#if __PSTL_EXECUTION_POLICIES_DEFINED +#if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations # include "internal/glue_memory_impl.h" #else // Otherwise just pull in forward declarations # include "internal/glue_memory_defs.h" -# define __PSTL_MEMORY_FORWARD_DECLARED 1 +# define _PSTL_MEMORY_FORWARD_DECLARED 1 #endif -#endif /* __PSTL_memory */ +#endif /* _PSTL_MEMORY */ diff --git a/pstl/include/pstl/numeric b/pstl/include/pstl/numeric index 20a9aea1ad8..94e9b76dc17 100644 --- a/pstl/include/pstl/numeric +++ b/pstl/include/pstl/numeric @@ -7,18 +7,18 @@ // //===----------------------------------------------------------------------===// -#ifndef __PSTL_numeric -#define __PSTL_numeric +#ifndef _PSTL_NUMERIC +#define _PSTL_NUMERIC #include "internal/pstl_config.h" -#if __PSTL_EXECUTION_POLICIES_DEFINED +#if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations # include "internal/glue_numeric_impl.h" #else // Otherwise just pull in forward declarations # include "internal/glue_numeric_defs.h" -# define __PSTL_NUMERIC_FORWARD_DECLARED 1 +# define _PSTL_NUMERIC_FORWARD_DECLARED 1 #endif -#endif /* __PSTL_numeric */ +#endif /* _PSTL_NUMERIC */ |
