OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix some problems in PSTL tests

Browse Source 
libstdc++-v3/ChangeLog:

	* testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc:
	Increase dg-timeout-factor to 4. Fix -Wunused-parameter
	warnings. Replace bitwise AND with logical AND in loop
	condition.
	* testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc:
	Replace bitwise AND with logical AND in loop condition.
	* testsuite/util/pstl/test_utils.h: Remove unused parameter
	names.

(cherry picked from commit d1adbe5c1bd3f3ba098ff112eed9b61515e2dc20)
This commit is contained in:
Jonathan Wakely 2021-05-12 11:21:51 +01:00
parent 0e4fc87837
commit 8000947e54
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc
View File

@ -1,7 +1,7 @@
// -*- C++ -*-
// { dg-options "-ltbb" }
// { dg-do run { target c++17 } }
// { dg-timeout-factor 3 }
// { dg-timeout-factor 4 }
// { dg-require-effective-target tbb-backend }
//===-- find_end.pass.cpp -------------------------------------------------===//
@ -78,8 +78,8 @@ test(const std::size_t bits)
const std::size_t max_n1 = 1000;
const std::size_t max_n2 = (max_n1 * 10) / 8;
Sequence<T> in(max_n1, [max_n1, bits](std::size_t k) { return T(2 * HashBits(max_n1, bits - 1) ^ 1); });
Sequence<T> sub(max_n2, [max_n1, bits](std::size_t k) { return T(2 * HashBits(max_n1, bits - 1)); });
Sequence<T> in(max_n1, [max_n1, bits](std::size_t) { return T(2 * HashBits(max_n1, bits - 1) ^ 1); });
Sequence<T> sub(max_n2, [max_n1, bits](std::size_t) { return T(2 * HashBits(max_n1, bits - 1)); });
for (std::size_t n1 = 0; n1 <= max_n1; n1 = n1 <= 16 ? n1 + 1 : size_t(3.1415 * n1))
{
std::size_t sub_n[] = {0, 1, 3, n1, (n1 * 10) / 8};
@ -89,7 +89,7 @@ test(const std::size_t bits)
for (auto r : res)
{
std::size_t i = r, isub = 0;
for (; i < n1 & isub < n2; ++i, ++isub)
for (; i < n1 && isub < n2; ++i, ++isub)
in[i] = sub[isub];
invoke_on_all_policies(test_one_policy(), in.begin(), in.begin() + n1, sub.begin(), sub.begin() + n2,
std::equal_to<T>());

2
libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc
View File

@ -79,7 +79,7 @@ test()
{
Sequence<T> in(n1, [n1](std::size_t k) { return T(0); });
std::size_t i = r, isub = 0;
for (; i < n1 & isub < n2; ++i, ++isub)
for (; i < n1 && isub < n2; ++i, ++isub)
in[i] = value;
invoke_on_all_policies(test_one_policy(), in.begin(), in.begin() + n1, n2, value, std::equal_to<T>());

10
libstdc++-v3/testsuite/util/pstl/test_utils.h
View File

@ -752,7 +752,7 @@ struct invoke_if_<std::false_type, std::false_type>
{
template <typename Op, typename... Rest>
void
operator()(bool is_allow, Op op, Rest&&... rest)
operator()(bool, Op op, Rest&&... rest)
{
op(std::forward<Rest>(rest)...);
}
@ -787,14 +787,14 @@ struct non_const_wrapper_tagged : non_const_wrapper
template <typename Policy, typename Iterator>
typename std::enable_if<IsPositiveCondition != is_same_iterator_category<Iterator, IteratorTag>::value, void>::type
operator()(Policy&& exec, Iterator iter)
operator()(Policy&&, Iterator)
{
}
template <typename Policy, typename InputIterator, typename OutputIterator>
typename std::enable_if<IsPositiveCondition != is_same_iterator_category<OutputIterator, IteratorTag>::value,
void>::type
operator()(Policy&& exec, InputIterator input_iter, OutputIterator out_iter)
operator()(Policy&&, InputIterator, OutputIterator)
{
}
};
@ -999,7 +999,7 @@ struct iterator_invoker<std::forward_iterator_tag, /*isReverse=*/std::true_type>
{
template <typename... Rest>
void
operator()(Rest&&... rest)
operator()(Rest&&...)
{
}
};
@ -1226,7 +1226,7 @@ test_algo_basic_double(F&& f)
template <typename Policy, typename F>
static void
invoke_if(Policy&& p, F f)
invoke_if(Policy&&, F f)
{
#if _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
__pstl::__internal::invoke_if_not(__pstl::__internal::allow_unsequenced<Policy>(), f);