igt/gem_sync: Test across all rings simultaneously

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-02-26 10:06:51 +00:00
parent 0667cf5669
commit 430439541c

View File

@ -65,16 +65,68 @@ out:
return ts.tv_sec + 1e-9*ts.tv_nsec; return ts.tv_sec + 1e-9*ts.tv_nsec;
} }
static int has_engine(int fd, const struct intel_execution_engine *e)
{
uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 exec;
int ret;
memset(&exec, 0, sizeof(exec));
exec.handle = gem_create(fd, 4096);
gem_write(fd, exec.handle, 0, &bbe, sizeof(bbe));
memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = (uintptr_t)&exec;
execbuf.buffer_count = 1;
execbuf.flags = e->exec_id | e->flags;
ret = __gem_execbuf(fd, &execbuf);
gem_close(fd, exec.handle);
return ret;
}
static void static void
sync_ring(int fd, unsigned ring, int num_children) sync_ring(int fd, unsigned ring, int num_children)
{ {
gem_require_ring(fd, ring); unsigned engines[16];
intel_detect_and_clear_missed_interrupts(fd); const char *names[16];
int num_engines = 0;
if (ring == ~0u) {
const struct intel_execution_engine *e;
for (e = intel_execution_engines; e->name; e++) {
if (e->exec_id == 0)
continue;
if (has_engine(fd, e))
continue;
if (e->exec_id == I915_EXEC_BSD) {
int is_bsd2 = e->flags != 0;
if (gem_has_bsd2(fd) != is_bsd2)
continue;
}
names[num_engines] = e->name;
engines[num_engines++] = e->exec_id | e->flags;
if (num_engines == ARRAY_SIZE(engines))
break;
}
num_children *= num_engines;
} else {
gem_require_ring(fd, ring);
names[num_engines] = NULL;
engines[num_engines++] = ring;
}
intel_detect_and_clear_missed_interrupts(fd);
igt_fork(child, num_children) { igt_fork(child, num_children) {
const uint32_t bbe = MI_BATCH_BUFFER_END; const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 object; struct drm_i915_gem_exec_object2 object;
struct drm_i915_gem_execbuffer2 execbuf;
double start, elapsed; double start, elapsed;
unsigned long cycles; unsigned long cycles;
@ -85,7 +137,7 @@ sync_ring(int fd, unsigned ring, int num_children)
memset(&execbuf, 0, sizeof(execbuf)); memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = (uintptr_t)&object; execbuf.buffers_ptr = (uintptr_t)&object;
execbuf.buffer_count = 1; execbuf.buffer_count = 1;
execbuf.flags = ring; execbuf.flags = engines[child % num_engines];
gem_execbuf(fd, &execbuf); gem_execbuf(fd, &execbuf);
start = gettime(); start = gettime();
@ -96,7 +148,10 @@ sync_ring(int fd, unsigned ring, int num_children)
gem_sync(fd, object.handle); gem_sync(fd, object.handle);
} while (++cycles & 1023); } while (++cycles & 1023);
} while ((elapsed = gettime() - start) < SLOW_QUICK(10, 1)); } while ((elapsed = gettime() - start) < SLOW_QUICK(10, 1));
igt_info("Completed %ld cycles: %.3f us\n", cycles, elapsed*1e6/cycles); igt_info("%s%sompleted %ld cycles: %.3f us\n",
names[child % num_engines] ?: "",
names[child % num_engines] ? " c" : "C",
cycles, elapsed*1e6/cycles);
gem_close(fd, object.handle); gem_close(fd, object.handle);
} }
@ -107,6 +162,7 @@ sync_ring(int fd, unsigned ring, int num_children)
igt_main igt_main
{ {
const struct intel_execution_engine *e; const struct intel_execution_engine *e;
const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
int fd = -1; int fd = -1;
igt_skip_on_simulation(); igt_skip_on_simulation();
@ -118,9 +174,14 @@ igt_main
igt_subtest_f("basic-%s", e->name) igt_subtest_f("basic-%s", e->name)
sync_ring(fd, e->exec_id | e->flags, 1); sync_ring(fd, e->exec_id | e->flags, 1);
igt_subtest_f("forked-%s", e->name) igt_subtest_f("forked-%s", e->name)
sync_ring(fd, e->exec_id | e->flags, sysconf(_SC_NPROCESSORS_ONLN)); sync_ring(fd, e->exec_id | e->flags, ncpus);
} }
igt_subtest("basic-all")
sync_ring(fd, ~0u, 1);
igt_subtest("forked-all")
sync_ring(fd, ~0u, ncpus);
igt_fixture igt_fixture
close(fd); close(fd);
} }