intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: 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 v8 11/21] tests/sw_sync: Add subtest test_sync_random_merge
Date: Mon, 21 Nov 2016 10:29:12 -0500	[thread overview]
Message-ID: <20161121152922.5595-12-robert.foss@collabora.com> (raw)
In-Reply-To: <20161121152922.5595-1-robert.foss@collabora.com>

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that creating many timelines and merging random fences
from each timeline with eachother results in merged fences that are fully
functional.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 11373bb..09c7ab8 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -399,6 +399,76 @@ static void test_sync_multi_consumer_producer(void)
 	igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
 }
 
+static void test_sync_random_merge(void)
+{
+	int i, size, ret;
+	const int nbr_timeline = 32;
+	const int nbr_merge = 1024;
+	int fence_map[nbr_timeline];
+	int timeline_arr[nbr_timeline];
+	int fence, tmpfence, merged;
+	int timeline, timeline_offset, sync_pt;
+
+	srand(time(NULL));
+
+	for (i = 0; i < nbr_timeline; i++) {
+		timeline_arr[i] = sw_sync_timeline_create();
+		fence_map[i] = -1;
+	}
+
+	sync_pt = rand();
+	fence = sw_sync_fence_create(timeline_arr[0], sync_pt);
+
+	fence_map[0] = sync_pt;
+
+	/* Randomly create syncpoints out of a fixed set of timelines,
+	 * and merge them together.
+	 */
+	for (i = 0; i < nbr_merge; i++) {
+		/* Generate syncpoint. */
+		timeline_offset = rand() % nbr_timeline;
+		timeline = timeline_arr[timeline_offset];
+		sync_pt = rand();
+
+		/* Keep track of the latest sync_pt in each timeline. */
+		if (fence_map[timeline_offset] == -1)
+			fence_map[timeline_offset] = sync_pt;
+		else if (fence_map[timeline_offset] < sync_pt)
+			fence_map[timeline_offset] = sync_pt;
+
+		/* Merge. */
+		tmpfence = sw_sync_fence_create(timeline, sync_pt);
+		merged = sync_merge(tmpfence, fence);
+		close(tmpfence);
+		close(fence);
+		fence = merged;
+	}
+
+	size = 0;
+	for (i = 0; i < nbr_timeline; i++)
+		if (fence_map[i] != -1)
+			size++;
+
+	/* Trigger the merged fence. */
+	for (i = 0; i < nbr_timeline; i++) {
+		if (fence_map[i] != -1) {
+			ret = sync_wait(fence, 0);
+			igt_assert_f(ret == -1 && errno == ETIME,
+				    "Failure waiting on fence until timeout\n");
+			/* Increment the timeline to the last sync_pt */
+			sw_sync_timeline_inc(timeline_arr[i], fence_map[i]);
+		}
+	}
+
+	/* Check that the fence is triggered. */
+	ret = sync_wait(fence, 0);
+	igt_assert_f(ret == 0, "Failure triggering fence\n");
+
+	close(fence);
+	for (i = 0; i < nbr_timeline; i++)
+		close(timeline_arr[i]);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -427,5 +497,8 @@ igt_main
 
 	igt_subtest("sync_multi_consumer_producer")
 		test_sync_multi_consumer_producer();
+
+	igt_subtest("sync_random_merge")
+		test_sync_random_merge();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-11-21 15:30 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-21 15:29 [PATCH i-g-t v8 00/21] Implement sw_sync test robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 02/21] tests/sw_sync: Add sw_sync test robert.foss
2016-11-21 15:45   ` Chris Wilson
2016-11-21 15:29 ` [PATCH i-g-t v8 03/21] tests/sw_sync: Add subtest test_alloc_fence robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 06/21] tests/sw_sync: Add subtest test_sync_busy robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 07/21] tests/sw_sync: Add subtest test_sync_merge robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 08/21] tests/sw_sync: Add subtest test_sync_merge_same robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer robert.foss
2016-11-21 15:29 ` robert.foss [this message]
2016-11-21 15:29 ` [PATCH i-g-t v8 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 14/21] tests/sw_sync: Add subtest test_sync_expired_merge robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 15/21] tests/sw_sync: Add subtest test_timeline_closed robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 18/21] tests/sw_sync: Add igt_require check for sw_sync feature robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 20/21] tests/sw_sync: Add subtest test_sync_busy_fork robert.foss
2016-11-21 15:29 ` [PATCH i-g-t v8 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=20161121152922.5595-12-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;
as well as URLs for NNTP newsgroup(s).