Build the 27 per-opcode pack tests as a single executable, test_dsp_pack.c, to reduce the number of test binaries. Each opcode reports one TAP line.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/tcg/mipsel/test_dsp_pack.c | 152 ++++++++++++++++++ tests/tcg/mipsel/test_dsp_r1_bitrev.c | 1 - tests/tcg/mipsel/test_dsp_r1_insv.c | 1 - tests/tcg/mipsel/test_dsp_r1_packrl_ph.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceq_w_phl.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceq_w_phr.c | 1 - tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbl.c | 1 - .../tcg/mipsel/test_dsp_r1_precequ_ph_qbla.c | 1 - tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbr.c | 1 - .../tcg/mipsel/test_dsp_r1_precequ_ph_qbra.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbl.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbla.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbr.c | 1 - tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbra.c | 1 - tests/tcg/mipsel/test_dsp_r1_precrq_ph_w.c | 1 - tests/tcg/mipsel/test_dsp_r1_precrq_qb_ph.c | 1 - tests/tcg/mipsel/test_dsp_r1_precrq_rs_ph_w.c | 1 - .../tcg/mipsel/test_dsp_r1_precrqu_s_qb_ph.c | 1 - tests/tcg/mipsel/test_dsp_r1_repl_ph.c | 1 - tests/tcg/mipsel/test_dsp_r1_repl_qb.c | 1 - tests/tcg/mipsel/test_dsp_r1_replv_ph.c | 1 - tests/tcg/mipsel/test_dsp_r1_replv_qb.c | 1 - tests/tcg/mipsel/test_dsp_r2_append.c | 1 - tests/tcg/mipsel/test_dsp_r2_balign.c | 1 - tests/tcg/mipsel/test_dsp_r2_precr_qb_ph.c | 1 - tests/tcg/mipsel/test_dsp_r2_precr_sra_ph_w.c | 1 - .../tcg/mipsel/test_dsp_r2_precr_sra_r_ph_w.c | 1 - tests/tcg/mipsel/test_dsp_r2_prepend.c | 1 - tests/tcg/mipsel/meson.build | 28 +--- 29 files changed, 153 insertions(+), 54 deletions(-) create mode 100644 tests/tcg/mipsel/test_dsp_pack.c diff --git a/tests/tcg/mipsel/test_dsp_pack.c b/tests/tcg/mipsel/test_dsp_pack.c new file mode 100644 index 000000000000..1c04d420ac22 --- /dev/null +++ b/tests/tcg/mipsel/test_dsp_pack.c @@ -0,0 +1,152 @@ +/* + * MIPS DSP ASE tests: Precision, Pack, Replicate and bit Insert instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "test_dsp_runner.h" + +#define main test_dsp_r1_bitrev +#include "test_dsp_r1_bitrev.c" +#undef main + +#define main test_dsp_r1_insv +#include "test_dsp_r1_insv.c" +#undef main + +#define main test_dsp_r1_packrl_ph +#include "test_dsp_r1_packrl_ph.c" +#undef main + +#define main test_dsp_r1_preceq_w_phl +#include "test_dsp_r1_preceq_w_phl.c" +#undef main + +#define main test_dsp_r1_preceq_w_phr +#include "test_dsp_r1_preceq_w_phr.c" +#undef main + +#define main test_dsp_r1_precequ_ph_qbl +#include "test_dsp_r1_precequ_ph_qbl.c" +#undef main + +#define main test_dsp_r1_precequ_ph_qbla +#include "test_dsp_r1_precequ_ph_qbla.c" +#undef main + +#define main test_dsp_r1_precequ_ph_qbr +#include "test_dsp_r1_precequ_ph_qbr.c" +#undef main + +#define main test_dsp_r1_precequ_ph_qbra +#include "test_dsp_r1_precequ_ph_qbra.c" +#undef main + +#define main test_dsp_r1_preceu_ph_qbl +#include "test_dsp_r1_preceu_ph_qbl.c" +#undef main + +#define main test_dsp_r1_preceu_ph_qbla +#include "test_dsp_r1_preceu_ph_qbla.c" +#undef main + +#define main test_dsp_r1_preceu_ph_qbr +#include "test_dsp_r1_preceu_ph_qbr.c" +#undef main + +#define main test_dsp_r1_preceu_ph_qbra +#include "test_dsp_r1_preceu_ph_qbra.c" +#undef main + +#define main test_dsp_r1_precrq_ph_w +#include "test_dsp_r1_precrq_ph_w.c" +#undef main + +#define main test_dsp_r1_precrq_qb_ph +#include "test_dsp_r1_precrq_qb_ph.c" +#undef main + +#define main test_dsp_r1_precrq_rs_ph_w +#include "test_dsp_r1_precrq_rs_ph_w.c" +#undef main + +#define main test_dsp_r1_precrqu_s_qb_ph +#include "test_dsp_r1_precrqu_s_qb_ph.c" +#undef main + +#define main test_dsp_r1_repl_ph +#include "test_dsp_r1_repl_ph.c" +#undef main + +#define main test_dsp_r1_repl_qb +#include "test_dsp_r1_repl_qb.c" +#undef main + +#define main test_dsp_r1_replv_ph +#include "test_dsp_r1_replv_ph.c" +#undef main + +#define main test_dsp_r1_replv_qb +#include "test_dsp_r1_replv_qb.c" +#undef main + +#define main test_dsp_r2_append +#include "test_dsp_r2_append.c" +#undef main + +#define main test_dsp_r2_balign +#include "test_dsp_r2_balign.c" +#undef main + +#define main test_dsp_r2_precr_qb_ph +#include "test_dsp_r2_precr_qb_ph.c" +#undef main + +#define main test_dsp_r2_precr_sra_ph_w +#include "test_dsp_r2_precr_sra_ph_w.c" +#undef main + +#define main test_dsp_r2_precr_sra_r_ph_w +#include "test_dsp_r2_precr_sra_r_ph_w.c" +#undef main + +#define main test_dsp_r2_prepend +#include "test_dsp_r2_prepend.c" +#undef main + +int main(void) +{ + int ret = 0; + + RUN_TEST(test_dsp_r1_bitrev); + RUN_TEST(test_dsp_r1_insv); + RUN_TEST(test_dsp_r1_packrl_ph); + RUN_TEST(test_dsp_r1_preceq_w_phl); + RUN_TEST(test_dsp_r1_preceq_w_phr); + RUN_TEST(test_dsp_r1_precequ_ph_qbl); + RUN_TEST(test_dsp_r1_precequ_ph_qbla); + RUN_TEST(test_dsp_r1_precequ_ph_qbr); + RUN_TEST(test_dsp_r1_precequ_ph_qbra); + RUN_TEST(test_dsp_r1_preceu_ph_qbl); + RUN_TEST(test_dsp_r1_preceu_ph_qbla); + RUN_TEST(test_dsp_r1_preceu_ph_qbr); + RUN_TEST(test_dsp_r1_preceu_ph_qbra); + RUN_TEST(test_dsp_r1_precrq_ph_w); + RUN_TEST(test_dsp_r1_precrq_qb_ph); + RUN_TEST(test_dsp_r1_precrq_rs_ph_w); + RUN_TEST(test_dsp_r1_precrqu_s_qb_ph); + RUN_TEST(test_dsp_r1_repl_ph); + RUN_TEST(test_dsp_r1_repl_qb); + RUN_TEST(test_dsp_r1_replv_ph); + RUN_TEST(test_dsp_r1_replv_qb); + RUN_TEST(test_dsp_r2_append); + RUN_TEST(test_dsp_r2_balign); + RUN_TEST(test_dsp_r2_precr_qb_ph); + RUN_TEST(test_dsp_r2_precr_sra_ph_w); + RUN_TEST(test_dsp_r2_precr_sra_r_ph_w); + RUN_TEST(test_dsp_r2_prepend); + + DSP_TAP_PLAN(); + + return ret; +} diff --git a/tests/tcg/mipsel/test_dsp_r1_bitrev.c b/tests/tcg/mipsel/test_dsp_r1_bitrev.c index 04d8a3844eb8..08b49aff8353 100644 --- a/tests/tcg/mipsel/test_dsp_r1_bitrev.c +++ b/tests/tcg/mipsel/test_dsp_r1_bitrev.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_insv.c b/tests/tcg/mipsel/test_dsp_r1_insv.c index 9d674697ccaa..58e1404b36ec 100644 --- a/tests/tcg/mipsel/test_dsp_r1_insv.c +++ b/tests/tcg/mipsel/test_dsp_r1_insv.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_packrl_ph.c b/tests/tcg/mipsel/test_dsp_r1_packrl_ph.c index 1f8e69992503..32fdb27fa5cd 100644 --- a/tests/tcg/mipsel/test_dsp_r1_packrl_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_packrl_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceq_w_phl.c b/tests/tcg/mipsel/test_dsp_r1_preceq_w_phl.c index bf70bf7d3aec..2d03bb8615e9 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceq_w_phl.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceq_w_phl.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceq_w_phr.c b/tests/tcg/mipsel/test_dsp_r1_preceq_w_phr.c index 3f885ef584e6..75a68d75e079 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceq_w_phr.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceq_w_phr.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbl.c b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbl.c index 63b7a9568345..644799d16671 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbl.c +++ b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbl.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbla.c b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbla.c index 31627f0bd606..8825e696f39e 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbla.c +++ b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbla.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbr.c b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbr.c index b6f72d3cbfde..fda12bb5e591 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbr.c +++ b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbr.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbra.c b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbra.c index 4764fd031d8a..98cef45cc865 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbra.c +++ b/tests/tcg/mipsel/test_dsp_r1_precequ_ph_qbra.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbl.c b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbl.c index fa95c26cc48f..f5a2b9ec9a6f 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbl.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbl.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbla.c b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbla.c index 021f21a74440..9eb9800b2323 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbla.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbla.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbr.c b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbr.c index 03df18c72ca5..81d470de2347 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbr.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbr.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbra.c b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbra.c index 634327618cce..1698ff2c837a 100644 --- a/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbra.c +++ b/tests/tcg/mipsel/test_dsp_r1_preceu_ph_qbra.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precrq_ph_w.c b/tests/tcg/mipsel/test_dsp_r1_precrq_ph_w.c index 25d45f1a9aa8..1f04c644c44a 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precrq_ph_w.c +++ b/tests/tcg/mipsel/test_dsp_r1_precrq_ph_w.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precrq_qb_ph.c b/tests/tcg/mipsel/test_dsp_r1_precrq_qb_ph.c index fe23acce8c47..e5512cd82106 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precrq_qb_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_precrq_qb_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precrq_rs_ph_w.c b/tests/tcg/mipsel/test_dsp_r1_precrq_rs_ph_w.c index da6845bf2423..807f33c7ad73 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precrq_rs_ph_w.c +++ b/tests/tcg/mipsel/test_dsp_r1_precrq_rs_ph_w.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_precrqu_s_qb_ph.c b/tests/tcg/mipsel/test_dsp_r1_precrqu_s_qb_ph.c index 7481d5af3a5b..a24b066056d5 100644 --- a/tests/tcg/mipsel/test_dsp_r1_precrqu_s_qb_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_precrqu_s_qb_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_repl_ph.c b/tests/tcg/mipsel/test_dsp_r1_repl_ph.c index 21074953bdde..13375231b54b 100644 --- a/tests/tcg/mipsel/test_dsp_r1_repl_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_repl_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_repl_qb.c b/tests/tcg/mipsel/test_dsp_r1_repl_qb.c index 6631393ea131..2e65fb715485 100644 --- a/tests/tcg/mipsel/test_dsp_r1_repl_qb.c +++ b/tests/tcg/mipsel/test_dsp_r1_repl_qb.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_replv_ph.c b/tests/tcg/mipsel/test_dsp_r1_replv_ph.c index 07fb15f1f795..64a5c1b334f5 100644 --- a/tests/tcg/mipsel/test_dsp_r1_replv_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_replv_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_replv_qb.c b/tests/tcg/mipsel/test_dsp_r1_replv_qb.c index dd1271fedff0..5aecf82f50a5 100644 --- a/tests/tcg/mipsel/test_dsp_r1_replv_qb.c +++ b/tests/tcg/mipsel/test_dsp_r1_replv_qb.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_append.c b/tests/tcg/mipsel/test_dsp_r2_append.c index 9a91e1650dbd..62cf0e76a196 100644 --- a/tests/tcg/mipsel/test_dsp_r2_append.c +++ b/tests/tcg/mipsel/test_dsp_r2_append.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_balign.c b/tests/tcg/mipsel/test_dsp_r2_balign.c index 537cf0451cc8..62cc0359e21b 100644 --- a/tests/tcg/mipsel/test_dsp_r2_balign.c +++ b/tests/tcg/mipsel/test_dsp_r2_balign.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_precr_qb_ph.c b/tests/tcg/mipsel/test_dsp_r2_precr_qb_ph.c index 3a2b3fde0573..dce58816c815 100644 --- a/tests/tcg/mipsel/test_dsp_r2_precr_qb_ph.c +++ b/tests/tcg/mipsel/test_dsp_r2_precr_qb_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_precr_sra_ph_w.c b/tests/tcg/mipsel/test_dsp_r2_precr_sra_ph_w.c index 5c9baab03d00..9e65e7d2575b 100644 --- a/tests/tcg/mipsel/test_dsp_r2_precr_sra_ph_w.c +++ b/tests/tcg/mipsel/test_dsp_r2_precr_sra_ph_w.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_precr_sra_r_ph_w.c b/tests/tcg/mipsel/test_dsp_r2_precr_sra_r_ph_w.c index 6474a108c057..bb7bb97a231f 100644 --- a/tests/tcg/mipsel/test_dsp_r2_precr_sra_r_ph_w.c +++ b/tests/tcg/mipsel/test_dsp_r2_precr_sra_r_ph_w.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_prepend.c b/tests/tcg/mipsel/test_dsp_r2_prepend.c index f6bcd47b2da9..a77efa4d6208 100644 --- a/tests/tcg/mipsel/test_dsp_r2_prepend.c +++ b/tests/tcg/mipsel/test_dsp_r2_prepend.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/meson.build b/tests/tcg/mipsel/meson.build index 4991c14b7bf8..247db7d10d79 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -10,27 +10,7 @@ tests_dsp = [ 'test_dsp_ctrl.c', 'test_dsp_dot.c', 'test_dsp_mul.c', - 'test_dsp_r1_bitrev.c', - 'test_dsp_r1_insv.c', - 'test_dsp_r1_packrl_ph.c', - 'test_dsp_r1_preceq_w_phl.c', - 'test_dsp_r1_preceq_w_phr.c', - 'test_dsp_r1_precequ_ph_qbl.c', - 'test_dsp_r1_precequ_ph_qbla.c', - 'test_dsp_r1_precequ_ph_qbr.c', - 'test_dsp_r1_precequ_ph_qbra.c', - 'test_dsp_r1_preceu_ph_qbl.c', - 'test_dsp_r1_preceu_ph_qbla.c', - 'test_dsp_r1_preceu_ph_qbr.c', - 'test_dsp_r1_preceu_ph_qbra.c', - 'test_dsp_r1_precrq_ph_w.c', - 'test_dsp_r1_precrq_qb_ph.c', - 'test_dsp_r1_precrq_rs_ph_w.c', - 'test_dsp_r1_precrqu_s_qb_ph.c', - 'test_dsp_r1_repl_ph.c', - 'test_dsp_r1_repl_qb.c', - 'test_dsp_r1_replv_ph.c', - 'test_dsp_r1_replv_qb.c', + 'test_dsp_pack.c', 'test_dsp_r1_shll_ph.c', 'test_dsp_r1_shll_qb.c', 'test_dsp_r1_shll_s_ph.c', @@ -47,12 +27,6 @@ tests_dsp = [ 'test_dsp_r1_shrav_r_w.c', 'test_dsp_r1_shrl_qb.c', 'test_dsp_r1_shrlv_qb.c', - 'test_dsp_r2_append.c', - 'test_dsp_r2_balign.c', - 'test_dsp_r2_precr_qb_ph.c', - 'test_dsp_r2_precr_sra_ph_w.c', - 'test_dsp_r2_precr_sra_r_ph_w.c', - 'test_dsp_r2_prepend.c', 'test_dsp_r2_shra_qb.c', 'test_dsp_r2_shra_r_qb.c', 'test_dsp_r2_shrav_qb.c', -- 2.55.0
