[PATCH i-g-t v9 00/21] Implement sw_sync test

[PATCH i-g-t v9 00/21] Implement sw_sync test

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This series implements the sw_sync test and the lib/sw_sync helper functions
for said test.

The sw_sync subtests range from very basic tests of the sw_sync functionality,
to stress testing and randomized tests.


Changes since v1:
Added "Reviewed-by: Eric Engestrom <eric@engestrom.ch>" tag

  lib/sw_sync:
  - Fixed fd value checking
  - Fixed fd validity check in sw_sync_fd_close()
  - Moved sw_sync related paths to define
  - Switched from malloc+memset to calloc in sync_file_info()
  - Switched sizeof to dereferenced ptr

  tests/sw_sync:
  - Moved lib/sw_sync related code to lib/sw_sync commit
  - Replaced memset with assignment in loop


Changes since v2:

  lib/sw_sync:
  - Replaced fd validity check in sw_sync_timeline_create()
  - Replace sw_sync_XXX_destroy() functions with close()
  - Simplified sw_sync_timeline_inc() comparison
  - Changed sw_sync_merge() return value to -errno
  - Changed name of sw_sync_fence_size() to sw_sync_fence_count()
  - Reworked implementation of sw_sync_fence_count()
  - Reworked implementation of sw_sync_fence_count_status()

  tests/sw_sync:
  - Replace sw_sync_XXX_destroy() functions with close()


Changes since v3:

  lib/sw_sync:
  - Changed sw_sync_fence_create() to take uint32_t seqno
  - Added raw __sw_sync_fence_create() and failure check sw_sync_fence_create()

  tests/sw_sync:
  - Switch to using __sw_sync_fence_create() for failure cases


Changes since v4:

  lib/sw_sync:
  - Fixed whitespace in sw_sync_fence_count()
  - Fixed whitespace and style of sw_sync_wait()
  - Fixed whitespace in __sw_sync_fence_count_status()


Changes since v5:

  lib/sw_sync:
  - Added kernel_has_sw_sync()
  - Added igt_require_sw_sync()
  - Split out __sw_sync_merge() from sw_sync_merge()
  - Added igt_debugfs.h include
  - Change sw_sync_wait to reflect android implementation
  - Renamed some functions:
   - sw_sync_merge -> sync_merge
   - sw_sync_wait -> sync_wait
   - sw_sync_fence_count -> sync_fence_count
   - sw_sync_fence_count_status -> sync_fence_count_status
   - __sw_sync_fence_count_status -> __sync_fence_count_status

  tests/sw_sync:
  - Added subtest test_sync_expired_merge
  - Added subtest test_timeline_closed
  - Added subtest test_timeline_closed_signaled
  - Added subtest test_sync_merge_invalid
  - Added subtest test_sync_busy_fork
  - Added subtest test_sync_busy_unixsockets
  - Skip test on no sw_sync support
  - Reworked comments of test_sync_wait
  - Renamed test_sync_wait -> test_sync_busy
  - Improved test_sync_wait igt_assert_f messages


Changes since v6:

  tests/sw_sync:
  - Added igt_assert to test_sync_expired_merge
  - Added prime increments to test_sync_busy


Changes since v7:

  - Removed accidental inclusions


Changes since v8:

  - Removed some more accidental inclusions

  lib/sw_sync:
    - Moved some changes into the lib/sw_sync commit

Rafael Antognolli (1):
  tests/sw_sync: Add subtest test_sync_expired_merge

Robert Foss (20):
  lib/sw_sync: Add helper functions for managing synchronization
    primitives
  test/sw_sync: Add sw_sync test
  tests/sw_sync: Add subtest test_alloc_fence
  tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline
  tests/sw_sync: Add subtest test_alloc_merge_fence
  tests/sw_sync: Add subtest test_sync_busy
  tests/sw_sync: Add subtest test_sync_merge
  tests/sw_sync: Add subtest test_sync_merge_same
  tests/sw_sync: Add subtest test_sync_multi_consumer
  tests/sw_sync: Add subtest test_sync_multi_consumer_producer
  tests/sw_sync: Add subtest test_sync_random_merge
  tests/sw_sync: Add subtest test_sync_multi_timeline_wait
  tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer
  tests/sw_sync: Add subtest test_timeline_closed
  tests/sw_sync: Add subtest test_timeline_closed_signaled
  lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync
    support
  tests/sw_sync: Add igt_require check for sw_sync feature
  tests/sw_sync: Add subtest test_sync_merge_invalid
  tests/sw_sync: Add subtest test_sync_busy_fork
  tests/sw_sync: Add subtest test_sync_busy_unixsocket

 lib/Makefile.sources   |   2 +
 lib/sw_sync.c          | 222 ++++++++++++
 lib/sw_sync.h          |  49 +++
 tests/Makefile.sources |   1 +
 tests/sw_sync.c        | 961 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 1235 insertions(+)
 create mode 100644 lib/sw_sync.c
 create mode 100644 lib/sw_sync.h
 create mode 100644 tests/sw_sync.c

-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Base functions to help testing the Sync File Framework (explicit fencing
mechanism ported from Android).
These functions allow you to create, use and destroy timelines and fences.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 lib/Makefile.sources |   2 +
 lib/sw_sync.c        | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/sw_sync.h        |  48 +++++++++++++
 3 files changed, 249 insertions(+)
 create mode 100644 lib/sw_sync.c
 create mode 100644 lib/sw_sync.h

diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index e8e277b..7aaf42f 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -63,6 +63,8 @@ lib_source_list =	 	\
 	rendercopy_gen8.c	\
 	rendercopy_gen9.c	\
 	rendercopy.h		\
+	sw_sync.c		\
+	sw_sync.h		\
 	intel_reg_map.c		\
 	intel_iosf.c		\
 	igt_kms.c		\
