Build the 8 per-opcode float-max-min tests as a single executable, test_msa_float_max_min.c, to reduce the number of test binaries. Each opcode reports one TAP line.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/tcg/mips/test_msa_float_max_min.c | 79 +++++++++++++++++++++++++ tests/tcg/mips/meson.build | 8 --- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 tests/tcg/mips/test_msa_float_max_min.c diff --git a/tests/tcg/mips/test_msa_float_max_min.c b/tests/tcg/mips/test_msa_float_max_min.c new file mode 100644 index 000000000000..77b8954f92c1 --- /dev/null +++ b/tests/tcg/mips/test_msa_float_max_min.c @@ -0,0 +1,79 @@ +/* + * MIPS MSA tests: Float Min / Max instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_fmax_a_d +#include "user/ase/msa/float-max-min/test_msa_fmax_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmax_a_w +#include "user/ase/msa/float-max-min/test_msa_fmax_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmax_d +#include "user/ase/msa/float-max-min/test_msa_fmax_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmax_w +#include "user/ase/msa/float-max-min/test_msa_fmax_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmin_a_d +#include "user/ase/msa/float-max-min/test_msa_fmin_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmin_a_w +#include "user/ase/msa/float-max-min/test_msa_fmin_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmin_d +#include "user/ase/msa/float-max-min/test_msa_fmin_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_fmin_w +#include "user/ase/msa/float-max-min/test_msa_fmin_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "fmax.a.d", test_msa_fmax_a_d }, + { "fmax.a.w", test_msa_fmax_a_w }, + { "fmax.d", test_msa_fmax_d }, + { "fmax.w", test_msa_fmax_w }, + { "fmin.a.d", test_msa_fmin_a_d }, + { "fmin.a.w", test_msa_fmin_a_w }, + { "fmin.d", test_msa_fmin_d }, + { "fmin.w", test_msa_fmin_w }, +}; + +int main(void) +{ + int fail = 0; + unsigned i; + + printf("TAP version 14\n" + "1..%u\n", + (unsigned)(sizeof(msa_tests) / sizeof(msa_tests[0]))); + for (i = 0; i < sizeof(msa_tests) / sizeof(msa_tests[0]); i++) { + int r = msa_tests[i].fn(); + + printf("%s %u - MSA %s %s\n", r ? "not ok" : "ok", i + 1, + "Float Max Min", msa_tests[i].name); + fail |= r; + } + + return fail ? 1 : 0; +} diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build index 21cf734c1763..413879c205c2 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -65,14 +65,6 @@ tests_mips_msa = [ '../mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c', '../mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c', '../mips/user/ase/msa/int-subtract/test_msa_subs_s_w.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmin_w.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmax_w.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmax_a_d.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmin_a_w.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmax_a_w.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmax_d.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmin_d.c', - '../mips/user/ase/msa/float-max-min/test_msa_fmin_a_d.c', '../mips/user/ase/msa/int-multiply/test_msa_mulv_w.c', '../mips/user/ase/msa/int-multiply/test_msa_msubv_d.c', '../mips/user/ase/msa/int-multiply/test_msa_msubv_h.c', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index e1963c9b16f5..adc9eda70f3c 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -44,6 +44,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_bit_move.c', '../mips/test_msa_bit_set.c', '../mips/test_msa_fixed_multiply.c', + '../mips/test_msa_float_max_min.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups diff --git a/tests/tcg/mipsel/meson.build b/tests/tcg/mipsel/meson.build index 0b8a8b77a514..fd4325f817a6 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -45,6 +45,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_bit_move.c', '../mips/test_msa_bit_set.c', '../mips/test_msa_fixed_multiply.c', + '../mips/test_msa_float_max_min.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
