Index: include/pstl/internal/algorithm_impl.h =================================================================== --- include/pstl/internal/algorithm_impl.h +++ include/pstl/internal/algorithm_impl.h @@ -404,6 +404,82 @@ // equal //------------------------------------------------------------------------ +template +bool +equal_serial_impl(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, + _ForwardIterator2 __last2, _BinaryPredicate __p) +{ + for(; __first1 != __last1 && __first2 != __last2; __first1++, __first2++) + if(!__p(*__first1, *__first2)) + return false; + + return __first1 == __last1 && __first2 == __last2; +} + +template +bool +brick_equal(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 + __last2, _BinaryPredicate __p, /* IsVector = */ std::false_type) noexcept +{ + return invoke_if_else(typename is_random_access_iterator<_ForwardIterator1, _ForwardIterator2>::type(), + [&]() { + if(std::distance(__first1, __last1) != std::distance(__first2, __last2)) + return false; + return equal_serial_impl(__first1, __last1, __first2, __last2, __p); + }, + [&]() { + return equal_serial_impl(__first1, __last1, __first2, __last2, __p); + } + ); +} + +template +bool +brick_equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2, + _RandomAccessIterator2 __last2, _BinaryPredicate __p, /* is_vector = */ std::true_type) noexcept +{ + if(__last1 - __first1 != __last2 - __first2) + return false; + + return unseq_backend::simd_first(__first1, __last1 - __first1, __first2, not_pred<_BinaryPredicate>(__p)).first == + __last1; +} + +template +bool +pattern_equal(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, + _ForwardIterator2 __last2, _BinaryPredicate __p, _IsVector __is_vector, /* is_parallel = */ + std::false_type) noexcept +{ + return internal::brick_equal(__first1, __last1, __first2, __last2, __p, __is_vector); +} + +#if __PSTL_USE_PAR_POLICIES +template +bool +pattern_equal(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, + _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __p, + _IsVector __is_vector, /*is_parallel=*/ std::true_type) +{ + if(__last1 - __first1 != __last2 - __first2) + return false; + + return internal::except_handler([&]() { + return !internal::parallel_or( + std::forward<_ExecutionPolicy>(__exec), __first1, __last1, + [__first1, __first2, __p, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) { + return !brick_equal(__i, __j, __first2 + (__i - __first1), __first2 + (__j - __first1), __p, __is_vector); + }); + }); +} +#endif + +//------------------------------------------------------------------------ +// equal version for sequences with equal lenght +//------------------------------------------------------------------------ + template bool brick_equal(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __p, @@ -436,7 +512,7 @@ bool pattern_equal(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2, _BinaryPredicate __p, _IsVector __is_vector, - /*is_parallel=*/std::true_type) + /*is_parallel=*/ std::true_type) { return internal::except_handler([&]() { return !internal::parallel_or( Index: include/pstl/internal/glue_algorithm_impl.h =================================================================== --- include/pstl/internal/glue_algorithm_impl.h +++ include/pstl/internal/glue_algorithm_impl.h @@ -736,10 +736,10 @@ equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __p) { - if (std::distance(__first1, __last1) == std::distance(__first2, __last2)) - return std::equal(__first1, __last1, __first2, __p); - - return false; + using namespace __pstl; + return internal::pattern_equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __p, + internal::is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec), + internal::is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec)); } template @@ -747,7 +747,8 @@ equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) { - return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __pstl::internal::pstl_equal()); + return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, + __pstl::internal::pstl_equal()); } // [alg.move]