Commit aaa3bed0c2 for qemu.org
commit aaa3bed0c2aef8f0e6e013830f30dbddbd6b1bfe
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date: Thu Oct 29 11:18:07 2026 +0100
tests/tcg/mips: Group MSA shift tests
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é <philmd@oss.qualcomm.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-ID: <20261030175357.99684-32-philmd@oss.qualcomm.com>
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 8a0ae3cdae..560d07ad63 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -18,6 +18,7 @@ tests_mips_msa_groups = [
'../mips/test_msa_interleave.c',
'../mips/test_msa_logic.c',
'../mips/test_msa_pack.c',
+ '../mips/test_msa_shift.c',
]
tests += tcg_tests['multiarch-linux-user']['tests']
@@ -41,26 +42,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/mips/test_msa_shift.c b/tests/tcg/mips/test_msa_shift.c
new file mode 100644
index 0000000000..14a73d9093
--- /dev/null
+++ b/tests/tcg/mips/test_msa_shift.c
@@ -0,0 +1,147 @@
+/*
+ * MIPS MSA tests: Shift instructions
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "../include/tap.h"
+
+#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)
+{
+ 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",
+ "Shift", msa_tests[i].name);
+ }
+
+ return tap_done();
+}
diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build
index ebb4006e7e..ad69e36d91 100644
--- a/tests/tcg/mips64/meson.build
+++ b/tests/tcg/mips64/meson.build
@@ -39,11 +39,12 @@ foreach src: tests_mips64r6
tests += {src: {'cflags': '-march=mips64r6', 'protocol': 'tap'}}
endforeach
-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 edb59a2545..1951c3c437 100644
--- a/tests/tcg/mipsel/meson.build
+++ b/tests/tcg/mipsel/meson.build
@@ -40,12 +40,13 @@ endif
tests = []
-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