Re: [PATCH] drm/i915: Convert some trace events to DEFINE_TRACE

[Eric Anholt]

On Thu, 11 Mar 2010 16:41:45 +0800, Li Zefan  wrote:
> Use DECLARE_EVENT_CLASS to remove duplicate code:
> 
>textdata bss dec hex filename
>   146552732  15   1740243fa i915_trace_points.o.orig
>   116252732  10   14367381f i915_trace_points.o
> 
> 8 events are converted:
> 
>   i915_gem_object:  i915_gem_object_{unbind, destroy}
>   i915_gem_request: i915_gem_request_{complete, retire, wait_begin, wait_end}
>   i915_ring:i915_ring_{wait_begin, wait_end}
> 
> No functional change.

Applied to -next.  Thanks!


pgp7RE1XbJgQv.pgp
Description: PGP signature
--
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

[PATCH] drm/i915: Convert some trace events to DEFINE_TRACE

[Li Zefan]

Use DECLARE_EVENT_CLASS to remove duplicate code:

   textdata bss dec hex filename
  146552732  15   1740243fa i915_trace_points.o.orig
  116252732  10   14367381f i915_trace_points.o

8 events are converted:

  i915_gem_object:  i915_gem_object_{unbind, destroy}
  i915_gem_request: i915_gem_request_{complete, retire, wait_begin, wait_end}
  i915_ring:i915_ring_{wait_begin, wait_end}

No functional change.

Signed-off-by: Li Zefan 
---
 drivers/gpu/drm/i915/i915_trace.h |   86 +++--
 1 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_trace.h 
b/drivers/gpu/drm/i915/i915_trace.h
index 01840d9..3038153 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -115,7 +115,7 @@ TRACE_EVENT(i915_gem_object_get_fence,
  __entry->obj, __entry->fence, __entry->tiling_mode)
 );
 
-TRACE_EVENT(i915_gem_object_unbind,
+DECLARE_EVENT_CLASS(i915_gem_object,
 
TP_PROTO(struct drm_gem_object *obj),
 
@@ -132,21 +132,18 @@ TRACE_EVENT(i915_gem_object_unbind,
TP_printk("obj=%p", __entry->obj)
 );
 
-TRACE_EVENT(i915_gem_object_destroy,
+DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind,
 
TP_PROTO(struct drm_gem_object *obj),
 
-   TP_ARGS(obj),
+   TP_ARGS(obj)
+);
 
-   TP_STRUCT__entry(
-__field(struct drm_gem_object *, obj)
-),
+DEFINE_EVENT(i915_gem_object, i915_gem_object_destroy,
 
-   TP_fast_assign(
-  __entry->obj = obj;
-  ),
+   TP_PROTO(struct drm_gem_object *obj),
 
-   TP_printk("obj=%p", __entry->obj)
+   TP_ARGS(obj)
 );
 
 /* batch tracing */
@@ -197,8 +194,7 @@ TRACE_EVENT(i915_gem_request_flush,
  __entry->flush_domains, __entry->invalidate_domains)
 );
 
-
-TRACE_EVENT(i915_gem_request_complete,
+DECLARE_EVENT_CLASS(i915_gem_request,
 
TP_PROTO(struct drm_device *dev, u32 seqno),
 
@@ -217,64 +213,35 @@ TRACE_EVENT(i915_gem_request_complete,
TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
 );
 
-TRACE_EVENT(i915_gem_request_retire,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_complete,
 
TP_PROTO(struct drm_device *dev, u32 seqno),
 
-   TP_ARGS(dev, seqno),
-
-   TP_STRUCT__entry(
-__field(u32, dev)
-__field(u32, seqno)
-),
-
-   TP_fast_assign(
-  __entry->dev = dev->primary->index;
-  __entry->seqno = seqno;
-  ),
-
-   TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+   TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_gem_request_wait_begin,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_retire,
 
TP_PROTO(struct drm_device *dev, u32 seqno),
 
-   TP_ARGS(dev, seqno),
-
-   TP_STRUCT__entry(
-__field(u32, dev)
-__field(u32, seqno)
-),
-
-   TP_fast_assign(
-  __entry->dev = dev->primary->index;
-  __entry->seqno = seqno;
-  ),
-
-   TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+   TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_gem_request_wait_end,
+DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_begin,
 
TP_PROTO(struct drm_device *dev, u32 seqno),
 
-   TP_ARGS(dev, seqno),
+   TP_ARGS(dev, seqno)
+);
 
-   TP_STRUCT__entry(
-__field(u32, dev)
-__field(u32, seqno)
-),
+DEFINE_EVENT(i915_gem_request, i915_gem_request_wait_end,
 
-   TP_fast_assign(
-  __entry->dev = dev->primary->index;
-  __entry->seqno = seqno;
-  ),
+   TP_PROTO(struct drm_device *dev, u32 seqno),
 
-   TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno)
+   TP_ARGS(dev, seqno)
 );
 
-TRACE_EVENT(i915_ring_wait_begin,
+DECLARE_EVENT_CLASS(i915_ring,
 
TP_PROTO(struct drm_device *dev),
 
@@ -291,21 +258,18 @@ TRACE_EVENT(i915_ring_wait_begin,
TP_printk("dev=%u", __entry->dev)
 );
 
-TRACE_EVENT(i915_ring_wait_end,
+DEFINE_EVENT(i915_ring, i915_ring_wait_begin,
 
TP_PROTO(struct drm_device *dev),
 
-   TP_ARGS(dev),
+   TP_ARGS(dev)
+);
 
-   TP_STRUCT__entry(
-__field(u32, dev)
-),
+DEFINE_EVENT(i915_ring, i915_ring_wait_end,
 
-   TP_fast_assign(
-  __entry->dev = dev->primary->index;
-