diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-18 10:23:49 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-18 11:06:38 +0100 |
| commit | 69b29f87eda6178998254ddf54f005d2bddedd7c (patch) | |
| tree | 22648762d6ceae98cb18c426526e5fc82acd0759 /tests/gem_ctx_switch.c | |
| parent | 54f8a3f7cf12eea484a0b0641718ced559959f53 (diff) | |
igt: Trim timeouts for basic GEM tests
It's a compromise between detecting an unlikely timing error in one
test and being able to run a broader selection of tests. I hope this is
wise.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/gem_ctx_switch.c')
| -rw-r--r-- | tests/gem_ctx_switch.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/gem_ctx_switch.c b/tests/gem_ctx_switch.c index 0f5286d7..0841bf22 100644 --- a/tests/gem_ctx_switch.c +++ b/tests/gem_ctx_switch.c @@ -67,7 +67,8 @@ static double elapsed(const struct timespec *start, const struct timespec *end) static void single(int fd, uint32_t handle, const struct intel_execution_engine *e, unsigned flags, - const int ncpus) + const int ncpus, + int timeout) { struct drm_i915_gem_execbuffer2 execbuf; struct drm_i915_gem_exec_object2 obj; @@ -117,15 +118,15 @@ static void single(int fd, uint32_t handle, clock_gettime(CLOCK_MONOTONIC, &start); do { igt_while_interruptible(flags & INTERRUPTIBLE) { - for (int loop = 0; loop < 1024; loop++) { + for (int loop = 0; loop < 64; loop++) { execbuf.rsvd1 = contexts[loop % 64]; reloc.presumed_offset = 0; gem_execbuf(fd, &execbuf); } - count += 1024; + count += 64; } clock_gettime(CLOCK_MONOTONIC, &now); - } while (elapsed(&start, &now) < 20.); + } while (elapsed(&start, &now) < timeout); gem_sync(fd, handle); clock_gettime(CLOCK_MONOTONIC, &now); @@ -161,17 +162,17 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%s%s", e->exec_id == 0 ? "basic-" : "", e->name) - single(fd, light, e, 0, 1); + single(fd, light, e, 0, 1, 5); igt_subtest_f("%s%s-heavy", e->exec_id == 0 ? "basic-" : "", e->name) - single(fd, heavy, e, 0, 1); + single(fd, heavy, e, 0, 1, 5); igt_subtest_f("%s-interruptible", e->name) - single(fd, light, e, INTERRUPTIBLE, 1); + single(fd, light, e, INTERRUPTIBLE, 1, 150); igt_subtest_f("forked-%s", e->name) - single(fd, light, e, 0, ncpus); + single(fd, light, e, 0, ncpus, 150); igt_subtest_f("forked-%s-heavy", e->name) - single(fd, heavy, e, 0, ncpus); + single(fd, heavy, e, 0, ncpus, 150); igt_subtest_f("forked-%s-interruptible", e->name) - single(fd, light, e, INTERRUPTIBLE, ncpus); + single(fd, light, e, INTERRUPTIBLE, ncpus, 150); } igt_fixture { |