From patchwork Wed Dec 7 02:52:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9463791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7663260231 for ; Wed, 7 Dec 2016 02:53:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 684C228156 for ; Wed, 7 Dec 2016 02:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D279284BD; Wed, 7 Dec 2016 02:53:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0535A28156 for ; Wed, 7 Dec 2016 02:53:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 285026E526; Wed, 7 Dec 2016 02:53:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E0C16E522 for ; Wed, 7 Dec 2016 02:52:57 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id A2DEB268EF4 From: Robert Foss To: intel-gfx@lists.freedesktop.org, Gustavo Padovan , Daniel Stone , Daniel Vetter , Marius Vlad , Eric Engestrom , Chris Wilson , Tomeu Vizoso Date: Tue, 6 Dec 2016 21:52:02 -0500 Message-Id: <20161207025213.11669-11-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161207025213.11669-1-robert.foss@collabora.com> References: <20161207025213.11669-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v10 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This test verifies that stressing the kernel by creating multiple consumer/producer threads that wait on a single timeline to be incremented by another conumer/producer thread does not fail. And that the order amongst the threads is maintained. Signed-off-by: Robert Foss Reviewed-by: Eric Engestrom Reviewed-by: Tomeu Vizoso --- tests/sw_sync.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/tests/sw_sync.c b/tests/sw_sync.c index 5b6532c2..f32dae5a 100644 --- a/tests/sw_sync.c +++ b/tests/sw_sync.c @@ -102,24 +102,28 @@ static void test_sync_busy(void) /* Make sure that fence has not been signaled yet */ ret = sync_wait(fence, 0); - igt_assert_f(ret == -1 && errno == ETIME, "Fence signaled early (timeline value 0, fence seqno 5)\n"); + igt_assert_f(ret == -1 && errno == ETIME, + "Fence signaled early (timeline value 0, fence seqno 5)\n"); /* Advance timeline from 0 -> 1 */ sw_sync_timeline_inc(timeline, 1); /* Make sure that fence has not been signaled yet */ ret = sync_wait(fence, 0); - igt_assert_f(ret == -1 && errno == ETIME, "Fence signaled early (timeline value 1, fence seqno 5)\n"); + igt_assert_f(ret == -1 && errno == ETIME, + "Fence signaled early (timeline value 1, fence seqno 5)\n"); /* Advance timeline from 1 -> 5: signaling the fence (seqno 5)*/ sw_sync_timeline_inc(timeline, 4); ret = sync_wait(fence, 0); - igt_assert_f(ret == 0, "Fence not signaled (timeline value 5, fence seqno 5)\n"); + igt_assert_f(ret == 0, + "Fence not signaled (timeline value 5, fence seqno 5)\n"); /* Go even further, and confirm wait still succeeds */ sw_sync_timeline_inc(timeline, 5); ret = sync_wait(fence, 0); - igt_assert_f(ret == 0, "Fence not signaled (timeline value 10, fence seqno 5)\n"); + igt_assert_f(ret == 0, + "Fence not signaled (timeline value 10, fence seqno 5)\n"); seqno = 10; for_each_prime_number(prime, 100) { @@ -130,7 +134,8 @@ static void test_sync_busy(void) sw_sync_timeline_inc(timeline, prime); ret = sync_wait(fence_prime, 0); - igt_assert_f(ret == 0, "Fence not signaled during test of prime timeline increments\n"); + igt_assert_f(ret == 0, + "Fence not signaled during test of prime timeline increments\n"); close(fence_prime); } @@ -312,6 +317,83 @@ static void test_sync_multi_consumer(void) igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n"); } +#define MULTI_CONSUMER_PRODUCER_THREADS 8 +#define MULTI_CONSUMER_PRODUCER_ITERATIONS (1 << 14) +static void * test_sync_multi_consumer_producer_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_PRODUCER_ITERATIONS; i++) { + int next_point = i * MULTI_CONSUMER_PRODUCER_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; + } + + (*data->counter)++; + + /* Kick off the next thread. */ + sw_sync_timeline_inc(timeline, 1); + + close(fence); + } + return NULL; +} + +static void test_sync_multi_consumer_producer(void) +{ + data_t data_arr[MULTI_CONSUMER_PRODUCER_THREADS]; + pthread_t thread_arr[MULTI_CONSUMER_PRODUCER_THREADS]; + int timeline; + volatile uint32_t counter = 0; + uintptr_t thread_ret = 0; + data_t data; + int i, ret; + + timeline = sw_sync_timeline_create(); + + data.counter = &counter; + data.timeline = timeline; + + /* Start consumer threads. */ + for (i = 0; i < MULTI_CONSUMER_PRODUCER_THREADS; i++) + { + data_arr[i] = data; + data_arr[i].thread_id = i; + ret = pthread_create(&thread_arr[i], NULL, + test_sync_multi_consumer_producer_thread, + (void *) &(data_arr[i])); + igt_assert_eq(ret, 0); + } + + /* Wait for threads to complete. */ + for (i = 0; i < MULTI_CONSUMER_PRODUCER_THREADS; i++) + { + uintptr_t local_thread_ret; + pthread_join(thread_arr[i], (void **)&local_thread_ret); + thread_ret |= local_thread_ret; + } + + close(timeline); + + igt_assert_f(counter == MULTI_CONSUMER_PRODUCER_THREADS * + MULTI_CONSUMER_PRODUCER_ITERATIONS, + "Counter has unexpected value.\n"); + + igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n"); +} + igt_main { igt_subtest("alloc_timeline") @@ -337,5 +419,8 @@ igt_main igt_subtest("sync_multi_consumer") test_sync_multi_consumer(); + + igt_subtest("sync_multi_consumer_producer") + test_sync_multi_consumer_producer(); }