mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Emilio López" <emilio.lopez@collabora.co.uk>
To: Shuah Khan <shuahkh@osg.samsung.com>
Cc: devel@driverdev.osuosl.org,
	"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>,
	"Riley Andrews" <riandrews@android.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"John Harrison" <John.C.Harrison@Intel.com>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	"Greg Hackmann" <ghackmann@google.com>,
	"Rob Clark" <robdclark@gmail.com>,
	linux-kselftest@vger.kernel.org,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Daniel Stone" <daniels@collabora.com>,
	"Arve Hjønnevåg" <arve@android.com>,
	"Emilio López" <emilio.lopez@collabora.co.uk>
Subject: [RFC PATCH v1 8/9] selftest: sync: stress test for merges
Date: Wed,  9 Mar 2016 12:29:01 -0300	[thread overview]
Message-ID: <1457537342-678-9-git-send-email-emilio.lopez@collabora.co.uk> (raw)
In-Reply-To: <1457537342-678-1-git-send-email-emilio.lopez@collabora.co.uk>

This test is based on the libsync test suite from Android.
This commit includes a test to stress merge operations.

Signed-off-by: Emilio López <emilio.lopez@collabora.co.uk>
---

 tools/testing/selftests/sync/Makefile            |   1 +
 tools/testing/selftests/sync/sync_stress_merge.c | 115 +++++++++++++++++++++++
 tools/testing/selftests/sync/sync_test.c         |   1 +
 tools/testing/selftests/sync/synctest.h          |   3 +
 4 files changed, 120 insertions(+)
 create mode 100644 tools/testing/selftests/sync/sync_stress_merge.c

diff --git a/tools/testing/selftests/sync/Makefile b/tools/testing/selftests/sync/Makefile
index eb14e8c..7237a6c 100644
--- a/tools/testing/selftests/sync/Makefile
+++ b/tools/testing/selftests/sync/Makefile
@@ -18,6 +18,7 @@ TESTS += sync_wait.o
 TESTS += sync_destroyed.o
 TESTS += sync_stress_parallelism.o
 TESTS += sync_stress_consumer.o
+TESTS += sync_stress_merge.o
 
 sync_test: $(SRC) $(TESTS)
 
diff --git a/tools/testing/selftests/sync/sync_stress_merge.c b/tools/testing/selftests/sync/sync_stress_merge.c
new file mode 100644
index 0000000..7eb2cdf
--- /dev/null
+++ b/tools/testing/selftests/sync/sync_stress_merge.c
@@ -0,0 +1,115 @@
+/*
+ *  sync stress test: merging
+ *  Copyright 2015-2016 Collabora Ltd.
+ *
+ *  Based on the implementation from the Android Open Source Project,
+ *
+ *  Copyright 2012 Google, Inc
+ *
+ *  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 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 <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "sync.h"
+#include "sw_sync.h"
+#include "synctest.h"
+
+static int fence_map[1024 * 32];
+
+int test_merge_stress_random_merge(void)
+{
+	int i, size, ret;
+	int timelineCount = 32;
+	int mergeCount = 1024 * 32;
+	int timelines[timelineCount];
+	int fence, tmpfence, merged, valid;
+	int timeline, timelineOffset, syncPoint;
+
+	srand(time(NULL));
+
+	for (i = 0; i < timelineCount; i++)
+		timelines[i] = sw_sync_timeline_create();
+
+	fence = sw_sync_fence_create(timelines[0], "fence", 0);
+	valid = sw_sync_fence_is_valid(fence);
+	ASSERT(valid, "Failure creating fence\n");
+
+	memset(fence_map, -1, sizeof(fence_map));
+	fence_map[0] = 0;
+
+	/*
+	 * Randomly create syncpoints out of a fixed set of timelines,
+	 * and merge them together
+	 */
+	for (i = 0; i < mergeCount; i++) {
+		/* Generate syncpoint. */
+		timelineOffset = rand() % timelineCount;
+		timeline = timelines[timelineOffset];
+		syncPoint = rand();
+
+		/* Keep track of the latest syncpoint in each timeline. */
+		if (fence_map[timelineOffset] == -1)
+			fence_map[timelineOffset] = syncPoint;
+		else if (fence_map[timelineOffset] < syncPoint)
+			fence_map[timelineOffset] = syncPoint;
+
+		/* Merge */
+		tmpfence = sw_sync_fence_create(timeline, "fence", syncPoint);
+		merged = sync_merge("merge", tmpfence, fence);
+		sw_sync_fence_destroy(tmpfence);
+		sw_sync_fence_destroy(fence);
+		fence = merged;
+
+		valid = sw_sync_fence_is_valid(merged);
+		ASSERT(valid, "Failure creating fence i\n");
+	}
+
+	size = 0;
+	for (i = 0; i < mergeCount; i++)
+		if (fence_map[i] != -1)
+			size++;
+
+	/* Confirm our map matches the fence. */
+	ASSERT(sync_fence_size(fence) == size,
+	       "Quantity of elements not matching\n");
+
+	/* Trigger the merged fence */
+	for (i = 0; i < mergeCount; i++) {
+		if (fence_map[i] != -1) {
+			ret = sync_wait(fence, 0);
+			ASSERT(ret == 0,
+			       "Failure waiting on fence until timeout\n");
+			/* Increment the timeline to the last syncpoint */
+			sw_sync_timeline_inc(timelines[i], fence_map[i]);
+		}
+	}
+
+	/* Check that the fence is triggered. */
+	ret = sync_wait(fence, 0);
+	ASSERT(ret > 0, "Failure triggering fence\n");
+
+	for (i = 0; i < timelineCount; i++)
+		sw_sync_timeline_destroy(timelines[i]);
+
+	return 0;
+}
diff --git a/tools/testing/selftests/sync/sync_test.c b/tools/testing/selftests/sync/sync_test.c
index b27f492..c3e4c01 100644
--- a/tools/testing/selftests/sync/sync_test.c
+++ b/tools/testing/selftests/sync/sync_test.c
@@ -69,6 +69,7 @@ int main(void)
 	err += RUN_TEST(test_fence_wait_on_destroyed_timeline);
 	err += RUN_TEST(test_stress_two_threads_shared_timeline);
 	err += RUN_TEST(test_consumer_stress_multi_producer_single_consumer);
