From: Robert Foss <robert.foss@collabora.com>
To: intel-gfx@lists.freedesktop.org,
Gustavo Padovan <gustavo.padovan@collabora.com>,
Daniel Stone <daniels@collabora.com>,
Daniel Vetter <daniel@ffwll.ch>,
Marius Vlad <marius.c.vlad@intel.com>,
Eric Engestrom <eric@engestrom.ch>,
Chris Wilson <chris@chris-wilson.co.uk>,
Tomeu Vizoso <tomeu@tomeuvizoso.net>
Subject: [PATCH i-g-t v10 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait
Date: Tue, 6 Dec 2016 21:52:04 -0500 [thread overview]
Message-ID: <20161207025213.11669-13-robert.foss@collabora.com> (raw)
In-Reply-To: <20161207025213.11669-1-robert.foss@collabora.com>
This subtest verifies that waiting, timing out on a wait and that counting
fences in various states works.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
tests/sw_sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 81e83fc8..b0bd2ad4 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -231,6 +231,69 @@ static void test_sync_merge_same(void)
close(timeline);
}
+static void test_sync_multi_timeline_wait(void)
+{
+ int timeline[3];
+ int in_fence[3];
+ int fence_merge;
+ int active, signaled, ret;
+
+ timeline[0] = sw_sync_timeline_create();
+ timeline[1] = sw_sync_timeline_create();
+ timeline[2] = sw_sync_timeline_create();
+
+ in_fence[0] = sw_sync_fence_create(timeline[0], 5);
+ in_fence[1] = sw_sync_fence_create(timeline[1], 5);
+ in_fence[2] = sw_sync_fence_create(timeline[2], 5);
+
+ fence_merge = sync_merge(in_fence[0], in_fence[1]);
+ fence_merge = sync_merge(in_fence[2], fence_merge);
+
+ /* Confirm fence isn't signaled */
+ active = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_ACTIVE);
+ igt_assert_f(active == 3, "Fence signaled too early\n");
+
+ ret = sync_wait(fence_merge, 0);
+ igt_assert_f(ret == -1 && errno == ETIME, "Failure waiting on fence until timeout\n");
+
+ sw_sync_timeline_inc(timeline[0], 5);
+ active = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_ACTIVE);
+ signaled = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_SIGNALED);
+ igt_assert_f(active == 2 && signaled == 1,
+ "Fence did not signal properly\n");
+
+ sw_sync_timeline_inc(timeline[1], 5);
+ active = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_ACTIVE);
+ signaled = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_SIGNALED);
+ igt_assert_f(active == 1 && signaled == 2,
+ "Fence did not signal properly\n");
+
+ sw_sync_timeline_inc(timeline[2], 5);
+ active = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_ACTIVE);
+ signaled = sync_fence_count_status(fence_merge,
+ SW_SYNC_FENCE_STATUS_SIGNALED);
+ igt_assert_f(active == 0 && signaled == 3,
+ "Fence did not signal properly\n");
+
+ /* confirm you can successfully wait */
+ ret = sync_wait(fence_merge, 100);
+ igt_assert_f(ret == 0, "Failure waiting on signaled fence\n");
+
+ close(in_fence[0]);
+ close(in_fence[1]);
+ close(in_fence[2]);
+ close(fence_merge);
+ close(timeline[0]);
+ close(timeline[1]);
+ close(timeline[2]);
+}
+
#define MULTI_CONSUMER_THREADS 8
#define MULTI_CONSUMER_ITERATIONS (1 << 14)
static void * test_sync_multi_consumer_thread(void *arg)
@@ -487,6 +550,9 @@ igt_main
igt_subtest("sync_merge_same")
test_sync_merge_same();
+ igt_subtest("sync_multi_timeline_wait")
+ test_sync_multi_timeline_wait();
+
igt_subtest("sync_multi_consumer")
test_sync_multi_consumer();
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-07 2:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 2:51 [PATCH i-g-t v10 00/21] Implement sw_sync test Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 02/21] test/sw_sync: Add sw_sync test Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 03/21] tests/sw_sync: Add subtest test_alloc_fence Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 06/21] tests/sw_sync: Add subtest test_sync_busy Robert Foss
2016-12-07 2:51 ` [PATCH i-g-t v10 07/21] tests/sw_sync: Add subtest test_sync_merge Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 08/21] tests/sw_sync: Add subtest test_sync_merge_same Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 11/21] tests/sw_sync: Add subtest test_sync_random_merge Robert Foss
2016-12-07 2:52 ` Robert Foss [this message]
2016-12-07 2:52 ` [PATCH i-g-t v10 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 14/21] tests/sw_sync: Add subtest test_sync_expired_merge Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 15/21] tests/sw_sync: Add subtest test_timeline_closed Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support Robert Foss
2016-12-07 11:06 ` Petri Latvala
2016-12-07 15:27 ` Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 18/21] tests/sw_sync: Add igt_require check for sw_sync feature Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 20/21] tests/sw_sync: Add subtest test_sync_busy_fork Robert Foss
2016-12-07 2:52 ` [PATCH i-g-t v10 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket Robert Foss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161207025213.11669-13-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=daniels@collabora.com \
--cc=eric@engestrom.ch \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu@tomeuvizoso.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox