drm/msm: More GPU tracepoints
Subsystems (4)
cover drm/msm: More GPU tracepoints
From: Rob Clark <[email protected]>
Various extra tracepoints that I've been collecting.
Rob Clark (3):
drm/msm/gpu: Add GPU freq_change traces
drm/msm: Convert shrinker msgs to tracepoints
drm/msm/gpu: Add suspend/resume tracepoints
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +- drivers/gpu/drm/msm/msm_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 83 ++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 2 deletions(-)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm/msm/gpu: Add GPU freq_change traces
From: Rob Clark <[email protected]>
Technically the GMU specific one is a bit redundant, but it was useful to track down a bug.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 +++ drivers/gpu/drm/msm/msm_gpu.c | 2 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 31 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +3 -0
@@ -11,6 +11,7 @@#include "a6xx_gpu.h" #include "a6xx_gmu.xml.h" #include "msm_gem.h" +#include "msm_gpu_trace.h" #include "msm_mmu.h" static void a6xx_gmu_fault (struct a6xx_gmu *gmu)
@@ -124,6 +125,8 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp) gmu->current_perf_index = perf_index; gmu->freq = gmu->gpu_freqs[perf_index]; +trace_msm_gmu_freq_change (gmu->freq, perf_index); +/* * This can get called from devfreq while the hardware is idle. Don't * bring up the power if it isn't already active
drivers/gpu/drm/msm/msm_gpu.c +2 -0
@@ -32,6 +32,8 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,if (IS_ERR (opp))return PTR_ERR (opp); +trace_msm_gpu_freq_change (dev_pm_opp_get_freq (opp)); +if (gpu->funcs->gpu_set_freq) gpu->funcs->gpu_set_freq (gpu, opp);else
drivers/gpu/drm/msm/msm_gpu_trace.h +31 -0
@@ -83,6 +83,37 @@ TRACE_EVENT(msm_gpu_submit_retired, __entry->start_ticks, __entry->end_ticks) ); + +TRACE_EVENT (msm_gpu_freq_change, + TP_PROTO(u32 freq), +TP_ARGS (freq), +TP_STRUCT__entry ( +__field (u32, freq) + ), +TP_fast_assign ( +/* trace freq in MHz to match intel_gpu_freq_change, to make life easier +* for userspace +*/ + __entry->freq = DIV_ROUND_UP(freq, 1000000); + ), +TP_printk ("new_freq=%u" , __entry->freq) +); + + +TRACE_EVENT (msm_gmu_freq_change, + TP_PROTO(u32 freq, u32 perf_index), +TP_ARGS (freq, perf_index), +TP_STRUCT__entry ( + __field(u32, freq) +__field (u32, perf_index) + ), +TP_fast_assign ( + __entry->freq = freq; + __entry->perf_index = perf_index; + ), +TP_printk ("freq=%u, perf_index=%u" , __entry->freq, __entry->perf_index) +); +#endif #undef TRACE_INCLUDE_PATH
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/msm: Convert shrinker msgs to tracepoints
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This reduces the spam in dmesg when we start hitting the shrinker, and replaces it with something we can put on a timeline while profiling or debugging system issues.
--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu_trace.h | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem_shrinker.c +3 -2
@@ -6,6 +6,7 @@#include "msm_drv.h" #include "msm_gem.h" +#include "msm_gpu_trace.h" static bool msm_gem_shrinker_lock (struct drm_device *dev,bool *unlock) {
@@ -87,7 +88,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)mutex_unlock (&dev->struct_mutex);if (freed >0 ) -pr_info_ratelimited ("Purging %lu bytes\n" , freed <<PAGE_SHIFT ); +trace_msm_gem_purge (freed <<PAGE_SHIFT );return freed; }
@@ -123,7 +124,7 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) *(unsigned long *)ptr += unmapped;if (unmapped >0 ) -pr_info_ratelimited ("Purging %u vmaps\n" , unmapped); +trace_msm_gem_purge_vmaps (unmapped);return NOTIFY_DONE ; }
drivers/gpu/drm/msm/msm_gpu_trace.h +26 -0
@@ -114,6 +114,32 @@ TRACE_EVENT(msm_gmu_freq_change,TP_printk ("freq=%u, perf_index=%u" , __entry->freq, __entry->perf_index) ); + +TRACE_EVENT (msm_gem_purge, + TP_PROTO(u32 bytes), +TP_ARGS (bytes), +TP_STRUCT__entry ( +__field (u32, bytes) + ), +TP_fast_assign ( + __entry->bytes = bytes; + ), +TP_printk ("Purging %u bytes" , __entry->bytes) +); + + +TRACE_EVENT (msm_gem_purge_vmaps, + TP_PROTO(u32 unmapped), +TP_ARGS (unmapped), +TP_STRUCT__entry ( +__field (u32, unmapped) + ), +TP_fast_assign ( + __entry->unmapped = unmapped; + ), +TP_printk ("Purging %u vmaps" , __entry->unmapped) +); +#endif #undef TRACE_INCLUDE_PATH
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm/msm/gpu: Add suspend/resume tracepoints
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
---
I'm not sure if there is a better way to do no-arg tracepoints? The trace framework seems to go out of it's way to make this difficult. Or maybe there is a more obvious thing that I'm not seeing.
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++++ drivers/gpu/drm/msm/msm_gpu.c | 2 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +4 -0
@@ -923,6 +923,8 @@ static int a6xx_pm_resume(struct msm_gpu *gpu) gpu->needs_hw_init = true; +trace_msm_gpu_resume (0 ); + ret =a6xx_gmu_resume (a6xx_gpu);if (ret)return ret;
@@ -937,6 +939,8 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +trace_msm_gpu_suspend (0 ); +devfreq_suspend_device (gpu->devfreq.devfreq);return a6xx_gmu_stop (a6xx_gpu);
drivers/gpu/drm/msm/msm_gpu.c +2 -0
@@ -202,6 +202,7 @@ int msm_gpu_pm_resume(struct msm_gpu *gpu)int ret;DBG ("%s" , gpu->name); +trace_msm_gpu_resume (0 ); ret =enable_pwrrail (gpu);if (ret)
@@ -227,6 +228,7 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu)int ret;DBG ("%s" , gpu->name); +trace_msm_gpu_suspend (0 );devfreq_suspend_device (gpu->devfreq.devfreq);
drivers/gpu/drm/msm/msm_gpu_trace.h +26 -0
@@ -140,6 +140,32 @@ TRACE_EVENT(msm_gem_purge_vmaps,TP_printk ("Purging %u vmaps" , __entry->unmapped) ); + +TRACE_EVENT (msm_gpu_suspend, + TP_PROTO(int dummy), +TP_ARGS (dummy), +TP_STRUCT__entry ( +__field (u32, dummy) + ), +TP_fast_assign ( + __entry->dummy = dummy; + ), +TP_printk ("%u" , __entry->dummy) +); + + +TRACE_EVENT (msm_gpu_resume, + TP_PROTO(int dummy), +TP_ARGS (dummy), +TP_STRUCT__entry ( +__field (u32, dummy) + ), +TP_fast_assign ( + __entry->dummy = dummy; + ), +TP_printk ("%u" , __entry->dummy) +); +#endif #undef TRACE_INCLUDE_PATH
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Rob,
Do you think we could make all these generic? Visualization tools will need to do some processing so these can be neatly presented and it could be far more convenient if people wouldn't need to add code for each GPU driver.
Maybe we could put all these tracepoints in DRM core as they seem useful to all drivers?
Thanks,
Tomeu
Quoted 16 lines · Rob Clark
From: Rob Clark <[email protected]>
Various extra tracepoints that I've been collecting.
Rob Clark (3):
drm/msm/gpu: Add GPUfreq_changetraces
drm/msm: Convert shrinker msgs to tracepoints
drm/msm/gpu: Add suspend/resume tracepointsdrivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +- drivers/gpu/drm/msm/msm_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 83 ++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 2 deletions(-)
Quoted 8 lines
--
2.26.2_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
The cat is somewhat out of the bag already.. so I took the approach of making the more useful of the traces for visualization (freq_change trace) identical to the i915 one in units and format, so userspace just has to add another event name to a list, and not have to add more parsing code.
But the bigger problem is that it doesn't seem possible to #include multiple foo_trace.h's in a single C file, so I'm not seeing how it is possible to have both generic and driver specific traces.
BR,
-R
Quoted 5 lines · Tomeu Vizoso
Hi Rob,
Do you think we could make all these generic? Visualization tools will need to do some processing so these can be neatly presented and it could be far more convenient if people wouldn't need to add code for each GPU driver.
Quoted 31 lines
Maybe we could put all these tracepoints in DRM core as they seem useful to all drivers?
Thanks,
Tomeu
Quoted 24 lines · Rob Clark
From: Rob Clark <[email protected]>
Various extra tracepoints that I've been collecting.
Rob Clark (3):
drm/msm/gpu: Add GPUfreq_changetraces
drm/msm: Convert shrinker msgs to tracepoints
drm/msm/gpu: Add suspend/resume tracepointsdrivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +- drivers/gpu/drm/msm/msm_gpu.c | 4 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 83 ++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 2 deletions(-)--
2.26.2_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/3] drm/msm/gpu: Add GPU freq_change traces
In reply to Rob ClarkQuoted 4 lines · Rob Clark
From: Rob Clark <[email protected]>
Technically the GMU specific one is a bit redundant, but it was useful to track down a bug.
Quoted 86 lines
Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 3 +++ drivers/gpu/drm/msm/msm_gpu.c | 2 ++ drivers/gpu/drm/msm/msm_gpu_trace.h | 31 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +3
-0@@ -11,6 +11,7 @@#include "a6xx_gpu.h" #include "a6xx_gmu.xml.h" #include "msm_gem.h" +#include "msm_gpu_trace.h" #include "msm_mmu.h" static void a6xx_gmu_fault (struct a6xx_gmu *gmu)@@ -124,6 +125,8 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp) gmu->current_perf_index = perf_index; gmu->freq = gmu->gpu_freqs[perf_index]; +trace_msm_gmu_freq_change (gmu->freq, perf_index); +/* * This can get called from devfreq while the hardware is idle. Don't * bring up the power if it isn't already active drivers/gpu/drm/msm/msm_gpu.c +2
-0@@ -32,6 +32,8 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq,if (IS_ERR (opp))return PTR_ERR (opp); +trace_msm_gpu_freq_change (dev_pm_opp_get_freq (opp)); +if (gpu->funcs->gpu_set_freq) gpu->funcs->gpu_set_freq (gpu, opp);else drivers/gpu/drm/msm/msm_gpu_trace.h +31
-0@@ -83,6 +83,37 @@ TRACE_EVENT(msm_gpu_submit_retired, __entry->start_ticks, __entry->end_ticks) ); + +TRACE_EVENT (msm_gpu_freq_change, + TP_PROTO(u32 freq), +TP_ARGS (freq), +TP_STRUCT__entry ( +__field (u32, freq) + ), +TP_fast_assign ( +/* trace freq in MHz to match intel_gpu_freq_change, to make life easier +* for userspace +*/ + __entry->freq = DIV_ROUND_UP(freq, 1000000); + ), +TP_printk ("new_freq=%u" , __entry->freq) +); + + +TRACE_EVENT (msm_gmu_freq_change, + TP_PROTO(u32 freq, u32 perf_index), +TP_ARGS (freq, perf_index), +TP_STRUCT__entry ( + __field(u32, freq) +__field (u32, perf_index) + ), +TP_fast_assign ( + __entry->freq = freq; + __entry->perf_index = perf_index; + ), +TP_printk ("freq=%u, perf_index=%u" , __entry->freq, __entry->perf_index) +); +#endif #undef TRACE_INCLUDE_PATHSignature · 1 line
2.26.2
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [Freedreno] [PATCH 2/3] drm/msm: Convert shrinker msgs to tracepoints
In reply to Rob ClarkQuoted 5 lines · Rob Clark
From: Rob Clark <[email protected]>
This reduces the spam in dmesg when we start hitting the shrinker, and replaces it with something we can put on a timeline while profiling or debugging system issues.
Quoted 80 lines
Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu_trace.h | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/msm_gem_shrinker.c +3
-2@@ -6,6 +6,7 @@#include "msm_drv.h" #include "msm_gem.h" +#include "msm_gpu_trace.h" static bool msm_gem_shrinker_lock (struct drm_device *dev,bool *unlock) {@@ -87,7 +88,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)mutex_unlock (&dev->struct_mutex);if (freed >0 ) -pr_info_ratelimited ("Purging %lu bytes\n" , freed <<PAGE_SHIFT ); +trace_msm_gem_purge (freed <<PAGE_SHIFT );return freed; }@@ -123,7 +124,7 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) *(unsigned long *)ptr += unmapped;if (unmapped >0 ) -pr_info_ratelimited ("Purging %u vmaps\n" , unmapped); +trace_msm_gem_purge_vmaps (unmapped);return NOTIFY_DONE ; }drivers/gpu/drm/msm/msm_gpu_trace.h +26
-0@@ -114,6 +114,32 @@ TRACE_EVENT(msm_gmu_freq_change,TP_printk ("freq=%u, perf_index=%u" , __entry->freq, __entry->perf_index) ); + +TRACE_EVENT (msm_gem_purge, + TP_PROTO(u32 bytes), +TP_ARGS (bytes), +TP_STRUCT__entry ( +__field (u32, bytes) + ), +TP_fast_assign ( + __entry->bytes = bytes; + ), +TP_printk ("Purging %u bytes" , __entry->bytes) +); + + +TRACE_EVENT (msm_gem_purge_vmaps, + TP_PROTO(u32 unmapped), +TP_ARGS (unmapped), +TP_STRUCT__entry ( +__field (u32, unmapped) + ), +TP_fast_assign ( + __entry->unmapped = unmapped; + ), +TP_printk ("Purging %u vmaps" , __entry->unmapped) +); +#endif #undef TRACE_INCLUDE_PATHSignature · 6 lines
2.26.2 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [Freedreno] [PATCH 2/3] drm/msm: Convert shrinker msgs to tracepoints
In reply to Rob ClarkQuoted 6 lines · Rob Clark
From: Rob Clark <[email protected]>
This reduces the spam in dmesg when we start hitting the shrinker, and replaces it with something we can put on a timeline while profiling or debugging system issues.
That is a good solution,
Quoted 80 lines
Signed-off-by Rob Clark <[email protected]>--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu_trace.h | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/msm_gem_shrinker.c +3
-2@@ -6,6 +6,7 @@#include "msm_drv.h" #include "msm_gem.h" +#include "msm_gpu_trace.h" static bool msm_gem_shrinker_lock (struct drm_device *dev,bool *unlock) {@@ -87,7 +88,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)mutex_unlock (&dev->struct_mutex);if (freed >0 ) -pr_info_ratelimited ("Purging %lu bytes\n" , freed <<PAGE_SHIFT ); +trace_msm_gem_purge (freed <<PAGE_SHIFT );return freed; }@@ -123,7 +124,7 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) *(unsigned long *)ptr += unmapped;if (unmapped >0 ) -pr_info_ratelimited ("Purging %u vmaps\n" , unmapped); +trace_msm_gem_purge_vmaps (unmapped);return NOTIFY_DONE ; }drivers/gpu/drm/msm/msm_gpu_trace.h +26
-1@@ -114,6 +114,32 @@ TRACE_EVENT(msm_gmu_freq_change,TP_printk ("freq=%u, perf_index=%u" , __entry->freq, __entry->perf_index) ); + +TRACE_EVENT (msm_gem_purge, + TP_PROTO(u32 bytes), +TP_ARGS (bytes), +TP_STRUCT__entry ( +__field (u32, bytes) + ), +TP_fast_assign ( + __entry->bytes = bytes; + ), +TP_printk ("Purging %u bytes" , __entry->bytes) +); + + +TRACE_EVENT (msm_gem_purge_vmaps, + TP_PROTO(u32 unmapped), +TP_ARGS (unmapped), +TP_STRUCT__entry ( +__field (u32, unmapped) + ), +TP_fast_assign ( + __entry->unmapped = unmapped; + ), +TP_printk ("Purging %u vmaps" , __entry->unmapped) +); +#endif #undef TRACE_INCLUDE_PATH --2.26.2
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno