Build the 10 per-opcode mul tests as a single executable, test_dsp_mul.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_mul.c | 67 +++++++++++++++++++ tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phl.c | 1 - tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phr.c | 1 - tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbl.c | 1 - tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbr.c | 1 - tests/tcg/mipsel/test_dsp_r1_mulq_rs_ph.c | 1 - tests/tcg/mipsel/test_dsp_r2_mul_ph.c | 1 - tests/tcg/mipsel/test_dsp_r2_mul_s_ph.c | 1 - tests/tcg/mipsel/test_dsp_r2_mulq_rs_w.c | 1 - tests/tcg/mipsel/test_dsp_r2_mulq_s_ph.c | 1 - tests/tcg/mipsel/test_dsp_r2_mulq_s_w.c | 1 - tests/tcg/mipsel/meson.build | 11 +-- 12 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 tests/tcg/mipsel/test_dsp_mul.c diff --git a/tests/tcg/mipsel/test_dsp_mul.c b/tests/tcg/mipsel/test_dsp_mul.c new file mode 100644 index 000000000000..f7189d94dfe6 --- /dev/null +++ b/tests/tcg/mipsel/test_dsp_mul.c @@ -0,0 +1,67 @@ +/* + * MIPS DSP ASE tests: Multiply instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "test_dsp_runner.h" + +#define main test_dsp_r1_muleq_s_w_phl +#include "test_dsp_r1_muleq_s_w_phl.c" +#undef main + +#define main test_dsp_r1_muleq_s_w_phr +#include "test_dsp_r1_muleq_s_w_phr.c" +#undef main + +#define main test_dsp_r1_muleu_s_ph_qbl +#include "test_dsp_r1_muleu_s_ph_qbl.c" +#undef main + +#define main test_dsp_r1_muleu_s_ph_qbr +#include "test_dsp_r1_muleu_s_ph_qbr.c" +#undef main + +#define main test_dsp_r1_mulq_rs_ph +#include "test_dsp_r1_mulq_rs_ph.c" +#undef main + +#define main test_dsp_r2_mul_ph +#include "test_dsp_r2_mul_ph.c" +#undef main + +#define main test_dsp_r2_mul_s_ph +#include "test_dsp_r2_mul_s_ph.c" +#undef main + +#define main test_dsp_r2_mulq_rs_w +#include "test_dsp_r2_mulq_rs_w.c" +#undef main + +#define main test_dsp_r2_mulq_s_ph +#include "test_dsp_r2_mulq_s_ph.c" +#undef main + +#define main test_dsp_r2_mulq_s_w +#include "test_dsp_r2_mulq_s_w.c" +#undef main + +int main(void) +{ + int ret = 0; + + RUN_TEST(test_dsp_r1_muleq_s_w_phl); + RUN_TEST(test_dsp_r1_muleq_s_w_phr); + RUN_TEST(test_dsp_r1_muleu_s_ph_qbl); + RUN_TEST(test_dsp_r1_muleu_s_ph_qbr); + RUN_TEST(test_dsp_r1_mulq_rs_ph); + RUN_TEST(test_dsp_r2_mul_ph); + RUN_TEST(test_dsp_r2_mul_s_ph); + RUN_TEST(test_dsp_r2_mulq_rs_w); + RUN_TEST(test_dsp_r2_mulq_s_ph); + RUN_TEST(test_dsp_r2_mulq_s_w); + + DSP_TAP_PLAN(); + + return ret; +} diff --git a/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phl.c b/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phl.c index b3a5370fe59e..e9b0dc55071b 100644 --- a/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phl.c +++ b/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phl.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phr.c b/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phr.c index 8066d7d02a1e..a8238c673293 100644 --- a/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phr.c +++ b/tests/tcg/mipsel/test_dsp_r1_muleq_s_w_phr.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbl.c b/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbl.c index 66a382806a21..ce16164bc853 100644 --- a/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbl.c +++ b/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbl.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbr.c b/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbr.c index 4cc6c8f7cfe1..2baedb9f53a5 100644 --- a/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbr.c +++ b/tests/tcg/mipsel/test_dsp_r1_muleu_s_ph_qbr.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_mulq_rs_ph.c b/tests/tcg/mipsel/test_dsp_r1_mulq_rs_ph.c index 370c2a801832..bd2ab49b0717 100644 --- a/tests/tcg/mipsel/test_dsp_r1_mulq_rs_ph.c +++ b/tests/tcg/mipsel/test_dsp_r1_mulq_rs_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_mul_ph.c b/tests/tcg/mipsel/test_dsp_r2_mul_ph.c index c7e9d60d12e2..bb92f6cbc0f1 100644 --- a/tests/tcg/mipsel/test_dsp_r2_mul_ph.c +++ b/tests/tcg/mipsel/test_dsp_r2_mul_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_mul_s_ph.c b/tests/tcg/mipsel/test_dsp_r2_mul_s_ph.c index 33da110de869..092dd531f421 100644 --- a/tests/tcg/mipsel/test_dsp_r2_mul_s_ph.c +++ b/tests/tcg/mipsel/test_dsp_r2_mul_s_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_mulq_rs_w.c b/tests/tcg/mipsel/test_dsp_r2_mulq_rs_w.c index 7ba633bc17f7..f94c1678af09 100644 --- a/tests/tcg/mipsel/test_dsp_r2_mulq_rs_w.c +++ b/tests/tcg/mipsel/test_dsp_r2_mulq_rs_w.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_mulq_s_ph.c b/tests/tcg/mipsel/test_dsp_r2_mulq_s_ph.c index 00e015542e69..8c944c6ea3fa 100644 --- a/tests/tcg/mipsel/test_dsp_r2_mulq_s_ph.c +++ b/tests/tcg/mipsel/test_dsp_r2_mulq_s_ph.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r2_mulq_s_w.c b/tests/tcg/mipsel/test_dsp_r2_mulq_s_w.c index 9c2be06cc08a..caa8e8d76193 100644 --- a/tests/tcg/mipsel/test_dsp_r2_mulq_s_w.c +++ b/tests/tcg/mipsel/test_dsp_r2_mulq_s_w.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 c26f5fba06b7..4991c14b7bf8 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -9,13 +9,9 @@ tests_dsp = [ 'test_dsp_cmp.c', '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_muleq_s_w_phl.c', - 'test_dsp_r1_muleq_s_w_phr.c', - 'test_dsp_r1_muleu_s_ph_qbl.c', - 'test_dsp_r1_muleu_s_ph_qbr.c', - 'test_dsp_r1_mulq_rs_ph.c', 'test_dsp_r1_packrl_ph.c', 'test_dsp_r1_preceq_w_phl.c', 'test_dsp_r1_preceq_w_phr.c', @@ -53,11 +49,6 @@ tests_dsp = [ 'test_dsp_r1_shrlv_qb.c', 'test_dsp_r2_append.c', 'test_dsp_r2_balign.c', - 'test_dsp_r2_mul_ph.c', - 'test_dsp_r2_mul_s_ph.c', - 'test_dsp_r2_mulq_rs_w.c', - 'test_dsp_r2_mulq_s_ph.c', - 'test_dsp_r2_mulq_s_w.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', -- 2.55.0
