From: Tvrtko Ursulin <tursulin@ursulin.net>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t v2 1/4] igt: Remove default from the engine list
Date: Thu, 6 Jul 2017 14:33:06 +0100 [thread overview]
Message-ID: <20170706133306.6170-1-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1498468528.25430.14.camel@intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Default is not an engine but an ABI alias for RCS. Remove it
from the engine list to eliminate redundant subtests and test
passes.
v2: Fix basic test timeout.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@intel.com>
---
lib/igt_gt.c | 1 -
lib/igt_gt.h | 5 ++
tests/gem_busy.c | 4 +-
tests/gem_cs_tlb.c | 2 +-
tests/gem_ctx_switch.c | 4 +-
tests/gem_exec_fence.c | 12 ++---
tests/gem_exec_flush.c | 12 ++---
tests/gem_ringfill.c | 2 +-
tests/intel-ci/extended.testlist | 21 ---------
tests/intel-ci/fast-feedback.testlist | 86 +++++++++++++++++------------------
tests/kms_busy.c | 4 +-
tests/prime_busy.c | 4 +-
tests/prime_vgem.c | 10 ++--
13 files changed, 73 insertions(+), 94 deletions(-)
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index 6f7daa5ef982..05fe2f45e254 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -553,7 +553,6 @@ unsigned intel_detect_and_clear_missed_interrupts(int fd)
}
const struct intel_execution_engine intel_execution_engines[] = {
- { "default", NULL, 0, 0 },
{ "render", "rcs0", I915_EXEC_RENDER, 0 },
{ "bsd", "vcs0", I915_EXEC_BSD, 0 },
{ "bsd1", "vcs0", I915_EXEC_BSD, 1<<13 /*I915_EXEC_BSD_RING1*/ },
diff --git a/lib/igt_gt.h b/lib/igt_gt.h
index 2579cbd37be7..d82d352a2d36 100644
--- a/lib/igt_gt.h
+++ b/lib/igt_gt.h
@@ -80,4 +80,9 @@ extern const struct intel_execution_engine {
bool gem_can_store_dword(int fd, unsigned int engine);
+static inline bool igt_is_basic(const struct intel_execution_engine *e)
+{
+ return e->exec_id == 1;
+}
+
#endif /* IGT_GT_H */
diff --git a/tests/gem_busy.c b/tests/gem_busy.c
index 8702dd7efa6f..72cffd218dfd 100644
--- a/tests/gem_busy.c
+++ b/tests/gem_busy.c
@@ -521,7 +521,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_group {
igt_subtest_f("%sbusy-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name) {
igt_require(gem_has_ring(fd, e->exec_id | e->flags));
gem_quiescent_gpu(fd);
@@ -599,7 +599,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%shang-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name) {
igt_require(gem_has_ring(fd, e->exec_id | e->flags));
gem_quiescent_gpu(fd);
diff --git a/tests/gem_cs_tlb.c b/tests/gem_cs_tlb.c
index 51e1c4e19930..98f857dad785 100644
--- a/tests/gem_cs_tlb.c
+++ b/tests/gem_cs_tlb.c
@@ -151,7 +151,7 @@ igt_main
}
for (e = intel_execution_engines; e->name; e++)
- igt_subtest_f("%s%s", e->exec_id ? "" : "basic-", e->name)
+ igt_subtest_f("%s%s", !igt_is_basic(e) ? "" : "basic-", e->name)
run_on_ring(fd, e->exec_id | e->flags, e->name);
igt_fixture
diff --git a/tests/gem_ctx_switch.c b/tests/gem_ctx_switch.c
index b6ea71cfe87b..c559e2cd7330 100644
--- a/tests/gem_ctx_switch.c
+++ b/tests/gem_ctx_switch.c
@@ -163,9 +163,9 @@ igt_main
}
for (e = intel_execution_engines; e->name; e++) {
- igt_subtest_f("%s%s", e->exec_id == 0 ? "basic-" : "", e->name)
+ igt_subtest_f("%s%s", igt_is_basic(e) ? "basic-" : "", e->name)
single(fd, light, e, 0, 1, 5);
- igt_subtest_f("%s%s-heavy", e->exec_id == 0 ? "basic-" : "", e->name)
+ igt_subtest_f("%s%s-heavy", igt_is_basic(e) ? "basic-" : "", e->name)
single(fd, heavy, e, 0, 1, 5);
igt_subtest_f("%s-interruptible", e->name)
single(fd, light, e, INTERRUPTIBLE, 1, 150);
diff --git a/tests/gem_exec_fence.c b/tests/gem_exec_fence.c
index b094f58551ab..92c626c34021 100644
--- a/tests/gem_exec_fence.c
+++ b/tests/gem_exec_fence.c
@@ -757,16 +757,16 @@ igt_main
}
igt_subtest_f("%sbusy-%s",
- e->exec_id == 0 ? "basic-" : "",
- e->name)
+ igt_is_basic(e) ? "basic-" : "",
+ e->name)
test_fence_busy(i915, e->exec_id | e->flags, 0);
igt_subtest_f("%swait-%s",
- e->exec_id == 0 ? "basic-" : "",
- e->name)
+ igt_is_basic(e) ? "basic-" : "",
+ e->name)
test_fence_busy(i915, e->exec_id | e->flags, WAIT);
igt_subtest_f("%sawait-%s",
- e->exec_id == 0 ? "basic-" : "",
- e->name)
+ igt_is_basic(e) ? "basic-" : "",
+ e->name)
test_fence_await(i915, e->exec_id | e->flags, 0);
igt_subtest_f("nb-await-%s", e->name)
test_fence_await(i915, e->exec_id | e->flags, NONBLOCK);
diff --git a/tests/gem_exec_flush.c b/tests/gem_exec_flush.c
index 803d45b66b29..ddc483994b73 100644
--- a/tests/gem_exec_flush.c
+++ b/tests/gem_exec_flush.c
@@ -598,7 +598,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) igt_subtest_group {
unsigned ring = e->exec_id | e->flags;
- unsigned timeout = 5 + 120*!!e->exec_id;
+ unsigned timeout = 5 + 120 * !!!igt_is_basic(e);
igt_fixture {
gem_require_ring(fd, ring);
@@ -607,17 +607,17 @@ igt_main
for (const struct batch *b = batches; b->name; b++) {
igt_subtest_f("%sbatch-%s-%s-uc",
- b == batches && e->exec_id == 0 ? "basic-" : "",
+ b == batches && igt_is_basic(e) ? "basic-" : "",
b->name,
e->name)
batch(fd, ring, ncpus, timeout, b->mode, 0);
igt_subtest_f("%sbatch-%s-%s-wb",
- b == batches && e->exec_id == 0 ? "basic-" : "",
+ b == batches && igt_is_basic(e) ? "basic-" : "",
b->name,
e->name)
batch(fd, ring, ncpus, timeout, b->mode, COHERENT);
igt_subtest_f("%sbatch-%s-%s-cmd",
- b == batches && e->exec_id == 0 ? "basic-" : "",
+ b == batches && igt_is_basic(e) ? "basic-" : "",
b->name,
e->name)
batch(fd, ring, ncpus, timeout, b->mode,
@@ -626,7 +626,7 @@ igt_main
for (const struct mode *m = modes; m->name; m++) {
igt_subtest_f("%suc-%s-%s",
- (m->flags & BASIC && e->exec_id == 0) ? "basic-" : "",
+ (m->flags & BASIC && igt_is_basic(e)) ? "basic-" : "",
m->name,
e->name)
run(fd, ring, ncpus, timeout,
@@ -639,7 +639,7 @@ igt_main
UNCACHED | m->flags | INTERRUPTIBLE);
igt_subtest_f("%swb-%s-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
m->name,
e->name)
run(fd, ring, ncpus, timeout,
diff --git a/tests/gem_ringfill.c b/tests/gem_ringfill.c
index b52996a433fd..be2e35f2a0a7 100644
--- a/tests/gem_ringfill.c
+++ b/tests/gem_ringfill.c
@@ -368,7 +368,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%s%s%s",
- m->basic && !e->exec_id ? "basic-" : "",
+ m->basic && igt_is_basic(e) ? "basic-" : "",
e->name,
m->suffix) {
igt_skip_on(m->flags & NEWFD && master);
diff --git a/tests/intel-ci/extended.testlist b/tests/intel-ci/extended.testlist
index 17eed013f810..7b480cfa1d03 100644
--- a/tests/intel-ci/extended.testlist
+++ b/tests/intel-ci/extended.testlist
@@ -76,7 +76,6 @@ igt@gem_ringfill@blt-bomb
igt@gem_ringfill@bsd-bomb
igt@gem_ringfill@bsd1-bomb
igt@gem_ringfill@bsd2-bomb
-igt@gem_ringfill@default-bomb
igt@gem_ringfill@render-bomb
igt@gem_ringfill@vebox-bomb
igt@gem_userptr_blits@stress-mm
@@ -1153,12 +1152,10 @@ igt@gem_bad_reloc@negative-reloc-bltcopy
igt@gem_bad_reloc@negative-reloc-bsd
igt@gem_bad_reloc@negative-reloc-bsd1
igt@gem_bad_reloc@negative-reloc-bsd2
-igt@gem_bad_reloc@negative-reloc-default
igt@gem_bad_reloc@negative-reloc-lut-blt
igt@gem_bad_reloc@negative-reloc-lut-bsd
igt@gem_bad_reloc@negative-reloc-lut-bsd1
igt@gem_bad_reloc@negative-reloc-lut-bsd2
-igt@gem_bad_reloc@negative-reloc-lut-default
igt@gem_bad_reloc@negative-reloc-lut-render
igt@gem_bad_reloc@negative-reloc-lut-vebox
igt@gem_bad_reloc@negative-reloc-render
@@ -1202,7 +1199,6 @@ igt@gem_cs_prefetch@blt
igt@gem_cs_prefetch@bsd
igt@gem_cs_prefetch@bsd1
igt@gem_cs_prefetch@bsd2
-igt@gem_cs_prefetch@default
igt@gem_cs_prefetch@render
igt@gem_cs_prefetch@vebox
igt@gem_cs_tlb@blt
@@ -1219,7 +1215,6 @@ igt@gem_ctx_bad_exec@blt
igt@gem_ctx_bad_exec@bsd
igt@gem_ctx_bad_exec@bsd1
igt@gem_ctx_bad_exec@bsd2
-igt@gem_ctx_bad_exec@default
igt@gem_ctx_bad_exec@render
igt@gem_ctx_bad_exec@vebox
igt@gem_ctx_exec@lrc-lite-restore
@@ -1243,7 +1238,6 @@ igt@gem_ctx_switch@bsd1
igt@gem_ctx_switch@bsd1-interruptible
igt@gem_ctx_switch@bsd2
igt@gem_ctx_switch@bsd2-interruptible
-igt@gem_ctx_switch@default-interruptible
igt@gem_ctx_switch@render
igt@gem_ctx_switch@render-interruptible
igt@gem_ctx_switch@vebox
@@ -1321,7 +1315,6 @@ igt@gem_exec_nop@blt
igt@gem_exec_nop@bsd
igt@gem_exec_nop@bsd1
igt@gem_exec_nop@bsd2
-igt@gem_exec_nop@default
igt@gem_exec_nop@parallel
igt@gem_exec_nop@render
igt@gem_exec_nop@series
@@ -1339,9 +1332,6 @@ igt@gem_exec_parallel@bsd2
igt@gem_exec_parallel@bsd2-contexts
igt@gem_exec_parallel@bsd2-fds
igt@gem_exec_parallel@contexts
-igt@gem_exec_parallel@default
-igt@gem_exec_parallel@default-contexts
-igt@gem_exec_parallel@default-fds
igt@gem_exec_parallel@fds
igt@gem_exec_parallel@render
igt@gem_exec_parallel@render-contexts
@@ -1391,7 +1381,6 @@ igt@gem_exec_reloc@active-blt
igt@gem_exec_reloc@active-bsd
igt@gem_exec_reloc@active-bsd1
igt@gem_exec_reloc@active-bsd2
-igt@gem_exec_reloc@active-default
igt@gem_exec_reloc@active-render
igt@gem_exec_reloc@active-vebox
igt@gem_exec_schedule@deep-blt
@@ -1430,7 +1419,6 @@ igt@gem_exec_whisper@bsd1-normal
igt@gem_exec_whisper@bsd2-normal
igt@gem_exec_whisper@chain
igt@gem_exec_whisper@contexts
-igt@gem_exec_whisper@default-normal
igt@gem_exec_whisper@fds
igt@gem_exec_whisper@forked
igt@gem_exec_whisper@interruptible
@@ -1707,8 +1695,6 @@ igt@gem_ringfill@bsd2
igt@gem_ringfill@bsd2-child
igt@gem_ringfill@bsd2-interruptible
igt@gem_ringfill@bsd2-s3
-igt@gem_ringfill@default-child
-igt@gem_ringfill@default-s3
igt@gem_ringfill@render
igt@gem_ringfill@render-child
igt@gem_ringfill@render-interruptible
@@ -1753,26 +1739,22 @@ igt@gem_storedw_loop@long-blt
igt@gem_storedw_loop@long-bsd
igt@gem_storedw_loop@long-bsd1
igt@gem_storedw_loop@long-bsd2
-igt@gem_storedw_loop@long-default
igt@gem_storedw_loop@long-render
igt@gem_storedw_loop@long-vebox
igt@gem_storedw_loop@short-blt
igt@gem_storedw_loop@short-bsd
igt@gem_storedw_loop@short-bsd1
igt@gem_storedw_loop@short-bsd2
-igt@gem_storedw_loop@short-default
igt@gem_storedw_loop@short-render
igt@gem_storedw_loop@short-vebox
igt@gem_sync@blt
igt@gem_sync@bsd
igt@gem_sync@bsd1
igt@gem_sync@bsd2
-igt@gem_sync@default
igt@gem_sync@many-blt
igt@gem_sync@many-bsd
igt@gem_sync@many-bsd1
igt@gem_sync@many-bsd2
-igt@gem_sync@many-default
igt@gem_sync@many-render
igt@gem_sync@many-vebox
igt@gem_sync@render
@@ -1780,7 +1762,6 @@ igt@gem_sync@store-blt
igt@gem_sync@store-bsd
igt@gem_sync@store-bsd1
igt@gem_sync@store-bsd2
-igt@gem_sync@store-default
igt@gem_sync@store-render
igt@gem_sync@store-vebox
igt@gem_sync@vebox
@@ -1833,7 +1814,6 @@ igt@gem_wait@busy-blt
igt@gem_wait@busy-bsd
igt@gem_wait@busy-bsd1
igt@gem_wait@busy-bsd2
-igt@gem_wait@busy-default
igt@gem_wait@busy-render
igt@gem_wait@busy-vebox
igt@gem_wait@invalid-buf
@@ -1842,7 +1822,6 @@ igt@gem_wait@wait-blt
igt@gem_wait@wait-bsd
igt@gem_wait@wait-bsd1
igt@gem_wait@wait-bsd2
-igt@gem_wait@wait-default
igt@gem_wait@wait-render
igt@gem_wait@wait-vebox
igt@gem_workarounds@reset
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index abe928d973e9..7d4f65ec2248 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -8,62 +8,59 @@ igt@drv_hangman@error-state-basic
igt@gem_basic@bad-close
igt@gem_basic@create-close
igt@gem_basic@create-fd-close
-igt@gem_busy@basic-busy-default
-igt@gem_busy@basic-hang-default
+igt@gem_busy@basic-busy-render
+igt@gem_busy@basic-hang-render
igt@gem_close_race@basic-process
igt@gem_close_race@basic-threads
igt@gem_cpu_reloc@basic
-igt@gem_cs_tlb@basic-default
+igt@gem_cs_tlb@basic-render
igt@gem_ctx_basic
igt@gem_ctx_create@basic
igt@gem_ctx_create@basic-files
igt@gem_ctx_exec@basic
igt@gem_ctx_param@basic
igt@gem_ctx_param@basic-default
-igt@gem_ctx_switch@basic-default
-igt@gem_ctx_switch@basic-default-heavy
+igt@gem_ctx_switch@basic-render
+igt@gem_ctx_switch@basic-render-heavy
igt@gem_exec_basic@basic-blt
igt@gem_exec_basic@basic-bsd
igt@gem_exec_basic@basic-bsd1
igt@gem_exec_basic@basic-bsd2
-igt@gem_exec_basic@basic-default
igt@gem_exec_basic@basic-render
igt@gem_exec_basic@basic-vebox
igt@gem_exec_basic@gtt-blt
igt@gem_exec_basic@gtt-bsd
igt@gem_exec_basic@gtt-bsd1
igt@gem_exec_basic@gtt-bsd2
-igt@gem_exec_basic@gtt-default
igt@gem_exec_basic@gtt-render
igt@gem_exec_basic@gtt-vebox
igt@gem_exec_basic@readonly-blt
igt@gem_exec_basic@readonly-bsd
igt@gem_exec_basic@readonly-bsd1
igt@gem_exec_basic@readonly-bsd2
-igt@gem_exec_basic@readonly-default
igt@gem_exec_basic@readonly-render
igt@gem_exec_basic@readonly-vebox
igt@gem_exec_create@basic
-igt@gem_exec_fence@basic-busy-default
-igt@gem_exec_fence@basic-wait-default
-igt@gem_exec_fence@basic-await-default
-igt@gem_exec_fence@await-hang-default
-igt@gem_exec_fence@nb-await-default
-igt@gem_exec_flush@basic-batch-kernel-default-cmd
-igt@gem_exec_flush@basic-batch-kernel-default-uc
-igt@gem_exec_flush@basic-batch-kernel-default-wb
-igt@gem_exec_flush@basic-uc-pro-default
-igt@gem_exec_flush@basic-uc-prw-default
-igt@gem_exec_flush@basic-uc-ro-default
-igt@gem_exec_flush@basic-uc-rw-default
-igt@gem_exec_flush@basic-uc-set-default
-igt@gem_exec_flush@basic-wb-pro-default
-igt@gem_exec_flush@basic-wb-prw-default
-igt@gem_exec_flush@basic-wb-ro-before-default
-igt@gem_exec_flush@basic-wb-ro-default
-igt@gem_exec_flush@basic-wb-rw-before-default
-igt@gem_exec_flush@basic-wb-rw-default
-igt@gem_exec_flush@basic-wb-set-default
+igt@gem_exec_fence@basic-busy-render
+igt@gem_exec_fence@basic-wait-render
+igt@gem_exec_fence@basic-await-render
+igt@gem_exec_fence@await-hang-render
+igt@gem_exec_fence@nb-await-render
+igt@gem_exec_flush@basic-batch-kernel-render-cmd
+igt@gem_exec_flush@basic-batch-kernel-render-uc
+igt@gem_exec_flush@basic-batch-kernel-render-wb
+igt@gem_exec_flush@basic-uc-pro-render
+igt@gem_exec_flush@basic-uc-prw-render
+igt@gem_exec_flush@basic-uc-ro-render
+igt@gem_exec_flush@basic-uc-rw-render
+igt@gem_exec_flush@basic-uc-set-render
+igt@gem_exec_flush@basic-wb-pro-render
+igt@gem_exec_flush@basic-wb-prw-render
+igt@gem_exec_flush@basic-wb-ro-before-render
+igt@gem_exec_flush@basic-wb-ro-render
+igt@gem_exec_flush@basic-wb-rw-before-render
+igt@gem_exec_flush@basic-wb-rw-render
+igt@gem_exec_flush@basic-wb-set-render
igt@gem_exec_gttfill@basic
igt@gem_exec_nop@basic-parallel
igt@gem_exec_nop@basic-series
@@ -103,7 +100,6 @@ igt@gem_exec_store@basic-blt
igt@gem_exec_store@basic-bsd
igt@gem_exec_store@basic-bsd1
igt@gem_exec_store@basic-bsd2
-igt@gem_exec_store@basic-default
igt@gem_exec_store@basic-render
igt@gem_exec_store@basic-vebox
igt@gem_exec_suspend@basic
@@ -141,11 +137,11 @@ igt@gem_pread@basic
igt@gem_pwrite@basic
igt@gem_render_linear_blits@basic
igt@gem_render_tiled_blits@basic
-igt@gem_ringfill@basic-default
-igt@gem_ringfill@basic-default-interruptible
-igt@gem_ringfill@basic-default-forked
-igt@gem_ringfill@basic-default-fd
-igt@gem_ringfill@basic-default-hang
+igt@gem_ringfill@basic-render
+igt@gem_ringfill@basic-render-interruptible
+igt@gem_ringfill@basic-render-forked
+igt@gem_ringfill@basic-render-fd
+igt@gem_ringfill@basic-render-hang
igt@gem_sync@basic-all
igt@gem_sync@basic-each
igt@gem_sync@basic-many-each
@@ -195,9 +191,9 @@ igt@kms_addfb_basic@unused-handle
igt@kms_addfb_basic@unused-modifier
igt@kms_addfb_basic@unused-offsets
igt@kms_addfb_basic@unused-pitches
-igt@kms_busy@basic-flip-default-a
-igt@kms_busy@basic-flip-default-b
-igt@kms_busy@basic-flip-default-c
+igt@kms_busy@basic-flip-render-a
+igt@kms_busy@basic-flip-render-b
+igt@kms_busy@basic-flip-render-c
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic
igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy
igt@kms_cursor_legacy@basic-flip-after-cursor-atomic
@@ -243,25 +239,25 @@ igt@pm_backlight@basic-brightness
igt@pm_rpm@basic-pci-d3-state
igt@pm_rpm@basic-rte
igt@pm_rps@basic-api
-igt@prime_busy@basic-after-default
-igt@prime_busy@basic-before-default
-igt@prime_busy@basic-wait-after-default
-igt@prime_busy@basic-wait-before-default
+igt@prime_busy@basic-after-render
+igt@prime_busy@basic-before-render
+igt@prime_busy@basic-wait-after-render
+igt@prime_busy@basic-wait-before-render
igt@prime_self_import@basic-llseek-bad
igt@prime_self_import@basic-llseek-size
igt@prime_self_import@basic-with_fd_dup
igt@prime_self_import@basic-with_one_bo
igt@prime_self_import@basic-with_one_bo_two_files
igt@prime_self_import@basic-with_two_bos
-igt@prime_vgem@basic-busy-default
+igt@prime_vgem@basic-busy-render
igt@prime_vgem@basic-fence-flip
igt@prime_vgem@basic-fence-mmap
igt@prime_vgem@basic-fence-read
-igt@prime_vgem@basic-fence-wait-default
+igt@prime_vgem@basic-fence-wait-render
igt@prime_vgem@basic-gtt
igt@prime_vgem@basic-read
-igt@prime_vgem@basic-sync-default
-igt@prime_vgem@basic-wait-default
+igt@prime_vgem@basic-sync-render
+igt@prime_vgem@basic-wait-render
igt@prime_vgem@basic-write
igt@vgem_basic@setversion
igt@vgem_basic@create
diff --git a/tests/kms_busy.c b/tests/kms_busy.c
index af7335db0d11..f7c476ac94c5 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -335,7 +335,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%sflip-%s-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name, kmstest_pipe_name(n)) {
igt_require(gem_has_ring(display.drm_fd,
e->exec_id | e->flags));
@@ -343,7 +343,7 @@ igt_main
test_flip(&display, e->exec_id | e->flags, n, false);
}
igt_subtest_f("%smodeset-%s-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name, kmstest_pipe_name(n)) {
igt_require(gem_has_ring(display.drm_fd,
e->exec_id | e->flags));
diff --git a/tests/prime_busy.c b/tests/prime_busy.c
index cbc91545d8d9..a4e42a7558e0 100644
--- a/tests/prime_busy.c
+++ b/tests/prime_busy.c
@@ -186,7 +186,7 @@ static void run_busy(int fd,
}
igt_subtest_f("%s%s-%s",
- !e->exec_id && !(flags & HANG) ? "basic-" : "",
+ igt_is_basic(e) && !(flags & HANG) ? "basic-" : "",
name, e->name)
busy(fd, e->exec_id | e->flags, flags);
@@ -211,7 +211,7 @@ static void run_poll(int fd,
}
igt_subtest_f("%swait-%s-%s",
- !e->exec_id && !(flags & HANG) ? "basic-" : "",
+ igt_is_basic(e) && !(flags & HANG) ? "basic-" : "",
name, e->name)
busy(fd, e->exec_id | e->flags, flags | POLL);
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 95557ef917fe..6cc637a32d12 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -755,7 +755,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%ssync-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name) {
gem_require_ring(i915, e->exec_id | e->flags);
igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags);
@@ -767,7 +767,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%sbusy-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name) {
gem_require_ring(i915, e->exec_id | e->flags);
igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags);
@@ -779,7 +779,7 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%swait-%s",
- e->exec_id == 0 ? "basic-" : "",
+ igt_is_basic(e) ? "basic-" : "",
e->name) {
gem_require_ring(i915, e->exec_id | e->flags);
igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags);
@@ -802,8 +802,8 @@ igt_main
for (e = intel_execution_engines; e->name; e++) {
igt_subtest_f("%sfence-wait-%s",
- e->exec_id == 0 ? "basic-" : "",
- e->name) {
+ igt_is_basic(e) ? "basic-" : "",
+ e->name) {
gem_require_ring(i915, e->exec_id | e->flags);
igt_require(gem_can_store_dword(i915, e->exec_id) | e->flags);
--
2.9.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-07-06 13:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 11:31 [RFC i-g-t 0/4] Redundant test pruning Tvrtko Ursulin
2017-06-23 11:31 ` [RFC i-g-t 1/4] igt: Remove default from the engine list Tvrtko Ursulin
2017-06-23 14:17 ` Szwichtenberg, Radoslaw
2017-06-23 14:35 ` Tvrtko Ursulin
2017-06-26 9:15 ` Szwichtenberg, Radoslaw
2017-07-06 13:33 ` Tvrtko Ursulin [this message]
2017-07-06 13:35 ` [PATCH i-g-t v2 " Chris Wilson
2017-06-23 11:31 ` [RFC i-g-t 2/4] gem_exec_basic: Exercise the default engine selection Tvrtko Ursulin
2017-06-23 11:31 ` [RFC i-g-t 3/4] gem_sync: Add all and store_all subtests Tvrtko Ursulin
2017-06-23 11:31 ` [RFC i-g-t 4/4] extended.testlist: Remove some test-subtest combinations Tvrtko Ursulin
2017-06-26 16:09 ` [RFC i-g-t 0/4] Redundant test pruning Daniel Vetter
2017-06-27 8:02 ` Tvrtko Ursulin
2017-06-27 9:14 ` Daniel Vetter
2017-06-27 11:46 ` Chris Wilson
2017-06-27 13:10 ` Daniel Vetter
2017-07-05 13:30 ` Tvrtko Ursulin
2017-07-06 9:28 ` Daniel Vetter
2017-07-06 11:31 ` Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170706133306.6170-1-tvrtko.ursulin@linux.intel.com \
--to=tursulin@ursulin.net \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.