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

igt/gem_exec_flush: Use subtest groups to tidy requirement checking

Browse Source 
We can make the requirement testing and reporting tidier by using
igt_subtest_group.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-05-01 15:34:56 +01:00
parent a0d6645d45
commit 89f354e0a5
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/gem_exec_flush.c
View File

@ -35,10 +35,6 @@ static void run(int fd, unsigned ring, int nchild, unsigned flags, int timeout)
{ {
const int gen = intel_gen(intel_get_drm_devid(fd)); const int gen = intel_gen(intel_get_drm_devid(fd));
gem_require_ring(fd, ring);
igt_skip_on_f(gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD,
"MI_STORE_DATA broken on gen6 bsd\n");
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[3]; struct drm_i915_gem_exec_object2 obj[3];
@ -191,6 +187,7 @@ igt_main
{ {
const struct intel_execution_engine *e; const struct intel_execution_engine *e;
const int ncpus = sysconf(_SC_NPROCESSORS_ONLN); const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
int gen = -1;
int fd = -1; int fd = -1;
igt_skip_on_simulation(); igt_skip_on_simulation();
@ -198,30 +195,36 @@ igt_main
igt_fixture { igt_fixture {
igt_require(igt_setup_clflush()); igt_require(igt_setup_clflush());
fd = drm_open_driver(DRIVER_INTEL); fd = drm_open_driver(DRIVER_INTEL);
gen = intel_gen(intel_get_drm_devid(fd));
} }
igt_fork_hang_detector(fd); igt_fork_hang_detector(fd);
for (e = intel_execution_engines; e->name; e++) { for (e = intel_execution_engines; e->name; e++) igt_subtest_group {
unsigned ring = e->exec_id | e->flags;
unsigned timeout = 2 + 120*!!e->exec_id;
igt_fixture {
gem_require_ring(fd, ring);
igt_skip_on_f(gen == 6 && e->exec_id == I915_EXEC_BSD,
"MI_STORE_DATA broken on gen6 bsd\n");
}
igt_subtest_f("%suc-ro-%s", igt_subtest_f("%suc-ro-%s",
e->exec_id == 0 ? "basic-" : "", e->name) e->exec_id == 0 ? "basic-" : "", e->name)
run(fd, e->exec_id | e->flags, ncpus, run(fd, ring, ncpus, UNCACHED, timeout);
UNCACHED, 2 + 120*!!e->exec_id);
igt_subtest_f("%suc-rw-%s", igt_subtest_f("%suc-rw-%s",
e->exec_id == 0 ? "basic-" : "", e->name) e->exec_id == 0 ? "basic-" : "", e->name)
run(fd, e->exec_id | e->flags, ncpus, run(fd, ring, ncpus, UNCACHED | WRITE, timeout);
UNCACHED | WRITE, 2 + 120*!!e->exec_id);
igt_subtest_f("%swb-ro-%s", igt_subtest_f("%swb-ro-%s",
e->exec_id == 0 ? "basic-" : "", e->name) e->exec_id == 0 ? "basic-" : "", e->name)
run(fd, e->exec_id | e->flags, ncpus, run(fd, ring, ncpus, COHERENT, timeout);
COHERENT, 2 + 120*!!e->exec_id);
igt_subtest_f("%swb-rw-%s", igt_subtest_f("%swb-rw-%s",
e->exec_id == 0 ? "basic-" : "", e->name) e->exec_id == 0 ? "basic-" : "", e->name)
run(fd, e->exec_id | e->flags, ncpus, run(fd, ring, ncpus, COHERENT | WRITE, timeout);
COHERENT | WRITE, 2 + 120*!!e->exec_id);
} }
igt_stop_hang_detector(); igt_stop_hang_detector();