Build the 16 per-opcode int-average tests as a single executable, test_msa_int_average.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_average.c | 127 ++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 16 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 tests/tcg/mips/test_msa_int_average.c diff --git a/tests/tcg/mips/test_msa_int_average.c b/tests/tcg/mips/test_msa_int_average.c new file mode 100644 index 000000000000..1e72986c3c53 --- /dev/null +++ b/tests/tcg/mips/test_msa_int_average.c @@ -0,0 +1,127 @@ +/* + * MIPS MSA tests: Int Average instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_ave_s_b +#include "user/ase/msa/int-average/test_msa_ave_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_s_d +#include "user/ase/msa/int-average/test_msa_ave_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_s_h +#include "user/ase/msa/int-average/test_msa_ave_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_s_w +#include "user/ase/msa/int-average/test_msa_ave_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_u_b +#include "user/ase/msa/int-average/test_msa_ave_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_u_d +#include "user/ase/msa/int-average/test_msa_ave_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_u_h +#include "user/ase/msa/int-average/test_msa_ave_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_ave_u_w +#include "user/ase/msa/int-average/test_msa_ave_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_s_b +#include "user/ase/msa/int-average/test_msa_aver_s_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_s_d +#include "user/ase/msa/int-average/test_msa_aver_s_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_s_h +#include "user/ase/msa/int-average/test_msa_aver_s_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_s_w +#include "user/ase/msa/int-average/test_msa_aver_s_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_u_b +#include "user/ase/msa/int-average/test_msa_aver_u_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_u_d +#include "user/ase/msa/int-average/test_msa_aver_u_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_u_h +#include "user/ase/msa/int-average/test_msa_aver_u_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_aver_u_w +#include "user/ase/msa/int-average/test_msa_aver_u_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "ave.s.b", test_msa_ave_s_b }, + { "ave.s.d", test_msa_ave_s_d }, + { "ave.s.h", test_msa_ave_s_h }, + { "ave.s.w", test_msa_ave_s_w }, + { "ave.u.b", test_msa_ave_u_b }, + { "ave.u.d", test_msa_ave_u_d }, + { "ave.u.h", test_msa_ave_u_h }, + { "ave.u.w", test_msa_ave_u_w }, + { "aver.s.b", test_msa_aver_s_b }, + { "aver.s.d", test_msa_aver_s_d }, + { "aver.s.h", test_msa_aver_s_h }, + { "aver.s.w", test_msa_aver_s_w }, + { "aver.u.b", test_msa_aver_u_b }, + { "aver.u.d", test_msa_aver_u_d }, + { "aver.u.h", test_msa_aver_u_h }, + { "aver.u.w", test_msa_aver_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 Average", 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 98bd391ee22b..be09044179c2 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -182,22 +182,6 @@ tests_mips_msa = [ '../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', - '../mips/user/ase/msa/int-average/test_msa_aver_s_b.c', - '../mips/user/ase/msa/int-average/test_msa_ave_s_b.c', - '../mips/user/ase/msa/int-average/test_msa_ave_u_w.c', - '../mips/user/ase/msa/int-average/test_msa_ave_s_h.c', - '../mips/user/ase/msa/int-average/test_msa_aver_u_w.c', - '../mips/user/ase/msa/int-average/test_msa_ave_s_w.c', - '../mips/user/ase/msa/int-average/test_msa_aver_u_h.c', - '../mips/user/ase/msa/int-average/test_msa_ave_s_d.c', - '../mips/user/ase/msa/int-average/test_msa_ave_u_h.c', - '../mips/user/ase/msa/int-average/test_msa_aver_u_b.c', - '../mips/user/ase/msa/int-average/test_msa_aver_s_d.c', - '../mips/user/ase/msa/int-average/test_msa_aver_s_w.c', - '../mips/user/ase/msa/int-average/test_msa_ave_u_d.c', - '../mips/user/ase/msa/int-average/test_msa_aver_u_d.c', - '../mips/user/ase/msa/int-average/test_msa_ave_u_b.c', - '../mips/user/ase/msa/int-average/test_msa_aver_s_h.c', '../mips/user/ase/msa/int-dot-product/test_msa_dpadd_s_h.c', '../mips/user/ase/msa/int-dot-product/test_msa_dpsub_u_h.c', '../mips/user/ase/msa/int-dot-product/test_msa_dpsub_s_w.c', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index 584b69812a54..c3d025452c4e 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -46,6 +46,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_fixed_multiply.c', '../mips/test_msa_float_max_min.c', '../mips/test_msa_int_add.c', + '../mips/test_msa_int_average.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 5140ada24cc0..7483b1aae7aa 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -47,6 +47,7 @@ tests_mips_msa_groups = [ '../mips/test_msa_fixed_multiply.c', '../mips/test_msa_float_max_min.c', '../mips/test_msa_int_add.c', + '../mips/test_msa_int_average.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
