flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 01:46:14 +00:00
Code Issues Releases Wiki Activity

igt/gem_exec_flush: Also check flushing before the cmdparser

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-05-04 13:51:58 +01:00
parent 8adb5a07f2
commit a263a043ec
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/gem_exec_flush.c
View File

@ -33,6 +33,7 @@ IGT_TEST_DESCRIPTION("Basic check of flushing after batches");
#define KERNEL 4 #define KERNEL 4
#define SET_DOMAIN 8 #define SET_DOMAIN 8
#define INTERRUPTIBLE 16 #define INTERRUPTIBLE 16
#define CMDPARSER 32
static void run(int fd, unsigned ring, int nchild, int timeout, static void run(int fd, unsigned ring, int nchild, int timeout,
unsigned flags) unsigned flags)
@ -244,6 +245,16 @@ static void batch(int fd, unsigned ring, int nchild, int timeout,
{ {
const int gen = intel_gen(intel_get_drm_devid(fd)); const int gen = intel_gen(intel_get_drm_devid(fd));
if (flags & CMDPARSER) {
int cmdparser = -1;
drm_i915_getparam_t gp;
gp.param = I915_PARAM_CMD_PARSER_VERSION;
gp.value = &cmdparser;
drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp);
igt_require(cmdparser > 0);
}
igt_fork(child, nchild) { igt_fork(child, nchild) {
const uint32_t bbe = MI_BATCH_BUFFER_END; const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj[2]; struct drm_i915_gem_exec_object2 obj[2];
@ -354,6 +365,13 @@ static void batch(int fd, unsigned ring, int nchild, int timeout,
*b++ = cycles + i; *b++ = cycles + i;
*b++ = MI_BATCH_BUFFER_END; *b++ = MI_BATCH_BUFFER_END;
if (flags & CMDPARSER) {
execbuf.batch_len =
(b - start) * sizeof(uint32_t);
if (execbuf.batch_len & 4)
execbuf.batch_len += 4;
}
switch (mode) { switch (mode) {
case BATCH_KERNEL: case BATCH_KERNEL:
gem_write(fd, obj[1].handle, gem_write(fd, obj[1].handle,
@ -362,7 +380,9 @@ static void batch(int fd, unsigned ring, int nchild, int timeout,
break; break;
case BATCH_USER: case BATCH_USER:
igt_clflush_range(start, (b - start) * sizeof(uint32_t)); if (!gem_has_llc(fd))
igt_clflush_range(start,
(b - start) * sizeof(uint32_t));
break; break;
case BATCH_CPU: case BATCH_CPU:
@ -463,6 +483,12 @@ igt_main
b->name, b->name,
e->name) e->name)
batch(fd, ring, ncpus, timeout, b->mode, COHERENT); batch(fd, ring, ncpus, timeout, b->mode, COHERENT);
igt_subtest_f("%sbatch-%s-%s-cmd",
e->exec_id == 0 ? "basic-" : "",
b->name,
e->name)
batch(fd, ring, ncpus, timeout, b->mode,
COHERENT | CMDPARSER);
} }
for (const struct mode *m = modes; m->name; m++) { for (const struct mode *m = modes; m->name; m++) {