Commit 03311a4b37 for qemu.org
commit 03311a4b37815f7e57da05cecaeedbc982ae4ca5
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Thu Oct 29 11:18:07 2026 +0100
tests/tcg/mips: Group MSA interleave tests
Build the 16 per-opcode interleave tests as a single executable,
test_msa_interleave.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-29-philmd@oss.qualcomm.com>
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 516da867ca..cc94623f8f 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -15,6 +15,7 @@ tests_mips_msa_groups = [
'../mips/test_msa_int_max_min.c',
'../mips/test_msa_int_multiply.c',
'../mips/test_msa_int_subtract.c',
+ '../mips/test_msa_interleave.c',
]
tests += tcg_tests['multiarch-linux-user']['tests']
@@ -40,22 +41,6 @@ if 'qemu-mips' in emulators
endif
tests_mips_msa = [
- '../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',
- '../mips/user/ase/msa/interleave/test_msa_ilvl_b.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvev_w.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvr_w.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvr_h.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvev_h.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvev_b.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvod_w.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvev_d.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvl_d.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvod_d.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvl_h.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvl_w.c',
- '../mips/user/ase/msa/interleave/test_msa_ilvod_h.c',
'../mips/user/ase/msa/pack/test_msa_vshf_b.c',
'../mips/user/ase/msa/pack/test_msa_pckev_b.c',
'../mips/user/ase/msa/pack/test_msa_vshf_w.c',
diff --git a/tests/tcg/mips/test_msa_interleave.c b/tests/tcg/mips/test_msa_interleave.c
new file mode 100644
index 0000000000..f561ebe25a
--- /dev/null
+++ b/tests/tcg/mips/test_msa_interleave.c
@@ -0,0 +1,123 @@
+/*
+ * MIPS MSA tests: Interleave instructions
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "../include/tap.h"
+
+#define main test_msa_ilvev_b
+#include "user/ase/msa/interleave/test_msa_ilvev_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvev_d
+#include "user/ase/msa/interleave/test_msa_ilvev_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvev_h
+#include "user/ase/msa/interleave/test_msa_ilvev_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvev_w
+#include "user/ase/msa/interleave/test_msa_ilvev_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvl_b
+#include "user/ase/msa/interleave/test_msa_ilvl_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvl_d
+#include "user/ase/msa/interleave/test_msa_ilvl_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvl_h
+#include "user/ase/msa/interleave/test_msa_ilvl_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvl_w
+#include "user/ase/msa/interleave/test_msa_ilvl_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvod_b
+#include "user/ase/msa/interleave/test_msa_ilvod_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvod_d
+#include "user/ase/msa/interleave/test_msa_ilvod_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvod_h
+#include "user/ase/msa/interleave/test_msa_ilvod_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvod_w
+#include "user/ase/msa/interleave/test_msa_ilvod_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvr_b
+#include "user/ase/msa/interleave/test_msa_ilvr_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvr_d
+#include "user/ase/msa/interleave/test_msa_ilvr_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvr_h
+#include "user/ase/msa/interleave/test_msa_ilvr_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ilvr_w
+#include "user/ase/msa/interleave/test_msa_ilvr_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+
+static const struct {
+ const char *name;
+ int32_t (*fn)(void);
+} msa_tests[] = {
+ { "ilvev.b", test_msa_ilvev_b },
+ { "ilvev.d", test_msa_ilvev_d },
+ { "ilvev.h", test_msa_ilvev_h },
+ { "ilvev.w", test_msa_ilvev_w },
+ { "ilvl.b", test_msa_ilvl_b },
+ { "ilvl.d", test_msa_ilvl_d },
+ { "ilvl.h", test_msa_ilvl_h },
+ { "ilvl.w", test_msa_ilvl_w },
+ { "ilvod.b", test_msa_ilvod_b },
+ { "ilvod.d", test_msa_ilvod_d },
+ { "ilvod.h", test_msa_ilvod_h },
+ { "ilvod.w", test_msa_ilvod_w },
+ { "ilvr.b", test_msa_ilvr_b },
+ { "ilvr.d", test_msa_ilvr_d },
+ { "ilvr.h", test_msa_ilvr_h },
+ { "ilvr.w", test_msa_ilvr_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",
+ "Interleave", msa_tests[i].name);
+ }
+
+ return tap_done();
+}