X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fnode.c;h=2b8c4f2d2285a243c23ed3c90ad994ecc4ab01dd;hb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;hp=029e25d814ae09fabe1128e3f0cc4c0652d91031;hpb=4d72b172377681536feb7c454af73516a366c192;p=vpp.git

diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 029e25d814a..2b8c4f2d228 100644
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -187,7 +187,7 @@ memif_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   u32 n_left, *to_next = 0;
   u32 bi0, bi1, bi2, bi3;
   vlib_buffer_t *b0, *b1, *b2, *b3;
-  u32 thread_index = vlib_get_thread_index ();
+  u32 thread_index = vm->thread_index;
   memif_per_thread_data_t *ptd = vec_elt_at_index (mm->per_thread_data,
 						   thread_index);
   vlib_buffer_t *bt = &ptd->buffer_template;
@@ -542,7 +542,7 @@ memif_device_input_zc_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   u16 s0, s1, s2, s3;
   memif_desc_t *d0, *d1, *d2, *d3;
   vlib_buffer_t *b0, *b1, *b2, *b3;
-  u32 thread_index = vlib_get_thread_index ();
+  u32 thread_index = vm->thread_index;
   memif_per_thread_data_t *ptd = vec_elt_at_index (mm->per_thread_data,
 						   thread_index);
   u16 cur_slot, last_slot, ring_size, n_slots, mask, head;
@@ -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* */