Build the 20 per-opcode int-compare tests as a single executable, test_msa_int_compare.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_compare.c | 151 ++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 20 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 153 insertions(+), 20 deletions(-) create mode 100644 tests/tcg/mips/test_msa_int_compare.c diff --git a/tests/tcg/mips/test_msa_int_compare.c b/tests/tcg/mips/test_msa_int_compare.c new file mode 100644 index 000000000000..b3c9693c9278 --- /dev/null +++ b/tests/tcg/mips/test_msa_int_compare.c @@ -0,0 +1,151 @@ +/* + * MIPS MSA tests: Int Compare instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_ceq_b +#include "user/ase/msa/int-compare/test_msa_ceq_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ceq_d +#include "user/ase/msa/int-compare/test_msa_ceq_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ceq_h +#include "user/ase/msa/int-compare/test_msa_ceq_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ceq_w +#include "user/ase/msa/int-compare/test_msa_ceq_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_s_b +#include "user/ase/msa/int-compare/test_msa_cle_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_s_d +#include "user/ase/msa/int-compare/test_msa_cle_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_s_h +#include "user/ase/msa/int-compare/test_msa_cle_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_s_w +#include "user/ase/msa/int-compare/test_msa_cle_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_u_b +#include "user/ase/msa/int-compare/test_msa_cle_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_u_d +#include "user/ase/msa/int-compare/test_msa_cle_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_u_h +#include "user/ase/msa/int-compare/test_msa_cle_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_cle_u_w +#include "user/ase/msa/int-compare/test_msa_cle_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_s_b +#include "user/ase/msa/int-compare/test_msa_clt_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_s_d +#include "user/ase/msa/int-compare/test_msa_clt_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_s_h +#include "user/ase/msa/int-compare/test_msa_clt_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_s_w +#include "user/ase/msa/int-compare/test_msa_clt_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_u_b +#include "user/ase/msa/int-compare/test_msa_clt_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_u_d +#include "user/ase/msa/int-compare/test_msa_clt_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_u_h +#include "user/ase/msa/int-compare/test_msa_clt_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_clt_u_w +#include "user/ase/msa/int-compare/test_msa_clt_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "ceq.b", test_msa_ceq_b }, + { "ceq.d", test_msa_ceq_d }, + { "ceq.h", test_msa_ceq_h }, + { "ceq.w", test_msa_ceq_w }, + { "cle.s.b", test_msa_cle_s_b }, + { "cle.s.d", test_msa_cle_s_d }, + { "cle.s.h", test_msa_cle_s_h }, + { "cle.s.w", test_msa_cle_s_w }, + { "cle.u.b", test_msa_cle_u_b }, + { "cle.u.d", test_msa_cle_u_d }, + { "cle.u.h", test_msa_cle_u_h }, + { "cle.u.w", test_msa_cle_u_w }, + { "clt.s.b", test_msa_clt_s_b }, + { "clt.s.d", test_msa_clt_s_d }, + { "clt.s.h", test_msa_clt_s_h }, + { "clt.s.w", test_msa_clt_s_w }, + { "clt.u.b", test_msa_clt_u_b }, + { "clt.u.d", test_msa_clt_u_d }, + { "clt.u.h", test_msa_clt_u_h }, + { "clt.u.w", test_msa_clt_u_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 Compare", 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 be09044179c2..34ea7d1a7bf7 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -133,26 +133,6 @@ tests_mips_msa = [ '../mips/user/ase/msa/shift/test_msa_srar_w.c', '../mips/user/ase/msa/shift/test_msa_srlr_b.c', '../mips/user/ase/msa/shift/test_msa_srlr_w.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_u_d.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_s_h.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_u_w.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_s_h.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_u_b.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_s_d.c', - '../mips/user/ase/msa/int-compare/test_msa_ceq_w.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_s_w.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_s_w.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_u_w.c', - '../mips/user/ase/msa/int-compare/test_msa_ceq_h.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_s_b.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_s_b.c', - '../mips/user/ase/msa/int-compare/test_msa_ceq_b.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_u_h.c', - '../mips/user/ase/msa/int-compare/test_msa_cle_u_h.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_s_d.c', - '../mips/user/ase/msa/int-compare/test_msa_ceq_d.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_u_b.c', - '../mips/user/ase/msa/int-compare/test_msa_clt_u_d.c', '../mips/user/ase/msa/logic/test_msa_or_v.c', '../mips/user/ase/msa/logic/test_msa_nor_v.c', '../mips/user/ase/msa/logic/test_msa_and_v.c', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index c3d025452c4e..e896658e66fd 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -47,6 +47,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_float_max_min.c', '../mips/test_msa_int_add.c', '../mips/test_msa_int_average.c', + '../mips/test_msa_int_compare.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 7483b1aae7aa..c4c9d2e77cb8 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -48,6 +48,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_float_max_min.c', '../mips/test_msa_int_add.c', '../mips/test_msa_int_average.c', + '../mips/test_msa_int_compare.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
