Build the 12 per-opcode bit-set tests as a single executable, test_msa_bit_set.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_bit_set.c | 103 ++++++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 12 ---- tests/tcg/mips64/meson.build | 1 + tests/tcg/mipsel/meson.build | 1 + 4 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 tests/tcg/mips/test_msa_bit_set.c diff --git a/tests/tcg/mips/test_msa_bit_set.c b/tests/tcg/mips/test_msa_bit_set.c new file mode 100644 index 000000000000..76301fb148d7 --- /dev/null +++ b/tests/tcg/mips/test_msa_bit_set.c @@ -0,0 +1,103 @@ +/* + * MIPS MSA tests: Bit Set instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_bclr_b +#include "user/ase/msa/bit-set/test_msa_bclr_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bclr_d +#include "user/ase/msa/bit-set/test_msa_bclr_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bclr_h +#include "user/ase/msa/bit-set/test_msa_bclr_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bclr_w +#include "user/ase/msa/bit-set/test_msa_bclr_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bneg_b +#include "user/ase/msa/bit-set/test_msa_bneg_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bneg_d +#include "user/ase/msa/bit-set/test_msa_bneg_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bneg_h +#include "user/ase/msa/bit-set/test_msa_bneg_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bneg_w +#include "user/ase/msa/bit-set/test_msa_bneg_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bset_b +#include "user/ase/msa/bit-set/test_msa_bset_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bset_d +#include "user/ase/msa/bit-set/test_msa_bset_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bset_h +#include "user/ase/msa/bit-set/test_msa_bset_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_bset_w +#include "user/ase/msa/bit-set/test_msa_bset_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "bclr.b", test_msa_bclr_b }, + { "bclr.d", test_msa_bclr_d }, + { "bclr.h", test_msa_bclr_h }, + { "bclr.w", test_msa_bclr_w }, + { "bneg.b", test_msa_bneg_b }, + { "bneg.d", test_msa_bneg_d }, + { "bneg.h", test_msa_bneg_h }, + { "bneg.w", test_msa_bneg_w }, + { "bset.b", test_msa_bset_b }, + { "bset.d", test_msa_bset_d }, + { "bset.h", test_msa_bset_h }, + { "bset.w", test_msa_bset_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, + "Bit Set", 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 adf25fd3c5d2..f3919436dacf 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -244,18 +244,6 @@ tests_mips_msa = [ '../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/bit-set/test_msa_bneg_b.c', - '../mips/user/ase/msa/bit-set/test_msa_bclr_d.c', - '../mips/user/ase/msa/bit-set/test_msa_bneg_h.c', - '../mips/user/ase/msa/bit-set/test_msa_bset_h.c', - '../mips/user/ase/msa/bit-set/test_msa_bclr_b.c', - '../mips/user/ase/msa/bit-set/test_msa_bclr_h.c', - '../mips/user/ase/msa/bit-set/test_msa_bneg_w.c', - '../mips/user/ase/msa/bit-set/test_msa_bset_w.c', - '../mips/user/ase/msa/bit-set/test_msa_bset_b.c', - '../mips/user/ase/msa/bit-set/test_msa_bclr_w.c', - '../mips/user/ase/msa/bit-set/test_msa_bset_d.c', - '../mips/user/ase/msa/bit-set/test_msa_bneg_d.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 b40b7c10c608..08a4900a9fb5 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -42,6 +42,7 @@ endforeach tests_mips_msa_groups = [ '../mips/test_msa_bit_count.c', '../mips/test_msa_bit_move.c', + '../mips/test_msa_bit_set.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 0a3b84623125..fc19a18acecb 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -43,6 +43,7 @@ tests = [] tests_mips_msa_groups = [ '../mips/test_msa_bit_count.c', '../mips/test_msa_bit_move.c', + '../mips/test_msa_bit_set.c', ] foreach src: tests_mips_msa + tests_mips_msa_groups -- 2.55.0
