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>
Subject: [PATCH i-g-t v2 09/13] tests/sw_sync: Add subtest test_sync_multi_consumer
Date: Mon, 12 Sep 2016 18:08:38 -0400 [thread overview]
Message-ID: <20160912220842.18752-10-robert.foss@collabora.com> (raw)
In-Reply-To: <20160912220842.18752-1-robert.foss@collabora.com>
From: Robert Foss <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>
---
tests/sw_sync.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index db03f48..0c9c923 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -27,6 +27,8 @@
* Robert Foss <robert.foss@collabora.com>
*/
+#include <pthread.h>
+#include <semaphore.h>
#include <stdint.h>
#include "sw_sync.h"
@@ -35,6 +37,15 @@
IGT_TEST_DESCRIPTION("Test SW Sync Framework");
+typedef struct {
+ int timeline;
+ uint32_t thread_id;
+ uint32_t nbr_threads;
+ uint32_t nbr_iterations;
+ volatile uint32_t * volatile counter;
+ sem_t *sem;
+} data_t;
+
static void test_alloc_timeline(void)
{
int timeline;
@@ -203,6 +214,95 @@ static void test_sync_merge_same(void)
sw_sync_timeline_destroy(timeline);
}
+static void * test_sync_multi_consumer_thread(void *arg)
+{
+ data_t *data = arg;
+ int thread_id = data->thread_id;
+ int nbr_threads = data->nbr_threads;
+ int timeline = data->timeline;
+ int iterations = data->nbr_iterations;
+ int ret, i;
+
+ for (i = 0; i < iterations; i++) {
+ int next_point = i * nbr_threads + thread_id;
+ int fence = sw_sync_fence_create(timeline, next_point);
+
+ ret = sw_sync_wait(fence, 1000);
+ if (ret <= 0)
+ {
+ return (void *) 1;
+ }
+
+ if (*(data->counter) != next_point)
+ {
+ return (void *) 1;
+ }
+
+ sem_post(data->sem);
+ sw_sync_fence_destroy(fence);
+ }
+ return NULL;
+}
+
+static void test_sync_multi_consumer(void)
+{
+ const uint32_t nbr_threads = 8;
+ const uint32_t nbr_iterations = 1 << 14;
+ data_t data_arr[nbr_threads];
+ pthread_t thread_arr[nbr_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.nbr_iterations = nbr_iterations;
+ data.nbr_threads = nbr_threads;
+ data.counter = &counter;
+ data.timeline = timeline;
+ data.sem = &sem;
+
+ /* Start sync threads. */
+ for (i = 0; i < nbr_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 < nbr_threads * nbr_iterations; i++)
+ {
+ sem_wait(&sem);
+
+ counter++;
+ sw_sync_timeline_inc(timeline, 1);
+ }
+
+ /* Wait for threads to complete. */
+ for (i = 0; i < nbr_threads; i++)
+ {
+ uintptr_t local_thread_ret;
+ pthread_join(thread_arr[i], (void **)&local_thread_ret);
+ thread_ret |= local_thread_ret;
+ }
+
+ sw_sync_timeline_destroy(timeline);
+ sem_destroy(&sem);
+
+ igt_assert_f(counter == nbr_threads * nbr_iterations,
+ "Counter has unexpected value.\n");
+
+ igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
+}
+
igt_main
{
igt_subtest("alloc_timeline")
@@ -225,5 +325,8 @@ igt_main
igt_subtest("sync_merge_same")
test_sync_merge_same();
+
+ igt_subtest("sync_multi_consumer")
+ test_sync_multi_consumer();
}
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-09-12 22:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 22:08 [PATCH i-g-t v2 00/13] Implement sw_sync test robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 01/13] lib/sw_sync: Add helper functions for managing synchronization primitives robert.foss
2016-09-13 11:03 ` Chris Wilson
2016-09-13 15:40 ` Robert Foss
2016-09-14 12:18 ` Chris Wilson
2016-09-14 15:01 ` Robert Foss
2016-09-12 22:08 ` [PATCH i-g-t v2 02/13] tests/sw_sync: Add sw_sync test robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 03/13] tests/sw_sync: Add subtest test_alloc_fence robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 04/13] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 05/13] tests/sw_sync: Add subtest test_alloc_merge_fence robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 06/13] tests/sw_sync: Add subtest test_sync_wait robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 07/13] tests/sw_sync: Add subtest test_sync_merge robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 08/13] tests/sw_sync: Add subtest test_sync_merge_same robert.foss
2016-09-12 22:08 ` robert.foss [this message]
2016-09-12 22:08 ` [PATCH i-g-t v2 10/13] tests/sw_sync: Add subtest test_sync_multi_consumer_producer robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 11/13] tests/sw_sync: Add subtest test_sync_random_merge robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 12/13] tests/sw_sync: Add subtest test_sync_multi_timeline_wait robert.foss
2016-09-12 22:08 ` [PATCH i-g-t v2 13/13] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer 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=20160912220842.18752-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 \
/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).