diff --git a/lib/sw_sync.c b/lib/sw_sync.c
new file mode 100644
index 0000000..862f8c4
--- /dev/null
+++ b/lib/sw_sync.c
@@ -0,0 +1,199 @@
+/*
+ * 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@collabora.com>
+ */
+
+#ifndef ANDROID
+#define _GNU_SOURCE
+#else
+#include <libgen.h>
+#endif
+#include <fcntl.h>
+#include <poll.h>
+#include <stdint.h>
+#include <linux/sync_file.h>
+#include <sys/ioctl.h>
+
+#include "sw_sync.h"
+#include "drmtest.h"
+#include "ioctl_wrappers.h"
+
+#ifndef SW_SYNC_IOC_INC
+struct sw_sync_create_fence_data {
+	__u32	value;
+	char	name[32];
+	__s32	fence;
+};
+
+#define SW_SYNC_IOC_MAGIC		'W'
+#define SW_SYNC_IOC_CREATE_FENCE	_IOWR(SW_SYNC_IOC_MAGIC, 0,\
+						struct sw_sync_create_fence_data)
+#define SW_SYNC_IOC_INC			_IOW(SW_SYNC_IOC_MAGIC, 1, __u32)
+#endif
+
+#define DEVFS_SW_SYNC   "/dev/sw_sync"
+#define DEBUGFS_SW_SYNC "/sys/kernel/debug/sync/sw_sync"
+
+
+int sw_sync_fd_is_valid(int fd)
+{
+	int status;
+
+	if (fd < 0)
+		return 0;
+
+	status = fcntl(fd, F_GETFD, 0);
+	return status >= 0;
+}
+
+int sw_sync_timeline_create(void)
+{
+	int fd = open(DEVFS_SW_SYNC, O_RDWR);
+
+	if (fd < 0)
+		fd = open(DEBUGFS_SW_SYNC, O_RDWR);
+
+	igt_assert(sw_sync_fd_is_valid(fd));
+
+	return fd;
+}
+
+int __sw_sync_fence_create(int fd, uint32_t seqno)
+{
+
+	struct sw_sync_create_fence_data data;
+
+	memset(&data, 0, sizeof(data));
+	data.value = seqno;
+
+	if (igt_ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data))
+		return -errno;
+
+	return data.fence;
+}
+
+int sw_sync_fence_create(int fd, uint32_t seqno)
+{
+	int fence = __sw_sync_fence_create(fd, seqno);
+	igt_assert(fence >= 0);
+	return fence;
+}
+
+void sw_sync_timeline_inc(int fd, uint32_t count)
+{
+	uint32_t arg = count;
+
+	do_ioctl(fd, SW_SYNC_IOC_INC, &arg);
+}
+
+int sync_merge(int fd1, int fd2)
+{
+	struct sync_merge_data data = {};
+	int err;
+
+	data.fd2 = fd2;
+
+	err = ioctl(fd1, SYNC_IOC_MERGE, &data);
+	if (err < 0)
+		return -errno;
+
+	sw_sync_fd_is_valid(data.fence);
+
+	return data.fence;
+}
+
+int sync_wait(int fd, int timeout)
+{
+	struct pollfd fds = {0};
+	int ret;
+
+	fds.fd = fd;
+	fds.events = POLLIN;
+
+	do {
+		 ret = poll(&fds, 1, timeout);
+		 if (ret > 0) {
+			  if (fds.revents & (POLLERR | POLLNVAL)) {
+				   errno = EINVAL;
+				   return -1;
+			  }
+			  return 0;
+		 } else if (ret == 0) {
+			  errno = ETIME;
+			  return -1;
+		 }
+	} while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+
+	return ret;
+}
+
+int sync_fence_count(int fd)
+{
+	struct sync_file_info info;
+
+	memset(&info, 0, sizeof(info));
+	if (ioctl(fd, SYNC_IOC_FILE_INFO, &info))
+		return -errno;
+
+	return info.num_fences;
+}
+
+static int __sync_fence_count_status(int fd, int status)
+{
+	struct sync_file_info info;
+	struct sync_fence_info *fence_info;
+	int count;
+	int i;
+
+	memset(&info, 0, sizeof(info));
+	if (ioctl(fd, SYNC_IOC_FILE_INFO, &info))
+		return -errno;
+
+	fence_info = calloc(info.num_fences, sizeof(*fence_info));
+	if (!fence_info)
+		return -ENOMEM;
+
+	info.sync_fence_info = (uintptr_t)fence_info;
+	if (ioctl(fd, SYNC_IOC_FILE_INFO, &info)) {
+		count = -errno;
+	} else {
+		count = 0;
+		for (i = 0 ; i < info.num_fences ; i++)
+			count += fence_info[i].status == status;
+	}
+
+	free(fence_info);
+
+	return count;
+}
+
+int sync_fence_count_status(int fd, int status)
+{
+	int count = __sync_fence_count_status(fd, status);
+	igt_assert(count >= 0);
+	return count;
+}
diff --git a/lib/sw_sync.h b/lib/sw_sync.h
new file mode 100644
index 0000000..1f47b29
--- /dev/null
+++ b/lib/sw_sync.h
@@ -0,0 +1,48 @@
+/*
+ * 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@collabora.com>
+ */
+
+#ifndef SW_SYNC_H
+#define SW_SYNC_H
+
+#define SW_SYNC_FENCE_STATUS_ERROR		(-1)
+#define SW_SYNC_FENCE_STATUS_ACTIVE		(0)
+#define SW_SYNC_FENCE_STATUS_SIGNALED	(1)
+
+int sw_sync_fd_is_valid(int fd);
+int sw_sync_timeline_create(void);
+int __sw_sync_fence_create(int fd, uint32_t seqno);
+int sw_sync_fence_create(int fd, uint32_t seqno);
+void sw_sync_timeline_inc(int fd, uint32_t count);
+int sync_merge(int fd1, int fd2);
+int sync_wait(int fence, int timeout);
+int sync_fence_count(int fd);
+int sync_fence_count_status(int fd, int status);
+
+#endif
+
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 02/21] test/sw_sync: Add sw_sync test

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add initial tests for sw_sync.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/Makefile.sources |  1 +
 tests/sw_sync.c        | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 tests/sw_sync.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 65e0792..8848094 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -131,6 +131,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..7d27234
--- /dev/null
+++ b/tests/sw_sync.c
@@ -0,0 +1,54 @@
+/*
+ * 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@collabora.com>
+ */
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include "igt.h"
+#include "igt_aux.h"
+
+#include "sw_sync.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
+{
+	igt_subtest("alloc_timeline")
+		test_alloc_timeline();
+}
+
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 03/21] tests/sw_sync: Add subtest test_alloc_fence

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest alloc_fence that verifies that it's possible to allocate a fence
on a timeline.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 7d27234..8e7764a 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -46,9 +46,25 @@ static void test_alloc_timeline(void)
 	close(timeline);
 }
 
+static void test_alloc_fence(void)
+{
+	int in_fence;
+	int timeline;
+
+	timeline = sw_sync_timeline_create();
+	in_fence = sw_sync_fence_create(timeline, 0);
+
+	close(in_fence);
+	close(timeline);
+}
+
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
 		test_alloc_timeline();
+
+	igt_subtest("alloc_fence")
+		test_alloc_fence();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtests tests that creating fences on negative timelines fail.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 8e7764a..f9d4fe9 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -58,6 +58,10 @@ static void test_alloc_fence(void)
 	close(timeline);
 }
 
+static void test_alloc_fence_invalid_timeline(void)
+{
+	igt_assert(__sw_sync_fence_create(-1, 0) < 0);
+}
 
 igt_main
 {
@@ -66,5 +70,8 @@ igt_main
 
 	igt_subtest("alloc_fence")
 		test_alloc_fence();
+
+	igt_subtest("alloc_fence_invalid_timeline")
+		test_alloc_fence_invalid_timeline();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that merging two fences works in the simples possible
case.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index f9d4fe9..03bc0b3 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -63,6 +63,26 @@ static void test_alloc_fence_invalid_timeline(void)
 	igt_assert(__sw_sync_fence_create(-1, 0) < 0);
 }
 
+static void test_alloc_merge_fence(void)
+{
+	int in_fence[2];
+	int fence_merge;
+	int timeline[2];
+
+	timeline[0] = sw_sync_timeline_create();
+	timeline[1] = sw_sync_timeline_create();
+
+	in_fence[0] = sw_sync_fence_create(timeline[0], 1);
+	in_fence[1] = sw_sync_fence_create(timeline[1], 1);
+	fence_merge = sync_merge(in_fence[1], in_fence[0]);
+
+	close(in_fence[0]);
+	close(in_fence[1]);
+	close(fence_merge);
+	close(timeline[0]);
+	close(timeline[1]);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -73,5 +93,8 @@ igt_main
 
 	igt_subtest("alloc_fence_invalid_timeline")
 		test_alloc_fence_invalid_timeline();
+
+	igt_subtest("alloc_merge_fence")
+		test_alloc_merge_fence();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 06/21] tests/sw_sync: Add subtest test_sync_busy

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that waiting on fences works properly.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 03bc0b3..b962e82 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -32,6 +32,7 @@
 
 #include "igt.h"
 #include "igt_aux.h"
+#include "igt_primes.h"
 
 #include "sw_sync.h"
 
@@ -83,6 +84,53 @@ static void test_alloc_merge_fence(void)
 	close(timeline[1]);
 }
 
