Re: [igt-dev] [PATCH i-g-t v11] igt/tests: kms_plane_stress: Add plane stress test

Martin Peres
2019-09-17T12:24:49Z

On 22/08/2019 12:04, Stanislav Lisovskiy wrote:
> This test attempts to utilize all connected
> outputs at the same time, using maximum possible
> resolution and amount of planes, to check whether
> we are hiting any kind of bandwidth, watermark or
> other limitations.
>
> v2: Added cpu and gpu load threads, which consume
> additional bandwidth.
>
> v3: Removed binary picture file, using pattern fb
> instead.
>
> v4: Moved FB creation/removal to better place.
>
> v5: Fixed rebase conflict and changed "fb->tiling"
> to "fb->modifier".
>
> v6: Removed unnecessary new macro for iterating on
> pipes. Taken into use igt_gettime instead of
> clock_gettime.
>
> v7: Put fb reinit into igt_fixture to avoid problems.
> Move stress function under igt_subtest. Release planes,
> remove redundant commit, assert if no planes can be used.
>
> v8: - Add blitting also, to have more fun
> - Now using separate framebuffer per each plane.
> - Fixed magic number for bpp value(now based on format)
> - Some optimizations, like not applying same mode if it
> hasn't change, also don't do highest mode search on
> each iteration, just calculate once and use it.
> - Some code refactoring: extracted some lengthy code
> to separate functions.
> - Fixed wrong index for cursor FB(cursor FB is one per pipe)
>
> v9:
> - More helper functions(start/stop threads, test init)
> - Now doing GPU work in pthreads also
> - Do GPU work in a separate framebuffer(not displayed)
>
> v10:
> - Fix issue in main testing cycle, code refactoring
> - Rebased
>
> v11:
> - Fixed issue with suspending/resuming GPU threads
> to get crc. Added num_rectangles to be able to customize
> number of gpgpu_fill calls.
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
> lib/gpu_cmds.c | 4 +-
> tests/Makefile.sources | 1 +
> tests/kms_plane_stress.c | 902 +++++++++++++++++++++++++++++++++++++++
> tests/meson.build | 1 +
> 4 files changed, 906 insertions(+), 2 deletions(-)
> create mode 100644 tests/kms_plane_stress.c
>
> diff --git a/lib/gpu_cmds.c b/lib/gpu_cmds.c
> index 8d270ee8..48ddfa0c 100644
> --- a/lib/gpu_cmds.c
> +++ b/lib/gpu_cmds.c
> @@ -681,12 +681,12 @@ gen8_emit_gpgpu_walk(struct intel_batchbuffer *batch,
> 0); /* width:1 */
>
> /* thread group X */
> - OUT_BATCH(0);
> + OUT_BATCH(x);
> OUT_BATCH(0);
> OUT_BATCH(x_dim);
>
> /* thread group Y */
> - OUT_BATCH(0);
> + OUT_BATCH(y);
> OUT_BATCH(0);
> OUT_BATCH(y_dim);

IIRC, this was to fix a bug, and thus should be in its own commit.

