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/vnet/classify/flow_classify_node.c | 4 ++-- src/vnet/classify/ip_classify.c | 4 ++-- src/vnet/classify/vnet_classify.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/vnet/classify') diff --git a/src/vnet/classify/flow_classify_node.c b/src/vnet/classify/flow_classify_node.c index 9462d467b70..4989bf0a012 100644 --- a/src/vnet/classify/flow_classify_node.c +++ b/src/vnet/classify/flow_classify_node.c @@ -97,9 +97,9 @@ flow_classify_inline (vlib_main_t * vm, p2 = vlib_get_buffer (vm, from[2]); vlib_prefetch_buffer_header (p1, STORE); - CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE); + clib_prefetch_store (p1->data); vlib_prefetch_buffer_header (p2, STORE); - CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE); + clib_prefetch_store (p2->data); } bi0 = from[0]; diff --git a/src/vnet/classify/ip_classify.c b/src/vnet/classify/ip_classify.c index 5a5cfed6904..a5c044521bf 100644 --- a/src/vnet/classify/ip_classify.c +++ b/src/vnet/classify/ip_classify.c @@ -102,9 +102,9 @@ ip_classify_inline (vlib_main_t * vm, p2 = vlib_get_buffer (vm, from[2]); vlib_prefetch_buffer_header (p1, STORE); - CLIB_PREFETCH (p1->data, CLIB_CACHE_LINE_BYTES, STORE); + clib_prefetch_store (p1->data); vlib_prefetch_buffer_header (p2, STORE); - CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE); + clib_prefetch_store (p2->data); } bi0 = from[0]; diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h index fbac77c45bc..06784e0541e 100644 --- a/src/vnet/classify/vnet_classify.h +++ b/src/vnet/classify/vnet_classify.h @@ -328,7 +328,7 @@ vnet_classify_prefetch_bucket (vnet_classify_table_t * t, u64 hash) bucket_index = hash & (t->nbuckets - 1); - CLIB_PREFETCH (&t->buckets[bucket_index], CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&t->buckets[bucket_index]); } static inline vnet_classify_entry_t * @@ -389,7 +389,7 @@ vnet_classify_prefetch_entry (vnet_classify_table_t * t, u64 hash) e = vnet_classify_entry_at_index (t, e, value_index); - CLIB_PREFETCH (e, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (e); } vnet_classify_entry_t *vnet_classify_find_entry (vnet_classify_table_t * t, -- cgit 1.2.3-korg