Commit a9c9d84079 for qemu.org
commit a9c9d840791727ea67fa0256b398531fede4bed8
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Thu Oct 29 11:18:06 2026 +0100
tests/tcg/mips: Group MSA int-compare tests
Build the 20 per-opcode int-compare tests as a single executable,
test_msa_int_compare.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-23-philmd@oss.qualcomm.com>
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 7da4aece84..199b1b934a 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -9,6 +9,7 @@ tests_mips_msa_groups = [
'../mips/test_msa_float_max_min.c',
'../mips/test_msa_int_add.c',
'../mips/test_msa_int_average.c',
+ '../mips/test_msa_int_compare.c',
]
tests += tcg_tests['multiarch-linux-user']['tests']
@@ -144,26 +145,6 @@ tests_mips_msa = [
'../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',
- '../mips/user/ase/msa/int-compare/test_msa_cle_u_d.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_s_h.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_u_w.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_s_h.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_u_b.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_s_d.c',
- '../mips/user/ase/msa/int-compare/test_msa_ceq_w.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_s_w.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_s_w.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_u_w.c',
- '../mips/user/ase/msa/int-compare/test_msa_ceq_h.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_s_b.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_s_b.c',
- '../mips/user/ase/msa/int-compare/test_msa_ceq_b.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_u_h.c',
- '../mips/user/ase/msa/int-compare/test_msa_cle_u_h.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_s_d.c',
- '../mips/user/ase/msa/int-compare/test_msa_ceq_d.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_u_b.c',
- '../mips/user/ase/msa/int-compare/test_msa_clt_u_d.c',
'../mips/user/ase/msa/logic/test_msa_or_v.c',
'../mips/user/ase/msa/logic/test_msa_nor_v.c',
'../mips/user/ase/msa/logic/test_msa_and_v.c',
diff --git a/tests/tcg/mips/test_msa_int_compare.c b/tests/tcg/mips/test_msa_int_compare.c
new file mode 100644
index 0000000000..b500772be5
--- /dev/null
+++ b/tests/tcg/mips/test_msa_int_compare.c
@@ -0,0 +1,147 @@
+/*
+ * MIPS MSA tests: Int Compare instructions
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "../include/tap.h"
+
+#define main test_msa_ceq_b
+#include "user/ase/msa/int-compare/test_msa_ceq_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ceq_d
+#include "user/ase/msa/int-compare/test_msa_ceq_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ceq_h
+#include "user/ase/msa/int-compare/test_msa_ceq_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ceq_w
+#include "user/ase/msa/int-compare/test_msa_ceq_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_s_b
+#include "user/ase/msa/int-compare/test_msa_cle_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_s_d
+#include "user/ase/msa/int-compare/test_msa_cle_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_s_h
+#include "user/ase/msa/int-compare/test_msa_cle_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_s_w
+#include "user/ase/msa/int-compare/test_msa_cle_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_u_b
+#include "user/ase/msa/int-compare/test_msa_cle_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_u_d
+#include "user/ase/msa/int-compare/test_msa_cle_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_u_h
+#include "user/ase/msa/int-compare/test_msa_cle_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_cle_u_w
+#include "user/ase/msa/int-compare/test_msa_cle_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_s_b
+#include "user/ase/msa/int-compare/test_msa_clt_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_s_d
+#include "user/ase/msa/int-compare/test_msa_clt_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_s_h
+#include "user/ase/msa/int-compare/test_msa_clt_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_s_w
+#include "user/ase/msa/int-compare/test_msa_clt_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_u_b
+#include "user/ase/msa/int-compare/test_msa_clt_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_u_d
+#include "user/ase/msa/int-compare/test_msa_clt_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_u_h
+#include "user/ase/msa/int-compare/test_msa_clt_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_clt_u_w
+#include "user/ase/msa/int-compare/test_msa_clt_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+
+static const struct {
+ const char *name;
+ int32_t (*fn)(void);
+} msa_tests[] = {
+ { "ceq.b", test_msa_ceq_b },
+ { "ceq.d", test_msa_ceq_d },
+ { "ceq.h", test_msa_ceq_h },
+ { "ceq.w", test_msa_ceq_w },
+ { "cle.s.b", test_msa_cle_s_b },
+ { "cle.s.d", test_msa_cle_s_d },
+ { "cle.s.h", test_msa_cle_s_h },
+ { "cle.s.w", test_msa_cle_s_w },
+ { "cle.u.b", test_msa_cle_u_b },
+ { "cle.u.d", test_msa_cle_u_d },
+ { "cle.u.h", test_msa_cle_u_h },
+ { "cle.u.w", test_msa_cle_u_w },
+ { "clt.s.b", test_msa_clt_s_b },
+ { "clt.s.d", test_msa_clt_s_d },
+ { "clt.s.h", test_msa_clt_s_h },
+ { "clt.s.w", test_msa_clt_s_w },
+ { "clt.u.b", test_msa_clt_u_b },
+ { "clt.u.d", test_msa_clt_u_d },
+ { "clt.u.h", test_msa_clt_u_h },
+ { "clt.u.w", test_msa_clt_u_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 Compare", msa_tests[i].name);
+ }
+
+ return tap_done();
+}