+static void test_sync_busy(void)
+{
+	int fence, ret;
+	int timeline;
+	int seqno;
+
+	timeline = sw_sync_timeline_create();
+	fence = sw_sync_fence_create(timeline, 5);
+
+	/* 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");
+
+	/* 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");
+
+	/* 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");
+
+	/* 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");
+
+	seqno = 10;
+	for_each_prime_number(prime, 100) {
+		int fence_prime;
+		seqno += prime;
+
+		fence_prime = sw_sync_fence_create(timeline, seqno);
+		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");
+		close(fence_prime);
+	}
+
+	close(fence);
+	close(timeline);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -96,5 +144,8 @@ igt_main
 
 	igt_subtest("alloc_merge_fence")
 		test_alloc_merge_fence();
+
+	igt_subtest("sync_busy")
+		test_sync_busy();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 07/21] tests/sw_sync: Add subtest test_sync_merge

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest test_sync_merge that tests merging fences and the validity of the
resulting merged fence.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index b962e82..96dcbff 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -131,6 +131,70 @@ static void test_sync_busy(void)
 	close(timeline);
 }
 
+static void test_sync_merge(void)
+{
+	int in_fence[3];
+	int fence_merge;
+	int timeline;
+	int active, signaled;
+
+	timeline = sw_sync_timeline_create();
+	in_fence[0] = sw_sync_fence_create(timeline, 1);
+	in_fence[1] = sw_sync_fence_create(timeline, 2);
+	in_fence[2] = sw_sync_fence_create(timeline, 3);
+
+	fence_merge = sync_merge(in_fence[0], in_fence[1]);
+	fence_merge = sync_merge(in_fence[2], fence_merge);
+
+	/* confirm all fences have one active point (even d) */
+	active = sync_fence_count_status(in_fence[0],
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 1, "in_fence[0] has too many active fences\n");
+	active = sync_fence_count_status(in_fence[1],
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 1, "in_fence[1] has too many active fences\n");
+	active = sync_fence_count_status(in_fence[2],
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 1, "in_fence[2] has too many active fences\n");
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 1, "fence_merge has too many active fences\n");
+
+	/* confirm that fence_merge is not signaled until the max of fence 0,1,2 */
+	sw_sync_timeline_inc(timeline, 1);
+	signaled = sync_fence_count_status(in_fence[0],
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(signaled == 1, "in_fence[0] did not signal\n");
+	igt_assert_f(active == 1, "fence_merge signaled too early\n");
+
+	sw_sync_timeline_inc(timeline, 1);
+	signaled = sync_fence_count_status(in_fence[1],
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(signaled == 1, "in_fence[1] did not signal\n");
+	igt_assert_f(active == 1, "fence_merge signaled too early\n");
+
+	sw_sync_timeline_inc(timeline, 1);
+	signaled = sync_fence_count_status(in_fence[2],
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(signaled == 1, "in_fence[2] did not signal\n");
+	signaled = sync_fence_count_status(fence_merge,
+					       SW_SYNC_FENCE_STATUS_SIGNALED);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 0 && signaled == 1,
+		     "fence_merge did not signal\n");
+
+	close(in_fence[0]);
+	close(in_fence[1]);
+	close(in_fence[2]);
+	close(fence_merge);
+	close(timeline);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -147,5 +211,8 @@ igt_main
 
 	igt_subtest("sync_busy")
 		test_sync_busy();
+
+	igt_subtest("sync_merge")
+		test_sync_merge();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 08/21] tests/sw_sync: Add subtest test_sync_merge_same

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies merging a fence with itself does not fail.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 96dcbff..ada1243 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -195,6 +195,30 @@ static void test_sync_merge(void)
 	close(timeline);
 }
 
