These tests are based on the libsync test suite from Android.
This commit includes tests for basic fence creation.

Signed-off-by: Emilio López <emilio.lo...@collabora.co.uk>
---
 tools/testing/selftests/sync/Makefile     |   1 +
 tools/testing/selftests/sync/sync_fence.c | 132 ++++++++++++++++++++++++++++++
 tools/testing/selftests/sync/sync_test.c  |   3 +
 tools/testing/selftests/sync/synctest.h   |   4 +
 4 files changed, 140 insertions(+)
 create mode 100644 tools/testing/selftests/sync/sync_fence.c

diff --git a/tools/testing/selftests/sync/Makefile 
b/tools/testing/selftests/sync/Makefile
index f67827f..2bba52e 100644
--- a/tools/testing/selftests/sync/Makefile
+++ b/tools/testing/selftests/sync/Makefile
@@ -15,6 +15,7 @@ include ../lib.mk
 SRC = sync_test.o sync.o
 
 TESTS += sync_alloc.o
+TESTS += sync_fence.o
 
 sync_test: $(SRC) $(TESTS)
 
diff --git a/tools/testing/selftests/sync/sync_fence.c 
b/tools/testing/selftests/sync/sync_fence.c
new file mode 100644
index 0000000..13f1752
--- /dev/null
+++ b/tools/testing/selftests/sync/sync_fence.c
@@ -0,0 +1,132 @@
+/*
+ *  sync fence tests with one timeline
+ *  Copyright 2015-2016 Collabora Ltd.
+ *
+ *  Based on the implementation from the Android Open Source Project,
+ *
+ *  Copyright 2012 Google, Inc
+ *
+ *  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 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.
+ */
+
+#include "sync.h"
+#include "sw_sync.h"
+#include "synctest.h"
+
+int test_fence_one_timeline_wait(void)
+{
+       int fence, valid, ret;
+       int timeline = sw_sync_timeline_create();
+
+       valid = sw_sync_timeline_is_valid(timeline);
+       ASSERT(valid, "Failure allocating timeline\n");
+
+       fence = sw_sync_fence_create(timeline, "allocFence", 5);
+       valid = sw_sync_fence_is_valid(fence);
+       ASSERT(valid, "Failure allocating fence\n");
+
+       /* Wait on fence until timeout */
+       ret = sync_wait(fence, 0);
+       ASSERT(ret == 0, "Failure waiting on fence until timeout\n");
+
+       /* Advance timeline from 0 -> 1 */
+       ret = sw_sync_timeline_inc(timeline, 1);
+       ASSERT(ret == 0, "Failure advancing timeline\n");
+
+       /* Wait on fence until timeout */
+       ret = sync_wait(fence, 0);
+       ASSERT(ret == 0, "Failure waiting on fence until timeout\n");
+
+       /* Signal the fence */
+       ret = sw_sync_timeline_inc(timeline, 4);
+       ASSERT(ret == 0, "Failure signaling the fence\n");
+
+       /* Wait successfully */
+       ret = sync_wait(fence, 0);
+       ASSERT(ret > 0, "Failure waiting on fence\n");
+
+       /* Go even further, and confirm wait still succeeds */
+       ret = sw_sync_timeline_inc(timeline, 10);
+       ASSERT(ret == 0, "Failure going further\n");
+       ret = sync_wait(fence, 0);
+       ASSERT(ret > 0, "Failure waiting ahead\n");
+
+       sw_sync_fence_destroy(fence);
+       sw_sync_timeline_destroy(timeline);
+
+       return 0;
+}
+
+int test_fence_one_timeline_merge(void)
+{
+       int a, b, c, d, valid;
+       int timeline = sw_sync_timeline_create();
+
+       /* create fence a,b,c and then merge them all into fence d */
+       a = sw_sync_fence_create(timeline, "allocFence", 1);
+       b = sw_sync_fence_create(timeline, "allocFence", 2);
+       c = sw_sync_fence_create(timeline, "allocFence", 3);
+
+       valid = sw_sync_fence_is_valid(a) &&
+               sw_sync_fence_is_valid(b) &&
+               sw_sync_fence_is_valid(c);
+       ASSERT(valid, "Failure allocating fences\n");
+
+       d = sync_merge("mergeFence", b, a);
+       d = sync_merge("mergeFence", c, d);
+       valid = sw_sync_fence_is_valid(d);
+       ASSERT(valid, "Failure merging fences\n");
+
+       /* confirm all fences have one active point (even d) */
+       ASSERT(sync_fence_count_with_status(a, FENCE_STATUS_ACTIVE) == 1,
+              "a has too many active fences!\n");
+       ASSERT(sync_fence_count_with_status(a, FENCE_STATUS_ACTIVE) == 1,
+              "b has too many active fences!\n");
+       ASSERT(sync_fence_count_with_status(a, FENCE_STATUS_ACTIVE) == 1,
+              "c has too many active fences!\n");
+       ASSERT(sync_fence_count_with_status(a, FENCE_STATUS_ACTIVE) == 1,
+              "d has too many active fences!\n");
+
+       /* confirm that d is not signaled until the max of a,b,c */
+       sw_sync_timeline_inc(timeline, 1);
+       ASSERT(sync_fence_count_with_status(a, FENCE_STATUS_SIGNALED) == 1,
+              "a did not signal!\n");
+       ASSERT(sync_fence_count_with_status(d, FENCE_STATUS_ACTIVE) == 1,
+              "d signaled too early!\n");
+
+       sw_sync_timeline_inc(timeline, 1);
+       ASSERT(sync_fence_count_with_status(b, FENCE_STATUS_SIGNALED) == 1,
+              "b did not signal!\n");
+       ASSERT(sync_fence_count_with_status(d, FENCE_STATUS_ACTIVE) == 1,
+              "d signaled too early!\n");
+
+       sw_sync_timeline_inc(timeline, 1);
+       ASSERT(sync_fence_count_with_status(c, FENCE_STATUS_SIGNALED) == 1,
+              "c did not signal!\n");
+       ASSERT(sync_fence_count_with_status(d, FENCE_STATUS_ACTIVE) == 0 &&
+              sync_fence_count_with_status(d, FENCE_STATUS_SIGNALED) == 1,
+              "d did not signal!\n");
+
+       sw_sync_fence_destroy(d);
+       sw_sync_fence_destroy(c);
+       sw_sync_fence_destroy(b);
+       sw_sync_fence_destroy(a);
+       sw_sync_timeline_destroy(timeline);
+       return 0;
+}
diff --git a/tools/testing/selftests/sync/sync_test.c 
b/tools/testing/selftests/sync/sync_test.c
index e471ba9..b442292b 100644
--- a/tools/testing/selftests/sync/sync_test.c
+++ b/tools/testing/selftests/sync/sync_test.c
@@ -62,6 +62,9 @@ int main(void)
        err += RUN_TEST(test_alloc_fence);
        err += RUN_TEST(test_alloc_fence_negative);
 
+       err += RUN_TEST(test_fence_one_timeline_wait);
+       err += RUN_TEST(test_fence_one_timeline_merge);
+
        if (err)
                printf("[FAIL]\tsync errors: %d\n", err);
        else
diff --git a/tools/testing/selftests/sync/synctest.h 
b/tools/testing/selftests/sync/synctest.h
index 7d2d8ce..6505c28 100644
--- a/tools/testing/selftests/sync/synctest.h
+++ b/tools/testing/selftests/sync/synctest.h
@@ -44,4 +44,8 @@ int test_alloc_timeline(void);
 int test_alloc_fence(void);
 int test_alloc_fence_negative(void);
 
+/* Fence tests with one timeline */
+int test_fence_one_timeline_wait(void);
+int test_fence_one_timeline_merge(void);
+
 #endif
-- 
2.9.3

Reply via email to