[igt-dev] [v2 1/5] tests/intel: Add multi-gt support for rc6-idle test

[Sundaresan, Sujaritha]

On 11/10/2023 7:20 PM, Riana Tauro wrote:
> Hi Suja
>
> On 11/9/2023 4:30 PM, Sujaritha Sundaresan wrote:
>> Adding multi-gt support for the rc6-idle subtest
>>
>> Signed-off-by: Sujaritha Sundaresan <sujaritha.sundaresan at intel.com>
>> ---
>>   tests/intel/i915_pm_rc6_residency.c | 18 +++++++++++-------
>>   1 file changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/tests/intel/i915_pm_rc6_residency.c 
>> b/tests/intel/i915_pm_rc6_residency.c
>> index b266680ac..57ac5c721 100644
>> --- a/tests/intel/i915_pm_rc6_residency.c
>> +++ b/tests/intel/i915_pm_rc6_residency.c
>> @@ -376,7 +376,7 @@ static void kill_children(int sig)
>>       signal(sig, old);
>>   }
>>   -static void rc6_idle(int i915, uint32_t ctx_id, uint64_t flags)
>> +static void rc6_idle(int i915, uint32_t ctx_id, uint64_t flags, 
>> unsigned int gt)
>>   {
>>       const int64_t duration_ns = SLEEP_DURATION * 
>> (int64_t)NSEC_PER_SEC;
>>       const int tolerance = 20; /* Some RC6 is better than none! */
>> @@ -397,7 +397,7 @@ static void rc6_idle(int i915, uint32_t ctx_id, 
>> uint64_t flags)
>>       struct igt_power gpu;
>>       int fd;
>>   -    fd = open_pmu(i915, I915_PMU_RC6_RESIDENCY);
>> +    fd = open_pmu(i915, __I915_PMU_RC6_RESIDENCY(gt));
>>       igt_drop_caches_set(i915, DROP_IDLE);
>>       igt_require(__pmu_wait_for_rc6(fd));
>>       igt_power_open(i915, &gpu, "gpu");
>> @@ -558,6 +558,7 @@ static void rc6_fence(int i915, const intel_ctx_t 
>> *ctx)
>>   igt_main
>>   {
>>       int i915 = -1;
>> +    unsigned int dirfd, gt;
>>       const intel_ctx_t *ctx;
> There is
> ctx = intel_ctx_create_all_physical(i915);
> in fixture. Please remove that as it is duplicate
>
> Thanks
> Riana

Fixed.

Thanks

Suja

>>       /* Use drm_open_driver to verify device existence */
>> @@ -572,11 +573,15 @@ igt_main
>>           igt_require_gem(i915);
>>           gem_quiescent_gpu(i915);
>>   -        for_each_ctx_engine(i915, ctx, e) {
>> -            if (e->instance == 0) {
>> -                igt_dynamic_f("%s", e->name)
>> -                    rc6_idle(i915, ctx->id, e->flags);
>> +        i915_for_each_gt(i915, dirfd, gt) {
>> +            ctx = intel_ctx_create_for_gt(i915, gt);
>> +            for_each_ctx_engine(i915, ctx, e) {
>> +                if (e->instance == 0) {
>> +                    igt_dynamic_f("gt%u-%s", gt, e->name)
>> +                        rc6_idle(i915, ctx->id, e->flags, gt);
>> +                }
>>               }
>> +            intel_ctx_destroy(i915, ctx);
>>           }
>>       }
>>   @@ -626,7 +631,6 @@ igt_main
>>       }
>>         igt_fixture {
>> -        intel_ctx_destroy(i915, ctx);
>>           drm_close_driver(i915);
>>       }
>>   }