Re: [Intel-gfx] [RFC i-g-t 1/4] igt: Remove default from the engine list

[Szwichtenberg, Radoslaw]

On Fri, 2017-06-23 at 15:35 +0100, Tvrtko Ursulin wrote:
> On 23/06/2017 15:17, Szwichtenberg, Radoslaw wrote:
> > On Fri, 2017-06-23 at 12:31 +0100, Tvrtko Ursulin wrote:
> > > From: Tvrtko Ursulin 
> > > 
> > > Default is not an engine but an ABI alias for RCS. Remove it
> > > from the engine list to eliminate redundant subtests and test
> > > passes.
> > 
> > Does it mean that we will have an ABI part that we don't test?
> 
> Second patch adds the ABI testing to gem_exec_basic. Plus there is and 
> odd test here and there which explicitly sends batches to 
> I915_EXEC_DEFAULT. But to me just basic verification that the default 
> works sounds enough.
Looks good to me.
-Radek
> Regards,
> 
> Tvrtko
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [RFC i-g-t 1/4] igt: Remove default from the engine list

[Tvrtko Ursulin]

On 23/06/2017 15:17, Szwichtenberg, Radoslaw wrote:

On Fri, 2017-06-23 at 12:31 +0100, Tvrtko Ursulin wrote:

From: Tvrtko Ursulin 

Default is not an engine but an ABI alias for RCS. Remove it
from the engine list to eliminate redundant subtests and test
passes.

Does it mean that we will have an ABI part that we don't test?


Second patch adds the ABI testing to gem_exec_basic. Plus there is and 
odd test here and there which explicitly sends batches to 
I915_EXEC_DEFAULT. But to me just basic verification that the default 
works sounds enough.


Regards,

Tvrtko
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [RFC i-g-t 1/4] igt: Remove default from the engine list

[Szwichtenberg, Radoslaw]

On Fri, 2017-06-23 at 12:31 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin 
> 
> Default is not an engine but an ABI alias for RCS. Remove it
> from the engine list to eliminate redundant subtests and test
> passes.
Does it mean that we will have an ABI part that we don't test?
-Radek
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [RFC i-g-t 1/4] igt: Remove default from the engine list

[Tvrtko Ursulin]

From: Tvrtko Ursulin 

Default is not an engine but an ABI alias for RCS. Remove it
from the engine list to eliminate redundant subtests and test
passes.

Signed-off-by: Tvrtko Ursulin 
---
 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| 10 ++--
 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, 72 insertions(+), 93 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 80ebce5d6707..046e065b33e2 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 5230e693ba16..2baf1f05d74a 100644
--- a/tests/gem_exec_fence.c
+++ b/tests/gem_exec_fence.c
@@ -558,16 +558,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);