Added graph node profiling stats, build time configurable by enabling RTE_GRAPH_PROFILE in rte_config.h.
Signed-off-by: Morten Brørup <[email protected]> --- v4: * Added documentation. (AI) * Added more comments. (AI) * Improved dump. (AI) v3: * Debug shows cycles/obj instead of cycles/call. * Fixed missing --in-reply-to. v2: * Fixed indentation. --- config/rte_config.h | 1 + doc/guides/prog_guide/graph_lib.rst | 1 + lib/graph/graph_debug.c | 39 ++++++++++++++++++++++++++++- lib/graph/node.c | 2 ++ lib/graph/rte_graph_worker_common.h | 23 ++++++++++++++--- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/config/rte_config.h b/config/rte_config.h index 0447cdf2ad..1942c1b1ec 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -106,6 +106,7 @@ /* rte_graph defines */ #define RTE_GRAPH_BURST_SIZE 256 #define RTE_LIBRTE_GRAPH_STATS 1 +/* RTE_GRAPH_PROFILE is not set */ /****** driver defines ********/ diff --git a/doc/guides/prog_guide/graph_lib.rst b/doc/guides/prog_guide/graph_lib.rst index 8dd49c19d2..bc36042296 100644 --- a/doc/guides/prog_guide/graph_lib.rst +++ b/doc/guides/prog_guide/graph_lib.rst @@ -49,6 +49,7 @@ Performance tuning parameters RTE_GRAPH_BURST_SIZE config option. The testing shows, on x86 and arm64 servers, The sweet spot is 256 burst size. While on arm64 embedded SoCs, it is either 64 or 128. +- Enable the ``RTE_GRAPH_PROFILE`` config option for more profiling details. - Disable node statistics (using ``RTE_LIBRTE_GRAPH_STATS`` config option) if not needed. diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c index e3b8cccdc1..2aa1e4d22f 100644 --- a/lib/graph/graph_debug.c +++ b/lib/graph/graph_debug.c @@ -92,7 +92,44 @@ rte_graph_obj_dump(FILE *f, struct rte_graph *g, bool all) fprintf(f, " total_sched_fail=%" PRId64 "\n", n->dispatch.total_sched_fail); } - fprintf(f, " total_calls=%" PRId64 "\n", n->total_calls); + fprintf(f, " total_calls=%" PRIu64 "\n", n->total_calls); + if (rte_graph_has_stats_feature()) { + fprintf(f, " total_cycles=%" PRIu64 ", avg cycles/call=%.1f\n", + n->total_cycles, + n->total_calls == 0 ? (double)0 : + (double)n->total_cycles / (double)n->total_calls); + } +#ifdef RTE_GRAPH_PROFILE + uint64_t calls = n->usage_stats[0].calls; + fprintf(f, " objs[0]\n"); + fprintf(f, " calls=%" PRIu64 ", cycles=%" PRIu64 ", avg cycles/call=%.1f\n", + calls, + n->usage_stats[0].cycles, + calls == 0 ? 0.0 : + (double)n->usage_stats[0].cycles / (double)calls); + calls = n->usage_stats[1].calls; + fprintf(f, " objs[1]\n"); + fprintf(f, " calls=%" PRIu64 ", cycles=%" PRIu64 ", avg cycles/call=%.1f\n", + calls, + n->usage_stats[1].cycles, + calls == 0 ? 0.0 : + (double)n->usage_stats[1].cycles / (double)calls); + calls = RTE_MAX(INT64_C(0), (int64_t)(n->total_calls - + (n->usage_stats[0].calls + n->usage_stats[1].calls))); + uint64_t cycles = RTE_MAX(INT64_C(0), (int64_t)(n->total_cycles - + (n->usage_stats[0].cycles + n->usage_stats[1].cycles))); + uint64_t objs = RTE_MAX(INT64_C(0), (int64_t)(n->total_objs - + n->usage_stats[1].calls)); + double objs_per_call = calls == 0 ? 0.0 : (double)objs / (double)calls; + fprintf(f, " objs[more], avg objs/call=%.1f\n", objs_per_call); + fprintf(f, " calls=%" PRIu64 ", cycles=%" PRIu64 ", avg cycles/call=%.1f" + ", avg cycles/obj=%.1f\n", + calls, + cycles, + calls == 0 ? 0.0 : (double)cycles / (double)calls, + calls == 0 || objs_per_call == 0.0 ? 0.0 : + (double)cycles / (double)calls / objs_per_call); +#endif for (i = 0; i < n->nb_edges; i++) fprintf(f, " edge[%d] <%s>\n", i, n->nodes[i]->name); diff --git a/lib/graph/node.c b/lib/graph/node.c index 1fce3e6632..19b38881ae 100644 --- a/lib/graph/node.c +++ b/lib/graph/node.c @@ -110,10 +110,12 @@ __rte_node_register(const struct rte_node_register *reg) rte_edge_t i; size_t sz; +#ifndef RTE_GRAPH_PROFILE /* Limit Node specific metadata to one cacheline on 64B CL machine */ RTE_BUILD_BUG_ON((offsetof(struct rte_node, nodes) - offsetof(struct rte_node, ctx)) != RTE_CACHE_LINE_MIN_SIZE); +#endif graph_spinlock_lock(); diff --git a/lib/graph/rte_graph_worker_common.h b/lib/graph/rte_graph_worker_common.h index 4ab53a533e..10a52a540b 100644 --- a/lib/graph/rte_graph_worker_common.h +++ b/lib/graph/rte_graph_worker_common.h @@ -144,12 +144,22 @@ struct __rte_cache_aligned rte_node { rte_node_process_t process; /**< Process function. */ uint64_t process_u64; }; + /** Fast path area cache line 3. */ +#ifdef RTE_GRAPH_PROFILE + struct { + uint64_t calls; /**< Calls processing resp. 0 or 1 objects. */ + uint64_t cycles; /**< Cycles spent processing resp. 0 or 1 objects. */ + } usage_stats[2]; /**< Usage when this node processed 0 or 1 objects. */ + /** Fast path area cache line 4. */ +#endif alignas(RTE_CACHE_LINE_MIN_SIZE) struct rte_node *nodes[]; /**< Next nodes. */ }; }; +#ifndef RTE_GRAPH_PROFILE static_assert(offsetof(struct rte_node, nodes) - offsetof(struct rte_node, ctx) == RTE_CACHE_LINE_MIN_SIZE, "rte_node fast path area must fit in 64 bytes"); +#endif /** * @internal @@ -197,7 +207,7 @@ void __rte_node_stream_alloc_size(struct rte_graph *graph, static __rte_always_inline void __rte_node_process(struct rte_graph *graph, struct rte_node *node) { - uint64_t start; + uint64_t cycles; uint16_t rc; void **objs; @@ -206,11 +216,18 @@ __rte_node_process(struct rte_graph *graph, struct rte_node *node) rte_prefetch0(objs); if (rte_graph_has_stats_feature()) { - start = rte_rdtsc(); + cycles = -rte_rdtsc(); rc = node->process(graph, node, objs, node->idx); - node->total_cycles += rte_rdtsc() - start; + cycles += rte_rdtsc(); + node->total_cycles += cycles; node->total_calls++; node->total_objs += rc; +#ifdef RTE_GRAPH_PROFILE + if (rc <= 1) { + node->usage_stats[rc].calls++; + node->usage_stats[rc].cycles += cycles; + } +#endif } else { node->process(graph, node, objs, node->idx); } -- 2.43.0
