eal: provide trace point register macro for MSVC
PATCH 1/1 eal: provide trace point register macro for MSVC
Provide an alternate RTE_TRACE_POINT_REGISTER macro when building with MSVC that allocates segments for the trace point using MSVC specific features
--- lib/eal/include/rte_trace_point_register.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
lib/eal/include/rte_trace_point_register.h +14 -0
@@ -18,6 +18,19 @@ RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); +#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_TRACE_POINT_REGISTER (trace, name) \ +rte_trace_point_t \ +__pragma(data_seg("__rte_trace_point")) \ +__declspec(allocate("__rte_trace_point")) \ +__##trace; \ +static const char __##trace##_name[] = RTE_STR(name); \ +RTE_INIT(trace##_init) \ +{ \ + __rte_trace_point_register(&__##trace, __##trace##_name, \ + (void (*)(void)) trace); \ +} +#else #define RTE_TRACE_POINT_REGISTER (trace, name) \ rte_trace_point_t __attribute__((section("__rte_trace_point"))) __##trace; \ static const char __##trace##_name[] = RTE_STR(name); \
@@ -26,6 +39,7 @@ __rte_trace_point_register(&__##trace, __##trace##_name, \ (void (*)(void)) trace); \ } +#endif #define __rte_trace_point_emit_header_generic (t) \ RTE_PER_LCORE(trace_point_sz) = __RTE_TRACE_EVENT_HEADER_SZ
Signature · 1 line
1.8.3.1
01/11/2023 23:47, Tyler Retzlaff:
Quoted 3 lines
Provide an alternate
RTE_TRACE_POINT_REGISTERmacro when building with MSVC that allocates segments for the trace point using MSVC specific features
Please could you elaborate what is the improvement?
Quoted 11 lines
lib/eal/include/rte_trace_point_register.h +11
-0+#define RTE_TRACE_POINT_REGISTER (trace, name) \ +rte_trace_point_t \ +__pragma(data_seg("__rte_trace_point")) \ +__declspec(allocate("__rte_trace_point")) \ +__##trace; \ +static const char __##trace##_name[] = RTE_STR(name); \ +RTE_INIT(trace##_init) \ +{ \ + __rte_trace_point_register(&__##trace, __##trace##_name, \ + (void (*)(void)) trace); \ +}
Quoted 6 lines · Thomas Monjalon
01/11/2023 23:47, Tyler Retzlaff:
Quoted 3 lines
Provide an alternate
RTE_TRACE_POINT_REGISTERmacro when building with MSVC that allocates segments for the trace point using MSVC specific featuresPlease could you elaborate what is the improvement?
well not intended to be an improvement, intended to align the msvc build with the gcc/clang builds placement of registered tracepoint in their own section.
the alternate expansion for msvc is provided to place the trace point being registered in it's own section `__rte_trace_point'
msvc doesn't have __attribute__(section("name")) instead as an alternate we use msvc's data_seg pragma to create and place the trace point into a named section.
i.e.
gcc/clang
T __attribute__(section("__rte_trace_point") __##trace;
msvc
T __pragma(data_seg("__rte_trace_point")) __declspec(allocate("__rte_trace_point")) __##trace;
Quoted 14 lines
Quoted 12 lines
lib/eal/include/rte_trace_point_register.h +11
-0+#define RTE_TRACE_POINT_REGISTER (trace, name) \ +rte_trace_point_t \ +__pragma(data_seg("__rte_trace_point")) \ +__declspec(allocate("__rte_trace_point")) \ +__##trace; \ +static const char __##trace##_name[] = RTE_STR(name); \ +RTE_INIT(trace##_init) \ +{ \ + __rte_trace_point_register(&__##trace, __##trace##_name, \ + (void (*)(void)) trace); \ +}
01/11/2023 23:47, Tyler Retzlaff:
lib/eal/include/rte_trace_point_register.h line 26
Quoted 12 lines
Provide an alternate
RTE_TRACE_POINT_REGISTERmacro when building with MSVC that allocates segments for the trace point using MSVC specific featuresSigned-off-by Tyler Retzlaff <[email protected]>---
lib/eal/include/rte_trace_point_register.h +6
-0+#ifdef RTE_TOOLCHAIN_MSVC +#define RTE_TRACE_POINT_REGISTER (trace, name) \ +rte_trace_point_t \ +__pragma(data_seg("__rte_trace_point")) \ +__declspec(allocate("__rte_trace_point")) \ +__##trace; \
You could indent lines which are part of the define.
lib/eal/include/rte_trace_point_register.h line 32
Quoted 6 lines
lib/eal/include/rte_trace_point_register.h +6
-0+static const char __##trace##_name[] = RTE_STR(name); \ +RTE_INIT(trace##_init) \ +{ \ + __rte_trace_point_register(&__##trace, __##trace##_name, \ + (void (*)(void)) trace); \ +}
This part is common to both implementation.
It would be clearer to define a private macro for the trace point allocation which is what differs, so it can be reused in a single common macro.
PATCH v2 1/1 eal: provide macro to allocate and name a section or segment
In reply to Tyler RetzlaffProvide __rte_section(name) macro that allocates and names a section or segment that works with both MSVC and GCC.
Update RTE_TRACE_POINT_REGISTER with __rte_section("__rte_trace_point") instead of __attribute__(section(name)) so the macro may be compatibly expanded when using MSVC.
---
v2:
* Define an internal macro __rte_section for the trace point allocation and use it in RTE_TRACE_POINT_REGISTER instead of duplicating original macro expansion for MSVC.
lib/eal/include/rte_common.h | 11 +++++++++++ lib/eal/include/rte_trace_point_register.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-)
lib/eal/include/rte_common.h +11 -0
@@ -178,6 +178,17 @@#endif /** +* specify data or function section/segment +*/ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_section (name) \ + __pragma(data_seg(name)) __declspec(allocate(name)) +#else +#define __rte_section (name) \ + __attribute__((section(name))) +#endif + +/** * Tells compiler that the function returns a value that points to * memory, where the size is given by the one or two arguments. * Used by compiler to validate object size.
lib/eal/include/rte_trace_point_register.h +1 -1
@@ -19,7 +19,7 @@ RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz);#define RTE_TRACE_POINT_REGISTER (trace, name) \ -rte_trace_point_t __attribute__((section("__rte_trace_point"))) __##trace; \ +rte_trace_point_t __rte_section("__rte_trace_point") __##trace; \ static const char __##trace##_name[] = RTE_STR(name); \ RTE_INIT(trace##_init) \ { \
Signature · 1 line
1.8.3.1
RE: [PATCH v2] eal: provide macro to allocate and name a section or segment
Quoted 6 lines
From: Tyler Retzlaff [mailto:[email protected]]
Sent: Monday, 12 February 2024 21.52Provide
__rte_section(name)macro that allocates and names a section or segment that works with both MSVC and GCC.
Quoted 6 lines
Update
RTE_TRACE_POINT_REGISTERwith__rte_section("__rte_trace_point")instead of __attribute__(section(name)) so the macro may be compatibly expanded when using MSVC.Signed-off-by Tyler Retzlaff <[email protected]>---
Re: [PATCH v2] eal: provide macro to allocate and name a section or segment
13/02/2024 09:51, Morten Brørup:
Quoted 6 lines
Quoted 6 lines
From: Tyler Retzlaff [mailto:[email protected]]
Sent: Monday, 12 February 2024 21.52Provide
__rte_section(name)macro that allocates and names a section or segment that works with both MSVC and GCC.
Quoted 8 lines
Quoted 6 lines
Update
RTE_TRACE_POINT_REGISTERwith__rte_section("__rte_trace_point")instead of __attribute__(section(name)) so the macro may be compatibly expanded when using MSVC.Signed-off-by Tyler Retzlaff <[email protected]>---
Acked-by Morten Brørup <[email protected]>
Applied (with minor nits fixed), thanks.