Build the 11 per-opcode bit-move tests as a single executable, test_msa_bit_move.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_bit_move.c | 97 ++++++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 11 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 tests/tcg/mips/test_msa_bit_move.c diff --git a/tests/tcg/mips/test_msa_bit_move.c b/tests/tcg/mips/test_msa_bit_move.c new file mode 100644 index 000000000000..4fd41e96764b --- /dev/null +++ b/tests/tcg/mips/test_msa_bit_move.c @@ -0,0 +1,97 @@ +/* + * MIPS MSA tests: Bit Move instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_binsl_b +#include "user/ase/msa/bit-move/test_msa_binsl_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsl_d +#include "user/ase/msa/bit-move/test_msa_binsl_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsl_h +#include "user/ase/msa/bit-move/test_msa_binsl_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsl_w +#include "user/ase/msa/bit-move/test_msa_binsl_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsr_b +#include "user/ase/msa/bit-move/test_msa_binsr_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsr_d +#include "user/ase/msa/bit-move/test_msa_binsr_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsr_h +#include "user/ase/msa/bit-move/test_msa_binsr_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_binsr_w +#include "user/ase/msa/bit-move/test_msa_binsr_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bmnz_v +#include "user/ase/msa/bit-move/test_msa_bmnz_v.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bmz_v +#include "user/ase/msa/bit-move/test_msa_bmz_v.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bsel_v +#include "user/ase/msa/bit-move/test_msa_bsel_v.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "binsl.b", test_msa_binsl_b }, + { "binsl.d", test_msa_binsl_d }, + { "binsl.h", test_msa_binsl_h }, + { "binsl.w", test_msa_binsl_w }, + { "binsr.b", test_msa_binsr_b }, + { "binsr.d", test_msa_binsr_d }, + { "binsr.h", test_msa_binsr_h }, + { "binsr.w", test_msa_binsr_w }, + { "bmnz.v", test_msa_bmnz_v }, + { "bmz.v", test_msa_bmz_v }, + { "bsel.v", test_msa_bsel_v }, +}; + +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, + "Bit Move", 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 40984e9b4fcf..adf25fd3c5d2 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -147,17 +147,6 @@ tests_mips_msa = [ '../mips/user/ase/msa/pack/test_msa_pckod_w.c', '../mips/user/ase/msa/pack/test_msa_vshf_h.c', '../mips/user/ase/msa/pack/test_msa_pckod_d.c', - '../mips/user/ase/msa/bit-move/test_msa_binsr_w.c', - '../mips/user/ase/msa/bit-move/test_msa_binsr_b.c', - '../mips/user/ase/msa/bit-move/test_msa_binsr_d.c', - '../mips/user/ase/msa/bit-move/test_msa_binsr_h.c', - '../mips/user/ase/msa/bit-move/test_msa_binsl_h.c', - '../mips/user/ase/msa/bit-move/test_msa_binsl_w.c', - '../mips/user/ase/msa/bit-move/test_msa_bmnz_v.c', - '../mips/user/ase/msa/bit-move/test_msa_bsel_v.c', - '../mips/user/ase/msa/bit-move/test_msa_bmz_v.c', - '../mips/user/ase/msa/bit-move/test_msa_binsl_d.c', - '../mips/user/ase/msa/bit-move/test_msa_binsl_b.c', '../mips/user/ase/msa/shift/test_msa_sra_d.c', '../mips/user/ase/msa/shift/test_msa_srl_b.c', '../mips/user/ase/msa/shift/test_msa_srl_d.c', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index bcc02d955436..b40b7c10c608 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -41,6 +41,7 @@ endforeach tests_mips_msa_groups = [ '../mips/test_msa_bit_count.c', + '../mips/test_msa_bit_move.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 8b4e665634ab..0a3b84623125 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -42,6 +42,7 @@ tests = [] tests_mips_msa_groups = [ '../mips/test_msa_bit_count.c', + '../mips/test_msa_bit_move.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