+static void test_sync_merge_same(void)
+{
+	int in_fence[2];
+	int timeline;
+	int signaled;
+
+	timeline = sw_sync_timeline_create();
+	in_fence[0] = sw_sync_fence_create(timeline, 1);
+	in_fence[1] = sync_merge(in_fence[0], in_fence[0]);
+
+	signaled = sync_fence_count_status(in_fence[0],
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(signaled == 0, "fence signaled too early\n");
+
+	sw_sync_timeline_inc(timeline, 1);
+	signaled = sync_fence_count_status(in_fence[0],
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(signaled == 1, "fence did not signal\n");
+
+	close(in_fence[0]);
+	close(in_fence[1]);
+	close(timeline);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -214,5 +238,8 @@ igt_main
 
 	igt_subtest("sync_merge")
 		test_sync_merge();
+
+	igt_subtest("sync_merge_same")
+		test_sync_merge_same();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer

[robert.foss]

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 ada1243..cd0c588 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 <unistd.h>
 
@@ -39,6 +41,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;
@@ -219,6 +230,95 @@ static void test_sync_merge_same(void)
 	close(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 = sync_wait(fence, 1000);
+		if (ret == -1)
+		{
+			return (void *) 1;
+		}
+
+		if (*(data->counter) != next_point)
+		{
+			return (void *) 1;
+		}
+
+		sem_post(data->sem);
+		close(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;
+	}
+
+	close(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")
@@ -241,5 +341,8 @@ igt_main
 
 	igt_subtest("sync_merge_same")
 		test_sync_merge_same();
+
+	igt_subtest("sync_multi_consumer")
+		test_sync_multi_consumer();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

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 <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index cd0c588..11373bb 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -319,6 +319,86 @@ static void test_sync_multi_consumer(void)
 	igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
 }
 
+static void * test_sync_multi_consumer_producer_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 = 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)
+{
+	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];
+	int timeline;
+	volatile uint32_t counter = 0;
+	uintptr_t thread_ret = 0;
+	data_t data;
+	int i, ret;
+
+	timeline = sw_sync_timeline_create();
+
+	data.nbr_iterations = nbr_iterations;
+	data.nbr_threads = nbr_threads;
+	data.counter = &counter;
+	data.timeline = timeline;
+
+	/* Start consumer 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_producer_thread,
+				     (void *) &(data_arr[i]));
+		igt_assert_eq(ret, 0);
+	}
+
+	/* 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;
+	}
+
+	close(timeline);
+
+	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")
@@ -344,5 +424,8 @@ igt_main
 
 	igt_subtest("sync_multi_consumer")
 		test_sync_multi_consumer();
+
+	igt_subtest("sync_multi_consumer_producer")
+		test_sync_multi_consumer_producer();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 11/21] tests/sw_sync: Add subtest test_sync_random_merge

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that creating many timelines and merging random fences
from each timeline with eachother results in merged fences that are fully
functional.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 11373bb..09c7ab8 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -399,6 +399,76 @@ static void test_sync_multi_consumer_producer(void)
 	igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
 }
 
+static void test_sync_random_merge(void)
+{
+	int i, size, ret;
+	const int nbr_timeline = 32;
+	const int nbr_merge = 1024;
+	int fence_map[nbr_timeline];
+	int timeline_arr[nbr_timeline];
+	int fence, tmpfence, merged;
+	int timeline, timeline_offset, sync_pt;
+
+	srand(time(NULL));
+
+	for (i = 0; i < nbr_timeline; i++) {
+		timeline_arr[i] = sw_sync_timeline_create();
+		fence_map[i] = -1;
+	}
+
+	sync_pt = rand();
+	fence = sw_sync_fence_create(timeline_arr[0], sync_pt);
+
+	fence_map[0] = sync_pt;
+
+	/* Randomly create syncpoints out of a fixed set of timelines,
+	 * and merge them together.
+	 */
+	for (i = 0; i < nbr_merge; i++) {
+		/* Generate syncpoint. */
+		timeline_offset = rand() % nbr_timeline;
+		timeline = timeline_arr[timeline_offset];
+		sync_pt = rand();
+
+		/* Keep track of the latest sync_pt in each timeline. */
+		if (fence_map[timeline_offset] == -1)
+			fence_map[timeline_offset] = sync_pt;
+		else if (fence_map[timeline_offset] < sync_pt)
+			fence_map[timeline_offset] = sync_pt;
+
+		/* Merge. */
+		tmpfence = sw_sync_fence_create(timeline, sync_pt);
+		merged = sync_merge(tmpfence, fence);
+		close(tmpfence);
+		close(fence);
+		fence = merged;
+	}
+
+	size = 0;
+	for (i = 0; i < nbr_timeline; i++)
+		if (fence_map[i] != -1)
+			size++;
+
+	/* Trigger the merged fence. */
+	for (i = 0; i < nbr_timeline; i++) {
+		if (fence_map[i] != -1) {
+			ret = sync_wait(fence, 0);
+			igt_assert_f(ret == -1 && errno == ETIME,
+				    "Failure waiting on fence until timeout\n");
+			/* Increment the timeline to the last sync_pt */
+			sw_sync_timeline_inc(timeline_arr[i], fence_map[i]);
+		}
+	}
+
+	/* Check that the fence is triggered. */
+	ret = sync_wait(fence, 0);
+	igt_assert_f(ret == 0, "Failure triggering fence\n");
+
+	close(fence);
+	for (i = 0; i < nbr_timeline; i++)
+		close(timeline_arr[i]);
+}
+
 igt_main
 {
 	igt_subtest("alloc_timeline")
@@ -427,5 +497,8 @@ igt_main
 
 	igt_subtest("sync_multi_consumer_producer")
 		test_sync_multi_consumer_producer();
+
+	igt_subtest("sync_random_merge")
+		test_sync_random_merge();
 }
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that waiting, timing out on a wait and that counting
fences in various states works.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 09c7ab8..13b2005 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -230,6 +230,69 @@ static void test_sync_merge_same(void)
 	close(timeline);
 }
 
+static void test_sync_multi_timeline_wait(void)
+{
+	int timeline[3];
+	int in_fence[3];
+	int fence_merge;
+	int active, signaled, ret;
+
+	timeline[0] = sw_sync_timeline_create();
+	timeline[1] = sw_sync_timeline_create();
+	timeline[2] = sw_sync_timeline_create();
+
+	in_fence[0] = sw_sync_fence_create(timeline[0], 5);
+	in_fence[1] = sw_sync_fence_create(timeline[1], 5);
+	in_fence[2] = sw_sync_fence_create(timeline[2], 5);
+
+	fence_merge = sync_merge(in_fence[0], in_fence[1]);
+	fence_merge = sync_merge(in_fence[2], fence_merge);
+
+	/* Confirm fence isn't signaled */
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	igt_assert_f(active == 3, "Fence signaled too early\n");
+
+	ret = sync_wait(fence_merge, 0);
+	igt_assert_f(ret == -1 && errno == ETIME, "Failure waiting on fence until timeout\n");
+
+	sw_sync_timeline_inc(timeline[0], 5);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	signaled = sync_fence_count_status(fence_merge,
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(active == 2 && signaled == 1,
+		    "Fence did not signal properly\n");
+
+	sw_sync_timeline_inc(timeline[1], 5);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	signaled = sync_fence_count_status(fence_merge,
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(active == 1 && signaled == 2,
+		    "Fence did not signal properly\n");
+
+	sw_sync_timeline_inc(timeline[2], 5);
+	active = sync_fence_count_status(fence_merge,
+					    SW_SYNC_FENCE_STATUS_ACTIVE);
+	signaled = sync_fence_count_status(fence_merge,
+					      SW_SYNC_FENCE_STATUS_SIGNALED);
+	igt_assert_f(active == 0 && signaled == 3,
+		     "Fence did not signal properly\n");
+
+	/* confirm you can successfully wait */
+	ret = sync_wait(fence_merge, 100);
+	igt_assert_f(ret == 0, "Failure waiting on signaled fence\n");
+
+	close(in_fence[0]);
+	close(in_fence[1]);
+	close(in_fence[2]);
+	close(fence_merge);
+	close(timeline[0]);
+	close(timeline[1]);
+	close(timeline[2]);
+}
+
 static void * test_sync_multi_consumer_thread(void *arg)
 {
 	data_t *data = arg;
@@ -492,6 +555,9 @@ igt_main
 	igt_subtest("sync_merge_same")
 		test_sync_merge_same();
 
+	igt_subtest("sync_multi_timeline_wait")
+		test_sync_multi_timeline_wait();
+
 	igt_subtest("sync_multi_consumer")
 		test_sync_multi_consumer();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest runs a single consumer thread and multiple producer thread that
are synchronized using multiple timelines.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---
 tests/sw_sync.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 13b2005..265e446 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -462,6 +462,142 @@ static void test_sync_multi_consumer_producer(void)
 	igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");
 }
 
+static int test_mspc_wait_on_fence(int fence)
+{
+	int error, active;
+
+	do {
+		error = sync_fence_count_status(fence,
+						   SW_SYNC_FENCE_STATUS_ERROR);
+		igt_assert_f(error == 0, "Error occurred on fence\n");
+		active = sync_fence_count_status(fence,
+						    SW_SYNC_FENCE_STATUS_ACTIVE);
+	} while (active);
+
+	return 0;
+}
+
+static struct {
+	int iterations;
+	int threads;
+	int counter;
+	int cons_timeline;
+	int *prod_timeline;
+	pthread_mutex_t lock;
+} test_mpsc_data;
+
+static int mpsc_producer_thread(void *d)
+{
+	int id = (long)d;
+	int fence, i;
+	int *prod_timeline = test_mpsc_data.prod_timeline;
+	int cons_timeline = test_mpsc_data.cons_timeline;
+	int iterations = test_mpsc_data.iterations;
+
+	for (i = 0; i < iterations; i++) {
+		fence = sw_sync_fence_create(cons_timeline, i);
+
+		/* Wait for the consumer to finish. Use alternate
+		 * means of waiting on the fence
+		 */
+		if ((iterations + id) % 8 != 0) {
+			igt_assert_f(sync_wait(fence, -1) == 0,
+				     "Failure waiting on fence\n");
+		} else {
+			igt_assert_f(test_mspc_wait_on_fence(fence) == 0,
+				     "Failure waiting on fence\n");
+		}
+
+		/* Every producer increments the counter, the consumer
+		 * checks and erases it
+		 */
+		pthread_mutex_lock(&test_mpsc_data.lock);
+		test_mpsc_data.counter++;
+		pthread_mutex_unlock(&test_mpsc_data.lock);
+
+		sw_sync_timeline_inc(prod_timeline[id], 1);
+		close(fence);
+	}
+
+	return 0;
+}
+
+static int mpsc_consumer_thread(void)
+{
+	int fence, merged, tmp, it, i;
+	int *prod_timeline = test_mpsc_data.prod_timeline;
+	int cons_timeline = test_mpsc_data.cons_timeline;
+	int iterations = test_mpsc_data.iterations;
+	int n = test_mpsc_data.threads;
+
+	for (it = 1; it <= iterations; it++) {
+		fence = sw_sync_fence_create(prod_timeline[0], it);
+		for (i = 1; i < n; i++) {
+			tmp = sw_sync_fence_create(prod_timeline[i], it);
+			merged = sync_merge(tmp, fence);
+			close(tmp);
+			close(fence);
+			fence = merged;
+		}
+
+		/* Make sure we see an increment from every producer thread.
+		 * Vary the means by which we wait.
+		 */
+		if (iterations % 8 != 0) {
+			igt_assert_f(sync_wait(fence, -1) == 0,
+				    "Producers did not increment as expected\n");
+		} else {
+			igt_assert_f(test_mspc_wait_on_fence(fence) == 0,
+				     "Failure waiting on fence\n");
+		}
+
+		igt_assert_f(test_mpsc_data.counter == n * it,
+			     "Counter value mismatch\n");
+
+		/* Release the producer threads */
+		sw_sync_timeline_inc(cons_timeline, 1);
+		close(fence);
+	}
+
+	return 0;
+}
+
+/* IMPORTANT NOTE: if you see this test failing on your system, it may be
+ * due to a shortage of file descriptors. Please ensure your system has
+ * a sensible limit for this test to finish correctly.
+ */
+static void test_sync_multi_producer_single_consumer(void)
+{
+	int iterations = 1 << 12;
+	int n = 5;
+	int prod_timeline[n];
+	int cons_timeline;
+	pthread_t threads[n];
+	long i;
+
+	cons_timeline = sw_sync_timeline_create();
+	for (i = 0; i < n; i++)
+		prod_timeline[i] = sw_sync_timeline_create();
+
+	test_mpsc_data.prod_timeline = prod_timeline;
+	test_mpsc_data.cons_timeline = cons_timeline;
+	test_mpsc_data.iterations = iterations;
+	test_mpsc_data.threads = n;
+	test_mpsc_data.counter = 0;
+	pthread_mutex_init(&test_mpsc_data.lock, NULL);
+
+	for (i = 0; i < n; i++) {
+		pthread_create(&threads[i], NULL, (void * (*)(void *))
+			       mpsc_producer_thread,
+			       (void *)i);
+	}
+
+	mpsc_consumer_thread();
+
+	for (i = 0; i < n; i++)
+		pthread_join(threads[i], NULL);
+}
+
 static void test_sync_random_merge(void)
 {
 	int i, size, ret;
@@ -564,6 +700,9 @@ igt_main
 	igt_subtest("sync_multi_consumer_producer")
 		test_sync_multi_consumer_producer();
 
+	igt_subtest("sync_multi_producer_single_consumer")
+		test_sync_multi_producer_single_consumer();
+
 	igt_subtest("sync_random_merge")
 		test_sync_random_merge();
 }
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 14/21] tests/sw_sync: Add subtest test_sync_expired_merge

[robert.foss]

From: Rafael Antognolli <rafael.antognolli@intel.com>

This test creates an already expired fence, then creates a merged fence
out of that expired one (passed twice to the merge operation), and
finally closes the merged fence. It shows that if the refcounts are
wrong on the original expired fence, it might get freed while still in
use. Usually a kernel panick will follow.

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 265e446..b5ea692 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -598,6 +598,34 @@ static void test_sync_multi_producer_single_consumer(void)
 		pthread_join(threads[i], NULL);
 }
 
+static void test_sync_expired_merge(void)
+{
+	int iterations = 1 << 20;
+	int timeline;
+	int i;
+	int fence_expired, fence_merged;
+
+	timeline = sw_sync_timeline_create();
+
+	sw_sync_timeline_inc(timeline, 100);
+	fence_expired = sw_sync_fence_create(timeline, 1);
+	igt_assert_f(sync_wait(fence_expired, 0) == 0,
+	             "Failure waiting for expired fence\n");
+
+	fence_merged = sync_merge(fence_expired, fence_expired);
+	close(fence_merged);
+
+	for (i = 0; i < iterations; i++) {
+		int fence = sync_merge(fence_expired, fence_expired);
+
+		igt_assert_f(sync_wait(fence, -1) == 0,
+				     "Failure waiting on fence\n");
+		close(fence);
+	}
+
+	close(fence_expired);
+}
+
 static void test_sync_random_merge(void)
 {
 	int i, size, ret;
@@ -703,6 +731,9 @@ igt_main
 	igt_subtest("sync_multi_producer_single_consumer")
 		test_sync_multi_producer_single_consumer();
 
+	igt_subtest("sync_expired_merge")
+		test_sync_expired_merge();
+
 	igt_subtest("sync_random_merge")
 		test_sync_random_merge();
 }
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 15/21] tests/sw_sync: Add subtest test_timeline_closed

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

