On 2016-09-15 04:22 PM, Chris Wilson wrote:
On Thu, Sep 15, 2016 at 02:40:07PM -0400, robert.foss@xxxxxxxxxxxxx wrote:From: Robert Foss <robert.foss@xxxxxxxxxxxxx> Add initial tests for sw_sync. Signed-off-by: Robert Foss <robert.foss@xxxxxxxxxxxxx> Signed-off-by: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx> Reviewed-by: Eric Engestrom <eric@xxxxxxxxxxxx> --- tests/Makefile.sources | 1 + tests/sw_sync.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tests/sw_sync.c 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..47e2dfa --- /dev/null +++ b/tests/sw_sync.c @@ -0,0 +1,52 @@ +/* + * 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 <robert.foss@xxxxxxxxxxxxx> + */ + +#include <stdint.h> +#include <unistd.h> + +#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(); + close(timeline); +} + +igt_main +{If I were to run this on a kernel without sw_sync support, it would fail. We want it to skip instead! in lib/sw_sync.c: static bool kernel_has_sw_sync(void) { bool err; igt_ignore_warn(system("/sbin/modprobe -s r sw_sync")); err = false; if (access("/dev/sw_sync", R_OK | W_OK) < 0) { char buf[128]; snprintf(buf, sizeof(buf), "%s/sw_sync", igt_debugfs_mount()); err = access("/sys/kernel//sw_sync", R_OK | W_OK) < 0; } return !err; } void igt_require_sw_sync(void) { igt_require(kernel_has_sw_sync()); } then here: igt_main { igt_fixture { igt_require_sw_sync(); }+ igt_subtest("alloc_timeline") + test_alloc_timeline(); +}}
This is a solid improvement, igt_debugfs_mount() does not however seem to be available on upstream/master. I've found your patch that includes it amongst other things, would you like me to extract it and include it into this series?
Rob. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
