diff mbox series

[2/2] libstdc++: Increase timeouts for PSTL tests in debug mode [PR90276]

Message ID 20240620153526.2024602-2-jwakely@redhat.com
State New
Headers show
Series [1/2] libstdc++: Work around some PSTL test failures for debug mode [PR90276] | expand

Commit Message

Jonathan Wakely June 20, 2024, 3:35 p.m. UTC
Tested x86_64-linux.

-- >8 --

These tests compile very slowly in debug mode.

libstdc++-v3/ChangeLog:

	PR libstdc++/90276
	* testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc:
	Increase timeout for debug mode.
	* testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc:
	Likewise.
	* testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc:
	Likewise.
	* testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc:
	Likewise.
	* testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc:
	Likewise.
	* testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc:
	Likewise.
---
 .../25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc   | 1 +
 .../pstl/alg_modifying_operations/transform_binary.cc            | 1 +
 .../testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc    | 1 +
 .../25_algorithms/pstl/alg_sorting/lexicographical_compare.cc    | 1 +
 .../testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc   | 1 +
 .../25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc   | 1 +
 6 files changed, 6 insertions(+)

Comments

Jonathan Wakely June 26, 2024, 8:13 p.m. UTC | #1
Pushed to trunk now.

On Thu, 20 Jun 2024 at 16:36, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> Tested x86_64-linux.
>
> -- >8 --
>
> These tests compile very slowly in debug mode.
>
> libstdc++-v3/ChangeLog:
>
>         PR libstdc++/90276
>         * testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc:
>         Increase timeout for debug mode.
>         * testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc:
>         Likewise.
>         * testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc:
>         Likewise.
>         * testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc:
>         Likewise.
>         * testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc:
>         Likewise.
>         * testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc:
>         Likewise.
> ---
>  .../25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc   | 1 +
>  .../pstl/alg_modifying_operations/transform_binary.cc            | 1 +
>  .../testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc    | 1 +
>  .../25_algorithms/pstl/alg_sorting/lexicographical_compare.cc    | 1 +
>  .../testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc   | 1 +
>  .../25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc   | 1 +
>  6 files changed, 6 insertions(+)
>
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
> index ea647c6c23a..1b788e1b7ee 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- rotate_copy.pass.cpp ----------------------------------------------===//
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
> index 1f5f239a94b..16b815c5d51 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- transform_binary.pass.cpp -----------------------------------------===//
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
> index 1173186f65c..441f5d1e378 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- mismatch.pass.cpp -------------------------------------------------===//
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
> index 924aa78652e..78edeb025d7 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- lexicographical_compare.pass.cpp ----------------------------------===//
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
> index 0a9f41ca179..e4bd435d192 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- minmax_element.pass.cpp -------------------------------------------===//
> diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
> index 1cc59856086..ad3befcb690 100644
> --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
> +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
> @@ -2,6 +2,7 @@
>  // { dg-options "-ltbb" }
>  // { dg-do run { target c++17 } }
>  // { dg-timeout-factor 3 }
> +// { dg-timeout-factor 5 { target debug_mode } }
>  // { dg-require-effective-target tbb_backend }
>
>  //===-- set.pass.cpp ------------------------------------------------------===//
> --
> 2.45.2
>
diff mbox series

Patch

diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
index ea647c6c23a..1b788e1b7ee 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- rotate_copy.pass.cpp ----------------------------------------------===//
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
index 1f5f239a94b..16b815c5d51 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/transform_binary.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- transform_binary.pass.cpp -----------------------------------------===//
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
index 1173186f65c..441f5d1e378 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/mismatch.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- mismatch.pass.cpp -------------------------------------------------===//
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
index 924aa78652e..78edeb025d7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/lexicographical_compare.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- lexicographical_compare.pass.cpp ----------------------------------===//
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
index 0a9f41ca179..e4bd435d192 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/minmax_element.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- minmax_element.pass.cpp -------------------------------------------===//
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
index 1cc59856086..ad3befcb690 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/set_symmetric_difference.cc
@@ -2,6 +2,7 @@ 
 // { dg-options "-ltbb" }
 // { dg-do run { target c++17 } }
 // { dg-timeout-factor 3 }
+// { dg-timeout-factor 5 { target debug_mode } }
 // { dg-require-effective-target tbb_backend }
 
 //===-- set.pass.cpp ------------------------------------------------------===//