Build the 12 per-opcode pack tests as a single executable, test_msa_pack.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_pack.c | 103 +++++++++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 12 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 tests/tcg/mips/test_msa_pack.c diff --git a/tests/tcg/mips/test_msa_pack.c b/tests/tcg/mips/test_msa_pack.c new file mode 100644 index 000000000000..67d286d45788 --- /dev/null +++ b/tests/tcg/mips/test_msa_pack.c @@ -0,0 +1,103 @@ +/* + * MIPS MSA tests: Pack instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_pckev_b +#include "user/ase/msa/pack/test_msa_pckev_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckev_d +#include "user/ase/msa/pack/test_msa_pckev_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckev_h +#include "user/ase/msa/pack/test_msa_pckev_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckev_w +#include "user/ase/msa/pack/test_msa_pckev_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckod_b +#include "user/ase/msa/pack/test_msa_pckod_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckod_d +#include "user/ase/msa/pack/test_msa_pckod_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckod_h +#include "user/ase/msa/pack/test_msa_pckod_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_pckod_w +#include "user/ase/msa/pack/test_msa_pckod_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_vshf_b +#include "user/ase/msa/pack/test_msa_vshf_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_vshf_d +#include "user/ase/msa/pack/test_msa_vshf_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_vshf_h +#include "user/ase/msa/pack/test_msa_vshf_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_vshf_w +#include "user/ase/msa/pack/test_msa_vshf_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "pckev.b", test_msa_pckev_b }, + { "pckev.d", test_msa_pckev_d }, + { "pckev.h", test_msa_pckev_h }, + { "pckev.w", test_msa_pckev_w }, + { "pckod.b", test_msa_pckod_b }, + { "pckod.d", test_msa_pckod_d }, + { "pckod.h", test_msa_pckod_h }, + { "pckod.w", test_msa_pckod_w }, + { "vshf.b", test_msa_vshf_b }, + { "vshf.d", test_msa_vshf_d }, + { "vshf.h", test_msa_vshf_h }, + { "vshf.w", test_msa_vshf_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, + "Pack", 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 843031f6c0b8..791ac5109607 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -23,18 +23,6 @@ if 'qemu-mips' in emulators endif tests_mips_msa = [ - '../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', - '../mips/user/ase/msa/pack/test_msa_pckod_h.c', - '../mips/user/ase/msa/pack/test_msa_pckod_b.c', - '../mips/user/ase/msa/pack/test_msa_vshf_d.c', - '../mips/user/ase/msa/pack/test_msa_pckev_w.c', - '../mips/user/ase/msa/pack/test_msa_pckev_h.c', - '../mips/user/ase/msa/pack/test_msa_pckev_d.c', - '../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/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 fffbda7750ac..f18ff8153f2d 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -55,6 +55,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_subtract.c', '../mips/test_msa_interleave.c', '../mips/test_msa_logic.c', + '../mips/test_msa_pack.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 7ba88b2aac29..277ece3e306a 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -56,6 +56,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_subtract.c', '../mips/test_msa_interleave.c', '../mips/test_msa_logic.c', + '../mips/test_msa_pack.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
