Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/present: Test accuracy of long pauses 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-02-12 11:23:07 +00:00
parent 818b596a6a
commit ac1eb7f7c9
2 changed files with 156 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_present.c
View File

@ -219,7 +219,7 @@ sna_present_vblank_handler(struct drm_event_vblank *event)
{
struct sna_present_event *info = to_present_event(event->user_data);
DBG(("%s: pipe=%d tv=%d.%06d msc=%d (target=%lld), event %lld complete%s\n", __FUNCTION__,
DBG(("%s: pipe=%d tv=%d.%06d msc=%d (target=%lld), event=%lld complete%s\n", __FUNCTION__,
sna_crtc_to_pipe(info->crtc),
event->tv_sec, event->tv_usec, event->sequence,
(long long)info->target_msc, (long long)info->event_id,
@ -393,7 +393,7 @@ page_flip__async(struct sna *sna,
return FALSE;
}
DBG(("%s: pipe=%d tv=%d.%06d msc=%lld (target=%lld), event %lld complete\n", __FUNCTION__,
DBG(("%s: pipe=%d tv=%d.%06d msc=%lld (target=%lld), event=%lld complete\n", __FUNCTION__,
pipe_from_crtc(crtc),
gettime_ust64() / 1000000, gettime_ust64() % 1000000,
(long long)sna_crtc_last_swap(crtc->devPrivate)->msc,
@ -417,7 +417,7 @@ present_flip_handler(struct drm_event_vblank *event, void *data)
} else
swap = *sna_crtc_last_swap(info->crtc);
DBG(("%s: pipe=%d, tv=%d.%06d msc %lld (target %lld), event %lld complete%s\n", __FUNCTION__,
DBG(("%s: pipe=%d, tv=%d.%06d msc=%lld (target %lld), event=%lld complete%s\n", __FUNCTION__,
info->crtc ? sna_crtc_to_pipe(info->crtc) : -1,
swap.tv_sec, swap.tv_usec, (long long)swap.msc,
(long long)info->target_msc,
@ -553,7 +553,7 @@ sna_present_unflip(ScreenPtr screen, uint64_t event_id)
notify:
swap = sna_crtc_last_swap(sna_primary_crtc(sna));
DBG(("%s: pipe=%d, tv=%d.%06d msc %lld, event %lld complete\n", __FUNCTION__,
DBG(("%s: pipe=%d, tv=%d.%06d msc=%lld, event=%lld complete\n", __FUNCTION__,
-1,
swap->tv_sec, swap->tv_usec, (long long)swap->msc,
(long long)event_id));

165
test/present-test.c
View File

@ -242,6 +242,141 @@ static int test_whole(Display *dpy)
}
static int test_future(Display *dpy, void *Q)
{
xcb_connection_t *c = XGetXCBConnection(dpy);
Pixmap pixmap;
struct dri3_fence fence;
Window root;
unsigned int width, height;
unsigned border, depth;
int x, y, ret = 0, n;
uint64_t target;
int complete;
int early = 0, late = 0;
int earliest = 0, latest = 0;
XGetGeometry(dpy, DefaultRootWindow(dpy),
&root, &x, &y, &width, &height, &border, &depth);
if (dri3_create_fence(dpy, root, &fence))
return 0;
printf("Testing whole screen flips into the future: %dx%d\n", width, height);
_x_error_occurred = 0;
target = check_msc(dpy, root, Q, 0);
pixmap = XCreatePixmap(dpy, root, width, height, depth);
xcb_present_pixmap(c, root, pixmap,
0xdeadbeef, /* serial */
0, /* valid */
0, /* update */
0, /* x_off */
0, /* y_off */
None,
None, /* wait fence */
None,
XCB_PRESENT_OPTION_NONE,
target + 60, /* target msc */
0, /* divisor */
0, /* remainder */
0, NULL);
xcb_flush(c);
complete = 0;
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_PIXMAP)
break;
complete = ce->serial == 0xdeadbeef;
free(ev);
} while (!complete);
XSync(dpy, True);
target = check_msc(dpy, root, Q, 0);
for (n = 0; n <= 10; n++)
xcb_present_pixmap(c, root, pixmap,
target + 60 + n*15*60, /* serial */
0, /* valid */
0, /* update */
0, /* x_off */
0, /* y_off */
None,
None, /* wait fence */
None,
XCB_PRESENT_OPTION_NONE,
target + 60 + n*15*60, /* target msc */
0, /* divisor */
0, /* remainder */
0, NULL);
xcb_present_pixmap(c, root, pixmap,
0xdeadbeef, /* serial */
0, /* valid */
0, /* update */
0, /* x_off */
0, /* y_off */
None,
None, /* wait fence */
None,
XCB_PRESENT_OPTION_NONE,
target + 60 + n*15*60, /* target msc */
0, /* divisor */
0, /* remainder */
0, NULL);
xcb_flush(c);
complete = 0;
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_PIXMAP)
break;
assert(ce->serial);
if (ce->serial == 0xdeadbeef) {
complete = 1;
} else {
int msc = (uint32_t)ce->msc - ce->serial;
if (msc < 0) {
fprintf(stderr, "\tframe %d displayed early by %lld frames\n", (int)(ce->serial - target - 60)/(15*60), (long long)msc);
ret += -msc;
if (-msc > earliest)
earliest = -msc;
early++;
} else if (msc > 1) { /* allow the frame to slip by a vblank */
ret += msc;
if (msc > latest)
latest = msc;
late++;
}
}
free(ev);
} while (!complete);
if (early)
printf("\t%d frames shown too early (worst %d)!\n", early, earliest);
if (late)
printf("\t%d frames shown too late (worst %d)!\n", late, latest);
ret += !!_x_error_occurred;
return ret;
}
static int test_exhaustion(Display *dpy, void *Q)
{
#define N_VBLANKS 256 /* kernel event queue length: 128 vblanks */
xcb_connection_t *c = XGetXCBConnection(dpy);
@ -261,7 +396,7 @@ static int test_future(Display *dpy, void *Q)
if (dri3_create_fence(dpy, root, &fence))
return 0;
printf("Testing whole screen flips into the future: %dx%d\n", width, height);
printf("Testing whole screen flips with long vblank queues: %dx%d\n", width, height);
_x_error_occurred = 0;
region = xcb_generate_id(c);
@ -304,11 +439,11 @@ static int test_future(Display *dpy, void *Q)
final = check_msc(dpy, root, Q, 0);
if (final < target) {
printf("First flip too early, MSC was %llu, expected %llu\n",
printf("\tFirst flip too early, MSC was %llu, expected %llu\n",
(long long)final, (long long)target);
ret++;
} else if (final > target + 1) {
printf("First flip too late, MSC was %llu, expected %llu\n",
printf("\tFirst flip too late, MSC was %llu, expected %llu\n",
(long long)final, (long long)target);
ret++;
}
@ -332,11 +467,11 @@ static int test_future(Display *dpy, void *Q)
final = check_msc(dpy, root, Q, 0);
if (final < target + N_VBLANKS) {
printf("Last flip too early, MSC was %llu, expected %llu\n",
printf("\tLast flip too early, MSC was %llu, expected %llu\n",
(long long)final, (long long)(target + N_VBLANKS));
ret++;
} else if (final > target + N_VBLANKS + 1) {
printf("Last flip too late, MSC was %llu, expected %llu\n",
printf("\tLast flip too late, MSC was %llu, expected %llu\n",
(long long)final, (long long)(target + N_VBLANKS));
ret++;
}
@ -394,6 +529,7 @@ static int test_accuracy(Display *dpy, void *Q)
int x, y, ret = 0, n;
uint64_t target;
int early = 0, late = 0;
int earliest = 0, latest = 0;
int complete;
XGetGeometry(dpy, DefaultRootWindow(dpy),
@ -471,13 +607,17 @@ static int test_accuracy(Display *dpy, void *Q)
assert(ce->serial);
msc = ce->msc - ce->serial;
msc = (uint32_t)ce->msc - ce->serial;
if (msc < 0) {
fprintf(stderr, "frame %d displayed early by %lld frames\n", (int)(ce->serial - target - 60), (long long)msc);
fprintf(stderr, "\tframe %d displayed early by %lld frames\n", (int)(ce->serial - target - 60), (long long)msc);
ret += -msc;
if (-msc > earliest)
earliest = -msc;
early++;
} else if (msc > 1) { /* allow the frame to slip by a vblank */
ret += msc;
if (msc > latest)
latest = msc;
late++;
}
complete = ce->serial == target + 60 + N_VBLANKS;
@ -485,11 +625,9 @@ static int test_accuracy(Display *dpy, void *Q)
} while (!complete);
if (early)
printf("%d frames shown too early! ", early);
printf("\t%d frames shown too early (worst %d)!\n", early, earliest);
if (late)
printf("%d fames shown too late!", late);
if (early|late)
printf("\n");
printf("\t%d frames shown too late (worst %d)!\n", late, latest);
ret += !!_x_error_occurred;
@ -542,8 +680,6 @@ static int for_each_crtc(Display *dpy,
for (i = 0; i < res->ncrtc; i++)
original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
printf("noutput=%d, ncrtc=%d\n", res->noutput, res->ncrtc);
for (i = 0; i < res->noutput; i++) {
XRROutputInfo *output;
XRRModeInfo *mode;
@ -1016,6 +1152,9 @@ int main(void)
error += test_accuracy(dpy, queue);
last_msc = check_msc(dpy, root, queue, last_msc);
error += test_exhaustion(dpy, queue);
last_msc = check_msc(dpy, root, queue, last_msc);
error += test_crtc(dpy, queue, last_msc);
last_msc = check_msc(dpy, root, queue, last_msc);