diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-07-18 20:22:28 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-07-18 20:22:28 +0000 |
| commit | 01963cec9b3fbc8ec98da449180d95be224dfadd (patch) | |
| tree | eb8fa0aff7173862b588f43301e80985513dd02e /pstl | |
| parent | 96f497081351e01f70af275abbf98847d25a5158 (diff) | |
| download | llvm-01963cec9b3fbc8ec98da449180d95be224dfadd.tar.gz | |
[NFC][pstl] Run clang-format on the sources, including the tests
llvm-svn: 366492
Diffstat (limited to 'pstl')
36 files changed, 108 insertions, 118 deletions
diff --git a/pstl/include/pstl/internal/algorithm_impl.h b/pstl/include/pstl/internal/algorithm_impl.h index a9bf29a6fb27..883f03d8247d 100644 --- a/pstl/include/pstl/internal/algorithm_impl.h +++ b/pstl/include/pstl/internal/algorithm_impl.h @@ -2181,11 +2181,11 @@ __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 +#else std::copy(__i1, __j1, __i); -# endif +#endif // 2. Sort elements in output sequence std::sort(__i, __j, __comp); }, diff --git a/pstl/include/pstl/internal/pstl_config.h b/pstl/include/pstl/internal/pstl_config.h index 31dd47acfc72..ba964912e668 100644 --- a/pstl/include/pstl/internal/pstl_config.h +++ b/pstl/include/pstl/internal/pstl_config.h @@ -52,7 +52,8 @@ #endif // Enable SIMD for compilers that support OpenMP 4.0 -#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || defined(__clang__) +#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || \ + defined(__clang__) # 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)) diff --git a/pstl/test/pstl/version.pass.cpp b/pstl/test/pstl/version.pass.cpp index 84210de9849a..7e34c1f85439 100644 --- a/pstl/test/pstl/version.pass.cpp +++ b/pstl/test/pstl/version.pass.cpp @@ -8,12 +8,13 @@ #include <pstl/internal/pstl_config.h> - static_assert(_PSTL_VERSION == 10000); static_assert(_PSTL_VERSION_MAJOR == 10); static_assert(_PSTL_VERSION_MINOR == 00); static_assert(_PSTL_VERSION_PATCH == 0); -int main() { +int +main() +{ return 0; } diff --git a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp index 64433c835edd..74ecc0c5a706 100644 --- a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp @@ -20,7 +20,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename BiDirIt1, typename Size, typename Generator1, typename Generator2, typename Compare> void @@ -60,8 +60,7 @@ struct test_one_policy template <typename Policy, typename BiDirIt1, typename Size, typename Generator1, typename Generator2, typename Compare> typename std::enable_if<is_same_iterator_category<BiDirIt1, std::forward_iterator_tag>::value, void>::type - operator()(Policy&&, BiDirIt1, BiDirIt1, BiDirIt1, BiDirIt1, Size, Size, - Generator1, Generator2, Compare) + operator()(Policy&&, BiDirIt1, BiDirIt1, BiDirIt1, BiDirIt1, Size, Size, Generator1, Generator2, Compare) { } }; diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp index 56b557cca74b..d2381036cda0 100644 --- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp @@ -48,8 +48,7 @@ struct test_merge void operator()(Policy&& exec, std::reverse_iterator<InputIterator1> first1, std::reverse_iterator<InputIterator1> last1, std::reverse_iterator<InputIterator2> first2, std::reverse_iterator<InputIterator2> last2, - std::reverse_iterator<OutputIterator> out_first, std::reverse_iterator<OutputIterator> out_last, - Compare) + std::reverse_iterator<OutputIterator> out_first, std::reverse_iterator<OutputIterator> out_last, Compare) { using namespace std; typedef typename std::iterator_traits<std::reverse_iterator<InputIterator1>>::value_type T; diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp index 62eb7f688784..aeafb020f65f 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp @@ -44,8 +44,8 @@ struct run_copy_if typename Predicate, typename T> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, - Predicate pred, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, Predicate pred, + T trash) { // Cleaning std::fill_n(expected_first, n, trash); diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp index 57d783095d5b..c376f895664b 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp @@ -57,14 +57,14 @@ is_equal(Iterator first, Iterator last, Iterator d_first) template <typename Iterator> typename std::enable_if<!std::is_trivial<typename std::iterator_traits<Iterator>::value_type>::value, bool>::type -is_equal(Iterator, Iterator, Iterator) + is_equal(Iterator, Iterator, Iterator) { return true; } struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specializations to skip testing in case of broken configuration template <typename BiDirIt, typename Size, typename UnaryOp, typename Generator> void @@ -97,8 +97,8 @@ struct test_one_policy template <typename Policy, typename BiDirIt, typename Size, typename UnaryOp, typename Generator> typename std::enable_if<!is_same_iterator_category<BiDirIt, std::forward_iterator_tag>::value, void>::type - operator()(Policy&& exec, BiDirIt first, BiDirIt last, BiDirIt exp_first, BiDirIt exp_last, Size, - UnaryOp unary_op, Generator generator) + operator()(Policy&& exec, BiDirIt first, BiDirIt last, BiDirIt exp_first, BiDirIt exp_last, Size, UnaryOp unary_op, + Generator generator) { // partition { @@ -121,8 +121,7 @@ struct test_one_policy } template <typename Policy, typename BiDirIt, typename Size, typename UnaryOp, typename Generator> typename std::enable_if<is_same_iterator_category<BiDirIt, std::forward_iterator_tag>::value, void>::type - operator()(Policy&&, BiDirIt, BiDirIt, BiDirIt, BiDirIt, Size, - UnaryOp, Generator) + operator()(Policy&&, BiDirIt, BiDirIt, BiDirIt, BiDirIt, Size, UnaryOp, Generator) { } }; diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp index a9dbdf048f20..ab51504dd3c9 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp @@ -21,7 +21,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN || _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN || _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Iterator2> typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp index 668f970ef0fe..8c79de782441 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp @@ -61,7 +61,7 @@ struct test_one_policy Iterator data_e; test_one_policy(Iterator b, Iterator e) : data_b(b), data_e(e) {} -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename Iterator1> typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type diff --git a/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp index 8aa616e42777..5bef48e625bb 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp @@ -22,7 +22,7 @@ using namespace TestUtils; struct run_copy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size, typename T> void @@ -45,8 +45,7 @@ struct run_copy typename T> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size size, - Size n, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size size, Size n, T trash) { // Cleaning std::fill_n(expected_first, size, trash); @@ -75,7 +74,7 @@ template <typename T> struct run_move { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size> void @@ -97,8 +96,7 @@ struct run_move template <typename Policy, typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size size, - Size, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size size, Size, T trash) { // Cleaning std::fill_n(expected_first, size, trash); @@ -118,7 +116,7 @@ template <typename T> struct run_move<Wrapper<T>> { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size> void @@ -140,8 +138,7 @@ struct run_move<Wrapper<T>> template <typename Policy, typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2, OutputIterator2, Size size, - Size, Wrapper<T> trash) + OutputIterator out_last, OutputIterator2, OutputIterator2, Size size, Size, Wrapper<T> trash) { // Cleaning std::fill_n(out_first, size, trash); diff --git a/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp index d3375ec5b20f..4561f3c6dcef 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp @@ -58,8 +58,7 @@ struct test_generate const auto m = n / 2; auto actual_last = generate_n(exec, first, m, g); Size count = std::count(first, actual_last, g.default_value()); - EXPECT_TRUE(count == m && actual_last == std::next(first, m), - "generate_n wrong result for generate_n"); + EXPECT_TRUE(count == m && actual_last == std::next(first, m), "generate_n wrong result for generate_n"); std::fill(first, actual_last, T(0)); } } diff --git a/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp index c01b8e23b2eb..cb8b178417d7 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp @@ -21,7 +21,7 @@ using namespace TestUtils; struct run_remove { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename OutputIterator, typename Size, typename T> void @@ -59,7 +59,7 @@ struct run_remove struct run_remove_if { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename OutputIterator, typename Size, typename Predicate> void diff --git a/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp index 9b47cca54c0e..969343b3764c 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp @@ -24,8 +24,8 @@ struct run_remove_copy typename T> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, - const T& value, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, const T& value, + T trash) { // Cleaning std::fill_n(expected_first, n, trash); diff --git a/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp index 963ff1214eeb..d42dae76ebd1 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp @@ -23,7 +23,7 @@ struct copy_int { int32_t value; int32_t copied_times = 0; - constexpr explicit copy_int(int32_t val = 0) : value(val) { } + constexpr explicit copy_int(int32_t val = 0) : value(val) {} constexpr copy_int& operator=(const copy_int& other) @@ -82,8 +82,7 @@ struct test_one_policy } template <typename T, typename Iterator1> - bool - check(Iterator1, Iterator1) + bool check(Iterator1, Iterator1) { return true; } diff --git a/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp index a2e4f721e85c..4414d1cbd353 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp @@ -26,8 +26,8 @@ struct test_replace_copy typename Predicate, typename T> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, - Predicate pred, const T& old_value, const T& new_value, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, Predicate pred, + const T& old_value, const T& new_value, T trash) { // Cleaning std::fill_n(expected_first, n, trash); diff --git a/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp index a5c0bc2dad86..5eb242e6dd72 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp @@ -74,7 +74,7 @@ struct compare<wrapper<T>> struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specializations to skip testing in case of broken configuration template <typename Iterator, typename Size> void diff --git a/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp index 0706c9c4e7fd..3749492e2a28 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp @@ -69,7 +69,7 @@ struct comparator struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Iterator2> typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type diff --git a/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp index 7ef5d9194926..79f5518ad2cb 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp @@ -21,7 +21,7 @@ using namespace TestUtils; struct run_unique { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename ForwardIt, typename Generator> void diff --git a/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp index f55209f4ed62..b1590ef0b14c 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp @@ -45,8 +45,8 @@ struct run_unique_copy typename Predicate, typename T> void operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, - Predicate pred, T trash) + OutputIterator out_last, OutputIterator2 expected_first, OutputIterator2, Size n, Predicate pred, + T trash) { // Cleaning std::fill_n(expected_first, n, trash); @@ -124,8 +124,8 @@ main() test<float32_t>(float32_t(42), std::equal_to<float32_t>(), [](int32_t j) { return float32_t(5 * j / 23 ^ (j / 7)); }); #if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN - test<float32_t>(float32_t(42), [](float32_t, float32_t) { return false; }, - [](int32_t j) { return float32_t(j); }, false); + test<float32_t>(float32_t(42), [](float32_t, float32_t) { return false; }, [](int32_t j) { return float32_t(j); }, + false); #endif test_algo_basic_double<int32_t>(run_for_rnd_fw<test_non_const<int32_t>>()); diff --git a/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp index d9c983afec45..8f00351dcd07 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp @@ -47,7 +47,7 @@ test_adjacent_find_by_type() for (size_t e = 0; e < (counts[c] >= 64 ? 64 : (counts[c] == 2 ? 1 : 2)); ++e) { Sequence<T> in(counts[c], [](size_t v) -> T { return T(v); }); //fill 0...n - in[e] = in[e + 1] = -1; //make an adjacent pair + in[e] = in[e + 1] = -1; //make an adjacent pair auto i = std::adjacent_find(in.cbegin(), in.cend(), std::equal_to<T>()); EXPECT_TRUE(i == in.cbegin() + e, "std::adjacent_find returned wrong result"); diff --git a/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp index d6bcadb7bddf..f5a5d94f5e41 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp @@ -21,7 +21,7 @@ using namespace TestUtils; struct test_find { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator, typename Value> void @@ -85,7 +85,7 @@ main() { // Note that the "hit" and "miss" functions here avoid overflow issues. test<Number>(Weird(42, OddTag()), [](int32_t) { return Number(42, OddTag()); }, // hit - [](int32_t j) { return Number(j == 42 ? 0 : j, OddTag()); }); // miss + [](int32_t j) { return Number(j == 42 ? 0 : j, OddTag()); }); // miss // Test with value that is equal to two different bit patterns (-0.0 and 0.0) test<float32_t>(-0.0, [](int32_t j) { return j & 1 ? 0.0 : -0.0; }, // hit diff --git a/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp index b6a60f0c12e3..20826ae064e2 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp @@ -20,7 +20,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Iterator2, typename Predicate> void diff --git a/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp index 7f5a55681172..84c35e95cfc5 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp @@ -20,7 +20,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Iterator2, typename Predicate> void diff --git a/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp index 5bafbbc5e500..3dd41c07288e 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp @@ -21,7 +21,7 @@ using namespace TestUtils; struct test_find_if { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator, typename Predicate, typename NotPredicate> void diff --git a/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp index 49cf28be30b1..71009ac285ad 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp @@ -68,7 +68,7 @@ is_equal(const T& x, const T& y) struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Size, typename Generator1, typename Generator2, typename Compare> typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type @@ -113,8 +113,7 @@ struct test_one_policy template <typename Policy, typename Iterator1, typename Size, typename Generator1, typename Generator2, typename Compare> typename std::enable_if<!is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type - operator()(Policy&&, Iterator1, Iterator1, Iterator1, Iterator1, Size, Size, - Generator1, Generator2, Compare) + operator()(Policy&&, Iterator1, Iterator1, Iterator1, Iterator1, Size, Size, Generator1, Generator2, Compare) { } }; diff --git a/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp index a42193a4441f..9bcea249a2ea 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp @@ -20,7 +20,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator, typename Size, typename T, typename Predicate> void diff --git a/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp index 6dc8bb6a6f7e..78e7a3079dc4 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp @@ -35,7 +35,7 @@ struct WithCmpOp struct test_is_heap { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration template <typename Iterator, typename Predicate> typename std::enable_if<is_same_iterator_category<Iterator, std::random_access_iterator_tag>::value, void>::type diff --git a/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp index b1cd66965e1f..e378cb491ab6 100644 --- a/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp @@ -81,11 +81,11 @@ struct test_brick_partial_sort if (m1 - first > 1) { #ifdef _DEBUG -# if defined(_PSTL_PAR_BACKEND_TBB) +# if defined(_PSTL_PAR_BACKEND_TBB) auto p = tbb::this_task_arena::max_concurrency(); -# else +# else auto p = 1; -# endif +# endif auto complex = std::ceil(n * std::log(float32_t(m1 - first))); if (count_comp > complex * p) { @@ -99,8 +99,7 @@ struct test_brick_partial_sort template <typename Policy, typename InputIterator, typename Compare> typename std::enable_if<!is_same_iterator_category<InputIterator, std::random_access_iterator_tag>::value, void>::type - operator()(Policy&&, InputIterator, InputIterator, InputIterator, InputIterator, - Compare) + operator()(Policy&&, InputIterator, InputIterator, InputIterator, InputIterator, Compare) { } }; diff --git a/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp index 55b1d04c7986..3fe1d5ae4a12 100644 --- a/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp @@ -55,7 +55,7 @@ struct test_one_policy : d_first(b1), d_last(e1), exp_first(b2), exp_last(e2) { } -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename InputIterator, typename Size, typename T, typename Compare> void diff --git a/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp b/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp index 7280dfb61ca7..add69d66bc2d 100644 --- a/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp @@ -189,8 +189,8 @@ struct test_sort_with_compare typename Compare> typename std::enable_if<!is_same_iterator_category<InputIterator, std::random_access_iterator_tag>::value, void>::type - operator()(Policy&&, OutputIterator, OutputIterator, OutputIterator2, - OutputIterator2, InputIterator, InputIterator, Size, Compare) + operator()(Policy&&, OutputIterator, OutputIterator, OutputIterator2, OutputIterator2, InputIterator, InputIterator, + Size, Compare) { } }; diff --git a/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp b/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp index d77f2c1127ea..65251550381f 100644 --- a/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp @@ -86,15 +86,15 @@ compute_and_check(Iterator1 first, Iterator1 last, Iterator2 d_first, T, Functio // we don't want to check equality here // because we can't be sure it will be strictly equal for floating point types template <typename Iterator1, typename Iterator2, typename T, typename Function> -typename std::enable_if<std::is_floating_point<T>::value, bool>::type -compute_and_check(Iterator1, Iterator1, Iterator2, T, Function) +typename std::enable_if<std::is_floating_point<T>::value, bool>::type compute_and_check(Iterator1, Iterator1, Iterator2, + T, Function) { return true; } struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename Iterator1, typename Iterator2, typename T, typename Function> typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type diff --git a/pstl/test/std/numerics/numeric.ops/scan.pass.cpp b/pstl/test/std/numerics/numeric.ops/scan.pass.cpp index 4b422dc64fdb..64156f001a5c 100644 --- a/pstl/test/std/numerics/numeric.ops/scan.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/scan.pass.cpp @@ -156,8 +156,7 @@ struct test_scan_with_binary_op template <typename Policy, typename Iterator1, typename Iterator2, typename Iterator3, typename Size, typename T, typename BinaryOp> typename std::enable_if<TestUtils::isReverse<Iterator1>::value, void>::type - operator()(Policy&&, Iterator1, Iterator1, Iterator2, Iterator2, - Iterator3, Iterator3, Size, T, BinaryOp, T) + operator()(Policy&&, Iterator1, Iterator1, Iterator2, Iterator2, Iterator3, Iterator3, Size, T, BinaryOp, T) { } }; diff --git a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp index c4317c43e7d4..7341ed570cd9 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp @@ -124,10 +124,9 @@ main() test_by_type<int64_t>(0, [](const int64_t& a, const int64_t& b) -> int64_t { return a | b; }, XOR(), [](const int64_t& x) -> int64_t { return x * 2; }, [](std::size_t) -> int64_t { return int64_t(rand() % 1000); }); - test_by_type<float32_t>(1.0f, std::multiplies<float32_t>(), - [](const float32_t& a, const float32_t& b) -> float32_t { return a + b; }, - [](const float32_t& x) -> float32_t { return x + 2; }, - [](std::size_t) -> float32_t { return rand() % 1000; }); + test_by_type<float32_t>( + 1.0f, std::multiplies<float32_t>(), [](const float32_t& a, const float32_t& b) -> float32_t { return a + b; }, + [](const float32_t& x) -> float32_t { return x + 2; }, [](std::size_t) -> float32_t { return rand() % 1000; }); test_by_type<MyClass>(MyClass(), std::plus<MyClass>(), std::multiplies<MyClass>(), std::negate<MyClass>(), [](std::size_t) -> MyClass { return MyClass(rand() % 1000); }); diff --git a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp index c9475c97c9d9..a7dd44a8be2f 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp @@ -39,15 +39,15 @@ struct test_transform_scan typename T, typename BinaryOp> typename std::enable_if<!TestUtils::isReverse<InputIterator>::value, void>::type operator()(Policy&& exec, InputIterator first, InputIterator last, OutputIterator out_first, - OutputIterator out_last, OutputIterator expected_first, OutputIterator, Size n, - UnaryOp unary_op, T init, BinaryOp binary_op, T trash) + OutputIterator out_last, OutputIterator expected_first, OutputIterator, Size n, UnaryOp unary_op, T init, + BinaryOp binary_op, T trash) { using namespace std; - auto orr1 = inclusive ? transform_inclusive_scan(std::execution::seq, first, last, expected_first, binary_op, - unary_op, init) - : transform_exclusive_scan(std::execution::seq, first, last, expected_first, init, - binary_op, unary_op); + auto orr1 = + inclusive + ? transform_inclusive_scan(std::execution::seq, first, last, expected_first, binary_op, unary_op, init) + : transform_exclusive_scan(std::execution::seq, first, last, expected_first, init, binary_op, unary_op); auto orr2 = inclusive ? transform_inclusive_scan(exec, first, last, out_first, binary_op, unary_op, init) : transform_exclusive_scan(exec, first, last, out_first, init, binary_op, unary_op); EXPECT_TRUE(out_last == orr2, "transform...scan returned wrong iterator"); @@ -66,9 +66,8 @@ struct test_transform_scan template <typename Policy, typename InputIterator, typename OutputIterator, typename Size, typename UnaryOp, typename T, typename BinaryOp> typename std::enable_if<TestUtils::isReverse<InputIterator>::value, void>::type - operator()(Policy&&, InputIterator, InputIterator, OutputIterator, - OutputIterator, OutputIterator, OutputIterator, Size, - UnaryOp, T, BinaryOp, T) + operator()(Policy&&, InputIterator, InputIterator, OutputIterator, OutputIterator, OutputIterator, OutputIterator, + Size, UnaryOp, T, BinaryOp, T) { } }; diff --git a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp index cb7df7829fe1..d1c9e3a7a071 100644 --- a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp +++ b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp @@ -133,7 +133,7 @@ main() test_uninitialized_copy_move_by_type<float64_t>(); // for user-defined types -#if !_PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && !_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && \ +#if !_PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && !_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && \ !_PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN test_uninitialized_copy_move_by_type<Wrapper<int8_t>>(); #endif diff --git a/pstl/test/support/pstl_test_config.h b/pstl/test/support/pstl_test_config.h index 9220790eb810..daf5625a0554 100644 --- a/pstl/test/support/pstl_test_config.h +++ b/pstl/test/support/pstl_test_config.h @@ -11,41 +11,42 @@ #define _PSTL_TEST_config_H #if defined(_MSC_VER) && defined(_DEBUG) -#define _SCL_SECURE_NO_WARNINGS //to prevent the compilation warning. Microsoft STL implementation has specific checking of an iterator range in DEBUG mode for the containers from the standard library. +# define _SCL_SECURE_NO_WARNINGS //to prevent the compilation warning. Microsoft STL implementation has specific checking of an iterator range in DEBUG mode for the containers from the standard library. #endif #ifndef __clang__ -#define _PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN \ - (__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER <= 1700 && !__APPLE__) -#define _PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN \ - (!_DEBUG && __INTEL_COMPILER && \ - (__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1))) -#define _PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN \ - (__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1) -#define _PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN \ - (__i386__ && !_DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && __APPLE__) -#define _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN \ - (!_DEBUG && __INTEL_COMPILER >= 1800 && __INTEL_COMPILER < 1900 && _MSC_VER == 1910) -#define _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \ - (_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && _MSC_VER >= 1900) -#define _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \ - (_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1600 && __INTEL_COMPILER < 1700 && _MSC_VER == 1900) -#define _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN \ - (((_M_X64 && _MSC_VER == 1900) || __x86_64) && !_DEBUG && __INTEL_COMPILER < 1700) -#define _PSTL_ICC_16_17_TEST_64_TIMEOUT (__x86_64 && __INTEL_COMPILER && __INTEL_COMPILER < 1800 && !__APPLE__) -#define _PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN (!_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800) -#define _PSTL_CLANG_TEST_BIG_OBJ_DEBUG_32_BROKEN \ - (__i386__ && PSTL_USE_DEBUG && __clang__ && _PSTL_CLANG_VERSION <= 90000) -#define _PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN \ - (!_DEBUG && __INTEL_COMPILER && \ - (__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 3))) -#define _PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN \ - (!_DEBUG && __INTEL_COMPILER == 1800 && __AVX__ && !__AVX2__ && !__AVX512__) -#define _PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN \ - (!PSTL_USE_DEBUG && (__linux__ || __APPLE__) && __INTEL_COMPILER == 1900) -#define _PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN \ - (__INTEL_COMPILER == 1900 && _MSC_VER >= 1900 && _MSC_VER <= 1910) -#define _PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN (__INTEL_COMPILER == 1900 && _MSC_VER && !_DEBUG) +# define _PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN \ + (__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER <= 1700 && !__APPLE__) +# define _PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN \ + (!_DEBUG && __INTEL_COMPILER && \ + (__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1))) +# define _PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN \ + (__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1) +# define _PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN \ + (__i386__ && !_DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && __APPLE__) +# define _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN \ + (!_DEBUG && __INTEL_COMPILER >= 1800 && __INTEL_COMPILER < 1900 && _MSC_VER == 1910) +# define _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \ + (_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && _MSC_VER >= 1900) +# define _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \ + (_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1600 && __INTEL_COMPILER < 1700 && _MSC_VER == 1900) +# define _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN \ + (((_M_X64 && _MSC_VER == 1900) || __x86_64) && !_DEBUG && __INTEL_COMPILER < 1700) +# define _PSTL_ICC_16_17_TEST_64_TIMEOUT (__x86_64 && __INTEL_COMPILER && __INTEL_COMPILER < 1800 && !__APPLE__) +# define _PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN \ + (!_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800) +# define _PSTL_CLANG_TEST_BIG_OBJ_DEBUG_32_BROKEN \ + (__i386__ && PSTL_USE_DEBUG && __clang__ && _PSTL_CLANG_VERSION <= 90000) +# define _PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN \ + (!_DEBUG && __INTEL_COMPILER && \ + (__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 3))) +# define _PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN \ + (!_DEBUG && __INTEL_COMPILER == 1800 && __AVX__ && !__AVX2__ && !__AVX512__) +# define _PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN \ + (!PSTL_USE_DEBUG && (__linux__ || __APPLE__) && __INTEL_COMPILER == 1900) +# define _PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN \ + (__INTEL_COMPILER == 1900 && _MSC_VER >= 1900 && _MSC_VER <= 1910) +# define _PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN (__INTEL_COMPILER == 1900 && _MSC_VER && !_DEBUG) #endif // !__clang__ #endif /* _PSTL_TEST_config_H */ |