[Piglit] [PATCH 02/11] egl_android_native_fence_sync: Add test to create fence from fd.
Rafael Antognolli
rafael.antognolli at intel.com
Thu Oct 27 23:19:01 UTC 2016
Add a test that creates a sync file using sw_sync, and then creates an
EGL fence sync from that sync file. It also verify that the fence sync
EGL_SYNC_CONDITION_KHR is set to EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID,
and that EGL_SYNC_STATUS_KHR changes to EGL_SIGNALED_KHR once the fence
is signaled.
Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
---
.../CMakeLists.gles2.txt | 2 +-
.../egl_android_native_fence_sync.c | 136 +++++++++++-
.../spec/egl_android_native_fence_sync/sw_sync.c | 240 +++++++++++++++++++++
.../spec/egl_android_native_fence_sync/sw_sync.h | 52 +++++
4 files changed, 428 insertions(+), 2 deletions(-)
create mode 100644 tests/egl/spec/egl_android_native_fence_sync/sw_sync.c
create mode 100644 tests/egl/spec/egl_android_native_fence_sync/sw_sync.h
diff --git a/tests/egl/spec/egl_android_native_fence_sync/CMakeLists.gles2.txt b/tests/egl/spec/egl_android_native_fence_sync/CMakeLists.gles2.txt
index 0d85ce9..5492a39 100644
--- a/tests/egl/spec/egl_android_native_fence_sync/CMakeLists.gles2.txt
+++ b/tests/egl/spec/egl_android_native_fence_sync/CMakeLists.gles2.txt
@@ -4,6 +4,6 @@ if(PIGLIT_HAS_PTHREADS)
link_libraries(${CMAKE_THREAD_LIBS_INIT})
endif()
-piglit_add_executable(egl_android_native_fence_sync egl_android_native_fence_sync.c)
+piglit_add_executable(egl_android_native_fence_sync egl_android_native_fence_sync.c sw_sync.c)
# vim: ft=cmake:
diff --git a/tests/egl/spec/egl_android_native_fence_sync/egl_android_native_fence_sync.c b/tests/egl/spec/egl_android_native_fence_sync/egl_android_native_fence_sync.c
index 8d8f04d..c65eb24 100644
--- a/tests/egl/spec/egl_android_native_fence_sync/egl_android_native_fence_sync.c
+++ b/tests/egl/spec/egl_android_native_fence_sync/egl_android_native_fence_sync.c
@@ -34,6 +34,7 @@
#include "piglit-util-egl.h"
#include "piglit-util-gl.h"
+#include "sw_sync.h"
/* Extension function pointers.
*
@@ -333,10 +334,143 @@ cleanup:
return result;
}
+static EGLSyncKHR
+test_create_fence_from_fd(int fd)
+{
+ EGLint attrib_list[] = {
+ EGL_SYNC_NATIVE_FENCE_FD_ANDROID, fd,
+ EGL_NONE,
+ };
+
+ return peglCreateSyncKHR(g_dpy, EGL_SYNC_NATIVE_FENCE_ANDROID, attrib_list);
+}
+
static enum piglit_result
test_eglCreateSyncKHR_native_from_fd(void *test_data)
{
- return PIGLIT_PASS;
+ enum piglit_result result = PIGLIT_PASS;
+ EGLSyncKHR sync = 0;
+ EGLint sync_type = canary,
+ sync_status = canary,
+ sync_condition = canary;
+ int sync_fd = canary;
+ int timeline = canary;
+ bool ok = false;
+
+ result = test_setup();
+ if (result != PIGLIT_PASS) {
+ return result;
+ }
+
+ if (!sw_sync_is_supported()) {
+ result = PIGLIT_SKIP;
+ goto cleanup;
+ }
+
+ /* Create timeline and sw_sync */
+ timeline = sw_sync_timeline_create();
+ if (timeline < 0) {
+ piglit_loge("sw_sync_timeline_create() failed");
+ result = PIGLIT_FAIL;
+ goto cleanup;
+ }
+
+ sync_fd = sw_sync_fence_create(timeline, 1);
+ if (sync_fd < 0) {
+ piglit_loge("sw_sync_fence_create() failed");
+ result = PIGLIT_FAIL;
+ goto cleanup_timeline;
+ }
+
+ sync = test_create_fence_from_fd(sync_fd);
+ if (sync == EGL_NO_SYNC_KHR) {
+ piglit_loge("eglCreateSyncKHR(EGL_SYNC_NATIVE_FENCE_ANDROID) failed");
+ result = PIGLIT_FAIL;
+ goto cleanup_sw_fence;
+ }
+
+ ok = peglGetSyncAttribKHR(g_dpy, sync, EGL_SYNC_TYPE_KHR, &sync_type);
+ if (!ok) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_TYPE_KHR) failed");
+ result = PIGLIT_FAIL;
+ }
+ if (!piglit_check_egl_error(EGL_SUCCESS)) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_TYPE_KHR) emitted "
+ "an error");
+ result = PIGLIT_FAIL;
+ }
+ if (sync_type != EGL_SYNC_NATIVE_FENCE_ANDROID) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_TYPE_KHR) returned "
+ "0x%x but expected EGL_SYNC_NATIVE_FENCE_ANDROID(0x%x)",
+ sync_type, EGL_SYNC_NATIVE_FENCE_ANDROID);
+ result = PIGLIT_FAIL;
+ }
+
+ ok = peglGetSyncAttribKHR(g_dpy, sync, EGL_SYNC_STATUS_KHR, &sync_status);
+ if (!ok) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) failed");
+ result = PIGLIT_FAIL;
+ }
+ if (!piglit_check_egl_error(EGL_SUCCESS)) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) emitted "
+ "an error");
+ result = PIGLIT_FAIL;
+ }
+ if (sync_status != EGL_UNSIGNALED_KHR) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) "
+ "returned 0x%x but expected "
+ "EGL_UNSIGNALED_KHR(0x%x)",
+ sync_status, EGL_UNSIGNALED_KHR);
+ result = PIGLIT_FAIL;
+ }
+
+ ok = peglGetSyncAttribKHR(g_dpy, sync, EGL_SYNC_CONDITION_KHR, &sync_condition);
+ if (!ok) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_CONDITION_KHR) failed");
+ result = PIGLIT_FAIL;
+ }
+ if (!piglit_check_egl_error(EGL_SUCCESS)) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_CONDITION_KHR) "
+ "emitted an error");
+ result = PIGLIT_FAIL;
+ }
+ if (sync_condition != EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_CONDITION_KHR) "
+ "returned 0x%x but expected "
+ "EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID(0x%x)",
+ sync_condition, EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID);
+ result = PIGLIT_FAIL;
+ }
+
+ sw_sync_timeline_inc(timeline, 1);
+
+ ok = peglGetSyncAttribKHR(g_dpy, sync, EGL_SYNC_STATUS_KHR, &sync_status);
+ if (!ok) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) failed");
+ result = PIGLIT_FAIL;
+ }
+ if (!piglit_check_egl_error(EGL_SUCCESS)) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) emitted "
+ "an error");
+ result = PIGLIT_FAIL;
+ }
+ if (sync_status != EGL_SIGNALED_KHR) {
+ piglit_loge("eglGetSyncAttribKHR(EGL_SYNC_STATUS_KHR) "
+ "returned 0x%x but expected "
+ "EGL_SIGNALED_KHR(0x%x)",
+ sync_status, EGL_SIGNALED_KHR);
+ result = PIGLIT_FAIL;
+ }
+
+cleanup_sw_fence:
+ sw_sync_fence_destroy(sync_fd);
+
+cleanup_timeline:
+ sw_sync_timeline_destroy(timeline);
+
+cleanup:
+ test_cleanup(sync, &result);
+ return result;
}
static const struct piglit_subtest fence_sync_subtests[] = {
diff --git a/tests/egl/spec/egl_android_native_fence_sync/sw_sync.c b/tests/egl/spec/egl_android_native_fence_sync/sw_sync.c
new file mode 100644
index 0000000..d544dc7
--- /dev/null
+++ b/tests/egl/spec/egl_android_native_fence_sync/sw_sync.c
@@ -0,0 +1,240 @@
+/*
+ * 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 at collabora.com>
+ */
+
+#include <fcntl.h>
+#include <poll.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <linux/sync_file.h>
+#include <sys/ioctl.h>
+
+#include "sw_sync.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"
+
+bool sw_sync_is_supported(void)
+{
+ if(access(DEVFS_SW_SYNC, R_OK | W_OK) != -1) {
+ return true;
+ } else if (access(DEBUGFS_SW_SYNC, R_OK | W_OK) != -1 ) {
+ return true;
+ }
+
+ return false;
+}
+
+int sw_sync_fd_is_valid(int fd)
+{
+ int status;
+
+ if (fd < 0)
+ return 0;
+
+ status = fcntl(fd, F_GETFD, 0);
+ return status >= 0;
+}
+
+static
+void sw_sync_fd_close(int fd)
+{
+ if (!sw_sync_fd_is_valid(fd))
+ return;
+
+ close(fd);
+}
+
+int sw_sync_timeline_create(void)
+{
+ int fd = open(DEVFS_SW_SYNC, O_RDWR);
+
+ if (!sw_sync_fd_is_valid(fd))
+ fd = open(DEBUGFS_SW_SYNC, O_RDWR);
+
+ return fd;
+}
+
+void sw_sync_timeline_destroy(int fd)
+{
+ return sw_sync_fd_close(fd);
+}
+
+void sw_sync_fence_destroy(int fd)
+{
+ return sw_sync_fd_close(fd);
+}
+
+int sw_sync_fence_create(int fd, int32_t seqno)
+{
+ struct sw_sync_create_fence_data data = {};
+ data.value = seqno;
+
+ if (fd >= 0) {
+ ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data);
+ return data.fence;
+ } else {
+ ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data);
+ return -1;
+ }
+}
+
+void sw_sync_timeline_inc(int fd, uint32_t count)
+{
+ uint32_t arg = count;
+
+ if (fd == 0 || fd == -1)
+ return;
+
+ ioctl(fd, SW_SYNC_IOC_INC, &arg);
+}
+
+int sw_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 err;
+
+ sw_sync_fd_is_valid(data.fence);
+
+ return data.fence;
+}
+
+int sw_sync_wait(int fence, int timeout)
+{
+ struct pollfd fds;
+ int ret;
+
+ fds.fd = fence;
+ fds.events = POLLIN | POLLERR;
+
+ ret = poll(&fds, 1, timeout);
+
+ return ret;
+}
+
+static struct sync_file_info *sync_file_info(int fd)
+{
+ struct sync_file_info *info;
+ struct sync_fence_info *fence_info;
+ int err, num_fences;
+
+ info = calloc(1, sizeof(*info));
+ if (info == NULL)
+ return NULL;
+
+ err = ioctl(fd, SYNC_IOC_FILE_INFO, info);
+ if (err < 0) {
+ free(info);
+ return NULL;
+ }
+
+ num_fences = info->num_fences;
+
+ if (num_fences) {
+ info->flags = 0;
+ info->num_fences = num_fences;
+
+ fence_info = calloc(num_fences, sizeof(*fence_info));
+ if (!fence_info) {
+ free(info);
+ return NULL;
+ }
+
+ info->sync_fence_info = (uint64_t)(unsigned long) (fence_info);
+
+ err = ioctl(fd, SYNC_IOC_FILE_INFO, info);
+ if (err < 0) {
+ free(fence_info);
+ free(info);
+ return NULL;
+ }
+ }
+
+ return info;
+}
+
+static void sync_file_info_free(struct sync_file_info *info)
+{
+ free((void *)(uintptr_t)info->sync_fence_info);
+ free(info);
+}
+
+int sw_sync_fence_size(int fd)
+{
+ int count;
+ struct sync_file_info *info = sync_file_info(fd);
+
+ if (!info)
+ return 0;
+
+ count = info->num_fences;
+
+ sync_file_info_free(info);
+
+ return count;
+}
+
+int sw_sync_fence_count_status(int fd, int status)
+{
+ int i, count = 0;
+ struct sync_fence_info *fence_info = NULL;
+ struct sync_file_info *info = sync_file_info(fd);
+
+ if (!info)
+ return -1;
+
+ fence_info = (struct sync_fence_info *)(uintptr_t)info->sync_fence_info;
+ for (i = 0 ; i < info->num_fences ; i++) {
+ if (fence_info[i].status == status)
+ count++;
+ }
+
+ sync_file_info_free(info);
+
+ return count;
+}
diff --git a/tests/egl/spec/egl_android_native_fence_sync/sw_sync.h b/tests/egl/spec/egl_android_native_fence_sync/sw_sync.h
new file mode 100644
index 0000000..e948fdd
--- /dev/null
+++ b/tests/egl/spec/egl_android_native_fence_sync/sw_sync.h
@@ -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 at collabora.com>
+ */
+
+#ifndef SW_SYNC_H
+#define SW_SYNC_H
+
+#include <stdbool.h>
+
+#define SW_SYNC_FENCE_STATUS_ERROR (-1)
+#define SW_SYNC_FENCE_STATUS_ACTIVE (0)
+#define SW_SYNC_FENCE_STATUS_SIGNALED (1)
+
+bool sw_sync_is_supported(void);
+int sw_sync_fd_is_valid(int fd);
+int sw_sync_timeline_create(void);
+void sw_sync_timeline_destroy(int timeline);
+void sw_sync_fence_destroy(int fence);
+int sw_sync_fence_create(int fd, int32_t seqno);
+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_status(int fd, int status);
+
+#endif
+
--
2.7.4
More information about the Piglit
mailing list