>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index c02e4d94..a7370773 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -65,6 +65,7 @@ TESTS_progs = \
> kms_plane_multiple \
> kms_plane_scaling \
> kms_prime \
> + kms_plane_stress \
> kms_prop_blob \
> kms_properties \
> kms_psr \
> diff --git a/tests/kms_plane_stress.c b/tests/kms_plane_stress.c
> new file mode 100644
> index 00000000..87318070
> --- /dev/null
> +++ b/tests/kms_plane_stress.c
> @@ -0,0 +1,902 @@
> +/*
> + * Copyright © 2019 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +#include "igt.h"
> +#include "igt_rand.h"
> +#include "gpgpu_fill.h"
> +#include "drmtest.h"
> +#include "sw_sync.h"
> +#include <errno.h>
> +#include <pthread.h>
> +#include <stdbool.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <time.h>
> +#include <poll.h>
> +#include <pthread.h>
> +#include <semaphore.h>
> +
> +#ifndef DRM_CAP_CURSOR_WIDTH
> +#define DRM_CAP_CURSOR_WIDTH 0x8
> +#endif
> +#ifndef DRM_CAP_CURSOR_HEIGHT
> +#define DRM_CAP_CURSOR_HEIGHT 0x9
> +#endif
> +
> +
> +drmModeModeInfo uhd_mode_60hz = {
> + .name = "3840x2160@60hz",
> + .vrefresh = 60,
> + .clock = 142667*2,
> + .hdisplay = 3840,
> + .hsync_start = 1936*2,
> + .hsync_end = 1952*2,
> + .htotal = 2104*2,
> + .vdisplay = 2160,
> + .vsync_start = 1083*2,
> + .vsync_end = 1097*2,
> + .vtotal = 1128*2,
> + .flags = 0xa,
> +};
> +
> +#define N_BLITS 10
> +
> +#define N_FORMATS 3
> +static const uint32_t formats[N_FORMATS] = {
> + DRM_FORMAT_XRGB8888,
> + DRM_FORMAT_RGB565,
> + DRM_FORMAT_XRGB2101010,
> +};
> +
> +#define N_TILING_METHODS 3
> +static const uint64_t tilings[N_TILING_METHODS] = {
> + DRM_FORMAT_MOD_LINEAR,
> + I915_FORMAT_MOD_X_TILED,
> + I915_FORMAT_MOD_Y_TILED,
> +};
> +
> +static const char *format_str(int format_index)
> +{
> + switch (formats[format_index]) {
> + case DRM_FORMAT_RGB565:
> + return "rgb565";
> + case DRM_FORMAT_XRGB8888:
> + return "xrgb8888";
> + case DRM_FORMAT_XRGB2101010:
> + return "xrgb2101010";
> + default:
> + igt_assert(false);
> + }
> +}
> +
> +static const char *tiling_str(int tiling_index)
> +{
> + switch (tilings[tiling_index]) {
> + case DRM_FORMAT_MOD_LINEAR:
> + return "untiled";
> + case I915_FORMAT_MOD_X_TILED:
> + return "xtiled";
> + case I915_FORMAT_MOD_Y_TILED:
> + return "ytiled";
> + default:
> + igt_assert(false);
> + }
> +}
> +
> +
> +#define MAX_CORES 8
> +#define MAX_PLANES 16
> +
> +struct data;
> +
> +struct thread_context {
> + struct data *data;
> + int id;
> + void *buf1;
> + void *buf2;
> +};
> +
> +struct rect {
> + int x;
> + int y;
> + int w;
> + int h;
> +};
> +
> +struct gpu_context {
> + struct data *data;
> + int pipe;
> + int color;
> + int num_rectangles;
> + struct igt_fb *fb_ptr;
> + struct rect blt_rect;
> + struct intel_batchbuffer *batch;
> +};
> +
> +enum {
> + RUNNING,
> + STOPPED,
> + PAUSED,
> +} thread_state;
> +
> +struct data {
> + int drm_fd;
> + igt_display_t display;
> + int num_planes[IGT_MAX_PIPES];
> + uint32_t format;
> + uint64_t modifier;
> + uint32_t devid;
> + drm_intel_bufmgr *bufmgr;
> + drmModeModeInfo *last_mode[IGT_MAX_PIPES];
> + struct igt_fb fb[IGT_MAX_PIPES * MAX_PLANES];
> + struct igt_fb cursor_fb[IGT_MAX_PIPES];
> + pthread_t cpu_thread[MAX_CORES];
> + pthread_t gpu_thread[IGT_MAX_PIPES];
> + bool cpu_thread_stop[MAX_CORES];
> + int gpu_thread_state[IGT_MAX_PIPES];
> + sem_t gpu_thread_pause_ack[IGT_MAX_PIPES];
> + struct thread_context cpu_context[MAX_CORES];
> + struct gpu_context gpu_context[IGT_MAX_PIPES];
> + drmModeModeInfo *highest_mode[IGT_MAX_PIPES];
> + drmModeConnectorPtr connectors[IGT_MAX_PIPES];
> + drmModeRes *mode_resources;
> + int number_of_cores;
> +};
> +
> +
> +static void pause_gpu_threads(struct data *data);
> +
> +static void resume_gpu_threads(struct data *data);
> +
> +static void stop_gpu_threads(struct data *data);
> +
> +static void start_gpu_threads(struct data *data);
> +
> +struct base_crc {
> + bool set;
> + igt_crc_t crc;
> +};
> +
> +igt_pipe_crc_t *pipe_crc;
> +
> +#define BUF_SIZE 128*1024*1024
> +
> +static void *cpu_load(void *d)
> +{
> + char *buf1, *buf2;
> + struct thread_context *context = (struct thread_context *)d;
> + struct data *data = context->data;
> +
> + buf1 = context->buf1;
> + buf2 = context->buf2;
> +
> + data->cpu_thread_stop[context->id] = false;
> +
> + igt_info("CPU thread cpu id %d start\n", context->id);
> +
> + /* Just to make CPU busy... */
> + while(!data->cpu_thread_stop[context->id]) {
> + memcpy(buf1, buf2, BUF_SIZE);
> + memcpy(buf2, buf1, BUF_SIZE);
> + }
> +
> + igt_info("CPU thread cpu id %d stop\n", context->id);
> +
> + return NULL;
> +}
> +
> +
> +static void scratch_buf_init(struct igt_buf *buf,
> + drm_intel_bo *bo, int width, int height, int stride, int tiling, int bpp)
> +{
> + buf->bo = bo;
> + buf->stride = stride;
> + buf->tiling = tiling;
> + buf->size = width * height * bpp / 8;
> + buf->bpp = bpp;
> +}
> +
> +static void *gpu_load(void *ptr)
> +{
> + struct gpu_context *context = (struct gpu_context *)ptr;
> + struct intel_batchbuffer *batch = NULL;
> + struct igt_buf dst;
> + struct data *data = context->data;
> + int pipe = context->pipe;
> + igt_fillfunc_t gpgpu_fill = NULL;
> + drm_intel_bo *bo = NULL;
> + struct igt_fb fb, *fb_ptr = NULL, *last_fb_ptr = NULL;
> + int rect_divisor;
> + int rect_width;
> + int rect_height;
> + int frame_width;
> + int frame_height;
> + int bytes_per_pixel;
> + drmModeModeInfo *mode;
> + int frame = 0;
> + int x, y;
> + int last_state = -1;
> + int rect;
> +
> + gpgpu_fill = igt_get_gpgpu_fillfunc(data->devid);
> +
> + igt_require_f(gpgpu_fill,
> + "no gpgpu-fill function\n");
> +
> + batch = context->batch;
> + igt_assert(batch);
> +
> + mode = data->highest_mode[pipe];
> + igt_assert(mode);
> +
> + igt_create_color_pattern_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> + data->format,
> + data->modifier,
> + 0.0, 1.0, 0.0, &fb);
> +
> + igt_info("GPU thread pipe %d start\n", pipe);
> + while (data->gpu_thread_state[pipe] != STOPPED) {
> + if (last_state != data->gpu_thread_state[pipe]) {
> + last_state = data->gpu_thread_state[pipe];
> + sem_post(&data->gpu_thread_pause_ack[pipe]);
> + }
> + if (data->gpu_thread_state[pipe] == PAUSED)
> + continue;
> +
> + if (!context->fb_ptr) {
> + fb_ptr = &fb;
> + }
> + else {
> + fb_ptr = context->fb_ptr;
> + }
> +
> + if (last_fb_ptr != fb_ptr) {
> + igt_info("GPU thread pipe %d: Change from FB %x to FB %x\n", pipe, last_fb_ptr, fb_ptr);
> + frame_width = fb_ptr->width;
> + frame_height = fb_ptr->height;
> + bytes_per_pixel = fb_ptr->plane_bpp[0] / 8;
> + bo = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd, "", fb_ptr->gem_handle);
> + igt_assert(bo);
> +
> + scratch_buf_init(&dst, bo, frame_width, frame_height, fb_ptr->strides[0], fb_ptr->modifier, fb_ptr->plane_bpp[0]);
> + }
> + last_fb_ptr = fb_ptr;
> +
> + /* Fill the framebuffer using shader */
> + x = 0;
> + y = frame_height / 2;
> +
> + gpgpu_fill(batch,
> + &dst, x, y, (frame_width * bytes_per_pixel), frame_height,
> + context->color);
> +
> + rect = 0;
> +
> + while (rect < context->num_rectangles) {
> + /* divide at least by 2 and up to 8 */
> + rect_divisor = 1 << (hars_petruska_f54_1_random_unsafe_max(3) + 1);
> +
> + rect_width = frame_width / rect_divisor;
> + rect_height = frame_height / rect_divisor;
> +
> + context->blt_rect.x = x + hars_petruska_f54_1_random_unsafe_max(frame_width - rect_width);
> + context->blt_rect.y = y + hars_petruska_f54_1_random_unsafe_max(frame_height/2 - rect_height);
> +
> + /* Fill randomly sized and positioned rectangles */
> + gpgpu_fill(batch,
> + &dst, context->blt_rect.x, context->blt_rect.y, ((context->blt_rect.x + rect_width) * bytes_per_pixel),
> + context->blt_rect.y + rect_height,
> + context->color + 0x80);
> +
> + context->color += 4;
> +
> + ++rect;
> + }
> +
> + frame++;
> + }
> +
> + sem_post(&data->gpu_thread_pause_ack[pipe]);
> +
> + drm_intel_bo_unreference(bo);
> +
> + igt_remove_fb(data->display.drm_fd, &fb);
> +
> + igt_info("GPU thread pipe %d stop. Frames rendered: %d\n", pipe, frame);
> +
> + return NULL;
> +}
> +
> +static inline uint32_t pipe_select(enum pipe pipe)
> +{
> + if (pipe > 1)
> + return pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
> + else if (pipe > 0)
> + return DRM_VBLANK_SECONDARY;
> + else
> + return 0;
> +}
> +
> +static unsigned get_vblank(int fd, enum pipe pipe, unsigned flags)
> +{
> + union drm_wait_vblank vbl;
> +
> + memset(&vbl, 0, sizeof(vbl));
> + vbl.request.type = DRM_VBLANK_RELATIVE | pipe_select(pipe) | flags;
> + if (drmIoctl(fd, DRM_IOCTL_WAIT_VBLANK, &vbl))
> + return 0;
> +
> + return vbl.reply.sequence;
> +}
> +
> +
> +static int plane_stress(struct data *data, igt_output_t *output, enum pipe pipe, drmModeModeInfo *mode)

