xf86-video-intel: 2 commits - test/dri2-test.c test/.gitignore test/Makefile.am test/present-race.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Feb 3 01:58:32 PST 2016
test/.gitignore | 1
test/Makefile.am | 3
test/dri2-test.c | 43 ++++
test/present-race.c | 484 ++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 529 insertions(+), 2 deletions(-)
New commits:
commit 1c95b7e81140746e2904dbdf7b066937442243d7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Feb 3 09:56:58 2016 +0000
test/dri2-test: Add WaitMSC accuracy tests
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/test/dri2-test.c b/test/dri2-test.c
index d575305..bdf01f3 100644
--- a/test/dri2-test.c
+++ b/test/dri2-test.c
@@ -22,6 +22,8 @@
#define COUNT 60
+static int prime[] = { 0, 1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 27, 29, 31, 37, 41, 43, 47, 51, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131 };
+
static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
{
XRRScreenResources *res;
@@ -136,10 +138,10 @@ static void run(Display *dpy, int width, int height,
xcb_connection_t *c = XGetXCBConnection(dpy);
Window win;
XSetWindowAttributes attr;
- int count;
DRI2Buffer *buffers;
struct timespec start, end;
uint64_t start_msc, end_msc;
+ int modulus, remainder, count;
/* Be nasty and install a fullscreen window on top so that we
* can guarantee we do not get clipped by children.
@@ -209,6 +211,45 @@ static void run(Display *dpy, int width, int height,
count, (long)(end_msc - start_msc),
name, elapsed(&start, &end));
+ printf("Testing past & future waits\n");
+ for (modulus = 1; modulus <= 128; modulus <<= 1) {
+ for (count = 0; prime[count] < modulus; count++) {
+ uint64_t msc, ust, sbc;
+ uint64_t target;
+
+ remainder = prime[count];
+
+ DRI2WaitMSC(dpy, win, 0, 1, 0, &ust, &msc, &sbc);
+
+ target = msc + modulus + 1;
+ target &= -modulus;
+ target += remainder;
+
+ DRI2WaitMSC(dpy, win, target, modulus, remainder,
+ &ust, &msc, &sbc);
+ if (msc != target) {
+ printf("Missed future MSC (%d, %d): expected=%lld, found=%lld\n",
+ modulus, remainder,
+ (long long)target, (long long)msc);
+ }
+
+ target = msc;
+ target &= -modulus;
+ target += remainder;
+ if (target <= msc)
+ target += modulus;
+
+ DRI2WaitMSC(dpy, win, msc, modulus, remainder,
+ &ust, &msc, &sbc);
+
+ if (msc != target) {
+ printf("Missed past MSC (%d, %d): expected=%lld, found=%lld\n",
+ modulus, remainder,
+ (long long)target, (long long)msc);
+ }
+ }
+ }
+
XDestroyWindow(dpy, win);
free(buffers);
commit 65e6bae3ac250cb5f77f9e41498c4aad600fa9b5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Feb 3 09:56:28 2016 +0000
test: Add present-race
A simple demonstration of what may go wrong when a Window is destroyed
by another client such as the window-manager.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/test/.gitignore b/test/.gitignore
index 3eea32e..d85ba34 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -29,6 +29,7 @@ dri2-speed
dri2-swap
dri2-test
dri3-test
+present-race
present-speed
present-test
shm-test
diff --git a/test/Makefile.am b/test/Makefile.am
index 7d88810..286a03b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -40,8 +40,9 @@ endif
if X11_DRI3
stress_TESTS += \
dri3-test \
- present-test \
+ present-race \
present-speed \
+ present-test \
$(NULL)
endif
check_PROGRAMS = $(stress_TESTS)
diff --git a/test/present-race.c b/test/present-race.c
new file mode 100644
index 0000000..b2b6aa2
--- /dev/null
+++ b/test/present-race.c
@@ -0,0 +1,484 @@
+/*
+ * Copyright (c) 2014 Intel Corporation
+ *
+ * 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.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
+#include <X11/xshmfence.h>
+#include <X11/Xutil.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/dpms.h>
+#include <X11/extensions/randr.h>
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xrandr.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/XShm.h>
+#if HAVE_X11_EXTENSIONS_SHMPROTO_H
+#include <X11/extensions/shmproto.h>
+#elif HAVE_X11_EXTENSIONS_SHMSTR_H
+#include <X11/extensions/shmstr.h>
+#else
+#error Failed to find the right header for X11 MIT-SHM protocol definitions
+#endif
+#include <xcb/xcb.h>
+#include <xcb/present.h>
+#include <xcb/xfixes.h>
+#include <xcb/dri3.h>
+#include <xf86drm.h>
+#include <i915_drm.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+#include <errno.h>
+#include <setjmp.h>
+#include <signal.h>
+
+#include <sys/mman.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <pciaccess.h>
+
+#include "dri3.h"
+
+static int _x_error_occurred;
+static uint32_t stamp;
+
+static int
+_check_error_handler(Display *display,
+ XErrorEvent *event)
+{
+ printf("X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
+ DisplayString(display),
+ event->serial,
+ event->error_code,
+ event->request_code,
+ event->minor_code);
+ _x_error_occurred++;
+ return False; /* ignored */
+}
+
+static int has_composite(Display *dpy)
+{
+ int event, error;
+ int major, minor;
+
+ if (!XCompositeQueryExtension(dpy, &event, &error))
+ return 0;
+
+ XCompositeQueryVersion(dpy, &major, &minor);
+
+ return major > 0 || minor >= 4;
+}
+
+static void *setup_msc(Display *dpy, Window win)
+{
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_void_cookie_t cookie;
+ uint32_t id = xcb_generate_id(c);
+ xcb_generic_error_t *error;
+ void *q;
+
+ cookie = xcb_present_select_input_checked(c, id, win, XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY);
+ q = xcb_register_for_special_xge(c, &xcb_present_id, id, &stamp);
+
+ error = xcb_request_check(c, cookie);
+ assert(error == NULL);
+
+ return q;
+}
+
+static void teardown_msc(Display *dpy, void *q)
+{
+ xcb_unregister_for_special_event(XGetXCBConnection(dpy), q);
+}
+
+static uint64_t wait_vblank(Display *dpy, Window win)
+{
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ static uint32_t serial = 1;
+ uint64_t msc = 0;
+ int complete = 0;
+ void *q;
+
+ if (win == 0)
+ win = DefaultRootWindow(dpy);
+
+ q = setup_msc(dpy, win);
+
+ xcb_present_notify_msc(c, win, serial ^ 0xdeadbeef, 0, 1, 0);
+ xcb_flush(c);
+
+ do {
+ xcb_present_complete_notify_event_t *ce;
+ xcb_generic_event_t *ev;
+
+ ev = xcb_wait_for_special_event(c, q);
+ if (ev == NULL)
+ break;
+
+ ce = (xcb_present_complete_notify_event_t *)ev;
+ if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
+ ce->serial == (serial ^ 0xdeadbeef)) {
+ msc = ce->msc;
+ complete = 1;
+ }
+ free(ev);
+ } while (!complete);
+
+ if (++serial == 0)
+ serial = 1;
+
+ teardown_msc(dpy, q);
+
+ return msc;
+}
+
+static int test_basic(Display *dpy, int dummy)
+{
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ XSetWindowAttributes attr;
+ Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
+ Pixmap pixmap;
+ struct dri3_fence fence;
+ Window root, win;
+ unsigned int width, height;
+ unsigned border, depth;
+ int x, y, ret = 1;
+ const char *phase;
+ uint64_t msc;
+
+ root = DefaultRootWindow(dpy);
+ XGetGeometry(dpy, root,
+ &win, &x, &y,
+ &width, &height, &border, &depth);
+
+ _x_error_occurred = 0;
+ attr.override_redirect = 1;
+ switch (dummy) {
+ case 0:
+ win = root;
+ phase = "root";
+ break;
+ case 1:
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0, depth,
+ InputOutput, visual,
+ CWOverrideRedirect, &attr);
+ phase = "fullscreen";
+ break;
+ case 2:
+ width /= 2;
+ height /= 2;
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0, depth,
+ InputOutput, visual,
+ CWOverrideRedirect, &attr);
+ phase = "window";
+ break;
+ case 3:
+ if (!has_composite(dpy))
+ return 0;
+
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0,
+ DefaultDepth(dpy, DefaultScreen(dpy)),
+ InputOutput,
+ DefaultVisual(dpy, DefaultScreen(dpy)),
+ CWOverrideRedirect, &attr);
+ XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
+ phase = "composite";
+ break;
+
+ default:
+ phase = "broken";
+ win = root;
+ abort();
+ break;
+ }
+
+ XMapWindow(dpy, win);
+ XSync(dpy, True);
+ if (_x_error_occurred)
+ return 1;
+
+ if (dri3_create_fence(dpy, win, &fence))
+ return 0;
+
+ printf("%s: Testing basic flip: %dx%d\n", phase, width, height);
+ fflush(stdout);
+ _x_error_occurred = 0;
+
+ xshmfence_reset(fence.addr);
+ msc = wait_vblank(dpy, win);
+
+ pixmap = XCreatePixmap(dpy, win, width, height, depth);
+ xcb_present_pixmap(c, win, pixmap, 0,
+ 0, /* valid */
+ 0, /* update */
+ 0, /* x_off */
+ 0, /* y_off */
+ None,
+ None, /* wait fence */
+ fence.xid,
+ XCB_PRESENT_OPTION_NONE,
+ (msc + 64) & -64, /* target msc */
+ 64, /* divisor */
+ 32, /* remainder */
+ 0, NULL);
+ XFreePixmap(dpy, pixmap);
+
+ pixmap = XCreatePixmap(dpy, win, width, height, depth);
+ xcb_present_pixmap(c, win, pixmap, 0,
+ 0, /* valid */
+ 0, /* update */
+ 0, /* x_off */
+ 0, /* y_off */
+ None,
+ None, /* wait fence */
+ None, /* sync fence */
+ XCB_PRESENT_OPTION_NONE,
+ (msc + 64) & -64, /* target msc */
+ 64, /* divisor */
+ 48, /* remainder */
+ 0, NULL);
+ XFreePixmap(dpy, pixmap);
+ XDestroyWindow(dpy, win);
+ XFlush(dpy);
+
+ ret = !!xshmfence_await(fence.addr);
+ dri3_fence_free(dpy, &fence);
+
+ XSync(dpy, True);
+ ret += !!_x_error_occurred;
+
+ return ret;
+}
+
+static int test_race(Display *dpy, int dummy)
+{
+ Display *mgr = XOpenDisplay(NULL);
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ XSetWindowAttributes attr;
+ Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
+ Pixmap pixmap;
+ struct dri3_fence fence;
+ Window root, win;
+ unsigned int width, height;
+ unsigned border, depth;
+ int x, y, ret = 1;
+ const char *phase;
+ uint64_t msc;
+
+ root = DefaultRootWindow(dpy);
+ XGetGeometry(dpy, root,
+ &win, &x, &y,
+ &width, &height, &border, &depth);
+
+ _x_error_occurred = 0;
+ attr.override_redirect = 1;
+ switch (dummy) {
+ case 0:
+ win = root;
+ phase = "root";
+ break;
+ case 1:
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0, depth,
+ InputOutput, visual,
+ CWOverrideRedirect, &attr);
+ phase = "fullscreen";
+ break;
+ case 2:
+ width /= 2;
+ height /= 2;
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0, depth,
+ InputOutput, visual,
+ CWOverrideRedirect, &attr);
+ phase = "window";
+ break;
+ case 3:
+ if (!has_composite(dpy))
+ return 0;
+
+ win = XCreateWindow(dpy, root,
+ 0, 0, width, height, 0,
+ DefaultDepth(dpy, DefaultScreen(dpy)),
+ InputOutput,
+ DefaultVisual(dpy, DefaultScreen(dpy)),
+ CWOverrideRedirect, &attr);
+ XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
+ phase = "composite";
+ break;
+
+ default:
+ phase = "broken";
+ win = root;
+ abort();
+ break;
+ }
+
+ XMapWindow(dpy, win);
+ XSync(dpy, True);
+ if (_x_error_occurred)
+ return 1;
+
+ if (dri3_create_fence(dpy, win, &fence))
+ return 0;
+
+ printf("%s: Testing race with manager: %dx%d\n", phase, width, height);
+ fflush(stdout);
+ _x_error_occurred = 0;
+
+ xshmfence_reset(fence.addr);
+ msc = wait_vblank(dpy, win);
+
+ pixmap = XCreatePixmap(dpy, win, width, height, depth);
+ xcb_present_pixmap(c, win, pixmap, 0,
+ 0, /* valid */
+ 0, /* update */
+ 0, /* x_off */
+ 0, /* y_off */
+ None,
+ None, /* wait fence */
+ fence.xid,
+ XCB_PRESENT_OPTION_NONE,
+ (msc + 64) & -64, /* target msc */
+ 64, /* divisor */
+ 32, /* remainder */
+ 0, NULL);
+ XFreePixmap(dpy, pixmap);
+
+ XFlush(dpy);
+ XDestroyWindow(mgr, win);
+ XFlush(mgr);
+
+ pixmap = XCreatePixmap(dpy, win, width, height, depth);
+ xcb_present_pixmap(c, win, pixmap, 0,
+ 0, /* valid */
+ 0, /* update */
+ 0, /* x_off */
+ 0, /* y_off */
+ None,
+ None, /* wait fence */
+ None, /* sync fence */
+ XCB_PRESENT_OPTION_NONE,
+ (msc + 64) & -64, /* target msc */
+ 64, /* divisor */
+ 48, /* remainder */
+ 0, NULL);
+ XFreePixmap(dpy, pixmap);
+ XFlush(dpy);
+
+ ret = !!xshmfence_await(fence.addr);
+ dri3_fence_free(dpy, &fence);
+
+ XSync(dpy, True);
+ ret += !!_x_error_occurred;
+
+ XCloseDisplay(mgr);
+
+ return ret;
+}
+
+static int has_present(Display *dpy)
+{
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_generic_error_t *error = NULL;
+ void *reply;
+
+ reply = xcb_xfixes_query_version_reply(c,
+ xcb_xfixes_query_version(c,
+ XCB_XFIXES_MAJOR_VERSION,
+ XCB_XFIXES_MINOR_VERSION),
+ &error);
+ free(reply);
+ free(error);
+ if (reply == NULL) {
+ fprintf(stderr, "XFixes not supported on %s\n", DisplayString(dpy));
+ return 0;
+ }
+
+ reply = xcb_dri3_query_version_reply(c,
+ xcb_dri3_query_version(c,
+ XCB_DRI3_MAJOR_VERSION,
+ XCB_DRI3_MINOR_VERSION),
+ &error);
+ free(reply);
+ free(error);
+ if (reply == NULL) {
+ fprintf(stderr, "DRI3 not supported on %s\n", DisplayString(dpy));
+ return 0;
+ }
+
+ reply = xcb_present_query_version_reply(c,
+ xcb_present_query_version(c,
+ XCB_PRESENT_MAJOR_VERSION,
+ XCB_PRESENT_MINOR_VERSION),
+ &error);
+
+ free(reply);
+ free(error);
+ if (reply == NULL) {
+ fprintf(stderr, "Present not supported on %s\n", DisplayString(dpy));
+ return 0;
+ }
+
+ return 1;
+}
+
+int main(void)
+{
+ Display *dpy;
+ int dummy;
+ int error = 0;
+
+ dpy = XOpenDisplay(NULL);
+ if (dpy == NULL)
+ return 77;
+
+ if (!has_present(dpy))
+ return 77;
+
+ if (DPMSQueryExtension(dpy, &dummy, &dummy))
+ DPMSDisable(dpy);
+
+ signal(SIGALRM, SIG_IGN);
+ XSetErrorHandler(_check_error_handler);
+
+ for (dummy = 0; dummy <= 3; dummy++) {
+ error += test_basic(dpy, dummy);
+ error += test_race(dpy, dummy);
+ }
+
+ if (DPMSQueryExtension(dpy, &dummy, &dummy))
+ DPMSEnable(dpy);
+ return !!error;
+}
More information about the xorg-commit
mailing list