[igt-dev] [PATCH i-g-t v3] tests/kms_plane_alpha_blend: Limit the test execution

[Modem, Bhanuprakash]

Hi Nidhi,

On Thu-09-02-2023 08:38 am, Nidhi Gupta wrote:
> To optimize the test execution time on hardware and simulation,
> limit the execution to two (first & last) pipes and 2 planes
> (first & last).
> 
> This patch will also provide an option (command line flag '-e') to
> execute on all pipes and planes.
> 
> Example: ./kms_plane_alpha_blend -e --run-subtest alpha-7efc
> 
> V2: Edited commit message (Bhanu)
> V3: New function for simulation constraints (Kamil)
>      Update commit message (Bhanu)
> v4: Restrict the execution only on 2 pipes for
>      real hardware aswell (Ankit)
> v5: Provide extended option for plane also (Bhanu)
>      Move pipe declaration inside fixture (Ankit)
> 
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
> ---
>   tests/kms_plane_alpha_blend.c | 69 ++++++++++++++++++++++++++++++++++-
>   1 file changed, 67 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
> index 38272ccb..dd93a6af 100644
> --- a/tests/kms_plane_alpha_blend.c
> +++ b/tests/kms_plane_alpha_blend.c
> @@ -28,6 +28,10 @@
>   
>   IGT_TEST_DESCRIPTION("Test plane alpha and blending mode properties");
>   
> +static bool extended;
> +static enum pipe active_pipes[IGT_MAX_PIPES];
> +static uint32_t last_pipe;
> +
>   typedef struct {
>   	int gfx_fd;
>   	igt_display_t display;
> @@ -482,8 +486,10 @@ static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, igt_output_t *
>   {
>   	igt_display_t *display = &data->display;
>   	igt_plane_t *plane;
> +	int first_plane = -1;
> +	int last_plane = -1;
>   
> -	for_each_plane_on_pipe(display, pipe, plane) {
> +	for_each_plane_on_pipe(&data->display, pipe, plane) {
--------------------------------^
Why do we need this change? We already preserved the struct display at 
the starting of this function.

>   		if (!igt_plane_has_prop(plane, IGT_PLANE_ALPHA))
>   			continue;
>   
> @@ -496,6 +502,29 @@ static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, igt_output_t *
>   		if (must_multiply && !has_multiplied_alpha(data, plane))
>   			continue;
>   
> +		/* Get first & last valid planes. */
> +		if (first_plane < 0)
> +			first_plane = j__;
> +
> +		last_plane = j__;
> +	}
> +
> +	for_each_plane_on_pipe(display, pipe, plane) {
-------------------------------^
Here you used it correctly.

> +		if (!igt_plane_has_prop(plane, IGT_PLANE_ALPHA))
> +			continue;
> +
> +		if (blend && !igt_plane_has_prop(plane, IGT_PLANE_PIXEL_BLEND_MODE))
> +			continue;
> +
> +		/* Reset plane alpha properties between each plane. */
> +		reset_alpha(display, pipe);
> +
> +		if (must_multiply && !has_multiplied_alpha(data, plane))
> +			continue;
> +
> +		if (!extended && j__ != first_plane && j__ != last_plane)
> +			continue;
> +
>   		igt_info("Testing plane %u\n", plane->index);
>   		test(data, pipe, plane);
>   		igt_plane_set_fb(plane, NULL);
> @@ -611,6 +640,16 @@ static bool pipe_check(data_t *data, enum pipe pipe,
>   	}
>   }
>   
> +static bool pipe_constraint(enum pipe pipe)

As mentioned in earlier patches, please update the function name.

I think it's better to drop this function & use the logic at caller, 
since we are using this only once.

> +{
> +	if (!extended &&
> +	    pipe != active_pipes[0] &&
> +	    pipe != active_pipes[last_pipe])
> +		return true;
> +
> +	return false;
> +}
> +
>   static void run_subtests(data_t *data)
>   {
>   	igt_output_t *output;
> @@ -621,6 +660,8 @@ static void run_subtests(data_t *data)
>   
>   		igt_subtest_with_dynamic(subtests[i].name) {
>   			for_each_pipe_with_single_output(&data->display, pipe, output) {
> +				if (pipe_constraint(pipe))

Please check the above comment.

> +					continue;

Please put a new line here.

>   				prepare_crtc(data, output, pipe);
>   				if (!pipe_check(data, pipe, subtests[i].blend, subtests[i].must_multiply))
>   					continue;
> @@ -633,15 +674,39 @@ static void run_subtests(data_t *data)
>   	}
>   }
>   
> -igt_main
> +static int opt_handler(int opt, int opt_index, void *_data)
> +{
> +	switch (opt) {
> +	case 'e':
> +		extended = true;
> +		break;
> +	default:
> +		return IGT_OPT_HANDLER_ERROR;
> +	}
> +
> +	return IGT_OPT_HANDLER_SUCCESS;
> +}
> +
> +const char *help_str =
> +	"  -e \tExtended tests.\n";
> +
> +igt_main_args("e", NULL, help_str, opt_handler, NULL)
>   {
>   	data_t data = {};
>   
> +	last_pipe = 0;

Maybe you can move this to igt_fixture.

> +
>   	igt_fixture {
> +		enum pipe pipe;
> +
>   		data.gfx_fd = drm_open_driver_master(DRIVER_ANY);
>   		igt_require_pipe_crc(data.gfx_fd);
>   		igt_display_require(&data.display, data.gfx_fd);
>   		igt_require(data.display.is_atomic);

Please put a new line here.

- Bhanu

> +		/* Get active pipes. */
> +		for_each_pipe(&data.display, pipe)
> +			active_pipes[last_pipe++] = pipe;
> +		last_pipe--;
>   	}
>   
>   	run_subtests(&data);