Build the 6 per-opcode bitops tests as a single executable, test_mips64r6_bitops.c, to reduce the number of test binaries. Each opcode reports one TAP line.
Prefix the per-case output of test_utils_64.h with '# ' so TAP parsers treat it as a comment. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/tcg/mips/include/test_utils_64.h | 6 +-- tests/tcg/mips64/test_mips64r6_bitops.c | 62 +++++++++++++++++++++++++ tests/tcg/mips64/meson.build | 7 +-- 3 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 tests/tcg/mips64/test_mips64r6_bitops.c diff --git a/tests/tcg/mips/include/test_utils_64.h b/tests/tcg/mips/include/test_utils_64.h index b785c26d0934..fe9f5f3b000f 100644 --- a/tests/tcg/mips/include/test_utils_64.h +++ b/tests/tcg/mips/include/test_utils_64.h @@ -58,7 +58,7 @@ static inline int32_t check_results_64(const char *isa_ase_name, uint32_t pass_count = 0; uint32_t fail_count = 0; - printf("| %-10s \t| %-20s\t| %-16s \t|", + printf("# %-10s \t| %-20s\t| %-16s \t|", isa_ase_name, group_name, instruction_name); for (i = 0; i < test_count; i++) { if (b64_result[i] == b64_expect[i]) { @@ -92,10 +92,10 @@ static inline bool check_binary_op_64_with_input(binary_op_64 op, const char *op uint64_t expected = expect[i * cols + j]; uint64_t res = 0; op(&input1, &input2, &res); - printf("assert(0x%"PRIx64" == %s(0x%"PRIx64", 0x%"PRIx64"));\n", + printf("# assert(0x%"PRIx64" == %s(0x%"PRIx64", 0x%"PRIx64"));\n", res, op_str, input1, input2); if (expected != res) { - printf("// error: expected 0x%"PRIx64"\n", expected); + printf("# error: expected 0x%"PRIx64"\n", expected); ret = false; } } diff --git a/tests/tcg/mips64/test_mips64r6_bitops.c b/tests/tcg/mips64/test_mips64r6_bitops.c new file mode 100644 index 000000000000..fbdc566b010a --- /dev/null +++ b/tests/tcg/mips64/test_mips64r6_bitops.c @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* MIPS64R6 tests: bit count and bit swap */ + +#define main test_mips64r6_bitswap +#include "test_mips64r6_bitswap.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_mips64r6_dbitswap +#include "test_mips64r6_dbitswap.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_mips64r6_clo +#include "test_mips64r6_clo.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_mips64r6_clz +#include "test_mips64r6_clz.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_mips64r6_dclo +#include "test_mips64r6_dclo.c" +#undef main +#undef TEST_COUNT_TOTAL + +#define main test_mips64r6_dclz +#include "test_mips64r6_dclz.c" +#undef main +#undef TEST_COUNT_TOTAL + +static const struct { + const char *name; + int32_t (*fn)(void); +} r6_tests[] = { + { "bitswap", test_mips64r6_bitswap }, + { "dbitswap", test_mips64r6_dbitswap }, + { "clo", test_mips64r6_clo }, + { "clz", test_mips64r6_clz }, + { "dclo", test_mips64r6_dclo }, + { "dclz", test_mips64r6_dclz }, +}; + +int main(void) +{ + unsigned count = sizeof(r6_tests) / sizeof(r6_tests[0]); + int fail = 0; + unsigned i; + + printf("TAP version 14\n1..%u\n", count); + for (i = 0; i < count; i++) { + int r = r6_tests[i].fn(); + + printf("%s %u - MIPS64R6 bit count and bit swap %s\n", r ? "not ok" : "ok", i + 1, + r6_tests[i].name); + fail |= r; + } + + return fail ? 1 : 0; +} diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index 3b895a169758..cb9e09ed3c29 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -28,10 +28,8 @@ endif tests = [] tests_mips64r6 = [ + '../mips64/test_mips64r6_bitops.c', '../mips64/test_mips64r6_and.c', - '../mips64/test_mips64r6_bitswap.c', - '../mips64/test_mips64r6_clo.c', - '../mips64/test_mips64r6_clz.c', '../mips64/test_mips64r6_crc32b.c', '../mips64/test_mips64r6_crc32cb.c', '../mips64/test_mips64r6_crc32cd.c', @@ -40,9 +38,6 @@ tests_mips64r6 = [ '../mips64/test_mips64r6_crc32d.c', '../mips64/test_mips64r6_crc32h.c', '../mips64/test_mips64r6_crc32w.c', - '../mips64/test_mips64r6_dbitswap.c', - '../mips64/test_mips64r6_dclo.c', - '../mips64/test_mips64r6_dclz.c', '../mips64/test_mips64r6_dmuh.c', '../mips64/test_mips64r6_dmuhu.c', '../mips64/test_mips64r6_dmul.c', -- 2.55.0
