[Intel-gfx] [PATCH 2/3] drm/i915/trace: Remove engine out of the context sandwich

[Tvrtko Ursulin]

On 25/05/2018 13:13, Tvrtko Ursulin wrote:
> 
> On 25/05/2018 11:28, Lionel Landwerlin wrote:
>> On 25/05/18 09:26, Tvrtko Ursulin wrote:
>>> From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>>>
>>> In the string tracepoint representation we ended up with the engine
>>> sandwiched between context hardware id and context fence id.
>>>
>>> Move the two pieces of context data together for redability.
>>>
>>> Binary records are left as is, that is both fields remaing under the
>>> existing name and ordering.
>>>
>>> v2:
>>>   * Do not consolidate the printk format, just reorder. (Lionel)
>>>
>>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>>> Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
>>
>> Maybe there was misunderstanding on my previous comment.
>> What I wanted to let you know is that the parser in igt doesn't know 
>> (yet) how to deal with "engine=%u:%u".
>> The ordering of the field doesn't matter though.
> 
> Ah I thought you were complaining about the ctx=%u.%u patch. Even though 
> I left the binary stream layout intact I thought maybe you have 
> something somewhere which parses the text.

Well.. left it intact in that patch but changed it with 
engine=class:instance.. :)

Regards,

Tvrtko

>> Updating the parser is probably a one liner. There is some interesting 
>> logic behind though that expect the engine ids to be contiguous numbers.
>>
>> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> 
> Thanks, now just to find common ground with Chris. :)
> 
> Regards,
> 
> Tvrtko
> 
>>> ---
>>>   drivers/gpu/drm/i915/i915_trace.h | 30 +++++++++++++++---------------
>>>   1 file changed, 15 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_trace.h 
>>> b/drivers/gpu/drm/i915/i915_trace.h
>>> index 7acea4052798..bac582ed3a0b 100644
>>> --- a/drivers/gpu/drm/i915/i915_trace.h
>>> +++ b/drivers/gpu/drm/i915/i915_trace.h
>>> @@ -638,9 +638,9 @@ TRACE_EVENT(i915_request_queue,
>>>                  __entry->flags = flags;
>>>                  ),
>>> -        TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, 
>>> flags=0x%x",
>>> -              __entry->dev, __entry->hw_id, __entry->class,
>>> -              __entry->instance, __entry->ctx, __entry->seqno,
>>> +        TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, 
>>> flags=0x%x",
>>> +              __entry->dev, __entry->class, __entry->instance,
>>> +              __entry->hw_id, __entry->ctx, __entry->seqno,
>>>                 __entry->flags)
>>>   );
>>> @@ -668,9 +668,9 @@ DECLARE_EVENT_CLASS(i915_request,
>>>                  __entry->global = rq->global_seqno;
>>>                  ),
>>> -        TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, 
>>> global=%u",
>>> -              __entry->dev, __entry->hw_id, __entry->class,
>>> -              __entry->instance, __entry->ctx, __entry->seqno,
>>> +        TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, 
>>> global=%u",
>>> +              __entry->dev, __entry->class, __entry->instance,
>>> +              __entry->hw_id, __entry->ctx, __entry->seqno,
>>>                 __entry->global)
>>>   );
>>> @@ -718,9 +718,9 @@ TRACE_EVENT(i915_request_in,
>>>                  __entry->port = port;
>>>                  ),
>>> -        TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, 
>>> prio=%u, global=%u, port=%u",
>>> -              __entry->dev, __entry->hw_id, __entry->class,
>>> -              __entry->instance, __entry->ctx, __entry->seqno,
>>> +        TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, 
>>> prio=%u, global=%u, port=%u",
>>> +              __entry->dev, __entry->class, __entry->instance,
>>> +              __entry->hw_id, __entry->ctx, __entry->seqno,
>>>                 __entry->prio, __entry->global_seqno, __entry->port)
>>>   );
>>> @@ -750,9 +750,9 @@ TRACE_EVENT(i915_request_out,
>>>                  __entry->completed = i915_request_completed(rq);
>>>                  ),
>>> -            TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, 
>>> seqno=%u, global=%u, completed?=%u",
>>> -                  __entry->dev, __entry->hw_id, __entry->class,
>>> -                  __entry->instance, __entry->ctx, __entry->seqno,
>>> +            TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, 
>>> seqno=%u, global=%u, completed?=%u",
>>> +                  __entry->dev, __entry->class, __entry->instance,
>>> +                  __entry->hw_id, __entry->ctx, __entry->seqno,
>>>                     __entry->global_seqno, __entry->completed)
>>>   );
>>> @@ -842,9 +842,9 @@ TRACE_EVENT(i915_request_wait_begin,
>>>                  __entry->flags = flags;
>>>                  ),
>>> -        TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, 
>>> global=%u, blocking=%u, flags=0x%x",
>>> -              __entry->dev, __entry->hw_id, __entry->class,
>>> -              __entry->instance, __entry->ctx, __entry->seqno,
>>> +        TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, 
>>> global=%u, blocking=%u, flags=0x%x",
>>> +              __entry->dev, __entry->class, __entry->instance,
>>> +              __entry->hw_id, __entry->ctx, __entry->seqno,
>>>                 __entry->global, !!(__entry->flags & I915_WAIT_LOCKED),
>>>                 __entry->flags)
>>>   );
>>
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx