Build the 6 per-opcode ctrl tests as a single executable, test_dsp_ctrl.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_ctrl.c | 47 +++++++++++++++++++++++++ tests/tcg/mipsel/test_dsp_r1_bposge32.c | 1 - tests/tcg/mipsel/test_dsp_r1_lbux.c | 1 - tests/tcg/mipsel/test_dsp_r1_lhx.c | 1 - tests/tcg/mipsel/test_dsp_r1_lwx.c | 1 - tests/tcg/mipsel/test_dsp_r1_rddsp.c | 1 - tests/tcg/mipsel/test_dsp_r1_wrdsp.c | 1 - tests/tcg/mipsel/meson.build | 7 +--- 8 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 tests/tcg/mipsel/test_dsp_ctrl.c diff --git a/tests/tcg/mipsel/test_dsp_ctrl.c b/tests/tcg/mipsel/test_dsp_ctrl.c new file mode 100644 index 000000000000..a7f21e84a069 --- /dev/null +++ b/tests/tcg/mipsel/test_dsp_ctrl.c @@ -0,0 +1,47 @@ +/* + * MIPS DSP ASE tests: Indexed Load and DSPControl access instructions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "test_dsp_runner.h" + +#define main test_dsp_r1_bposge32 +#include "test_dsp_r1_bposge32.c" +#undef main + +#define main test_dsp_r1_lbux +#include "test_dsp_r1_lbux.c" +#undef main + +#define main test_dsp_r1_lhx +#include "test_dsp_r1_lhx.c" +#undef main + +#define main test_dsp_r1_lwx +#include "test_dsp_r1_lwx.c" +#undef main + +#define main test_dsp_r1_rddsp +#include "test_dsp_r1_rddsp.c" +#undef main + +#define main test_dsp_r1_wrdsp +#include "test_dsp_r1_wrdsp.c" +#undef main + +int main(void) +{ + int ret = 0; + + RUN_TEST(test_dsp_r1_bposge32); + RUN_TEST(test_dsp_r1_lbux); + RUN_TEST(test_dsp_r1_lhx); + RUN_TEST(test_dsp_r1_lwx); + RUN_TEST(test_dsp_r1_rddsp); + RUN_TEST(test_dsp_r1_wrdsp); + + DSP_TAP_PLAN(); + + return ret; +} diff --git a/tests/tcg/mipsel/test_dsp_r1_bposge32.c b/tests/tcg/mipsel/test_dsp_r1_bposge32.c index d25417ea77b2..f39eae531c8f 100644 --- a/tests/tcg/mipsel/test_dsp_r1_bposge32.c +++ b/tests/tcg/mipsel/test_dsp_r1_bposge32.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_lbux.c b/tests/tcg/mipsel/test_dsp_r1_lbux.c index 2337abea2acb..3436289b5a65 100644 --- a/tests/tcg/mipsel/test_dsp_r1_lbux.c +++ b/tests/tcg/mipsel/test_dsp_r1_lbux.c @@ -1,5 +1,4 @@ #include <stdio.h> -#include <assert.h> int main(void) { diff --git a/tests/tcg/mipsel/test_dsp_r1_lhx.c b/tests/tcg/mipsel/test_dsp_r1_lhx.c index 10be3b385fee..28795dbf701a 100644 --- a/tests/tcg/mipsel/test_dsp_r1_lhx.c +++ b/tests/tcg/mipsel/test_dsp_r1_lhx.c @@ -1,5 +1,4 @@ #include <stdio.h> -#include <assert.h> int main(void) { diff --git a/tests/tcg/mipsel/test_dsp_r1_lwx.c b/tests/tcg/mipsel/test_dsp_r1_lwx.c index e6543c9e7eae..ac15edb7cf94 100644 --- a/tests/tcg/mipsel/test_dsp_r1_lwx.c +++ b/tests/tcg/mipsel/test_dsp_r1_lwx.c @@ -1,5 +1,4 @@ #include <stdio.h> -#include <assert.h> int main(void) { diff --git a/tests/tcg/mipsel/test_dsp_r1_rddsp.c b/tests/tcg/mipsel/test_dsp_r1_rddsp.c index 2f3028503324..a0e413614d58 100644 --- a/tests/tcg/mipsel/test_dsp_r1_rddsp.c +++ b/tests/tcg/mipsel/test_dsp_r1_rddsp.c @@ -1,5 +1,4 @@ #include<stdio.h> -#include<assert.h> int main() { diff --git a/tests/tcg/mipsel/test_dsp_r1_wrdsp.c b/tests/tcg/mipsel/test_dsp_r1_wrdsp.c index dc54943a99e8..57869203102e 100644 --- a/tests/tcg/mipsel/test_dsp_r1_wrdsp.c +++ b/tests/tcg/mipsel/test_dsp_r1_wrdsp.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 e8737308c40d..1c2851f56369 100644 --- a/tests/tcg/mipsel/meson.build +++ b/tests/tcg/mipsel/meson.build @@ -7,8 +7,8 @@ tests_dsp = [ 'test_dsp_acc.c', 'test_dsp_arith.c', 'test_dsp_cmp.c', + 'test_dsp_ctrl.c', 'test_dsp_r1_bitrev.c', - 'test_dsp_r1_bposge32.c', 'test_dsp_r1_dpaq_s_w_ph.c', 'test_dsp_r1_dpaq_sa_l_w.c', 'test_dsp_r1_dpau_h_qbl.c', @@ -18,9 +18,6 @@ tests_dsp = [ 'test_dsp_r1_dpsu_h_qbl.c', 'test_dsp_r1_dpsu_h_qbr.c', 'test_dsp_r1_insv.c', - 'test_dsp_r1_lbux.c', - 'test_dsp_r1_lhx.c', - 'test_dsp_r1_lwx.c', 'test_dsp_r1_madd.c', 'test_dsp_r1_maddu.c', 'test_dsp_r1_maq_s_w_phl.c', @@ -51,7 +48,6 @@ tests_dsp = [ '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_rddsp.c', 'test_dsp_r1_repl_ph.c', 'test_dsp_r1_repl_qb.c', 'test_dsp_r1_replv_ph.c', @@ -72,7 +68,6 @@ tests_dsp = [ 'test_dsp_r1_shrav_r_w.c', 'test_dsp_r1_shrl_qb.c', 'test_dsp_r1_shrlv_qb.c', - 'test_dsp_r1_wrdsp.c', 'test_dsp_r2_append.c', 'test_dsp_r2_balign.c', 'test_dsp_r2_dpa_w_ph.c', -- 2.55.0