This subtest verifies that the fences of a timeline are not signalled when
a timelne is closed.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index b5ea692..1d2c921 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -75,6 +75,20 @@ static void test_alloc_fence_invalid_timeline(void)
 	igt_assert(__sw_sync_fence_create(-1, 0) < 0);
 }
 
+static void test_timeline_closed(void)
+{
+	int fence, ret;
+	int timeline;
+
+	timeline = sw_sync_timeline_create();
+	fence = sw_sync_fence_create(timeline, 1);
+
+	close(timeline);
+	ret = sync_wait(fence, 0);
+	igt_assert_f(ret == -1 && errno == ETIME,
+	             "Failure waiting on unsignaled fence on closed timeline\n");
+}
+
 static void test_alloc_merge_fence(void)
 {
 	int in_fence[2];
@@ -707,6 +721,9 @@ igt_main
 	igt_subtest("alloc_fence_invalid_timeline")
 		test_alloc_fence_invalid_timeline();
 
+	igt_subtest("timeline_closed")
+		test_timeline_closed();
+
 	igt_subtest("alloc_merge_fence")
 		test_alloc_merge_fence();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest test_timeline_closed_signaled that verifies that a signaled fence
stays signaled after its timeline has been closed.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 1d2c921..ef21af6 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -89,6 +89,21 @@ static void test_timeline_closed(void)
 	             "Failure waiting on unsignaled fence on closed timeline\n");
 }
 
+static void test_timeline_closed_signaled(void)
+{
+	int fence, ret;
+	int timeline;
+
+	timeline = sw_sync_timeline_create();
+	fence = sw_sync_fence_create(timeline, 1);
+
+	sw_sync_timeline_inc(timeline, 1);
+	close(timeline);
+	ret = sync_wait(fence, 0);
+	igt_assert_f(ret == 0,
+	             "Failure waiting on signaled fence for closed timeline\n");
+}
+
 static void test_alloc_merge_fence(void)
 {
 	int in_fence[2];
@@ -724,6 +739,9 @@ igt_main
 	igt_subtest("timeline_closed")
 		test_timeline_closed();
 
+	igt_subtest("timeline_closed_signaled")
+		test_timeline_closed_signaled();
+
 	igt_subtest("alloc_merge_fence")
 		test_alloc_merge_fence();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add igt_require_sw_sync to provide tests to skip if sw_sync support isn't
available on the host machine.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 lib/sw_sync.c | 22 ++++++++++++++++++++++
 lib/sw_sync.h |  1 +
 2 files changed, 23 insertions(+)

diff --git a/lib/sw_sync.c b/lib/sw_sync.c
index 862f8c4..38fe670 100644
--- a/lib/sw_sync.c
+++ b/lib/sw_sync.c
@@ -197,3 +197,25 @@ int sync_fence_count_status(int fd, int status)
 	igt_assert(count >= 0);
 	return count;
 }
+
+static bool kernel_has_sw_sync(void)
+{
+	bool err;
+
+	igt_ignore_warn(system("/sbin/modprobe -s r sw_sync"));
+
+	err = false;
+	if (access(DEVFS_SW_SYNC, R_OK | W_OK) < 0) {
+		char buf[128];
+
+		snprintf(buf, sizeof(buf), "%s/sw_sync", igt_debugfs_mount());
+		err = access(DEBUGFS_SW_SYNC, R_OK | W_OK) < 0;
+	}
+
+	return !err;
+}
+
+void igt_require_sw_sync(void)
+{
+	igt_require(kernel_has_sw_sync());
+}
diff --git a/lib/sw_sync.h b/lib/sw_sync.h
index 1f47b29..0bbe73c 100644
--- a/lib/sw_sync.h
+++ b/lib/sw_sync.h
@@ -43,6 +43,7 @@ int sync_merge(int fd1, int fd2);
 int sync_wait(int fence, int timeout);
 int sync_fence_count(int fd);
 int sync_fence_count_status(int fd, int status);
+void igt_require_sw_sync(void);
 
 #endif
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 18/21] tests/sw_sync: Add igt_require check for sw_sync feature

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Make sure that this test is skipped if the sw_sync feature is missing from
the host system.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 lib/sw_sync.c   | 1 +
 tests/sw_sync.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/lib/sw_sync.c b/lib/sw_sync.c
index 38fe670..ac793ad 100644
--- a/lib/sw_sync.c
+++ b/lib/sw_sync.c
@@ -38,6 +38,7 @@
 #include <linux/sync_file.h>
 #include <sys/ioctl.h>
 
+#include "igt_debugfs.h"
 #include "sw_sync.h"
 #include "drmtest.h"
 #include "ioctl_wrappers.h"
diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index ef21af6..562b71f 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -727,6 +727,9 @@ static void test_sync_random_merge(void)
 
 igt_main
 {
+	igt_fixture
+		igt_require_sw_sync();
+
 	igt_subtest("alloc_timeline")
 		test_alloc_timeline();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest test_sync_merge_invalid that tests merging invalid fences.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 562b71f..3a67877 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -171,6 +171,44 @@ static void test_sync_busy(void)
 	close(timeline);
 }
 
