Build the 20 per-opcode shift tests as a single executable, test_msa_shift.c, to reduce the number of test binaries. Each opcode reports one TAP line.
All MSA tests now emit TAP: select it in the meson setup. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/tcg/mips/test_msa_shift.c | 151 ++++++++++++++++++++++++++++++++ tests/tcg/mips/meson.build | 23 ----- tests/tcg/mips64/meson.build | 4 +- tests/tcg/mipsel/meson.build | 4 +- 4 files changed, 157 insertions(+), 25 deletions(-) create mode 100644 tests/tcg/mips/test_msa_shift.c diff --git a/tests/tcg/mips/test_msa_shift.c b/tests/tcg/mips/test_msa_shift.c new file mode 100644 index 000000000000..22855472f068 --- /dev/null +++ b/tests/tcg/mips/test_msa_shift.c @@ -0,0 +1,151 @@ +/* + * MIPS MSA tests: Shift instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define main test_msa_sll_b +#include "user/ase/msa/shift/test_msa_sll_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sll_d +#include "user/ase/msa/shift/test_msa_sll_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sll_h +#include "user/ase/msa/shift/test_msa_sll_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sll_w +#include "user/ase/msa/shift/test_msa_sll_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sra_b +#include "user/ase/msa/shift/test_msa_sra_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sra_d +#include "user/ase/msa/shift/test_msa_sra_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sra_h +#include "user/ase/msa/shift/test_msa_sra_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_sra_w +#include "user/ase/msa/shift/test_msa_sra_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srar_b +#include "user/ase/msa/shift/test_msa_srar_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srar_d +#include "user/ase/msa/shift/test_msa_srar_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srar_h +#include "user/ase/msa/shift/test_msa_srar_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srar_w +#include "user/ase/msa/shift/test_msa_srar_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srl_b +#include "user/ase/msa/shift/test_msa_srl_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srl_d +#include "user/ase/msa/shift/test_msa_srl_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srl_h +#include "user/ase/msa/shift/test_msa_srl_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srl_w +#include "user/ase/msa/shift/test_msa_srl_w.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srlr_b +#include "user/ase/msa/shift/test_msa_srlr_b.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srlr_d +#include "user/ase/msa/shift/test_msa_srlr_d.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srlr_h +#include "user/ase/msa/shift/test_msa_srlr_h.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_msa_srlr_w +#include "user/ase/msa/shift/test_msa_srlr_w.c" +#undef main +#undef TEST_COUNT_TOTAL + + +static const struct { + const char *name; + int32_t (*fn)(void); +} msa_tests[] = { + { "sll.b", test_msa_sll_b }, + { "sll.d", test_msa_sll_d }, + { "sll.h", test_msa_sll_h }, + { "sll.w", test_msa_sll_w }, + { "sra.b", test_msa_sra_b }, + { "sra.d", test_msa_sra_d }, + { "sra.h", test_msa_sra_h }, + { "sra.w", test_msa_sra_w }, + { "srar.b", test_msa_srar_b }, + { "srar.d", test_msa_srar_d }, + { "srar.h", test_msa_srar_h }, + { "srar.w", test_msa_srar_w }, + { "srl.b", test_msa_srl_b }, + { "srl.d", test_msa_srl_d }, + { "srl.h", test_msa_srl_h }, + { "srl.w", test_msa_srl_w }, + { "srlr.b", test_msa_srlr_b }, + { "srlr.d", test_msa_srlr_d }, + { "srlr.h", test_msa_srlr_h }, + { "srlr.w", test_msa_srlr_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, + "Shift", 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 791ac5109607..feebcc30d6a9 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -21,26 +21,3 @@ if 'qemu-mips' in emulators } } endif - -tests_mips_msa = [ - '../mips/user/ase/msa/shift/test_msa_sra_d.c', - '../mips/user/ase/msa/shift/test_msa_srl_b.c', - '../mips/user/ase/msa/shift/test_msa_srl_d.c', - '../mips/user/ase/msa/shift/test_msa_sll_b.c', - '../mips/user/ase/msa/shift/test_msa_sra_w.c', - '../mips/user/ase/msa/shift/test_msa_sra_h.c', - '../mips/user/ase/msa/shift/test_msa_srar_h.c', - '../mips/user/ase/msa/shift/test_msa_srlr_h.c', - '../mips/user/ase/msa/shift/test_msa_srl_h.c', - '../mips/user/ase/msa/shift/test_msa_sll_d.c', - '../mips/user/ase/msa/shift/test_msa_srl_w.c', - '../mips/user/ase/msa/shift/test_msa_srar_b.c', - '../mips/user/ase/msa/shift/test_msa_sll_w.c', - '../mips/user/ase/msa/shift/test_msa_sra_b.c', - '../mips/user/ase/msa/shift/test_msa_sll_h.c', - '../mips/user/ase/msa/shift/test_msa_srar_d.c', - '../mips/user/ase/msa/shift/test_msa_srlr_d.c', - '../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', -] diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index f18ff8153f2d..d1d4bf6b5a24 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -56,13 +56,15 @@ tests_mips_msa_groups = [ '../mips/test_msa_interleave.c', '../mips/test_msa_logic.c', '../mips/test_msa_pack.c', + '../mips/test_msa_shift.c', ] -foreach src: tests_mips_msa + tests_mips_msa_groups +foreach src: tests_mips_msa_groups tests += { src: { 'cflags': ['-march=mips64r6', '-mmsa'], 'qemu_args': ['-cpu', 'I6400'], + 'protocol': 'tap', } } endforeach diff --git a/tests/tcg/mipsel/meson.build b/tests/tcg/mipsel/meson.build index 277ece3e306a..fcf764ea8df6 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -57,14 +57,16 @@ tests_mips_msa_groups = [ '../mips/test_msa_interleave.c', '../mips/test_msa_logic.c', '../mips/test_msa_pack.c', + '../mips/test_msa_shift.c', ] -foreach src: tests_mips_msa + tests_mips_msa_groups +foreach src: tests_mips_msa_groups tests += { src: { 'cflags': ['-mabi=32', '-march=mips32r5', '-mmsa', '-mno-odd-spreg', '-mfp64', '-mnan=2008'], 'qemu_args': ['-cpu', 'P5600'], + 'protocol': 'tap', } } endforeach -- 2.55.0