+	err += RUN_TEST(test_merge_stress_random_merge);
 
 	if (err)
 		printf("[FAIL]\tsync errors: %d\n", err);
diff --git a/tools/testing/selftests/sync/synctest.h b/tools/testing/selftests/sync/synctest.h
index 94c4594..f74459e 100644
--- a/tools/testing/selftests/sync/synctest.h
+++ b/tools/testing/selftests/sync/synctest.h
@@ -63,4 +63,7 @@ int test_stress_two_threads_shared_timeline(void);
 /* Stress test - consumer */
 int test_consumer_stress_multi_producer_single_consumer(void);
 
+/* Stress test - merging */
+int test_merge_stress_random_merge(void);
+
 #endif
-- 
2.5.0

  parent reply	other threads:[~2016-03-09 15:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-09 15:28 [RFC PATCH v1 0/9] Tests for sync infrastructure Emilio López
2016-03-09 15:28 ` [RFC PATCH v1 1/9] selftest: sync: basic tests for sw_sync framework Emilio López
2016-03-28 11:56   ` Emil Velikov
2016-03-28 12:20     ` Emilio López
2016-03-28 13:48       ` Emil Velikov
2016-04-04  4:12         ` Emilio López
2016-04-07 14:47           ` Emil Velikov
2016-03-09 15:28 ` [RFC PATCH v1 2/9] selftest: sync: fence " Emilio López
2016-03-09 15:28 ` [RFC PATCH v1 3/9] selftest: sync: merge " Emilio López
2016-03-09 15:28 ` [RFC PATCH v1 4/9] selftest: sync: wait " Emilio López
2016-03-09 15:28 ` [RFC PATCH v1 5/9] selftest: sync: destruction " Emilio López
2016-03-09 15:28 ` [RFC PATCH v1 6/9] selftest: sync: stress test for parallelism Emilio López
2016-03-09 15:29 ` [RFC PATCH v1 7/9] selftest: sync: stress consumer/producer test Emilio López
2016-03-09 15:29 ` Emilio López [this message]
2016-03-09 15:29 ` [RFC PATCH v1 9/9] selftest: sync: disable tests that rely on not yet defined behaviour Emilio López
2016-03-09 16:14   ` Shuah Khan
2016-03-28 12:33     ` Emilio López
2016-03-09 16:13 ` [RFC PATCH v1 0/9] Tests for sync infrastructure Shuah Khan
2016-03-28 12:32   ` Emilio López

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=1457537342-678-9-git-send-email-emilio.lopez@collabora.co.uk \
    --to=emilio.lopez@collabora.co.uk \
    --cc=John.C.Harrison@Intel.com \
    --cc=arve@android.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniels@collabora.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=ghackmann@google.com \
    --cc=gustavo.padovan@collabora.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=riandrews@android.com \
    --cc=robdclark@gmail.com \
    --cc=shuahkh@osg.samsung.com \
    /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

all inboxes | Powered by JetHome®