summaryrefslogtreecommitdiffstats
path: root/src/vlib/node.h
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2019-02-02 00:15:27 +0100
committerDamjan Marion <dmarion@me.com>2019-02-02 00:45:09 +0000
commit652d2e139443cea073da9b7bef8ee21e41a14111 (patch)
treedc477b1151b19b636e01bfc207258e0555dc9b2f /src/vlib/node.h
parent9bb20b310280a3c9604f9dd24fbb6757d7f9ca65 (diff)
Deprecate old mutliarch code, phase 1
It is causing compilation sloness with gcc-7 so removing it before it was originally planned. So far macros are left in the tree so we can know which nodes to convert to new multiarch code. Change-Id: Idb14622ca61fdce1eba59723b20d98715b7971e6 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vlib/node.h')
-rw-r--r--src/vlib/node.h26
1 files changed, 2 insertions, 24 deletions
diff --git a/src/vlib/node.h b/src/vlib/node.h
index 8bb89f44bc7..e5d46d83665 100644
--- a/src/vlib/node.h
+++ b/src/vlib/node.h
@@ -217,31 +217,9 @@ CLIB_MARCH_SFX (node##_multiarch_register) (void) \
} \
uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (node##_fn)
-#if CLIB_DEBUG > 0
-#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn)
-#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn)
+
+/* FIXME to be removed */
#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn)
-#else
-#define VLIB_NODE_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt) \
- uword \
- __attribute__ ((flatten)) \
- __attribute__ ((target (tgt))) \
- CLIB_CPU_OPTIMIZED \
- fn ## _ ## arch ( struct vlib_main_t * vm, \
- struct vlib_node_runtime_t * node, \
- struct vlib_frame_t * frame) \
- { return fn (vm, node, frame); }
-
-#define VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn) \
- foreach_march_variant(VLIB_NODE_FUNCTION_CLONE_TEMPLATE, fn)
-
-#define VLIB_NODE_FUNCTION_MULTIARCH(node, fn) \
- VLIB_NODE_FUNCTION_MULTIARCH_CLONE(fn) \
- CLIB_MULTIARCH_SELECT_FN(fn, static inline) \
- static void __attribute__((__constructor__)) \
- __vlib_node_function_multiarch_select_##node (void) \
- { node.function = fn ## _multiarch_select(); }
-#endif
always_inline vlib_node_registration_t *
vlib_node_next_registered (vlib_node_registration_t * c)