[igt-dev] [PATCH i-g-t v6 1/1] tests/i915/gem_ctx_persistence: Set context with supported engines

[Tvrtko Ursulin]

On 29/01/2020 21:09, Chris Wilson wrote:
> Quoting Bommu Krishnaiah (2020-01-29 18:10:02)
>> Update the context with supported engines on the platform with set_property
>> I915_CONTEXT_PARAM_ENGINES to make sure the work load is submitted to
>> the available engines only.
>>
>> v2: addressed the review comments.
>> v3: addressed v2 review comments.
>> V4: Re-introduced the gem_context_set_all_engines() API,test_process_mixed()
>> test creating new forked process, to set engine map to new forked process
>> I added gem_context_set_all_engines() API.
>> v5: addressed v4 review comments.
>> v6: addressed chris comments.
> 
> This is totally useless as a recording of the history. Explain why you
> had to make the changes, for posterity.
> 
>> -       __for_each_static_engine(e) {
>> +       for_each_engine(e, i915) {
> 
> Incorrect change that leads to compiler warnings and prevents the legacy
> tests being listed by CI.
> 
> I've given up and fixed it.

Partially my bad, I suggested to use for_each_engine while forgetting subtest
enumeration needs to be static and for_each_engine has an runtime element. :(

This diff on top fixes it:

diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c
index de6f59251200..c56189c57cdd 100644
--- a/tests/i915/gem_ctx_persistence.c
+++ b/tests/i915/gem_ctx_persistence.c
@@ -758,7 +758,8 @@ static void smoketest(int i915)
 
 igt_main
 {
-       const struct intel_execution_engine2 *e;
+       const struct intel_execution_engine *e;
+       const struct intel_execution_engine2 *e2;
        int i915;
 
        igt_fixture {
@@ -791,10 +792,10 @@ igt_main
        igt_subtest("hang")
                test_nohangcheck_hang(i915);
 
-       for_each_engine(e, i915) {
+       for (e = intel_execution_engines; e->name; e++) {
                igt_subtest_group {
                        igt_fixture {
-                               gem_require_ring(i915, e->flags);
+                               gem_require_ring(i915, eb_ring(e));
                                gem_require_contexts(i915);
                        }
 
@@ -822,37 +823,37 @@ igt_main
                }
        }
 
-        __for_each_physical_engine(i915, e) {
+        __for_each_physical_engine(i915, e2) {
                 igt_subtest_group {
                         igt_fixture {
-                                gem_require_ring(i915, e->flags);
+                                gem_require_ring(i915, e2->flags);
                                 gem_require_contexts(i915);
                         }
 
-                       igt_subtest_f("%s-persistence", e->name)
-                               test_persistence(i915, e->flags);
+                       igt_subtest_f("%s-persistence", e2->name)
+                               test_persistence(i915, e2->flags);
 
-                       igt_subtest_f("%s-cleanup", e->name)
-                               test_nonpersistent_cleanup(i915, e->flags);
+                       igt_subtest_f("%s-cleanup", e2->name)
+                               test_nonpersistent_cleanup(i915, e2->flags);
 
-                       igt_subtest_f("%s-queued", e->name)
-                               test_nonpersistent_queued(i915, e->flags);
+                       igt_subtest_f("%s-queued", e2->name)
+                               test_nonpersistent_queued(i915, e2->flags);
 
-                       igt_subtest_f("%s-mixed", e->name)
-                               test_nonpersistent_mixed(i915, e->flags);
+                       igt_subtest_f("%s-mixed", e2->name)
+                               test_nonpersistent_mixed(i915, e2->flags);
 
-                       igt_subtest_f("%s-mixed-process", e->name)
-                               test_process_mixed(i915, e->flags);
+                       igt_subtest_f("%s-mixed-process", e2->name)
+                               test_process_mixed(i915, e2->flags);
 
-                       igt_subtest_f("%s-hostile", e->name)
-                               test_nonpersistent_hostile(i915, e->flags);
+                       igt_subtest_f("%s-hostile", e2->name)
+                               test_nonpersistent_hostile(i915, e2->flags);
 
-                       igt_subtest_f("%s-hostile-preempt", e->name)
+                       igt_subtest_f("%s-hostile-preempt", e2->name)
                                test_nonpersistent_hostile_preempt(i915,
-                                                                  e->flags);
+                                                                  e2->flags);
 
-                       igt_subtest_f("%s-hang", e->name)
-                               test_nonpersistent_hang(i915, e->flags);
+                       igt_subtest_f("%s-hang", e2->name)
+                               test_nonpersistent_hang(i915, e2->flags);
                }
        }

Regards,

Tvrtko