+static void test_sync_merge_invalid(void)
+{
+	int in_fence;
+	int fence_invalid;
+	int fence_merge;
+	int timeline;
+	char tmppath[] = "/tmp/igt-XXXXXX";
+	int skip = 0;
+
+	timeline = sw_sync_timeline_create();
+	in_fence = sw_sync_fence_create(timeline, 1);
+
+	fence_invalid = -1;
+	fence_merge = sync_merge(in_fence, fence_invalid);
+	igt_assert_f(fence_merge < 0, "Verify invalid fd (-1) handling");
+
+	fence_invalid = drm_open_driver(DRIVER_ANY);
+	fence_merge = sync_merge(in_fence, fence_invalid);
+	igt_assert_f(fence_merge < 0, "Verify invalid fd (device fd) handling");
+
+	fence_invalid = mkstemp(tmppath);
+	if (fence_invalid == -1) {
+		skip = 1;
+		goto out;
+	}
+	unlink(tmppath);
+	fence_invalid = drm_open_driver(DRIVER_ANY);
+	fence_merge = sync_merge(in_fence, fence_invalid);
+	close(fence_invalid);
+	igt_assert_f(fence_merge < 0, "Verify invalid fd (file fd) handling");
+
+out:
+	close(in_fence);
+	close(fence_merge);
+	close(timeline);
+	igt_require(skip == 0);
+}
+
 static void test_sync_merge(void)
 {
 	int in_fence[3];
@@ -751,6 +789,9 @@ igt_main
 	igt_subtest("sync_busy")
 		test_sync_busy();
 
+	igt_subtest("sync_merge_invalid")
+		test_sync_merge_invalid();
+
 	igt_subtest("sync_merge")
 		test_sync_merge();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 20/21] tests/sw_sync: Add subtest test_sync_busy_fork

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest test_sync_busy_fork which increments the timeline in a forked child
process.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index 3a67877..e0bf6c3 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -171,6 +171,42 @@ static void test_sync_busy(void)
 	close(timeline);
 }
 
+static void test_sync_busy_fork(void)
+{
+	int fence, ret;
+	int timeline;
+	int skip = 0;
+
+	timeline = sw_sync_timeline_create();
+	fence = sw_sync_fence_create(timeline, 1);
+
+	switch (fork()) {
+	case 0:
+		/* Child process */
+		usleep(1*1000*1000);
+		/* Advance timeline from 0 -> 1 */
+		sw_sync_timeline_inc(timeline, 1);
+		_Exit(0);
+		break;
+	case -1:
+		/* Failed fork */
+		skip = 1;
+		break;
+	default:
+		/* Parent process */
+		ret = sync_wait(fence, 0);
+		igt_assert_f(ret == -1 && errno == ETIME, "Fence signaled (it should not have been signalled yet)\n");
+
+		ret = sync_wait(fence, 2*1000);
+		igt_assert_f(ret == 0, "Fence not signaled (timeline value 1 fence seqno 1)\n");
+		break;
+	}
+
+	close(fence);
+	close(timeline);
+	igt_require(!skip);
+}
+
 static void test_sync_merge_invalid(void)
 {
 	int in_fence;
@@ -789,6 +825,9 @@ igt_main
 	igt_subtest("sync_busy")
 		test_sync_busy();
 
+	igt_subtest("sync_busy_fork")
+		test_sync_busy_fork();
+
 	igt_subtest("sync_merge_invalid")
 		test_sync_merge_invalid();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t v9 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket

[robert.foss]

From: Robert Foss <robert.foss@collabora.com>

Add subtest test_sync_busy_fork which increments the timeline in a forked child
process, where the timeline fd has been sent through a UNIX socket.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/sw_sync.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index e0bf6c3..bcf5731 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -30,6 +30,8 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include <stdint.h>
+#include <sys/socket.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "igt.h"
@@ -171,6 +173,104 @@ static void test_sync_busy(void)
 	close(timeline);
 }
 
+static void test_sync_busy_fork_unixsocket(void)
+{
+	int fence, ret;
+	int timeline;
+	int skip = 0;
+	int sv[2];
+
+
+	timeline = sw_sync_timeline_create();
+	fence = sw_sync_fence_create(timeline, 1);
+
+	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sv) != 0) {
+		skip = 1;
+		goto out;
+	}
+
+	switch (fork()) {
+	case 0:
+	{
+		/* Child process */
+		int socket = sv[1];
+		int socket_timeline;
+		struct msghdr msg = {0};
+		struct cmsghdr *cmsg;
+		unsigned char *data;
+		char m_buffer[256];
+		char c_buffer[256];
+		struct iovec io = { .iov_base = m_buffer, .iov_len = sizeof(m_buffer) };
+		close(sv[0]);
+
+		msg.msg_iov = &io;
+		msg.msg_iovlen = 1;
+		msg.msg_control = c_buffer;
+		msg.msg_controllen = sizeof(c_buffer);
+
+		if (recvmsg(socket, &msg, 0) < 0)
+		    _Exit(1);
+
+		cmsg = CMSG_FIRSTHDR(&msg);
+		data = CMSG_DATA(cmsg);
+		socket_timeline = *((int *) data);
+
+		/* Advance timeline from 0 -> 1 */
+		sw_sync_timeline_inc(socket_timeline, 1);
+
+		_Exit(0);
+		break;
+	}
+	case -1:
+	{
+		/* Failed fork */
+		skip = 1;
+		break;
+	}
+	default:
+	{
+		/* Parent process */
+		int socket = sv[0];
+		struct cmsghdr *cmsg;
+		struct iovec io = { .iov_base = (char *)"ABC", .iov_len = 3 };
+		struct msghdr msg = { 0 };
+		char buf[CMSG_SPACE(sizeof(timeline))];
+		memset(buf, '\0', sizeof(buf));
+		close(sv[1]);
+
+		msg.msg_iov = &io;
+		msg.msg_iovlen = 1;
+		msg.msg_control = buf;
+		msg.msg_controllen = sizeof(buf);
+
+		cmsg = CMSG_FIRSTHDR(&msg);
+		cmsg->cmsg_level = SOL_SOCKET;
+		cmsg->cmsg_type = SCM_RIGHTS;
+		cmsg->cmsg_len = CMSG_LEN(sizeof(timeline));
+
+		*((int *) CMSG_DATA(cmsg)) = timeline;
+		msg.msg_controllen = cmsg->cmsg_len;
+
+		ret = sync_wait(fence, 0);
+		igt_assert_f(ret == -1 && errno == ETIME, "Fence signaled (it should not have been signalled yet)\n");
+
+		if (sendmsg(socket, &msg, 0) < 0) {
+		    skip = 1;
+		    goto out;
+		}
+
+		ret = sync_wait(fence, 2*1000);
+		igt_assert_f(ret == 0, "Fence not signaled (timeline value 1 fence seqno 1)\n");
+		break;
+	}
+	}
+
+out:
+	close(fence);
+	close(timeline);
+	igt_require(!skip);
+}
+
 static void test_sync_busy_fork(void)
 {
 	int fence, ret;
@@ -828,6 +928,9 @@ igt_main
 	igt_subtest("sync_busy_fork")
 		test_sync_busy_fork();
 
+	igt_subtest("sync_busy_fork_unixsocket")
+		test_sync_busy_fork_unixsocket();
+
 	igt_subtest("sync_merge_invalid")
 		test_sync_merge_invalid();
 
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v9 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives

[Tomeu Vizoso]

Hi Robert,

looks pretty good to me, have just found a few nits.

With those addressed:

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Regards,

Tomeu

On 22 November 2016 at 14:28,  <robert.foss@collabora.com> wrote:
> From: Robert Foss <robert.foss@collabora.com>
>
> Base functions to help testing the Sync File Framework (explicit fencing
> mechanism ported from Android).
> These functions allow you to create, use and destroy timelines and fences.
>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
> ---
>  lib/Makefile.sources |   2 +
>  lib/sw_sync.c        | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++
>  lib/sw_sync.h        |  48 +++++++++++++
>  3 files changed, 249 insertions(+)
>  create mode 100644 lib/sw_sync.c
>  create mode 100644 lib/sw_sync.h
>
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index e8e277b..7aaf42f 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -63,6 +63,8 @@ lib_source_list =             \
>         rendercopy_gen8.c       \
>         rendercopy_gen9.c       \
>         rendercopy.h            \
> +       sw_sync.c               \
> +       sw_sync.h               \
>         intel_reg_map.c         \
>         intel_iosf.c            \
>         igt_kms.c               \
> diff --git a/lib/sw_sync.c b/lib/sw_sync.c
> new file mode 100644
> index 0000000..862f8c4
> --- /dev/null
> +++ b/lib/sw_sync.c
> @@ -0,0 +1,199 @@
> +/*
> + * Copyright 2012 Google, Inc

What's the reason for this? I only see simple wrappers for the uapi in
the IGT style, so I wonder how it can be based in some work that
carries Google's copyright from 2012.

> + * Copyright © 2016 Collabora, Ltd.
> + *
> + * Based on the implementation from the Android Open Source Project

Ditto.

> + * 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@collabora.com>
> + */
> +
> +#ifndef ANDROID
> +#define _GNU_SOURCE
> +#else
> +#include <libgen.h>
> +#endif
> +#include <fcntl.h>
> +#include <poll.h>
> +#include <stdint.h>
> +#include <linux/sync_file.h>
> +#include <sys/ioctl.h>
> +
> +#include "sw_sync.h"
> +#include "drmtest.h"
> +#include "ioctl_wrappers.h"
> +
> +#ifndef SW_SYNC_IOC_INC
>
> +struct sw_sync_create_fence_data {
> +       __u32   value;
> +       char    name[32];
> +       __s32   fence;
> +};
> +
> +#define SW_SYNC_IOC_MAGIC              'W'
> +#define SW_SYNC_IOC_CREATE_FENCE       _IOWR(SW_SYNC_IOC_MAGIC, 0,\
> +                                               struct sw_sync_create_fence_data)
> +#define SW_SYNC_IOC_INC                        _IOW(SW_SYNC_IOC_MAGIC, 1, __u32)
> +#endif

