diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-05-28 21:26:47 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-05-29 17:00:26 +0000 |
| commit | 812b32dd8f637118bf65de2cdff0e95b421a963b (patch) | |
| tree | 184d57889b841958875d57c6503d8bfb96cdaec7 /src/plugins/memif | |
| parent | 04e0bb2ff0f39dab45da01ecdbc7914035a36897 (diff) | |
Add VLIB_NODE_FN() macro to simplify multiversioning of node functions
Change-Id: Ibab5e27277f618ceb2d543b9d6a1a5f191e7d1db
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/memif')
| -rw-r--r-- | src/plugins/memif/device.c | 4 | ||||
| -rw-r--r-- | src/plugins/memif/node.c | 25 |
2 files changed, 7 insertions, 22 deletions
diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c index c70a4ea3549..14b9d547234 100644 --- a/src/plugins/memif/device.c +++ b/src/plugins/memif/device.c @@ -46,7 +46,7 @@ static __clib_unused char *memif_tx_func_error_strings[] = { #undef _ }; -#ifndef CLIB_MULTIARCH_VARIANT +#ifndef CLIB_MARCH_VARIANT u8 * format_memif_device_name (u8 * s, va_list * args) { @@ -500,7 +500,7 @@ memif_subif_add_del_function (vnet_main_t * vnm, return 0; } -#ifndef CLIB_MULTIARCH_VARIANT +#ifndef CLIB_MARCH_VARIANT /* *INDENT-OFF* */ VNET_DEVICE_CLASS (memif_device_class) = { .name = "memif", diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c index 029e25d814a..6e2807a2054 100644 --- a/src/plugins/memif/node.c +++ b/src/plugins/memif/node.c @@ -854,10 +854,10 @@ done: return n_rx_packets; } -uword -CLIB_MULTIARCH_FN (memif_input_fn) (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) + +VLIB_NODE_FN (memif_input_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_rx = 0; memif_main_t *mm = &memif_main; @@ -910,10 +910,9 @@ CLIB_MULTIARCH_FN (memif_input_fn) (vlib_main_t * vm, return n_rx; } -#ifndef CLIB_MULTIARCH_VARIANT +#ifndef CLIB_MARCH_VARIANT /* *INDENT-OFF* */ VLIB_REGISTER_NODE (memif_input_node) = { - .function = memif_input_fn, .name = "memif-input", .sibling_of = "device-input", .format_trace = format_memif_input_trace, @@ -922,20 +921,6 @@ VLIB_REGISTER_NODE (memif_input_node) = { .n_errors = MEMIF_INPUT_N_ERROR, .error_strings = memif_input_error_strings, }; - -vlib_node_function_t __clib_weak memif_input_fn_avx512; -vlib_node_function_t __clib_weak memif_input_fn_avx2; - -#if __x86_64__ -static void __clib_constructor -memif_input_multiarch_select (void) -{ - if (memif_input_fn_avx512 && clib_cpu_supports_avx512f ()) - memif_input_node.function = memif_input_fn_avx512; - else if (memif_input_fn_avx2 && clib_cpu_supports_avx2 ()) - memif_input_node.function = memif_input_fn_avx2; -} -#endif #endif /* *INDENT-ON* */ |