From patchwork Tue Aug 23 17:56:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9296109 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 0687660574 for ; Tue, 23 Aug 2016 17:56:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F065F288B1 for ; Tue, 23 Aug 2016 17:56:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E535328C8C; Tue, 23 Aug 2016 17:56:27 +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 8BEDA288B1 for ; Tue, 23 Aug 2016 17:56:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C36F6E731; Tue, 23 Aug 2016 17:56:27 +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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id B479A6E731; Tue, 23 Aug 2016 17:56:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 21B06266F67 From: robert.foss@collabora.com To: intel-gfx@lists.freedesktop.org, mesa-dev@lists.freedesktop.org, Gustavo Padovan , Daniel Stone , Daniel Vetter , Marius Vlad Date: Tue, 23 Aug 2016 13:56:04 -0400 Message-Id: <1471974975-11531-3-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471974975-11531-1-git-send-email-robert.foss@collabora.com> References: <1471974975-11531-1-git-send-email-robert.foss@collabora.com> MIME-Version: 1.0 Cc: Gustavo Padovan Subject: [Intel-gfx] [PATCH v1 02/13] tests/sw_sync: Add sw_sync test 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss Add initial tests for sw_sync. Signed-off-by: Gustavo Padovan Signed-off-by: Robert Foss --- lib/sw_sync.c | 13 ++++++------- lib/sw_sync.h | 2 +- tests/Makefile.sources | 1 + tests/sw_sync.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 tests/sw_sync.c diff --git a/lib/sw_sync.c b/lib/sw_sync.c index c4e7d07..e3d5f85 100644 --- a/lib/sw_sync.c +++ b/lib/sw_sync.c @@ -150,8 +150,6 @@ int sw_sync_wait(int fence, int timeout) ret = poll(&fds, 1, timeout); - sw_sync_fd_close(fence); - return ret; } @@ -179,9 +177,10 @@ static struct sync_file_info *sync_file_info(int fd) info->num_fences = num_fences; fence_info = calloc(num_fences, sizeof(struct sync_fence_info)); - if (!fence_info) + if (!fence_info) { free(info); return NULL; + } info->sync_fence_info = (uint64_t)(unsigned long) (fence_info); @@ -217,18 +216,18 @@ int sw_sync_fence_size(int fd) return count; } -int sw_sync_fence_count_with_status(int fd, int status) +int sw_sync_fence_count_status(int fd, int status) { int i, count = 0; - struct sync_fence_info *fenceInfo = NULL; + struct sync_fence_info *fence_info = NULL; struct sync_file_info *info = sync_file_info(fd); if (!info) return -1; - fenceInfo = (struct sync_fence_info *)(uintptr_t)info->sync_fence_info; + fence_info = (struct sync_fence_info *)(uintptr_t)info->sync_fence_info; for (i = 0 ; i < info->num_fences ; i++) { - if (fenceInfo[i].status == status) + if (fence_info[i].status == status) count++; } diff --git a/lib/sw_sync.h b/lib/sw_sync.h index b179adf..1092608 100644 --- a/lib/sw_sync.h +++ b/lib/sw_sync.h @@ -43,7 +43,7 @@ void sw_sync_timeline_inc(int fd, uint32_t count); int sw_sync_merge(int fd1, int fd2); int sw_sync_wait(int fence, int timeout); int sw_sync_fence_size(int fd); -int sw_sync_fence_count_with_status(int fd, int status); +int sw_sync_fence_count_status(int fd, int status); #endif diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 72a58ad..0ba769f 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -125,6 +125,7 @@ TESTS_progs_M = \ prime_mmap_kms \ prime_self_import \ prime_vgem \ + sw_sync \ template \ vgem_basic \ vgem_slow \ diff --git a/tests/sw_sync.c b/tests/sw_sync.c new file mode 100644 index 0000000..d2d4c42 --- /dev/null +++ b/tests/sw_sync.c @@ -0,0 +1,51 @@ +/* + * Copyright 2012 Google, Inc + * Copyright © 2016 Collabora, Ltd. + * + * Based on the implementation from the Android Open Source Project + * + * 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 (including the next + * paragraph) 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. + * + * Authors: + * Robert Foss + */ + +#include + +#include "sw_sync.h" +#include "igt.h" +#include "igt_aux.h" + +IGT_TEST_DESCRIPTION("Test SW Sync Framework"); + +static void test_alloc_timeline(void) +{ + int timeline; + + timeline = sw_sync_timeline_create(); + sw_sync_timeline_destroy(timeline); +} + +igt_main +{ + igt_subtest("alloc_timeline") + test_alloc_timeline(); +} +