What about using the LOCAL_ scheme as in ioctl_wrappers.h so we have a
bigger chance of remembering to remove the local definitions once we
stop testing kernels without this API definition?

> +
> +#define DEVFS_SW_SYNC   "/dev/sw_sync"

What's the reason for this? May be worth adding a comment if we really
need to keep this.

> +#define DEBUGFS_SW_SYNC "/sys/kernel/debug/sync/sw_sync"
> +
> +
> +int sw_sync_fd_is_valid(int fd)

bool?

> +{
> +       int status;
> +
> +       if (fd < 0)
> +               return 0;
> +
> +       status = fcntl(fd, F_GETFD, 0);
> +       return status >= 0;
> +}
> +
> +int sw_sync_timeline_create(void)
> +{
> +       int fd = open(DEVFS_SW_SYNC, O_RDWR);
> +
> +       if (fd < 0)
> +               fd = open(DEBUGFS_SW_SYNC, O_RDWR);
> +
> +       igt_assert(sw_sync_fd_is_valid(fd));
> +
> +       return fd;
> +}
> +
> +int __sw_sync_fence_create(int fd, uint32_t seqno)
> +{
> +
> +       struct sw_sync_create_fence_data data;
> +
> +       memset(&data, 0, sizeof(data));

Just initialize to zero?

> +       data.value = seqno;
> +
> +       if (igt_ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data))
> +               return -errno;
> +
> +       return data.fence;
> +}
> +
> +int sw_sync_fence_create(int fd, uint32_t seqno)
> +{
> +       int fence = __sw_sync_fence_create(fd, seqno);
> +       igt_assert(fence >= 0);
> +       return fence;
> +}
> +
> +void sw_sync_timeline_inc(int fd, uint32_t count)
> +{
> +       uint32_t arg = count;
> +
> +       do_ioctl(fd, SW_SYNC_IOC_INC, &arg);
> +}
> +
> +int sync_merge(int fd1, int fd2)
> +{
> +       struct sync_merge_data data = {};
> +       int err;
> +
> +       data.fd2 = fd2;
> +
> +       err = ioctl(fd1, SYNC_IOC_MERGE, &data);
> +       if (err < 0)
> +               return -errno;
> +
> +       sw_sync_fd_is_valid(data.fence);

Was the idea to assert on this?

> +
> +       return data.fence;
> +}
> +
> +int sync_wait(int fd, int timeout)
> +{
> +       struct pollfd fds = {0};
> +       int ret;
> +
> +       fds.fd = fd;
> +       fds.events = POLLIN;
> +
> +       do {
> +                ret = poll(&fds, 1, timeout);
> +                if (ret > 0) {
> +                         if (fds.revents & (POLLERR | POLLNVAL)) {
> +                                  errno = EINVAL;
> +                                  return -1;
> +                         }
> +                         return 0;
> +                } else if (ret == 0) {
> +                         errno = ETIME;
> +                         return -1;
> +                }
> +       } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
> +
> +       return ret;
> +}
> +
> +int sync_fence_count(int fd)
> +{
> +       struct sync_file_info info;
> +
> +       memset(&info, 0, sizeof(info));

Just initialize to zero?

> +       if (ioctl(fd, SYNC_IOC_FILE_INFO, &info))
> +               return -errno;
> +
> +       return info.num_fences;
> +}
> +
> +static int __sync_fence_count_status(int fd, int status)
> +{
> +       struct sync_file_info info;
> +       struct sync_fence_info *fence_info;
> +       int count;
> +       int i;
> +
> +       memset(&info, 0, sizeof(info));

Just initialize to zero?

> +       if (ioctl(fd, SYNC_IOC_FILE_INFO, &info))
> +               return -errno;
> +
> +       fence_info = calloc(info.num_fences, sizeof(*fence_info));
> +       if (!fence_info)
> +               return -ENOMEM;
> +
> +       info.sync_fence_info = (uintptr_t)fence_info;
> +       if (ioctl(fd, SYNC_IOC_FILE_INFO, &info)) {
> +               count = -errno;
> +       } else {
> +               count = 0;
> +               for (i = 0 ; i < info.num_fences ; i++)
> +                       count += fence_info[i].status == status;

I think I would prefer if the code was longer by one line, and avoided
doing arithmetic with booleans :)

> +       }
> +
> +       free(fence_info);
> +
> +       return count;
> +}
> +
> +int sync_fence_count_status(int fd, int status)
> +{
> +       int count = __sync_fence_count_status(fd, status);
> +       igt_assert(count >= 0);
> +       return count;
> +}
> diff --git a/lib/sw_sync.h b/lib/sw_sync.h
> new file mode 100644
> index 0000000..1f47b29
> --- /dev/null
> +++ b/lib/sw_sync.h
> @@ -0,0 +1,48 @@
> +/*
> + * Copyright 2012 Google, Inc

Same as above.

> + * 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@collabora.com>
> + */
> +
> +#ifndef SW_SYNC_H
> +#define SW_SYNC_H
> +
> +#define SW_SYNC_FENCE_STATUS_ERROR             (-1)
> +#define SW_SYNC_FENCE_STATUS_ACTIVE            (0)
> +#define SW_SYNC_FENCE_STATUS_SIGNALED  (1)
> +
> +int sw_sync_fd_is_valid(int fd);

This one doesn't seem to be used outside sw_sync.c, so maybe remove?
Haven't checked the ones below.

> +int sw_sync_timeline_create(void);
> +int __sw_sync_fence_create(int fd, uint32_t seqno);
> +int sw_sync_fence_create(int fd, uint32_t seqno);
> +void sw_sync_timeline_inc(int fd, uint32_t count);
> +int sync_merge(int fd1, int fd2);
> +int sync_wait(int fence, int timeout);
> +int sync_fence_count(int fd);
> +int sync_fence_count_status(int fd, int status);
> +
> +#endif
> +
> --
> 2.10.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v9 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer

