The cs_dsp_ctl_cache suites run cs_dsp_ctl_cache_init(), cs_dsp_ctl_cache_writethrough() and cs_dsp_ctl_cache_writethrough_unchanged() against several sets of parameters by listing each function several times with KUNIT_CASE_PARAM(), which names the case after the function. The resulting cases all share a name, so they cannot be told apart in the results. Use KUNIT_CASE_PARAM_UNIQUE() for these entries so that each case is also named for the parameter generator it is run with, for example cs_dsp_ctl_cache_init-all_pop_varying_len_gen_params. Signed-off-by: Mark Brown --- .../cirrus/test/cs_dsp_test_control_cache.c | 143 +++++++++++---------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c b/drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c index b03cd7c37f6e..0a072063dfa7 100644 --- a/drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c +++ b/drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c @@ -2987,12 +2987,12 @@ KUNIT_ARRAY_PARAM(all_pop_nonvol_write_only_length, cs_dsp_ctl_all_param_desc); static struct kunit_case cs_dsp_ctl_cache_test_cases_v1[] = { - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init_write_only, all_pop_nonvol_write_only_length_gen_params), @@ -3019,25 +3019,25 @@ static struct kunit_case cs_dsp_ctl_cache_test_cases_v1[] = { KUNIT_CASE_PARAM(cs_dsp_ctl_cache_read_running_zero_flags, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_nonvol_writeable_flags_gen_params), - - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_nonvol_writeable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, + all_pop_nonvol_writeable_flags_gen_params), + + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_nonvol_writeable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_write_unchanged_not_started, all_pop_nonvol_writeable_flags_gen_params), @@ -3075,12 +3075,12 @@ static struct kunit_case cs_dsp_ctl_cache_test_cases_v1[] = { static struct kunit_case cs_dsp_ctl_cache_test_cases_v2[] = { KUNIT_CASE(cs_dsp_ctl_v2_cache_alloc), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init_write_only, all_pop_nonvol_write_only_length_gen_params), @@ -3108,25 +3108,25 @@ static struct kunit_case cs_dsp_ctl_cache_test_cases_v2[] = { KUNIT_CASE_PARAM(cs_dsp_ctl_cache_read_running_zero_flags, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_nonvol_writeable_flags_gen_params), - - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_z_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_nonvol_writeable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, + all_pop_nonvol_writeable_flags_gen_params), + + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, all_pop_z_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_nonvol_writeable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_write_unchanged_not_started, all_pop_nonvol_writeable_flags_gen_params), @@ -3164,11 +3164,11 @@ static struct kunit_case cs_dsp_ctl_cache_test_cases_v2[] = { static struct kunit_case cs_dsp_ctl_cache_test_cases_v3[] = { KUNIT_CASE(cs_dsp_ctl_v2_cache_alloc), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_init, all_pop_nonvol_readable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_init_write_only, all_pop_nonvol_write_only_length_gen_params), @@ -3194,22 +3194,23 @@ static struct kunit_case cs_dsp_ctl_cache_test_cases_v3[] = { KUNIT_CASE_PARAM(cs_dsp_ctl_cache_read_running, all_pop_nonvol_readable_nonzero_flags_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough, all_pop_nonvol_writeable_flags_gen_params), - - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_len_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_offset_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_xy_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_varying_alg_gen_params), - KUNIT_CASE_PARAM(cs_dsp_ctl_cache_writethrough_unchanged, - all_pop_nonvol_writeable_flags_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough, + all_pop_nonvol_writeable_flags_gen_params), + + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_len_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_offset_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_xy_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_varying_alg_gen_params), + KUNIT_CASE_PARAM_UNIQUE(cs_dsp_ctl_cache_writethrough_unchanged, + all_pop_nonvol_writeable_flags_gen_params), KUNIT_CASE_PARAM(cs_dsp_ctl_cache_write_unchanged_not_started, all_pop_nonvol_writeable_flags_gen_params), -- 2.47.3