Build the 12 per-opcode int-multiply tests as a single executable, test_msa_int_multiply.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_int_multiply.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_int_multiply.c diff --git a/tests/tcg/mips/test_msa_int_multiply.c b/tests/tcg/mips/test_msa_int_multiply.c new file mode 100644 index 000000000000..eb082783f51c --- /dev/null +++ b/tests/tcg/mips/test_msa_int_multiply.c @@ -0,0 +1,103 @@ +/* + * MIPS MSA tests: Int Multiply instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_maddv_b +#include "user/ase/msa/int-multiply/test_msa_maddv_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_maddv_d +#include "user/ase/msa/int-multiply/test_msa_maddv_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_maddv_h +#include "user/ase/msa/int-multiply/test_msa_maddv_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_maddv_w +#include "user/ase/msa/int-multiply/test_msa_maddv_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_msubv_b +#include "user/ase/msa/int-multiply/test_msa_msubv_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_msubv_d +#include "user/ase/msa/int-multiply/test_msa_msubv_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_msubv_h +#include "user/ase/msa/int-multiply/test_msa_msubv_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_msubv_w +#include "user/ase/msa/int-multiply/test_msa_msubv_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_mulv_b +#include "user/ase/msa/int-multiply/test_msa_mulv_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_mulv_d +#include "user/ase/msa/int-multiply/test_msa_mulv_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_mulv_h +#include "user/ase/msa/int-multiply/test_msa_mulv_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_mulv_w +#include "user/ase/msa/int-multiply/test_msa_mulv_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "maddv.b", test_msa_maddv_b }, + { "maddv.d", test_msa_maddv_d }, + { "maddv.h", test_msa_maddv_h }, + { "maddv.w", test_msa_maddv_w }, + { "msubv.b", test_msa_msubv_b }, + { "msubv.d", test_msa_msubv_d }, + { "msubv.h", test_msa_msubv_h }, + { "msubv.w", test_msa_msubv_w }, + { "mulv.b", test_msa_mulv_b }, + { "mulv.d", test_msa_mulv_d }, + { "mulv.h", test_msa_mulv_h }, + { "mulv.w", test_msa_mulv_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, + "Int Multiply", 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 aad18213a460..5d5bcd106ca0 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -57,18 +57,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/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', - '../mips/user/ase/msa/int-multiply/test_msa_maddv_w.c', - '../mips/user/ase/msa/int-multiply/test_msa_msubv_b.c', - '../mips/user/ase/msa/int-multiply/test_msa_mulv_b.c', - '../mips/user/ase/msa/int-multiply/test_msa_maddv_d.c', - '../mips/user/ase/msa/int-multiply/test_msa_msubv_w.c', - '../mips/user/ase/msa/int-multiply/test_msa_maddv_b.c', - '../mips/user/ase/msa/int-multiply/test_msa_mulv_h.c', - '../mips/user/ase/msa/int-multiply/test_msa_mulv_d.c', - '../mips/user/ase/msa/int-multiply/test_msa_maddv_h.c', '../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', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index 41a8c22234f1..ba94fb6a68ec 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -51,6 +51,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_div_mod.c', '../mips/test_msa_int_dot_product.c', '../mips/test_msa_int_max_min.c', + '../mips/test_msa_int_multiply.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 66041e0d191c..ef30568ab5f5 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -52,6 +52,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_div_mod.c', '../mips/test_msa_int_dot_product.c', '../mips/test_msa_int_max_min.c', + '../mips/test_msa_int_multiply.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
