Build the 26 per-opcode int-add tests as a single executable, test_msa_int_add.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_add.c | 187 ++++++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 26 ----- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 189 insertions(+), 26 deletions(-) create mode 100644 tests/tcg/mips/test_msa_int_add.c diff --git a/tests/tcg/mips/test_msa_int_add.c b/tests/tcg/mips/test_msa_int_add.c new file mode 100644 index 000000000000..aa7165f42f2d --- /dev/null +++ b/tests/tcg/mips/test_msa_int_add.c @@ -0,0 +1,187 @@ +/* + * MIPS MSA tests: Int Add instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_add_a_b +#include "user/ase/msa/int-add/test_msa_add_a_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_add_a_d +#include "user/ase/msa/int-add/test_msa_add_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_add_a_h +#include "user/ase/msa/int-add/test_msa_add_a_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_add_a_w +#include "user/ase/msa/int-add/test_msa_add_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_a_b +#include "user/ase/msa/int-add/test_msa_adds_a_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_a_d +#include "user/ase/msa/int-add/test_msa_adds_a_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_a_h +#include "user/ase/msa/int-add/test_msa_adds_a_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_a_w +#include "user/ase/msa/int-add/test_msa_adds_a_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_s_b +#include "user/ase/msa/int-add/test_msa_adds_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_s_d +#include "user/ase/msa/int-add/test_msa_adds_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_s_h +#include "user/ase/msa/int-add/test_msa_adds_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_s_w +#include "user/ase/msa/int-add/test_msa_adds_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_u_b +#include "user/ase/msa/int-add/test_msa_adds_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_u_d +#include "user/ase/msa/int-add/test_msa_adds_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_u_h +#include "user/ase/msa/int-add/test_msa_adds_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_adds_u_w +#include "user/ase/msa/int-add/test_msa_adds_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_addv_b +#include "user/ase/msa/int-add/test_msa_addv_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_addv_d +#include "user/ase/msa/int-add/test_msa_addv_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_addv_h +#include "user/ase/msa/int-add/test_msa_addv_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_addv_w +#include "user/ase/msa/int-add/test_msa_addv_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_s_d +#include "user/ase/msa/int-add/test_msa_hadd_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_s_h +#include "user/ase/msa/int-add/test_msa_hadd_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_s_w +#include "user/ase/msa/int-add/test_msa_hadd_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_u_d +#include "user/ase/msa/int-add/test_msa_hadd_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_u_h +#include "user/ase/msa/int-add/test_msa_hadd_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_hadd_u_w +#include "user/ase/msa/int-add/test_msa_hadd_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "add.a.b", test_msa_add_a_b }, + { "add.a.d", test_msa_add_a_d }, + { "add.a.h", test_msa_add_a_h }, + { "add.a.w", test_msa_add_a_w }, + { "adds.a.b", test_msa_adds_a_b }, + { "adds.a.d", test_msa_adds_a_d }, + { "adds.a.h", test_msa_adds_a_h }, + { "adds.a.w", test_msa_adds_a_w }, + { "adds.s.b", test_msa_adds_s_b }, + { "adds.s.d", test_msa_adds_s_d }, + { "adds.s.h", test_msa_adds_s_h }, + { "adds.s.w", test_msa_adds_s_w }, + { "adds.u.b", test_msa_adds_u_b }, + { "adds.u.d", test_msa_adds_u_d }, + { "adds.u.h", test_msa_adds_u_h }, + { "adds.u.w", test_msa_adds_u_w }, + { "addv.b", test_msa_addv_b }, + { "addv.d", test_msa_addv_d }, + { "addv.h", test_msa_addv_h }, + { "addv.w", test_msa_addv_w }, + { "hadd.s.d", test_msa_hadd_s_d }, + { "hadd.s.h", test_msa_hadd_s_h }, + { "hadd.s.w", test_msa_hadd_s_w }, + { "hadd.u.d", test_msa_hadd_u_d }, + { "hadd.u.h", test_msa_hadd_u_h }, + { "hadd.u.w", test_msa_hadd_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 Add", 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 413879c205c2..98bd391ee22b 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -85,32 +85,6 @@ tests_mips_msa = [ '../mips/user/ase/msa/int-divide/test_msa_div_u_w.c', '../mips/user/ase/msa/int-divide/test_msa_div_u_h.c', '../mips/user/ase/msa/int-divide/test_msa_div_u_d.c', - '../mips/user/ase/msa/int-add/test_msa_addv_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_a_h.c', - '../mips/user/ase/msa/int-add/test_msa_add_a_h.c', - '../mips/user/ase/msa/int-add/test_msa_adds_a_w.c', - '../mips/user/ase/msa/int-add/test_msa_adds_u_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_s_h.c', - '../mips/user/ase/msa/int-add/test_msa_adds_s_b.c', - '../mips/user/ase/msa/int-add/test_msa_addv_b.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_s_w.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_u_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_a_b.c', - '../mips/user/ase/msa/int-add/test_msa_add_a_w.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_u_h.c', - '../mips/user/ase/msa/int-add/test_msa_add_a_b.c', - '../mips/user/ase/msa/int-add/test_msa_adds_s_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_u_b.c', - '../mips/user/ase/msa/int-add/test_msa_adds_a_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_s_w.c', - '../mips/user/ase/msa/int-add/test_msa_addv_w.c', - '../mips/user/ase/msa/int-add/test_msa_adds_u_h.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_u_w.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_s_h.c', - '../mips/user/ase/msa/int-add/test_msa_addv_h.c', - '../mips/user/ase/msa/int-add/test_msa_hadd_s_d.c', - '../mips/user/ase/msa/int-add/test_msa_add_a_d.c', - '../mips/user/ase/msa/int-add/test_msa_adds_u_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 adc9eda70f3c..584b69812a54 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -45,6 +45,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_bit_set.c', '../mips/test_msa_fixed_multiply.c', '../mips/test_msa_float_max_min.c', + '../mips/test_msa_int_add.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 fd4325f817a6..5140ada24cc0 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -46,6 +46,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_bit_set.c', '../mips/test_msa_fixed_multiply.c', '../mips/test_msa_float_max_min.c', + '../mips/test_msa_int_add.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
