Commit 553b96ced5 for qemu.org
commit 553b96ced5075fd8539c72db2d90fba86b38984a
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Thu Oct 29 11:18:06 2026 +0100
tests/tcg/mips: Group MSA int-subtract tests
Build the 34 per-opcode int-subtract tests as a single executable,
test_msa_int_subtract.c, to reduce the number of test binaries.
Each opcode reports one TAP line.
Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-ID: <20261030175357.99684-28-philmd@oss.qualcomm.com>
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 0f4d55a2f2..516da867ca 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -14,6 +14,7 @@ tests_mips_msa_groups = [
'../mips/test_msa_int_dot_product.c',
'../mips/test_msa_int_max_min.c',
'../mips/test_msa_int_multiply.c',
+ '../mips/test_msa_int_subtract.c',
]
tests += tcg_tests['multiarch-linux-user']['tests']
@@ -39,40 +40,6 @@ if 'qemu-mips' in emulators
endif
tests_mips_msa = [
- '../mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subv_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subv_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subv_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subv_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c',
- '../mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c',
- '../mips/user/ase/msa/int-subtract/test_msa_subs_s_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/mips/test_msa_int_subtract.c b/tests/tcg/mips/test_msa_int_subtract.c
new file mode 100644
index 0000000000..84efc16ac4
--- /dev/null
+++ b/tests/tcg/mips/test_msa_int_subtract.c
@@ -0,0 +1,231 @@
+/*
+ * MIPS MSA tests: Int Subtract instructions
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "../include/tap.h"
+
+#define main test_msa_asub_s_b
+#include "user/ase/msa/int-subtract/test_msa_asub_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_s_d
+#include "user/ase/msa/int-subtract/test_msa_asub_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_s_h
+#include "user/ase/msa/int-subtract/test_msa_asub_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_s_w
+#include "user/ase/msa/int-subtract/test_msa_asub_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_u_b
+#include "user/ase/msa/int-subtract/test_msa_asub_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_u_d
+#include "user/ase/msa/int-subtract/test_msa_asub_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_u_h
+#include "user/ase/msa/int-subtract/test_msa_asub_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_asub_u_w
+#include "user/ase/msa/int-subtract/test_msa_asub_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_s_d
+#include "user/ase/msa/int-subtract/test_msa_hsub_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_s_h
+#include "user/ase/msa/int-subtract/test_msa_hsub_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_s_w
+#include "user/ase/msa/int-subtract/test_msa_hsub_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_u_d
+#include "user/ase/msa/int-subtract/test_msa_hsub_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_u_h
+#include "user/ase/msa/int-subtract/test_msa_hsub_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_hsub_u_w
+#include "user/ase/msa/int-subtract/test_msa_hsub_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_s_b
+#include "user/ase/msa/int-subtract/test_msa_subs_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_s_d
+#include "user/ase/msa/int-subtract/test_msa_subs_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_s_h
+#include "user/ase/msa/int-subtract/test_msa_subs_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_s_w
+#include "user/ase/msa/int-subtract/test_msa_subs_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_u_b
+#include "user/ase/msa/int-subtract/test_msa_subs_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_u_d
+#include "user/ase/msa/int-subtract/test_msa_subs_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_u_h
+#include "user/ase/msa/int-subtract/test_msa_subs_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subs_u_w
+#include "user/ase/msa/int-subtract/test_msa_subs_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsus_u_b
+#include "user/ase/msa/int-subtract/test_msa_subsus_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsus_u_d
+#include "user/ase/msa/int-subtract/test_msa_subsus_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsus_u_h
+#include "user/ase/msa/int-subtract/test_msa_subsus_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsus_u_w
+#include "user/ase/msa/int-subtract/test_msa_subsus_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsuu_s_b
+#include "user/ase/msa/int-subtract/test_msa_subsuu_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsuu_s_d
+#include "user/ase/msa/int-subtract/test_msa_subsuu_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsuu_s_h
+#include "user/ase/msa/int-subtract/test_msa_subsuu_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subsuu_s_w
+#include "user/ase/msa/int-subtract/test_msa_subsuu_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subv_b
+#include "user/ase/msa/int-subtract/test_msa_subv_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subv_d
+#include "user/ase/msa/int-subtract/test_msa_subv_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subv_h
+#include "user/ase/msa/int-subtract/test_msa_subv_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_subv_w
+#include "user/ase/msa/int-subtract/test_msa_subv_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+
+static const struct {
+ const char *name;
+ int32_t (*fn)(void);
+} msa_tests[] = {
+ { "asub.s.b", test_msa_asub_s_b },
+ { "asub.s.d", test_msa_asub_s_d },
+ { "asub.s.h", test_msa_asub_s_h },
+ { "asub.s.w", test_msa_asub_s_w },
+ { "asub.u.b", test_msa_asub_u_b },
+ { "asub.u.d", test_msa_asub_u_d },
+ { "asub.u.h", test_msa_asub_u_h },
+ { "asub.u.w", test_msa_asub_u_w },
+ { "hsub.s.d", test_msa_hsub_s_d },
+ { "hsub.s.h", test_msa_hsub_s_h },
+ { "hsub.s.w", test_msa_hsub_s_w },
+ { "hsub.u.d", test_msa_hsub_u_d },
+ { "hsub.u.h", test_msa_hsub_u_h },
+ { "hsub.u.w", test_msa_hsub_u_w },
+ { "subs.s.b", test_msa_subs_s_b },
+ { "subs.s.d", test_msa_subs_s_d },
+ { "subs.s.h", test_msa_subs_s_h },
+ { "subs.s.w", test_msa_subs_s_w },
+ { "subs.u.b", test_msa_subs_u_b },
+ { "subs.u.d", test_msa_subs_u_d },
+ { "subs.u.h", test_msa_subs_u_h },
+ { "subs.u.w", test_msa_subs_u_w },
+ { "subsus.u.b", test_msa_subsus_u_b },
+ { "subsus.u.d", test_msa_subsus_u_d },
+ { "subsus.u.h", test_msa_subsus_u_h },
+ { "subsus.u.w", test_msa_subsus_u_w },
+ { "subsuu.s.b", test_msa_subsuu_s_b },
+ { "subsuu.s.d", test_msa_subsuu_s_d },
+ { "subsuu.s.h", test_msa_subsuu_s_h },
+ { "subsuu.s.w", test_msa_subsuu_s_w },
+ { "subv.b", test_msa_subv_b },
+ { "subv.d", test_msa_subv_d },
+ { "subv.h", test_msa_subv_h },
+ { "subv.w", test_msa_subv_w },
+};
+
+int main(void)
+{
+ unsigned i;
+
+ TAP_START();
+ for (i = 0; i < sizeof(msa_tests) / sizeof(msa_tests[0]); i++) {
+ tap_report(!msa_tests[i].fn(), "MSA %s %s",
+ "Int Subtract", msa_tests[i].name);
+ }
+
+ return tap_done();
+}