[igt-dev] [PATCH i-g-t v3 2/3] tests/v3d_submit_csd: Create test for V3D's Submit CSD IOCTL
Kamil Konieczny
kamil.konieczny at linux.intel.com
Tue Feb 14 21:33:46 UTC 2023
Hi Maíra,
On 2023-02-10 at 14:46:18 -0300, Maíra Canal wrote:
> Add eightteen igt_subtests for the DRM_IOCTL_V3D_SUBMIT_CSD, which ensures
---------- ^
s/eightteen/eighteen/
imho you can skip number of tests added, also just s/igt_subtests/subtests/
> that improper parameters return an errno and test multisync and
> single sync abilities. For most of the subtests, the empty shader is the
> base of the submission, as it is one of the simplest jobs possible,
> allowing it to test the synchronization abilities of the V3D.
>
> Reviewed-by: Melissa Wen <mwen at igalia.com>
> Signed-off-by: Maíra Canal <mcanal at igalia.com>
Please note new Petri e-mail: Petri Latvala <adrinael at adrinael.net>
> ---
> tests/v3d/meson.build | 1 +
> tests/v3d/v3d_submit_csd.c | 362 +++++++++++++++++++++++++++++++++++++
> tests/v3d_ci/v3d.testlist | 18 ++
> 3 files changed, 381 insertions(+)
> create mode 100644 tests/v3d/v3d_submit_csd.c
>
> diff --git a/tests/v3d/meson.build b/tests/v3d/meson.build
> index be92fd66..d070fdb5 100644
> --- a/tests/v3d/meson.build
> +++ b/tests/v3d/meson.build
> @@ -4,6 +4,7 @@ v3d_progs = [
> 'v3d_get_param',
> 'v3d_mmap',
> 'v3d_submit_cl',
> + 'v3d_submit_csd',
> 'v3d_perfmon',
> 'v3d_wait_bo',
> ]
> diff --git a/tests/v3d/v3d_submit_csd.c b/tests/v3d/v3d_submit_csd.c
> new file mode 100644
> index 00000000..256140c8
> --- /dev/null
> +++ b/tests/v3d/v3d_submit_csd.c
> @@ -0,0 +1,362 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2022 Igalia S.L.
> + */
> +
> +#include "igt.h"
> +#include "igt_v3d.h"
> +#include "igt_syncobj.h"
> +
> +/* One tenth of a second */
> +#define SHORT_TIME_NSEC 100000000ull
> +
> +#define NSECS_PER_SEC 1000000000ull
Please put here global description:
IGT_TEST_DESCRIPTION("Global description of tests in this module");
For example, see:
https://patchwork.freedesktop.org/patch/522415/?series=113522&rev=3
Btw these are minor corrections, please keep your r-b tag,
Regards,
Kamil
> +
> +static uint64_t
> +gettime_ns(void)
> +{
> + struct timespec current;
> +
> + clock_gettime(CLOCK_MONOTONIC, ¤t);
> + return (uint64_t)current.tv_sec * NSECS_PER_SEC + current.tv_nsec;
> +}
> +
> +static uint64_t
> +short_timeout(void)
> +{
> + return gettime_ns() + SHORT_TIME_NSEC;
> +}
> +
> +igt_main
> +{
> + int fd;
> +
> + igt_fixture {
> + fd = drm_open_driver(DRIVER_V3D);
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_CSD));
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted with a pad different than zero.");
> + igt_subtest("bad-pad") {
> + struct drm_v3d_submit_csd submit = {
> + .pad = 1
> + };
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, &submit, EINVAL);
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted with invalid flags.");
> + igt_subtest("bad-flag") {
> + struct drm_v3d_submit_csd submit = {
> + .flags = 0xaa
> + };
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, &submit, EINVAL);
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted if the extensions handle "
> + "is invalid.");
> + igt_subtest("bad-extension") {
> + struct drm_v3d_submit_csd submit = {
> + .flags = DRM_V3D_SUBMIT_EXTENSION,
> + .extensions = 0ULL
> + };
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, &submit, EINVAL);
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted if the BO handle is invalid.");
> + igt_subtest("bad-bo") {
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + job->submit->bo_handles = 0ULL;
> + job->submit->bo_handle_count = 1;
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EFAULT);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted if the perfmon id is invalid.");
> + igt_subtest("bad-perfmon") {
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_PERFMON));
> +
> + job->submit->perfmon_id = 1;
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, ENOENT);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure a submission cannot be accepted if the in-sync is not signaled.");
> + igt_subtest("bad-in-sync") {
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + job->submit->in_sync = syncobj_create(fd, 0);
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EINVAL);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure that the multisync pad is zero.");
> + igt_subtest("bad-multisync-pad") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + ms.pad = 1;
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EINVAL);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure that the multisync extension id exists.");
> + igt_subtest("bad-multisync-extension") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + ms.base.id = 0;
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EINVAL);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure that the multisync out-sync is valid.");
> + igt_subtest("bad-multisync-out-sync") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + igt_v3d_set_multisync(&ms, V3D_CSD);
> +
> + ms.out_sync_count = 1;
> + ms.out_syncs = 0ULL;
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EFAULT);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Make sure that the multisync in-sync is valid.");
> + igt_subtest("bad-multisync-in-sync") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + igt_v3d_set_multisync(&ms, V3D_CSD);
> +
> + ms.in_sync_count = 1;
> + ms.in_syncs = 0ULL;
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit, EFAULT);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Test a valid submission without syncobj.");
> + igt_subtest("valid-submission") {
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Test a valid submission with a single out-sync.");
> + igt_subtest("single-out-sync") {
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + job->submit->out_sync = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + igt_assert(syncobj_wait(fd, &job->submit->out_sync, 1, INT64_MAX, 0, NULL));
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Test a valid submission with a single in-sync.");
> + igt_subtest("single-in-sync") {
> + struct v3d_csd_job *job1 = igt_v3d_empty_shader(fd);
> + struct v3d_csd_job *job2 = igt_v3d_empty_shader(fd);
> + uint32_t out_sync;
> +
> + out_sync = syncobj_create(fd, 0);
> +
> + job1->submit->in_sync = out_sync;
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job1->submit, EINVAL);
> +
> + job2->submit->out_sync = out_sync;
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job2->submit);
> +
> + igt_assert(syncobj_wait(fd, &job2->submit->out_sync, 1,
> + INT64_MAX, 0, NULL));
> +
> + job1->submit->in_sync = out_sync;
> + job1->submit->out_sync = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job1->submit);
> +
> + igt_assert(syncobj_wait(fd, &job1->submit->out_sync, 1,
> + INT64_MAX, 0, NULL));
> +
> + igt_v3d_free_csd_job(fd, job1);
> + igt_v3d_free_csd_job(fd, job2);
> + }
> +
> + igt_describe("Test a valid submission with a multisync without syncobjs.");
> + igt_subtest("valid-multisync-submission") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> +
> + if (!igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT)) {
> + do_ioctl_err(fd, DRM_IOCTL_V3D_SUBMIT_CSD, &job->submit, EINVAL);
> + } else {
> + igt_v3d_set_multisync(&ms, V3D_CSD);
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + }
> +
> + igt_v3d_free_csd_job(fd, job);
> + }
> +
> + igt_describe("Test a valid submission with a multiple out-syncs.");
> + igt_subtest("multisync-out-syncs") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> + struct drm_v3d_sem *out_syncs;
> + int i;
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + igt_v3d_set_multisync(&ms, V3D_CSD);
> + ms.out_sync_count = 4;
> +
> + out_syncs = malloc(ms.out_sync_count * sizeof(*out_syncs));
> + for (i = 0; i < ms.out_sync_count; i++)
> + out_syncs[i].handle = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> +
> + ms.out_syncs = to_user_pointer(out_syncs);
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + for (i = 0; i < ms.out_sync_count; i++)
> + igt_assert(syncobj_wait(fd, &out_syncs[i].handle, 1, INT64_MAX, 0, NULL));
> +
> + igt_v3d_free_csd_job(fd, job);
> + free(out_syncs);
> + }
> +
> + igt_describe("Make sure that the multisync extension is preferred over the "
> + "single syncobjs.");
> + igt_subtest("multi-and-single-sync") {
> + struct drm_v3d_multi_sync ms = { };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> + struct drm_v3d_sem *out_syncs;
> + int i;
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT));
> +
> + igt_v3d_set_multisync(&ms, V3D_CSD);
> + ms.out_sync_count = 1;
> +
> + out_syncs = malloc(ms.out_sync_count * sizeof(*out_syncs));
> + for (i = 0; i < ms.out_sync_count; i++)
> + out_syncs[i].handle = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> +
> + ms.out_syncs = to_user_pointer(out_syncs);
> +
> + job->submit->flags = DRM_V3D_SUBMIT_EXTENSION;
> + job->submit->extensions = to_user_pointer(&ms);
> +
> + job->submit->out_sync = syncobj_create(fd, 0);
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + for (i = 0; i < ms.out_sync_count; i++)
> + igt_assert(syncobj_wait(fd, &out_syncs[i].handle, 1, INT64_MAX, 0, NULL));
> +
> + /*
> + * The multisync extension should be prioritized over the single syncobjs.
> + * So, the job->submit->out_sync should stay not signaled.
> + */
> + igt_assert_eq(syncobj_wait_err(fd, &job->submit->out_sync, 1, INT64_MAX, 0),
> + -EINVAL);
> +
> + igt_v3d_free_csd_job(fd, job);
> + free(out_syncs);
> + }
> +
> + igt_describe("Test the implicit order of the submission to the CSD queue.");
> + igt_subtest("multiple-job-submission") {
> + const uint32_t num_jobs = 10;
> + struct v3d_csd_job **jobs = NULL;
> + int i;
> +
> + jobs = malloc(num_jobs * sizeof(*jobs));
> +
> + for (i = 0; i < num_jobs; i++) {
> + jobs[i] = igt_v3d_empty_shader(fd);
> + jobs[i]->submit->out_sync = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> + }
> +
> + for (i = 0; i < num_jobs; i++)
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, jobs[i]->submit);
> +
> + igt_assert(syncobj_wait(fd, &jobs[num_jobs - 1]->submit->out_sync, 1,
> + short_timeout(), 0, NULL));
> +
> + /*
> + * If the last job is signaled, then all the previous jobs should
> + * already signaled, to assure the implicit synchronization.
> + */
> + for (i = 0; i < num_jobs; i++) {
> + igt_assert(syncobj_wait(fd, &jobs[i]->submit->out_sync, 1, 0, 0, NULL));
> + igt_v3d_free_csd_job(fd, jobs[i]);
> + }
> +
> + free(jobs);
> + }
> +
> + igt_describe("Test the coherency of creation/destruction of a perfmon attached to a job.");
> + igt_subtest("job-perfmon") {
> + uint8_t counters[] = { V3D_PERFCNT_L2T_TMU_READS,
> + V3D_PERFCNT_L2T_CLE_READS,
> + V3D_PERFCNT_L2T_VCD_READS,
> + V3D_PERFCNT_L2T_TMUCFG_READS };
> + struct v3d_csd_job *job = igt_v3d_empty_shader(fd);
> + uint32_t id;
> +
> + igt_require(igt_v3d_get_param(fd, DRM_V3D_PARAM_SUPPORTS_PERFMON));
> +
> + id = igt_v3d_perfmon_create(fd, ARRAY_SIZE(counters), counters);
> +
> + job->submit->out_sync = syncobj_create(fd, DRM_SYNCOBJ_CREATE_SIGNALED);
> + job->submit->perfmon_id = id;
> +
> + do_ioctl(fd, DRM_IOCTL_V3D_SUBMIT_CSD, job->submit);
> + igt_assert(syncobj_wait(fd, &job->submit->out_sync, 1,
> + INT64_MAX, 0, NULL));
> + igt_v3d_perfmon_get_values(fd, job->submit->perfmon_id);
> +
> + igt_v3d_free_csd_job(fd, job);
> +
> + igt_v3d_perfmon_get_values(fd, id);
> + igt_v3d_perfmon_destroy(fd, id);
> + }
> +
> + igt_fixture
> + close(fd);
> +}
> diff --git a/tests/v3d_ci/v3d.testlist b/tests/v3d_ci/v3d.testlist
> index 80e99831..5452fd99 100644
> --- a/tests/v3d_ci/v3d.testlist
> +++ b/tests/v3d_ci/v3d.testlist
> @@ -29,6 +29,24 @@ igt at v3d/v3d_submit_cl at multiple-job-submission
> igt at v3d/v3d_submit_cl at multisync-out-syncs
> igt at v3d/v3d_submit_cl at multi-and-single-sync
> igt at v3d/v3d_submit_cl at job-perfmon
> +igt at v3d/v3d_submit_csd at bad-pad
> +igt at v3d/v3d_submit_csd at bad-flag
> +igt at v3d/v3d_submit_csd at bad-extension
> +igt at v3d/v3d_submit_csd at bad-bo
> +igt at v3d/v3d_submit_csd at bad-perfmon
> +igt at v3d/v3d_submit_csd at bad-in-sync
> +igt at v3d/v3d_submit_csd at bad-multisync-pad
> +igt at v3d/v3d_submit_csd at bad-multisync-extension
> +igt at v3d/v3d_submit_csd at bad-multisync-out-sync
> +igt at v3d/v3d_submit_csd at bad-multisync-in-sync
> +igt at v3d/v3d_submit_csd at valid-submission
> +igt at v3d/v3d_submit_csd at single-out-sync
> +igt at v3d/v3d_submit_csd at single-in-sync
> +igt at v3d/v3d_submit_csd at valid-multisync-submission
> +igt at v3d/v3d_submit_csd at multiple-job-submission
> +igt at v3d/v3d_submit_csd at multisync-out-syncs
> +igt at v3d/v3d_submit_csd at multi-and-single-sync
> +igt at v3d/v3d_submit_csd at job-perfmon
> igt at v3d/v3d_perfmon at create-perfmon-0
> igt at v3d/v3d_perfmon at create-perfmon-exceed
> igt at v3d/v3d_perfmon at create-perfmon-invalid-counters
> --
> 2.39.1
>
More information about the igt-dev
mailing list