Build the 34 per-opcode int-subtract tests as a single executable, test_msa_int_subtract.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_subtract.c | 235 +++++++++++++++++++++++++ tests/tcg/mips/meson.build | 34 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 237 insertions(+), 34 deletions(-) create mode 100644 tests/tcg/mips/test_msa_int_subtract.c diff --git a/tests/tcg/mips/test_msa_int_subtract.c b/tests/tcg/mips/test_msa_int_subtract.c new file mode 100644 index 000000000000..6837731cae85 --- /dev/null +++ b/tests/tcg/mips/test_msa_int_subtract.c @@ -0,0 +1,235 @@ +/* + * MIPS MSA tests: Int Subtract instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_asub_s_b +#include "user/ase/msa/int-subtract/test_msa_asub_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_s_d +#include "user/ase/msa/int-subtract/test_msa_asub_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_s_h +#include "user/ase/msa/int-subtract/test_msa_asub_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_s_w +#include "user/ase/msa/int-subtract/test_msa_asub_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_u_b +#include "user/ase/msa/int-subtract/test_msa_asub_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_u_d +#include "user/ase/msa/int-subtract/test_msa_asub_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_u_h +#include "user/ase/msa/int-subtract/test_msa_asub_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_asub_u_w +#include "user/ase/msa/int-subtract/test_msa_asub_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_s_d +#include "user/ase/msa/int-subtract/test_msa_hsub_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_s_h +#include "user/ase/msa/int-subtract/test_msa_hsub_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_s_w +#include "user/ase/msa/int-subtract/test_msa_hsub_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_u_d +#include "user/ase/msa/int-subtract/test_msa_hsub_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_u_h +#include "user/ase/msa/int-subtract/test_msa_hsub_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hsub_u_w +#include "user/ase/msa/int-subtract/test_msa_hsub_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_s_b +#include "user/ase/msa/int-subtract/test_msa_subs_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_s_d +#include "user/ase/msa/int-subtract/test_msa_subs_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_s_h +#include "user/ase/msa/int-subtract/test_msa_subs_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_s_w +#include "user/ase/msa/int-subtract/test_msa_subs_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_u_b +#include "user/ase/msa/int-subtract/test_msa_subs_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_u_d +#include "user/ase/msa/int-subtract/test_msa_subs_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_u_h +#include "user/ase/msa/int-subtract/test_msa_subs_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subs_u_w +#include "user/ase/msa/int-subtract/test_msa_subs_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsus_u_b +#include "user/ase/msa/int-subtract/test_msa_subsus_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsus_u_d +#include "user/ase/msa/int-subtract/test_msa_subsus_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsus_u_h +#include "user/ase/msa/int-subtract/test_msa_subsus_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsus_u_w +#include "user/ase/msa/int-subtract/test_msa_subsus_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsuu_s_b +#include "user/ase/msa/int-subtract/test_msa_subsuu_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsuu_s_d +#include "user/ase/msa/int-subtract/test_msa_subsuu_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsuu_s_h +#include "user/ase/msa/int-subtract/test_msa_subsuu_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subsuu_s_w +#include "user/ase/msa/int-subtract/test_msa_subsuu_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subv_b +#include "user/ase/msa/int-subtract/test_msa_subv_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subv_d +#include "user/ase/msa/int-subtract/test_msa_subv_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subv_h +#include "user/ase/msa/int-subtract/test_msa_subv_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_subv_w +#include "user/ase/msa/int-subtract/test_msa_subv_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "asub.s.b", test_msa_asub_s_b }, + { "asub.s.d", test_msa_asub_s_d }, + { "asub.s.h", test_msa_asub_s_h }, + { "asub.s.w", test_msa_asub_s_w }, + { "asub.u.b", test_msa_asub_u_b }, + { "asub.u.d", test_msa_asub_u_d }, + { "asub.u.h", test_msa_asub_u_h }, + { "asub.u.w", test_msa_asub_u_w }, + { "hsub.s.d", test_msa_hsub_s_d }, + { "hsub.s.h", test_msa_hsub_s_h }, + { "hsub.s.w", test_msa_hsub_s_w }, + { "hsub.u.d", test_msa_hsub_u_d }, + { "hsub.u.h", test_msa_hsub_u_h }, + { "hsub.u.w", test_msa_hsub_u_w }, + { "subs.s.b", test_msa_subs_s_b }, + { "subs.s.d", test_msa_subs_s_d }, + { "subs.s.h", test_msa_subs_s_h }, + { "subs.s.w", test_msa_subs_s_w }, + { "subs.u.b", test_msa_subs_u_b }, + { "subs.u.d", test_msa_subs_u_d }, + { "subs.u.h", test_msa_subs_u_h }, + { "subs.u.w", test_msa_subs_u_w }, + { "subsus.u.b", test_msa_subsus_u_b }, + { "subsus.u.d", test_msa_subsus_u_d }, + { "subsus.u.h", test_msa_subsus_u_h }, + { "subsus.u.w", test_msa_subsus_u_w }, + { "subsuu.s.b", test_msa_subsuu_s_b }, + { "subsuu.s.d", test_msa_subsuu_s_d }, + { "subsuu.s.h", test_msa_subsuu_s_h }, + { "subsuu.s.w", test_msa_subsuu_s_w }, + { "subv.b", test_msa_subv_b }, + { "subv.d", test_msa_subv_d }, + { "subv.h", test_msa_subv_h }, + { "subv.w", test_msa_subv_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 Subtract", 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 5d5bcd106ca0..c033e7a5500f 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -23,40 +23,6 @@ if 'qemu-mips' in emulators endif tests_mips_msa = [ - '../mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subv_d.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subv_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subv_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subv_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c', - '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c', - '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c', - '../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/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 ba94fb6a68ec..40ad347fa2ff 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -52,6 +52,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_dot_product.c', '../mips/test_msa_int_max_min.c', '../mips/test_msa_int_multiply.c', + '../mips/test_msa_int_subtract.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 ef30568ab5f5..cd3700e5e84b 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -53,6 +53,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_dot_product.c', '../mips/test_msa_int_max_min.c', '../mips/test_msa_int_multiply.c', + '../mips/test_msa_int_subtract.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