[Tomeu Vizoso]

On 22 November 2016 at 14:28,  <robert.foss@collabora.com> wrote:
> 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 ada1243..cd0c588 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 <unistd.h>
>
> @@ -39,6 +41,15 @@
>
>  IGT_TEST_DESCRIPTION("Test SW Sync Framework");
>
> +typedef struct {
> +       int timeline;
> +       uint32_t thread_id;
> +       uint32_t nbr_threads;
> +       uint32_t nbr_iterations;

Any reason why these two cannot be just defines?

> +       volatile uint32_t * volatile counter;
> +       sem_t *sem;
> +} data_t;
> +
>  static void test_alloc_timeline(void)
>  {
>         int timeline;
> @@ -219,6 +230,95 @@ static void test_sync_merge_same(void)
>         close(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 = sync_wait(fence, 1000);
> +               if (ret == -1)
> +               {
> +                       return (void *) 1;
> +               }
> +
> +               if (*(data->counter) != next_point)
> +               {
> +                       return (void *) 1;
> +               }
> +
> +               sem_post(data->sem);
> +               close(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;
> +       }
> +
> +       close(timeline);
> +       sem_destroy(&sem);
> +
> +       igt_assert_f(counter == nbr_threads * nbr_iterations,
> +                    "Counter has unexpected value.\n");

In this case I think igt_assert_eq would be more useful.

> +       igt_assert_f(thread_ret == 0, "A sync thread reported failure.\n");

Here probably as well, unless the message can be improved.

> +}
> +
>  igt_main
>  {
>         igt_subtest("alloc_timeline")
> @@ -241,5 +341,8 @@ igt_main
>
>         igt_subtest("sync_merge_same")
>                 test_sync_merge_same();
> +
> +       igt_subtest("sync_multi_consumer")
> +               test_sync_multi_consumer();
>  }
>
> --
> 2.10.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH i-g-t v9 00/21] Implement sw_sync test

[Tomeu Vizoso]

This series has my Reviewed-by tag with the small issues I pointed out
addressed. But I think it would be very good if you could go through
all the igt_assert* calls and make sure that no information is being
lost that could aid in triaging and debugging.

The messages you chose for igt_assert_f were very good in explaining
*what* went wrong, but if the values used in the comparison were
contained in the string, the person reading the logs would have a
better chance of understanding *why* without having to instrument the
code and re-run.

Thanks,

Tomeu

On 22 November 2016 at 14:28,  <robert.foss@collabora.com> wrote:
> From: Robert Foss <robert.foss@collabora.com>
>
> This series implements the sw_sync test and the lib/sw_sync helper functions
> for said test.
>
> The sw_sync subtests range from very basic tests of the sw_sync functionality,
> to stress testing and randomized tests.
>
>
> Changes since v1:
> Added "Reviewed-by: Eric Engestrom <eric@engestrom.ch>" tag
>
>   lib/sw_sync:
>   - Fixed fd value checking
>   - Fixed fd validity check in sw_sync_fd_close()
>   - Moved sw_sync related paths to define
>   - Switched from malloc+memset to calloc in sync_file_info()
>   - Switched sizeof to dereferenced ptr
>
>   tests/sw_sync:
>   - Moved lib/sw_sync related code to lib/sw_sync commit
>   - Replaced memset with assignment in loop
>
>
> Changes since v2:
>
>   lib/sw_sync:
>   - Replaced fd validity check in sw_sync_timeline_create()
>   - Replace sw_sync_XXX_destroy() functions with close()
>   - Simplified sw_sync_timeline_inc() comparison
>   - Changed sw_sync_merge() return value to -errno
>   - Changed name of sw_sync_fence_size() to sw_sync_fence_count()
>   - Reworked implementation of sw_sync_fence_count()
>   - Reworked implementation of sw_sync_fence_count_status()
>
>   tests/sw_sync:
>   - Replace sw_sync_XXX_destroy() functions with close()
>
>
> Changes since v3:
>
>   lib/sw_sync:
>   - Changed sw_sync_fence_create() to take uint32_t seqno
>   - Added raw __sw_sync_fence_create() and failure check sw_sync_fence_create()
>
>   tests/sw_sync:
>   - Switch to using __sw_sync_fence_create() for failure cases
>
>
> Changes since v4:
>
>   lib/sw_sync:
>   - Fixed whitespace in sw_sync_fence_count()
>   - Fixed whitespace and style of sw_sync_wait()
>   - Fixed whitespace in __sw_sync_fence_count_status()
>
>
> Changes since v5:
>
>   lib/sw_sync:
>   - Added kernel_has_sw_sync()
>   - Added igt_require_sw_sync()
>   - Split out __sw_sync_merge() from sw_sync_merge()
>   - Added igt_debugfs.h include
>   - Change sw_sync_wait to reflect android implementation
>   - Renamed some functions:
>    - sw_sync_merge -> sync_merge
>    - sw_sync_wait -> sync_wait
>    - sw_sync_fence_count -> sync_fence_count
>    - sw_sync_fence_count_status -> sync_fence_count_status
>    - __sw_sync_fence_count_status -> __sync_fence_count_status
>
>   tests/sw_sync:
>   - Added subtest test_sync_expired_merge
>   - Added subtest test_timeline_closed
>   - Added subtest test_timeline_closed_signaled
>   - Added subtest test_sync_merge_invalid
>   - Added subtest test_sync_busy_fork
>   - Added subtest test_sync_busy_unixsockets
>   - Skip test on no sw_sync support
>   - Reworked comments of test_sync_wait
>   - Renamed test_sync_wait -> test_sync_busy
>   - Improved test_sync_wait igt_assert_f messages
>
>
> Changes since v6:
>
>   tests/sw_sync:
>   - Added igt_assert to test_sync_expired_merge
>   - Added prime increments to test_sync_busy
>
>
> Changes since v7:
>
>   - Removed accidental inclusions
>
>
> Changes since v8:
>
>   - Removed some more accidental inclusions
>
>   lib/sw_sync:
>     - Moved some changes into the lib/sw_sync commit
>
> Rafael Antognolli (1):
>   tests/sw_sync: Add subtest test_sync_expired_merge
>
> Robert Foss (20):
>   lib/sw_sync: Add helper functions for managing synchronization
>     primitives
>   test/sw_sync: Add sw_sync test
>   tests/sw_sync: Add subtest test_alloc_fence
>   tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline
>   tests/sw_sync: Add subtest test_alloc_merge_fence
>   tests/sw_sync: Add subtest test_sync_busy
>   tests/sw_sync: Add subtest test_sync_merge
>   tests/sw_sync: Add subtest test_sync_merge_same
>   tests/sw_sync: Add subtest test_sync_multi_consumer
>   tests/sw_sync: Add subtest test_sync_multi_consumer_producer
>   tests/sw_sync: Add subtest test_sync_random_merge
>   tests/sw_sync: Add subtest test_sync_multi_timeline_wait
>   tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer
>   tests/sw_sync: Add subtest test_timeline_closed
>   tests/sw_sync: Add subtest test_timeline_closed_signaled
>   lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync
>     support
>   tests/sw_sync: Add igt_require check for sw_sync feature
>   tests/sw_sync: Add subtest test_sync_merge_invalid
>   tests/sw_sync: Add subtest test_sync_busy_fork
>   tests/sw_sync: Add subtest test_sync_busy_unixsocket
>
>  lib/Makefile.sources   |   2 +
>  lib/sw_sync.c          | 222 ++++++++++++
>  lib/sw_sync.h          |  49 +++
>  tests/Makefile.sources |   1 +
>  tests/sw_sync.c        | 961 +++++++++++++++++++++++++++++++++++++++++++++++++
>  5 files changed, 1235 insertions(+)
>  create mode 100644 lib/sw_sync.c
>  create mode 100644 lib/sw_sync.h
>  create mode 100644 tests/sw_sync.c
>
> --
> 2.10.2
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx