public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
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>,
	Petri Latvala <petri.latvala@intel.com>
Subject: [PATCH i-g-t v11 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer
Date: Wed,  7 Dec 2016 15:07:42 -0500	[thread overview]
Message-ID: <20161207200754.7690-10-robert.foss@collabora.com> (raw)
In-Reply-To: <20161207200754.7690-1-robert.foss@collabora.com>

This subtest verifies the access ordering of multiple consumer threads.

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 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index c0eade51..5b6532c2 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -24,6 +24,8 @@
  *    Robert Foss <robert.foss@collabora.com>
  */
 
+#include <pthread.h>
+#include <semaphore.h>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -36,6 +38,13 @@
 
 IGT_TEST_DESCRIPTION("Test SW Sync Framework");
 
+typedef struct {
+	int timeline;
+	uint32_t thread_id;
+	volatile uint32_t * volatile counter;
+	sem_t *sem;
+} data_t;
+
 static void test_alloc_timeline(void)
 {
 	int timeline;
@@ -217,6 +226,92 @@ static void test_sync_merge_same(void)
 	close(timeline);
 }
 
+#define MULTI_CONSUMER_THREADS 8
+#define MULTI_CONSUMER_ITERATIONS (1 << 14)
+static void * test_sync_multi_consumer_thread(void *arg)
+{
+	data_t *data = arg;
+	int thread_id = data->thread_id;
+	int timeline = data->timeline;
+	int ret, i;
+
+	for (i = 0; i < MULTI_CONSUMER_ITERATIONS; i++) {
+		int next_point = i * MULTI_CONSUMER_THREADS + thread_id;
+		int fence = sw_sync_fence_create(timeline, next_point);
+
+		ret = sync_wait(fence, 1000);
+		if (ret == -1)
+		{
+			return (void *) 1;
+		}
+
+		if (*(data->counter) != next_point)
+		{
+			return (void *) 1;
+		}
+
+		sem_post(data->sem);
+		close(fence);
+	}
+	return NULL;
+}
+
+static void test_sync_multi_consumer(void)
+{
+
+	data_t data_arr[MULTI_CONSUMER_THREADS];
+	pthread_t thread_arr[MULTI_CONSUMER_THREADS];
+	sem_t sem;
+	int timeline;
+	volatile uint32_t counter = 0;
+	uintptr_t thread_ret = 0;
+	data_t data;
+	int i, ret;
+
+	sem_init(&sem, 0, 0);
+	timeline = sw_sync_timeline_create();
+
+	data.counter = &counter;
+	data.timeline = timeline;
+	data.sem = &sem;
+
+	/* Start sync threads. */
+	for (i = 0; i < MULTI_CONSUMER_THREADS; i++)
+	{
+		data_arr[i] = data;
+		data_arr[i].thread_id = i;
+		ret = pthread_create(&thread_arr[i], NULL,
+				     test_sync_multi_consumer_thread,
+				     (void *) &(data_arr[i]));
+		igt_assert_eq(ret, 0);
+	}
+
+	/* Produce 'content'. */
+	for (i = 0; i < MULTI_CONSUMER_THREADS * MULTI_CONSUMER_ITERATIONS; i++)
+	{
+		sem_wait(&sem);
+
+		counter++;
+		sw_sync_timeline_inc(timeline, 1);
+	}
+
+	/* Wait for threads to complete. */
+	for (i = 0; i < MULTI_CONSUMER_THREADS; i++)
+	{
+		uintptr_t local_thread_ret;
+		pthread_join(thread_arr[i], (void **)&local_thread_ret);
+		thread_ret |= local_thread_ret;
+	}
+
+	close(timeline);
+	sem_destroy(&sem);
+
+	igt_assert_f(counter == MULTI_CONSUMER_THREADS * MULTI_CONSUMER_ITERATIONS,
+		     "Counter has unexpected value.\n");
+
+	igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -239,5 +334,8 @@ igt_main
 
 	igt_subtest("sync_merge_same")
 		test_sync_merge_same();
+
+	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

  parent reply	other threads:[~2016-12-07 20:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-07 20:07 [PATCH i-g-t v11 00/21] Implement sw_sync test Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 02/21] test/sw_sync: Add sw_sync test Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 03/21] tests/sw_sync: Add subtest test_alloc_fence Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 06/21] tests/sw_sync: Add subtest test_sync_busy Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 07/21] tests/sw_sync: Add subtest test_sync_merge Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 08/21] tests/sw_sync: Add subtest test_sync_merge_same Robert Foss
2016-12-07 20:07 ` Robert Foss [this message]
2016-12-07 20:07 ` [PATCH i-g-t v11 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 11/21] tests/sw_sync: Add subtest test_sync_random_merge Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 14/21] tests/sw_sync: Add subtest test_sync_expired_merge Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 15/21] tests/sw_sync: Add subtest test_timeline_closed Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 18/21] tests/sw_sync: Add igt_require check for sw_sync feature Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 20/21] tests/sw_sync: Add subtest test_sync_busy_fork Robert Foss
2016-12-07 20:07 ` [PATCH i-g-t v11 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=20161207200754.7690-10-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=petri.latvala@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