Looks like pipe_stress to me, don't you think?

> +{
> + igt_plane_t *plane;
> + int i;
> + int ret;
> + int last_plane;
> + bool new_mode = false;
> + uint64_t cursor_width, cursor_height;
> +
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
> +
> + if (data->last_mode[pipe] != mode) {
> + igt_output_override_mode(output, mode);
> + igt_output_set_pipe(output, pipe);
> +
> + ret = igt_display_try_commit_atomic(&data->display,
> + DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + if (ret) {
> + igt_warn("Could not commit mode: \n");
> + kmstest_dump_mode(mode);
> + return ret;
> + }
> +
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + data->last_mode[pipe] = mode;
> + new_mode = true;
> + }
> +
> + /*
> + * Looks like we can't have planes on that pipe at all
> + */
> + if (!data->num_planes[pipe])
> + return 0;
> +
> + mode = igt_output_get_mode(output);
> +
> + if (new_mode) {
> + i = 0;
> + for_each_plane_on_pipe(&data->display, pipe, plane) {
> + int plane_width, plane_height;
> + if (plane->type == DRM_PLANE_TYPE_CURSOR) {
> + igt_plane_set_fb(plane, &data->cursor_fb[pipe]);
> + igt_fb_set_size(&data->cursor_fb[pipe], plane, cursor_width, cursor_height);
> + igt_plane_set_size(plane, cursor_width, cursor_height);
> + plane_width = cursor_width;
> + plane_height = cursor_height;
> + } else {
> + igt_plane_set_fb(plane, &data->fb[pipe * MAX_PLANES + i]);
> + igt_plane_set_position(plane, 0, 0);
> + igt_fb_set_size(&data->fb[pipe * MAX_PLANES + i], plane, mode->hdisplay, mode->vdisplay);
> + igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay);
> + plane_width = mode->hdisplay;
> + plane_height = mode->vdisplay;
> + }
> +
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + while (ret) {
> + if (plane_width <= cursor_width || plane_height <= cursor_height)
> + break;
> + plane_width /= 2;
> + plane_height /= 2;
> + igt_plane_set_size(plane, plane_width, plane_height);
> + igt_info("Reduced plane %d size to %dx%d\n", plane->index, plane_width, plane_height);
> + ret = igt_display_try_commit_atomic(&data->display, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> + }
> + if (ret) {
> + igt_info("Plane %d pipe %d try commit failed, exiting\n", i, pipe);
> + data->num_planes[pipe] = i;
> + igt_info("Max num planes for pipe %d set to %d\n", pipe, i);
> + /*
> + * We have now determined max amount of full sized planes, we will just
> + * keep it in mind and be smarter next time. Also lets remove unneeded fbs.
> + * Don't destroy cursor_fb as will take care about it at the end.
> + */
> + igt_plane_set_fb(plane, NULL);
> + while (i < MAX_PLANES) {
> + igt_remove_fb(data->display.drm_fd, &data->fb[pipe * MAX_PLANES + i]);
> + data->fb[pipe * MAX_PLANES + i].fb_id = 0;
> + i++;
> + }
> + i = data->num_planes[pipe];
> + }
> + if (++i >= data->num_planes[pipe])
> + break;
> + }
> + igt_display_commit2(&data->display, COMMIT_ATOMIC);
> + }
> +
> + last_plane = data->num_planes[pipe] - 1;
> + if (last_plane >= 7)
> + last_plane = 6;
> +
> + if (data->gpu_context[pipe].fb_ptr != &data->fb[pipe * MAX_PLANES + last_plane]) {
> + data->gpu_context[pipe].fb_ptr = &data->fb[pipe * MAX_PLANES + last_plane];
> + igt_info("Plane stress for pipe %d: Set context fb ptr %x\n", pipe, data->gpu_context[pipe].fb_ptr);
> + }
> +
> + return 0;
> +}
> +
> +
> +static drmModeModeInfo * find_highest_mode(drmModeConnector *connector)
> +{
> + drmModeModeInfo *highest_mode = NULL;
> + int j;
> +
> + for (j = 0; j < connector->count_modes; j++) {
> + if (!highest_mode) {
> + highest_mode = &connector->modes[j];
> + }
> + else if (connector->modes[j].vdisplay && connector->modes[j].hdisplay) {
> + if (highest_mode->hdisplay < connector->modes[j].hdisplay)
> + highest_mode = &connector->modes[j];
> + }
> + }
> +
> + return highest_mode;
> +}
> +
> +typedef drmModeConnector * drmModeConnectorPtr;
> +
> +static void fill_connector_to_pipe_array(struct data *data, drmModeRes *mode_resources, drmModeConnectorPtr *connectors)
> +{
> + int pipe = 0, crtc_id;
> + igt_output_t *output;
> + int i;
> +
> + memset(connectors, 0, sizeof(drmModeConnectorPtr) * IGT_MAX_PIPES);
> +
> + for_each_connected_output(&data->display, output) {
> + crtc_id = 0;
> + for (i = 0; i < mode_resources->count_connectors; i++) {
> + drmModeConnector *connector;
> +
> + connector = drmModeGetConnectorCurrent(data->drm_fd,
> + mode_resources->connectors[i]);
> +
> + if (!connector) {
> + igt_warn("could not get connector %i: %s\n",
> + mode_resources->connectors[i], strerror(errno));
> + continue;
> + }
> +
> + if (connector->connection == DRM_MODE_CONNECTED) {
> + if (crtc_id == pipe) {
> + connectors[pipe] = (drmModeConnectorPtr)connector;
> + }
> + crtc_id++;
> + }
> + else
> + drmModeFreeConnector(connector);
> + }
> + if ((++pipe) == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +static void release_connectors(drmModeConnectorPtr *connectors)
> +{
> + int i;
> + for (i = 0; i < IGT_MAX_PIPES; i++) {
> + if (connectors[i])
> + drmModeFreeConnector(connectors[i]);
> + }
> +}
> +
> +#define MIN_DURATION_SEC 5.00
> +#define MIN_ITERATIONS 20
> +
> +static void stress(struct data *data)
> +{
> + struct timespec start, end;
> + igt_output_t *output;
> + int ret;
> + int pipe;
> + int iterations = 0;
> + bool need_continue;
> + igt_crc_t crc, crc2;
> +
> + igt_gettime(&start);
> +
> + do {
> + /*
> + * Increment pipe only for connected outputs,
> + * for each connected output we should assign a
> + * different pipe.
> + */
> + pipe = 0;
> + for_each_connected_output(&data->display, output) {
> + igt_assert_f(data->display.pipes[pipe].n_planes < MAX_PLANES,
> + "Currently we don't support more than %d planes!", MAX_PLANES);
> +
> + pipe_crc = igt_pipe_crc_new(data->drm_fd, pipe,
> + INTEL_PIPE_CRC_SOURCE_AUTO);
> +
> + ret = plane_stress(data, output, pipe, data->highest_mode[pipe]);
> +
> + if (!((int)igt_time_elapsed(&start, &end) % ((int)MIN_DURATION_SEC/4))) {
> + pause_gpu_threads(data);

Why do you pause the gpu threads ever? The point is to keep the memory
busy and making sure we always get the same crc.

I think the expected flow of this function would be:

if gpu_load: start_gpgpu_load()
if cpu_load: start_cpu_load()

# enable as many planes on as many pipes as possible (including force
enabling HDMI if possible)
config = set_worst_possible_display_config()

for p in config.active_pipes:
start_thread_checking_crc_stability(p)

sleep(TEST_DURATION)

for p in config.active_pipes:
stop_thread_checking_crc_stability(p)

if gpu_load: stop_gpgpu_load()
if cpu_load: stop_cpu_load()

Sorry for the python style, but I hope it helps better illustrate the
logic I was going for :)

> + igt_info("Checking crc...\n");
> + get_vblank(data->display.drm_fd, pipe, DRM_VBLANK_NEXTONMISS);
> +
> + igt_pipe_crc_collect_crc(pipe_crc, &crc);
> +
> + get_vblank(data->display.drm_fd, pipe, DRM_VBLANK_NEXTONMISS);
> +
> + igt_pipe_crc_collect_crc(pipe_crc, &crc2);
> +
> + resume_gpu_threads(data);
> + igt_assert_crc_equal(&crc, &crc2);
> + }
> +
> + igt_pipe_crc_free(pipe_crc);
> +
> + if (ret || (++pipe == IGT_MAX_PIPES))
> + break;
> + }
> + igt_gettime(&end);
> + iterations++;
> + need_continue = igt_time_elapsed(&start, &end) < MIN_DURATION_SEC;
> + } while ((need_continue || iterations < MIN_ITERATIONS));
> +
> +
> +}
> +
> +static void start_gpu_threads(struct data *data)
> +{
> + int i = 0;
> + igt_output_t *output;
> +
> + if (!data->devid) {
> + data->devid = intel_get_drm_devid(data->drm_fd);
> + igt_require_gem(data->drm_fd);
> +
> + data->bufmgr = drm_intel_bufmgr_gem_init(data->drm_fd, 4096);
> + igt_assert(data->bufmgr);
> + }
> +
> + for_each_connected_output(&data->display, output) {
> + data->gpu_context[i].data = data;
> + data->gpu_context[i].pipe = i;
> + data->gpu_context[i].fb_ptr = NULL;
> + data->gpu_context[i].blt_rect.x = 0;
> + data->gpu_context[i].blt_rect.y = 0;
> + data->gpu_context[i].blt_rect.w = 0;
> + data->gpu_context[i].blt_rect.h = 0;
> + data->gpu_context[i].num_rectangles = N_BLITS;
> + data->gpu_thread_state[i] = RUNNING;
> + igt_info("Starting GPU thread %d\n", i);
> + data->gpu_context[i].batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
> + pthread_create(&data->gpu_thread[i], NULL, gpu_load, (void*)&data->gpu_context[i]);
> + sem_wait(&data->gpu_thread_pause_ack[i]);
> + igt_info("GPU thread %d started\n", i);
> + if (++i == IGT_MAX_PIPES)
> + break;

It is possible here to force-connect HDMI outputs O:-) This would
increase the load without requiring a lot of connected screens. This can
be coming in a follow up patch though!

> + }
> +}
> +
> +
> +static void pause_gpu_threads(struct data *data)
> +{
> + int i = 0;
> + igt_output_t *output;
> + for_each_connected_output(&data->display, output) {
> + if (data->gpu_thread_state[i] != RUNNING) {
> + ++i;
> + continue;
> + }
> + igt_info("Pausing GPU thread %d \n", i);
> + data->gpu_thread_state[i] = PAUSED;
> + sem_wait(&data->gpu_thread_pause_ack[i]);
> + igt_info("GPU thread %d paused\n", i);
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +static void resume_gpu_threads(struct data *data)
> +{
> + int i = 0;
> + igt_output_t *output;
> + for_each_connected_output(&data->display, output) {
> + if (data->gpu_thread_state[i] != PAUSED) {
> + ++i;
> + continue;
> + }
> + igt_info("Resuming GPU thread %d\n", i);
> + data->gpu_thread_state[i] = RUNNING;
> + sem_wait(&data->gpu_thread_pause_ack[i]);
> + igt_info("GPU thread %d resumed\n", i);
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +
> +static void stop_gpu_threads(struct data *data)
> +{
> + int i = 0;
> + igt_output_t *output;
> + for_each_connected_output(&data->display, output) {
> + igt_info("Stoping GPU thread %d\n", i);
> + data->gpu_thread_state[i] = STOPPED;
> + pthread_join(data->gpu_thread[i], NULL);
> + data->gpu_context[i].fb_ptr = NULL;
> + intel_batchbuffer_free(data->gpu_context[i].batch);
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +static void start_cpu_threads(struct data *data)
> +{
> + int i;
> + for (i = 0; i < data->number_of_cores;i++) {
> + data->cpu_context[i].buf1 = malloc(BUF_SIZE);
> + data->cpu_context[i].buf2 = malloc(BUF_SIZE);
> + data->cpu_context[i].id = i;
> + data->cpu_context[i].data = data;
> + pthread_create(&data->cpu_thread[i], NULL, cpu_load, (void*)&data->cpu_context[i]);
> + }
> +}
> +
> +static void stop_cpu_threads(struct data *data)
> +{
> + int i;
> + for (i = 0; i < data->number_of_cores;i++) {
> + data->cpu_thread_stop[i] = true;
> + pthread_join(data->cpu_thread[i], NULL);
> + free(data->cpu_context[i].buf1);
> + free(data->cpu_context[i].buf2);
> + }
> +}
> +
> +static void create_framebuffers(struct data *data)
> +{
> + int i, j;
> + uint64_t cursor_width, cursor_height;
> + igt_output_t *output;
> +
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width));
> + do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_HEIGHT, &cursor_height));
> +
> + i = 0;
> + for_each_connected_output(&data->display, output) {
> + if (!data->cursor_fb[i].fb_id) {
> + igt_create_color_fb(data->drm_fd, cursor_width, cursor_height,
> + DRM_FORMAT_ARGB8888,

FYI, in a follow up patch, we probably want to be able to change the
plane format (or randomize it), and tiling formats. This way, we would
really stress all the scenarios :)

> + LOCAL_DRM_FORMAT_MOD_NONE,
> + 1.0,0.0,0.0,
> + &data->cursor_fb[i]);
> + }
> + for (j = 0; j < data->num_planes[i];j++) {
> + if (!data->fb[i * MAX_PLANES + j].fb_id) {
> + igt_create_color_pattern_fb(data->drm_fd,
> + data->highest_mode[i]->hdisplay,
> + data->highest_mode[i]->vdisplay,
> + data->format,
> + data->modifier,
> + 0.0, 1.0, 0.0, &data->fb[i * MAX_PLANES + j]);
> + }
> + }
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +static void destroy_framebuffers(struct data *data)
> +{
> + int i, j;
> + igt_output_t *output;
> +
> + i = 0;
> + for_each_connected_output(&data->display, output) {
> + for (j = 0;j < MAX_PLANES; j++) {
> + if (data->fb[i * MAX_PLANES + j].fb_id) {
> + igt_plane_set_fb(&data->display.pipes[i].planes[j], NULL);
> + igt_remove_fb(data->display.drm_fd, &data->fb[i * MAX_PLANES + j]);
> + data->fb[i * MAX_PLANES + j].fb_id = 0;
> + }
> + }
> + if (data->cursor_fb[i].fb_id) {
> + igt_remove_fb(data->display.drm_fd, &data->cursor_fb[i]);
> + data->cursor_fb[i].fb_id = 0;
> + }
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +}
> +
> +static void prepare_test(struct data *data, bool override, bool cpu, bool gpu)
> +{
> + int i,j;
> + igt_output_t *output;
> +
> + data->number_of_cores = min(sysconf(_SC_NPROCESSORS_ONLN), MAX_CORES);
> +
> + for (i = 0; i < IGT_MAX_PIPES; i++) {
> + for (j = 0;j < MAX_PLANES; j++)
> + data->fb[i * MAX_PLANES + j].fb_id = 0;
> + data->cursor_fb[i].fb_id = 0;
> + data->num_planes[i] = -1;
> + data->last_mode[i] = NULL;
> + sem_init(&data->gpu_thread_pause_ack[i], 0, 0);
> + }
> + if (cpu) {
> + start_cpu_threads(data);
> + }
> +
> + data->mode_resources = drmModeGetResources(data->drm_fd);
> + if (!data->mode_resources) {
> + igt_warn("drmModeGetResources failed: %s\n", strerror(errno));
> + return;
> + }
> +
> + memset(data->highest_mode, 0, sizeof(drmModeModeInfo *) * IGT_MAX_PIPES);
> +
> + fill_connector_to_pipe_array(data, data->mode_resources, data->connectors);
> +
> + i = 0;
> + for_each_connected_output(&data->display, output) {
> + drmModeConnector *connector = (drmModeConnector *)data->connectors[i];
> + if (!connector)
> + continue;
> + if (!data->highest_mode[i]) {
> + if (!override && connector->count_modes) {
> + data->highest_mode[i] = find_highest_mode(connector);
> + }
> + else
> + data->highest_mode[i] = &uhd_mode_60hz;
> + }
> + igt_info("Using mode: \n");
> + kmstest_dump_mode(data->highest_mode[i]);
> +
> + if (data->num_planes[i] == -1)
> + data->num_planes[i] = data->display.pipes[i].n_planes;
> +
> + igt_info("Max number of planes is %d for pipe %d\n", data->num_planes[i], i);
> +
> + if (++i == IGT_MAX_PIPES)
> + break;
> + }
> +
> + create_framebuffers(data);
> + if (gpu) {
> + start_gpu_threads(data);
> + }
> +}
> +
> +static void finish_test(struct data *data, bool override, bool cpu, bool gpu)
> +{
> + int i;
> +
> + if (gpu) {
> + stop_gpu_threads(data);
> + }
> + /*
> + * As we change tiling/format we need a new FB
> + */
> + destroy_framebuffers(data);
> + for (i = 0; i < IGT_MAX_PIPES; i++) {
> + data->num_planes[i] = -1;
> + data->last_mode[i] = NULL;
> + }
> + if (cpu) {
> + stop_cpu_threads(data);
> + }
> + release_connectors(data->connectors);
> +
> + drmModeFreeResources(data->mode_resources);
> +}
> +
> +struct data data = {
> + .format = DRM_FORMAT_XRGB8888,
> + .modifier = DRM_FORMAT_MOD_LINEAR,
> + .devid = 0,
> +};
> +
> +enum {
> + PLANES_ONLY = 0,
> + CPU_LOAD,
> + GPU_LOAD,
> + MODE_OVERRIDE,
> +} test_bits;
> +
> +static void set_params(uint8_t bits, bool *mode_override, bool *cpu_load, bool *gpu_load)
> +{
> + *cpu_load = (bits & (1 << CPU_LOAD)) != 0 ? true : false;
> + *gpu_load = (bits & (1 << GPU_LOAD)) != 0 ? true : false;
> + *mode_override = (bits & (1 << MODE_OVERRIDE)) != 0 ? true : false;
> +}
> +
> +
> +igt_main
> +{
> + bool mode_override;

I understand that you have a usecase where a screen does support 4K but
does not advertise it, but this is really not the place for this.

Instead, what you should do is set your own EDID for the connector
before running the test.

Is that making sense?

> + bool cpu_load;
> + bool gpu_load;
> + uint8_t format_idx = 0, tiling_idx = 0;
> + uint64_t max_combinations = 1 << (MODE_OVERRIDE + 1);
> + int8_t test_comb = max_combinations - 1;
> +
> + igt_fixture {
> + data.drm_fd = data.display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> +
> + kmstest_set_vt_graphics_mode();
> +
> + igt_display_require(&data.display, data.display.drm_fd);
> + igt_require(data.display.is_atomic);
> + igt_display_require_output(&data.display);
> + }
> +
> + do {
> + set_params(test_comb, &mode_override, &cpu_load, &gpu_load);
> + /*
> + * Do all combinations of mode_override, cpu_load, gpu_load and
> + * all format and tiling for each of those.
> + */
> + for (format_idx = 0; format_idx < N_FORMATS; format_idx++)
> + for (tiling_idx = 0; tiling_idx < N_TILING_METHODS; tiling_idx++) {
> + data.format = formats[format_idx];
> + data.modifier = tilings[tiling_idx];
> +
> + igt_fixture {
> + prepare_test(&data, mode_override, cpu_load, gpu_load);
> + }
> +
> + igt_subtest_f("stress%s%s%s-%s-%s",
> + mode_override == false ? "" : "-mode-override",
> + cpu_load == false ? "" : "-cpu-load",
> + gpu_load == false ? "" : "-gpu-load",
> + format_str(format_idx),
> + tiling_str(tiling_idx)) {
> +
> + stress(&data);

Thanks for having a single entry point, but parametrized!

> +
> + }
> +
> + igt_fixture {
> + finish_test(&data, mode_override, cpu_load, gpu_load);
> + }
> + }
> + } while (--test_comb > 0 );
> +
> + igt_fixture {
> +
> + igt_display_fini(&data.display);
> + }
> +}

New tests need to be documented (See
https://gitlab.freedesktop.org/drm/igt-gpu-tools/blob/master/CONTRIBUTING.md#the-code).

So, from the quick review, it looks like you got the GPU and CPU loads
implemented very nicely, and the only thing needed is to change the
logic for the CRC polling! So we are almost there!

Thanks a lot for working on this, and sorry for my outrageous slowness!

Martin

> \ No newline at end of file
> diff --git a/tests/meson.build b/tests/meson.build
> index a7b2b322..b6d7ed45 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -50,6 +50,7 @@ test_progs = [
> 'kms_plane_multiple',
> 'kms_plane_scaling',
> 'kms_prime',
> + 'kms_plane_stress',
> 'kms_prop_blob',
> 'kms_properties',
> 'kms_psr',
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org