From af7fb04b81c765c3e3f621c6b23fc3390310715b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 15 Jul 2021 11:54:41 +0200 Subject: misc: replace CLIB_PREFETCH with clib_prefetch_{load,store} Type: refactor Change-Id: Id10cbf52e8f2dd809080a228d8fa282308be84ac Signed-off-by: Damjan Marion --- src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c | 8 ++++---- src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c | 10 +++++----- src/plugins/dpdk/device/device.c | 10 +++++----- src/plugins/dpdk/device/node.c | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/plugins/dpdk') diff --git a/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c b/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c index 86f8e041f9e..4545e24fc83 100644 --- a/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c +++ b/src/plugins/dpdk/cryptodev/cryptodev_op_data_path.c @@ -171,8 +171,8 @@ cryptodev_frame_linked_algs_enqueue (vlib_main_t *vm, { CLIB_PREFETCH (cop[1], CLIB_CACHE_LINE_BYTES * 3, STORE); CLIB_PREFETCH (cop[2], CLIB_CACHE_LINE_BYTES * 3, STORE); - CLIB_PREFETCH (&fe[1], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (&fe[2], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&fe[1]); + clib_prefetch_load (&fe[2]); } if (last_key_index != fe->key_index) { @@ -288,8 +288,8 @@ cryptodev_frame_aead_enqueue (vlib_main_t *vm, { CLIB_PREFETCH (cop[1], CLIB_CACHE_LINE_BYTES * 3, STORE); CLIB_PREFETCH (cop[2], CLIB_CACHE_LINE_BYTES * 3, STORE); - CLIB_PREFETCH (&fe[1], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (&fe[2], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&fe[1]); + clib_prefetch_load (&fe[2]); } if (last_key_index != fe->key_index) { diff --git a/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c b/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c index c045d78ecb1..41a1e0c2a09 100644 --- a/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c +++ b/src/plugins/dpdk/cryptodev/cryptodev_raw_data_path.c @@ -144,8 +144,8 @@ cryptodev_frame_linked_algs_enqueue (vlib_main_t *vm, if (n_elts > 2) { - CLIB_PREFETCH (&fe[1], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (&fe[2], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&fe[1]); + clib_prefetch_load (&fe[2]); vlib_prefetch_buffer_header (b[1], LOAD); vlib_prefetch_buffer_header (b[2], LOAD); } @@ -275,7 +275,7 @@ cryptodev_raw_aead_enqueue (vlib_main_t *vm, vnet_crypto_async_frame_t *frame, if (n_elts > 1) { - CLIB_PREFETCH (&fe[1], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&fe[1]); vlib_prefetch_buffer_header (b[1], LOAD); } @@ -449,8 +449,8 @@ cryptodev_raw_dequeue (vlib_main_t *vm, u32 *nb_elts_processed, vnet_crypto_async_frame_t *f1, *f2; GET_RING_OBJ (cet->cached_frame, i + 1, f1); GET_RING_OBJ (cet->cached_frame, i + 2, f2); - CLIB_PREFETCH (f1, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (f2, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (f1); + clib_prefetch_load (f2); } n_left = f->state & 0x7f; diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 6d130a95e9c..7c083e1dcf4 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -212,7 +212,7 @@ dpdk_prefetch_buffer (vlib_main_t * vm, struct rte_mbuf *mb) { vlib_buffer_t *b = vlib_buffer_from_rte_mbuf (mb); CLIB_PREFETCH (mb, sizeof (struct rte_mbuf), STORE); - CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b); } static_always_inline void @@ -357,12 +357,12 @@ VNET_DEVICE_CLASS_TX_FN (dpdk_device_class) (vlib_main_t * vm, vlib_buffer_t *b2, *b3; u32 or_flags; - CLIB_PREFETCH (mb[2], CLIB_CACHE_LINE_BYTES, STORE); - CLIB_PREFETCH (mb[3], CLIB_CACHE_LINE_BYTES, STORE); + clib_prefetch_store (mb[2]); + clib_prefetch_store (mb[3]); b2 = vlib_buffer_from_rte_mbuf (mb[2]); - CLIB_PREFETCH (b2, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b2); b3 = vlib_buffer_from_rte_mbuf (mb[3]); - CLIB_PREFETCH (b3, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b3); b[0] = vlib_buffer_from_rte_mbuf (mb[0]); b[1] = vlib_buffer_from_rte_mbuf (mb[1]); diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c index 98cda4c452f..25222856912 100644 --- a/src/plugins/dpdk/device/node.c +++ b/src/plugins/dpdk/device/node.c @@ -86,10 +86,10 @@ dpdk_process_subseq_segs (vlib_main_t * vm, vlib_buffer_t * b, static_always_inline void dpdk_prefetch_mbuf_x4 (struct rte_mbuf *mb[]) { - CLIB_PREFETCH (mb[0], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (mb[1], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (mb[2], CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (mb[3], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (mb[0]); + clib_prefetch_load (mb[1]); + clib_prefetch_load (mb[2]); + clib_prefetch_load (mb[3]); } static_always_inline void @@ -97,13 +97,13 @@ dpdk_prefetch_buffer_x4 (struct rte_mbuf *mb[]) { vlib_buffer_t *b; b = vlib_buffer_from_rte_mbuf (mb[0]); - CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b); b = vlib_buffer_from_rte_mbuf (mb[1]); - CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b); b = vlib_buffer_from_rte_mbuf (mb[2]); - CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b); b = vlib_buffer_from_rte_mbuf (mb[3]); - CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (b); } /** \brief Main DPDK input node -- cgit 1.2.3-korg