Build the 16 per-opcode interleave tests as a single executable, test_msa_interleave.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_interleave.c | 127 +++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 16 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 tests/tcg/mips/test_msa_interleave.c diff --git a/tests/tcg/mips/test_msa_interleave.c b/tests/tcg/mips/test_msa_interleave.c new file mode 100644 index 000000000000..bdc130ccb6ae --- /dev/null +++ b/tests/tcg/mips/test_msa_interleave.c @@ -0,0 +1,127 @@ +/* + * MIPS MSA tests: Interleave instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_ilvev_b +#include "user/ase/msa/interleave/test_msa_ilvev_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvev_d +#include "user/ase/msa/interleave/test_msa_ilvev_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvev_h +#include "user/ase/msa/interleave/test_msa_ilvev_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvev_w +#include "user/ase/msa/interleave/test_msa_ilvev_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvl_b +#include "user/ase/msa/interleave/test_msa_ilvl_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvl_d +#include "user/ase/msa/interleave/test_msa_ilvl_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvl_h +#include "user/ase/msa/interleave/test_msa_ilvl_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvl_w +#include "user/ase/msa/interleave/test_msa_ilvl_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvod_b +#include "user/ase/msa/interleave/test_msa_ilvod_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvod_d +#include "user/ase/msa/interleave/test_msa_ilvod_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvod_h +#include "user/ase/msa/interleave/test_msa_ilvod_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvod_w +#include "user/ase/msa/interleave/test_msa_ilvod_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvr_b +#include "user/ase/msa/interleave/test_msa_ilvr_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvr_d +#include "user/ase/msa/interleave/test_msa_ilvr_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvr_h +#include "user/ase/msa/interleave/test_msa_ilvr_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ilvr_w +#include "user/ase/msa/interleave/test_msa_ilvr_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "ilvev.b", test_msa_ilvev_b }, + { "ilvev.d", test_msa_ilvev_d }, + { "ilvev.h", test_msa_ilvev_h }, + { "ilvev.w", test_msa_ilvev_w }, + { "ilvl.b", test_msa_ilvl_b }, + { "ilvl.d", test_msa_ilvl_d }, + { "ilvl.h", test_msa_ilvl_h }, + { "ilvl.w", test_msa_ilvl_w }, + { "ilvod.b", test_msa_ilvod_b }, + { "ilvod.d", test_msa_ilvod_d }, + { "ilvod.h", test_msa_ilvod_h }, + { "ilvod.w", test_msa_ilvod_w }, + { "ilvr.b", test_msa_ilvr_b }, + { "ilvr.d", test_msa_ilvr_d }, + { "ilvr.h", test_msa_ilvr_h }, + { "ilvr.w", test_msa_ilvr_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, + "Interleave", 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 c033e7a5500f..135e6297e4de 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -23,22 +23,6 @@ if 'qemu-mips' in emulators endif tests_mips_msa = [ - '../mips/user/ase/msa/interleave/test_msa_ilvr_b.c', - '../mips/user/ase/msa/interleave/test_msa_ilvr_d.c', - '../mips/user/ase/msa/interleave/test_msa_ilvod_b.c', - '../mips/user/ase/msa/interleave/test_msa_ilvl_b.c', - '../mips/user/ase/msa/interleave/test_msa_ilvev_w.c', - '../mips/user/ase/msa/interleave/test_msa_ilvr_w.c', - '../mips/user/ase/msa/interleave/test_msa_ilvr_h.c', - '../mips/user/ase/msa/interleave/test_msa_ilvev_h.c', - '../mips/user/ase/msa/interleave/test_msa_ilvev_b.c', - '../mips/user/ase/msa/interleave/test_msa_ilvod_w.c', - '../mips/user/ase/msa/interleave/test_msa_ilvev_d.c', - '../mips/user/ase/msa/interleave/test_msa_ilvl_d.c', - '../mips/user/ase/msa/interleave/test_msa_ilvod_d.c', - '../mips/user/ase/msa/interleave/test_msa_ilvl_h.c', - '../mips/user/ase/msa/interleave/test_msa_ilvl_w.c', - '../mips/user/ase/msa/interleave/test_msa_ilvod_h.c', '../mips/user/ase/msa/pack/test_msa_vshf_b.c', '../mips/user/ase/msa/pack/test_msa_pckev_b.c', '../mips/user/ase/msa/pack/test_msa_vshf_w.c', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index 40ad347fa2ff..67858c5a23f2 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -53,6 +53,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_max_min.c', '../mips/test_msa_int_multiply.c', '../mips/test_msa_int_subtract.c', + '../mips/test_msa_interleave.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 cd3700e5e84b..5c0a89197089 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -54,6 +54,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_max_min.c', '../mips/test_msa_int_multiply.c', '../mips/test_msa_int_subtract.c', + '../mips/test_msa_interleave.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
