Commit f52a9a4c68 for qemu.org

commit f52a9a4c68941d2095f03472f97f36602406d6eb
Author: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Date:   Thu Oct 29 11:18:06 2026 +0100

    tests/tcg/mips: Group MSA int-average tests

    Build the 16 per-opcode int-average tests as a single executable,
    test_msa_int_average.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-22-philmd@oss.qualcomm.com>

diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 7ef3d6aafa..7da4aece84 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -8,6 +8,7 @@ tests_mips_msa_groups = [
   '../mips/test_msa_fixed_multiply.c',
   '../mips/test_msa_float_max_min.c',
   '../mips/test_msa_int_add.c',
+  '../mips/test_msa_int_average.c',
 ]

 tests += tcg_tests['multiarch-linux-user']['tests']
@@ -192,22 +193,6 @@ tests_mips_msa = [
   '../mips/user/ase/msa/int-max-min/test_msa_min_s_b.c',
   '../mips/user/ase/msa/int-max-min/test_msa_min_u_w.c',
   '../mips/user/ase/msa/int-max-min/test_msa_max_u_w.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_s_b.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_s_b.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_u_w.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_s_h.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_u_w.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_s_w.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_u_h.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_s_d.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_u_h.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_u_b.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_s_d.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_s_w.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_u_d.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_u_d.c',
-  '../mips/user/ase/msa/int-average/test_msa_ave_u_b.c',
-  '../mips/user/ase/msa/int-average/test_msa_aver_s_h.c',
   '../mips/user/ase/msa/int-dot-product/test_msa_dpadd_s_h.c',
   '../mips/user/ase/msa/int-dot-product/test_msa_dpsub_u_h.c',
   '../mips/user/ase/msa/int-dot-product/test_msa_dpsub_s_w.c',
diff --git a/tests/tcg/mips/test_msa_int_average.c b/tests/tcg/mips/test_msa_int_average.c
new file mode 100644
index 0000000000..f3ff9fd345
--- /dev/null
+++ b/tests/tcg/mips/test_msa_int_average.c
@@ -0,0 +1,123 @@
+/*
+ * MIPS MSA tests: Int Average instructions
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "../include/tap.h"
+
+#define main test_msa_ave_s_b
+#include "user/ase/msa/int-average/test_msa_ave_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_s_d
+#include "user/ase/msa/int-average/test_msa_ave_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_s_h
+#include "user/ase/msa/int-average/test_msa_ave_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_s_w
+#include "user/ase/msa/int-average/test_msa_ave_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_u_b
+#include "user/ase/msa/int-average/test_msa_ave_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_u_d
+#include "user/ase/msa/int-average/test_msa_ave_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_u_h
+#include "user/ase/msa/int-average/test_msa_ave_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_ave_u_w
+#include "user/ase/msa/int-average/test_msa_ave_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_s_b
+#include "user/ase/msa/int-average/test_msa_aver_s_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_s_d
+#include "user/ase/msa/int-average/test_msa_aver_s_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_s_h
+#include "user/ase/msa/int-average/test_msa_aver_s_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_s_w
+#include "user/ase/msa/int-average/test_msa_aver_s_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_u_b
+#include "user/ase/msa/int-average/test_msa_aver_u_b.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_u_d
+#include "user/ase/msa/int-average/test_msa_aver_u_d.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_u_h
+#include "user/ase/msa/int-average/test_msa_aver_u_h.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+#define main test_msa_aver_u_w
+#include "user/ase/msa/int-average/test_msa_aver_u_w.c"
+#undef main
+#undef TEST_COUNT_TOTAL
+
+
+static const struct {
+    const char *name;
+    int32_t (*fn)(void);
+} msa_tests[] = {
+    { "ave.s.b", test_msa_ave_s_b },
+    { "ave.s.d", test_msa_ave_s_d },
+    { "ave.s.h", test_msa_ave_s_h },
+    { "ave.s.w", test_msa_ave_s_w },
+    { "ave.u.b", test_msa_ave_u_b },
+    { "ave.u.d", test_msa_ave_u_d },
+    { "ave.u.h", test_msa_ave_u_h },
+    { "ave.u.w", test_msa_ave_u_w },
+    { "aver.s.b", test_msa_aver_s_b },
+    { "aver.s.d", test_msa_aver_s_d },
+    { "aver.s.h", test_msa_aver_s_h },
+    { "aver.s.w", test_msa_aver_s_w },
+    { "aver.u.b", test_msa_aver_u_b },
+    { "aver.u.d", test_msa_aver_u_d },
+    { "aver.u.h", test_msa_aver_u_h },
+    { "aver.u.w", test_msa_aver_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 Average", msa_tests[i].name);
+    }
+
+    return tap_done();
+}