Re: [PATCH 1/2] drm/sched: use DECLARE_EVENT_CLASS

On 2022-04-08 16:46, Chia-I Wu wrote:

drm_sched_job and drm_run_job have the same prototype.

Signed-off-by: Chia-I Wu olvaffe@gmail.com Cc: Rob Clark robdclark@chromium.org

---

.../gpu/drm/scheduler/gpu_scheduler_trace.h | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 877ce9b127f1..2e6eda920fe1 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -32,7 +32,7 @@ #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace

-TRACE_EVENT(drm_sched_job, +DECLARE_EVENT_CLASS(drm_sched_job_entity,

I would just call it drm_sched_job since that what it is.

With that the series is Reviewed-by: Andrey Grodzovsky andrey.grodzovsky@amd.com

Andrey

   TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
   TP_ARGS(sched_job, entity),
   TP_STRUCT__entry(

@@ -59,31 +59,14 @@ TRACE_EVENT(drm_sched_job, __entry->job_count, __entry->hw_job_count) );

-TRACE_EVENT(drm_run_job, +DEFINE_EVENT(drm_sched_job_entity, drm_sched_job, TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),

•    TP_ARGS(sched_job, entity),
  

•    TP_STRUCT__entry(
  

• 	     __field(struct drm_sched_entity *, entity)
  

• 	     __field(struct dma_fence *, fence)
  

• 	     __field(const char *, name)
  

• 	     __field(uint64_t, id)
  

• 	     __field(u32, job_count)
  

• 	     __field(int, hw_job_count)
  

• 	     ),
  

•    TP_ARGS(sched_job, entity)
  

+);

•    TP_fast_assign(
  

• 	   __entry->entity = entity;
  

• 	   __entry->id = sched_job->id;
  

• 	   __entry->fence = &sched_job->s_fence->finished;
  

• 	   __entry->name = sched_job->sched->name;
  

• 	   __entry->job_count = spsc_queue_count(&entity->job_queue);
  

• 	   __entry->hw_job_count = atomic_read(
  

• 		   &sched_job->sched->hw_rq_count);
  

• 	   ),
  

•    TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",
  

•       __entry->entity, __entry->id,
  

•       __entry->fence, __entry->name,
  

•       __entry->job_count, __entry->hw_job_count)
  

+DEFINE_EVENT(drm_sched_job_entity, drm_run_job,

•    TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
  

•    TP_ARGS(sched_job, entity)
  

  );

  TRACE_EVENT(drm_sched_process_job,