[Intel-xe] [PATCH 2/2] drm/xe/trace: Optimize trace definition

[Balasubramani Vivekanandan]

On 18.10.2023 13:26, Kalvala, Haridhar wrote:
> 
> On 10/16/2023 3:47 PM, Balasubramani Vivekanandan wrote:
> > Make use of EVENT_CLASS to group similar trace events
> > 
> > Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan at intel.com>
> > ---
> >   drivers/gpu/drm/xe/xe_trace.h | 83 +++++++++++++++--------------------
> >   1 file changed, 36 insertions(+), 47 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_trace.h b/drivers/gpu/drm/xe/xe_trace.h
> > index 456c776f4be1..233b982f34da 100644
> > --- a/drivers/gpu/drm/xe/xe_trace.h
> > +++ b/drivers/gpu/drm/xe/xe_trace.h
> > @@ -517,55 +517,44 @@ DEFINE_EVENT(xe_vm, xe_vm_rebind_worker_exit,
> >   	     TP_ARGS(vm)
> >   );
> > -TRACE_EVENT(xe_guc_ct_h2g_flow_control,
> > -	    TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),
> > -	    TP_ARGS(_head, _tail, size, space, len),
> >   /* GUC */
> > +DECLARE_EVENT_CLASS(xe_guc_ct_flow_control,
> > +		    TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),
> > +		    TP_ARGS(_head, _tail, size, space, len),
> > -	    TP_STRUCT__entry(
> > -		     __field(u32, _head)
> > -		     __field(u32, _tail)
> > -		     __field(u32, size)
> > -		     __field(u32, space)
> > -		     __field(u32, len)
> > -		     ),
> > -
> > -	    TP_fast_assign(
> > -		   __entry->_head = _head;
> > -		   __entry->_tail = _tail;
> > -		   __entry->size = size;
> > -		   __entry->space = space;
> > -		   __entry->len = len;
> > -		   ),
> > -
> > -	    TP_printk("head=%u, tail=%u, size=%u, space=%u, len=%u",
> > -		      __entry->_head, __entry->_tail, __entry->size,
> > -		      __entry->space, __entry->len)
> > -);
> > -
> > -TRACE_EVENT(xe_guc_ct_g2h_flow_control,
> > -	    TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),
> > -	    TP_ARGS(_head, _tail, size, space, len),
> > -
> > -	    TP_STRUCT__entry(
> > -		     __field(u32, _head)
> > -		     __field(u32, _tail)
> > -		     __field(u32, size)
> > -		     __field(u32, space)
> > -		     __field(u32, len)
> > -		     ),
> > -
> > -	    TP_fast_assign(
> > -		   __entry->_head = _head;
> > -		   __entry->_tail = _tail;
> > -		   __entry->size = size;
> > -		   __entry->space = space;
> > -		   __entry->len = len;
> > -		   ),
> > -
> > -	    TP_printk("head=%u, tail=%u, size=%u, space=%u, len=%u",
> > -		      __entry->_head, __entry->_tail, __entry->size,
> > -		      __entry->space, __entry->len)
> > +		    TP_STRUCT__entry(
> > +			     __field(u32, _head)
> > +			     __field(u32, _tail)
> > +			     __field(u32, size)
> > +			     __field(u32, space)
> > +			     __field(u32, len)
> > +			     ),
> > +
> > +		    TP_fast_assign(
> > +			   __entry->_head = _head;
> > +			   __entry->_tail = _tail;
> > +			   __entry->size = size;
> > +			   __entry->space = space;
> > +			   __entry->len = len;
> > +			   ),
> > +
> > +		    TP_printk("h2g flow control: head=%u, tail=%u, size=%u, space=%u, len=%u",
> > +			      __entry->_head, __entry->_tail, __entry->size,
> > +			      __entry->space, __entry->len)
> > +);
> > +
> > +DEFINE_EVENT(xe_guc_ct_flow_control, xe_guc_ct_h2g_flow_control,
> > +	     TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),
> > +	     TP_ARGS(_head, _tail, size, space, len)
> > +);
> > +
> > +DEFINE_EVENT_PRINT(xe_guc_ct_flow_control, xe_guc_ct_g2h_flow_control,
> > +		   TP_PROTO(u32 _head, u32 _tail, u32 size, u32 space, u32 len),
> > +		   TP_ARGS(_head, _tail, size, space, len),
> > +
> 
> Hi Bala,
> 
> This patch looks good to me. basic query why line space b/w ARGS & printk ?

I simply followed the pattern existing for other trace events.

Regards,
Bala
> 
> Reviewed-by: Haridhar Kalvala <haridhar.kalvala at intel.com>
> 
> > +		   TP_printk("g2h flow control: head=%u, tail=%u, size=%u, space=%u, len=%u",
> > +			     __entry->_head, __entry->_tail, __entry->size,
> > +			     __entry->space, __entry->len)
> >   );
> >   DECLARE_EVENT_CLASS(xe_guc_ctb,
> 
> -- 
> Regards,
> Haridhar Kalvala
>