From 55ccaed2d18774705238b1f44df08b5a67c3337a Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 17 Sep 2024 15:16:41 +0100 Subject: tests/fp: Make mul and div tests have a longer timeout At the moment we run all fp-test tests except for the muladd ones with the default meson test timeout of 30s. This is plenty for most of the test cases, but for multiplication and division we can sometimes hit the timeout if the CI runner is going slow. Add support to meson.build for a way to override the timeout on a per test basis, and use it to set the timeout to 60s for fp-test-rem, fp-test-div and fp-test-mul. We can use this new generic mechanism also to set the timeout for mulAdd rather than hardcoding it. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20240917141641.2836265-1-peter.maydell@linaro.org --- tests/fp/meson.build | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tests/fp') diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 114b4b483e..9059a24752 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -7,6 +7,16 @@ if host_os == 'windows' subdir_done() endif +# By default tests run with the usual 30s timeout; particularly +# slow tests can have that overridden here. The keys here are +# the testnames without their fp-test- prefix. +slow_fp_tests = { + 'rem': 60, + 'div': 60, + 'mul': 60, + 'mulAdd': 180, +} + sfcflags = [ # softfloat defines '-DSOFTFLOAT_ROUND_ODD', @@ -109,6 +119,7 @@ fptest_rounding_args = ['-r', 'all'] foreach k, v : softfloat_conv_tests test('fp-test-' + k, fptest, args: fptest_args + fptest_rounding_args + v.split(), + timeout: slow_fp_tests.get(k, 30), suite: ['softfloat', 'softfloat-conv']) endforeach @@ -116,6 +127,7 @@ foreach k, v : softfloat_tests test('fp-test-' + k, fptest, args: fptest_args + fptest_rounding_args + ['f16_' + k, 'f32_' + k, 'f64_' + k, 'f128_' + k, 'extF80_' + k], + timeout: slow_fp_tests.get(k, 30), suite: ['softfloat', 'softfloat-' + v]) endforeach @@ -124,7 +136,8 @@ test('fp-test-mulAdd', fptest, # no fptest_rounding_args args: fptest_args + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], - suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 180) + timeout: slow_fp_tests.get('mulAdd', 30), + suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow']) executable( 'fp-bench', @@ -140,4 +153,5 @@ fptestlog2 = executable( c_args: fpcflags, ) test('fp-test-log2', fptestlog2, + timeout: slow_fp_tests.get('log2', 30), suite: ['softfloat', 'softfloat-ops']) -- cgit v1.2.3