Build the 24 per-opcode int-max-min tests as a single executable, test_msa_int_max_min.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_max_min.c | 175 ++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 24 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 177 insertions(+), 24 deletions(-) create mode 100644 tests/tcg/mips/test_msa_int_max_min.c diff --git a/tests/tcg/mips/test_msa_int_max_min.c b/tests/tcg/mips/test_msa_int_max_min.c new file mode 100644 index 000000000000..aca44867e872 --- /dev/null +++ b/tests/tcg/mips/test_msa_int_max_min.c @@ -0,0 +1,175 @@ +/* + * MIPS MSA tests: Int Min / Max instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_max_a_b +#include "user/ase/msa/int-max-min/test_msa_max_a_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_a_d +#include "user/ase/msa/int-max-min/test_msa_max_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_a_h +#include "user/ase/msa/int-max-min/test_msa_max_a_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_a_w +#include "user/ase/msa/int-max-min/test_msa_max_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_s_b +#include "user/ase/msa/int-max-min/test_msa_max_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_s_d +#include "user/ase/msa/int-max-min/test_msa_max_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_s_h +#include "user/ase/msa/int-max-min/test_msa_max_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_s_w +#include "user/ase/msa/int-max-min/test_msa_max_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_u_b +#include "user/ase/msa/int-max-min/test_msa_max_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_u_d +#include "user/ase/msa/int-max-min/test_msa_max_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_u_h +#include "user/ase/msa/int-max-min/test_msa_max_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_max_u_w +#include "user/ase/msa/int-max-min/test_msa_max_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_a_b +#include "user/ase/msa/int-max-min/test_msa_min_a_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_a_d +#include "user/ase/msa/int-max-min/test_msa_min_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_a_h +#include "user/ase/msa/int-max-min/test_msa_min_a_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_a_w +#include "user/ase/msa/int-max-min/test_msa_min_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_s_b +#include "user/ase/msa/int-max-min/test_msa_min_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_s_d +#include "user/ase/msa/int-max-min/test_msa_min_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_s_h +#include "user/ase/msa/int-max-min/test_msa_min_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_s_w +#include "user/ase/msa/int-max-min/test_msa_min_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_u_b +#include "user/ase/msa/int-max-min/test_msa_min_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_u_d +#include "user/ase/msa/int-max-min/test_msa_min_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_u_h +#include "user/ase/msa/int-max-min/test_msa_min_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_min_u_w +#include "user/ase/msa/int-max-min/test_msa_min_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "max.a.b", test_msa_max_a_b }, + { "max.a.d", test_msa_max_a_d }, + { "max.a.h", test_msa_max_a_h }, + { "max.a.w", test_msa_max_a_w }, + { "max.s.b", test_msa_max_s_b }, + { "max.s.d", test_msa_max_s_d }, + { "max.s.h", test_msa_max_s_h }, + { "max.s.w", test_msa_max_s_w }, + { "max.u.b", test_msa_max_u_b }, + { "max.u.d", test_msa_max_u_d }, + { "max.u.h", test_msa_max_u_h }, + { "max.u.w", test_msa_max_u_w }, + { "min.a.b", test_msa_min_a_b }, + { "min.a.d", test_msa_min_a_d }, + { "min.a.h", test_msa_min_a_h }, + { "min.a.w", test_msa_min_a_w }, + { "min.s.b", test_msa_min_s_b }, + { "min.s.d", test_msa_min_s_d }, + { "min.s.h", test_msa_min_s_h }, + { "min.s.w", test_msa_min_s_w }, + { "min.u.b", test_msa_min_u_b }, + { "min.u.d", test_msa_min_u_d }, + { "min.u.h", test_msa_min_u_h }, + { "min.u.w", test_msa_min_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 Max Min", 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 fade579a822c..aad18213a460 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -122,28 +122,4 @@ tests_mips_msa = [ '../mips/user/ase/msa/logic/test_msa_and_v.c', '../mips/user/ase/msa/logic/test_msa_xor_v.c', '../mips/user/ase/msa/move/test_msa_move_v.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_u_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_a_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_s_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_a_w.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_s_w.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_s_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_u_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_a_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_a_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_u_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_u_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_u_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_s_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_a_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_a_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_a_w.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_s_d.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_u_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_s_w.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_a_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_s_h.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_s_b.c', - '../mips/user/ase/msa/int-max-min/test_msa_min_u_w.c', - '../mips/user/ase/msa/int-max-min/test_msa_max_u_w.c', ] diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index b7daa9d0f014..41a8c22234f1 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -50,6 +50,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_compare.c', '../mips/test_msa_int_div_mod.c', '../mips/test_msa_int_dot_product.c', + '../mips/test_msa_int_max_min.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 7a0026075567..66041e0d191c 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -51,6 +51,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_int_compare.c', '../mips/test_msa_int_div_mod.c', '../mips/test_msa_int_dot_product.c', + '../mips/test_msa_int_max_min.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
