diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-07-15 11:54:41 +0200 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2021-07-15 11:25:08 +0000 |
| commit | af7fb04b81c765c3e3f621c6b23fc3390310715b (patch) | |
| tree | fec5e2de4dc1ec64026c7339eb898797ce66fba0 /src/vnet/devices | |
| parent | 0aea808ac5cb1132b9787c8f7d5f9d995cd3413b (diff) | |
misc: replace CLIB_PREFETCH with clib_prefetch_{load,store}
Type: refactor
Change-Id: Id10cbf52e8f2dd809080a228d8fa282308be84ac
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/devices')
| -rw-r--r-- | src/vnet/devices/pipe/pipe.c | 4 | ||||
| -rw-r--r-- | src/vnet/devices/virtio/vhost_user_input.c | 20 | ||||
| -rw-r--r-- | src/vnet/devices/virtio/vhost_user_output.c | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/vnet/devices/pipe/pipe.c b/src/vnet/devices/pipe/pipe.c index ec50f63d9b5..eb92b3c788a 100644 --- a/src/vnet/devices/pipe/pipe.c +++ b/src/vnet/devices/pipe/pipe.c @@ -324,8 +324,8 @@ pipe_rx (vlib_main_t * vm, p3 = vlib_get_buffer (vm, from[3]); vlib_prefetch_buffer_header (p2, STORE); vlib_prefetch_buffer_header (p3, STORE); - CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (p2->data); + clib_prefetch_load (p3->data); } bi0 = from[0]; diff --git a/src/vnet/devices/virtio/vhost_user_input.c b/src/vnet/devices/virtio/vhost_user_input.c index 6abc1fc6e94..bdb3d27245b 100644 --- a/src/vnet/devices/virtio/vhost_user_input.c +++ b/src/vnet/devices/virtio/vhost_user_input.c @@ -163,8 +163,8 @@ vhost_user_input_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy, (!(src3 = map_guest_mem (vui, cpy[3].src, map_hint)))) return 1; - CLIB_PREFETCH (src2, 64, LOAD); - CLIB_PREFETCH (src3, 64, LOAD); + clib_prefetch_load (src2); + clib_prefetch_load (src3); clib_memcpy_fast ((void *) cpy[0].dst, src0, cpy[0].len); clib_memcpy_fast ((void *) cpy[1].dst, src1, cpy[1].len); @@ -872,10 +872,10 @@ vhost_user_input_copy_packed (vhost_user_intf_t * vui, vhost_copy_t * cpy, bad = (src4 == 0) + (src5 == 0) + (src6 == 0) + (src7 == 0); if (PREDICT_FALSE (bad)) goto one_by_one; - CLIB_PREFETCH (src4, 64, LOAD); - CLIB_PREFETCH (src5, 64, LOAD); - CLIB_PREFETCH (src6, 64, LOAD); - CLIB_PREFETCH (src7, 64, LOAD); + clib_prefetch_load (src4); + clib_prefetch_load (src5); + clib_prefetch_load (src6); + clib_prefetch_load (src7); while (PREDICT_TRUE (copy_len >= 8)) { @@ -892,10 +892,10 @@ vhost_user_input_copy_packed (vhost_user_intf_t * vui, vhost_copy_t * cpy, if (PREDICT_FALSE (bad)) break; - CLIB_PREFETCH (src4, 64, LOAD); - CLIB_PREFETCH (src5, 64, LOAD); - CLIB_PREFETCH (src6, 64, LOAD); - CLIB_PREFETCH (src7, 64, LOAD); + clib_prefetch_load (src4); + clib_prefetch_load (src5); + clib_prefetch_load (src6); + clib_prefetch_load (src7); clib_memcpy_fast ((void *) cpy[0].dst, src0, cpy[0].len); clib_memcpy_fast ((void *) cpy[1].dst, src1, cpy[1].len); diff --git a/src/vnet/devices/virtio/vhost_user_output.c b/src/vnet/devices/virtio/vhost_user_output.c index 59ea8104d5b..40faefadb42 100644 --- a/src/vnet/devices/virtio/vhost_user_output.c +++ b/src/vnet/devices/virtio/vhost_user_output.c @@ -194,8 +194,8 @@ vhost_user_tx_copy (vhost_user_intf_t * vui, vhost_copy_t * cpy, (!(dst3 = map_guest_mem (vui, cpy[3].dst, map_hint)))) return 1; - CLIB_PREFETCH ((void *) cpy[2].src, 64, LOAD); - CLIB_PREFETCH ((void *) cpy[3].src, 64, LOAD); + clib_prefetch_load ((void *) cpy[2].src); + clib_prefetch_load ((void *) cpy[3].src); clib_memcpy_fast (dst0, (void *) cpy[0].src, cpy[0].len); clib_memcpy_fast (dst1, (void *) cpy[1].src, cpy[1].len); @@ -601,7 +601,7 @@ retry: buffer_map_addr += cpy->len; desc_len += cpy->len; - CLIB_PREFETCH (&rxvq->packed_desc, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&rxvq->packed_desc); /* Check if vlib buffer has more data. If not, get more or break */ if (PREDICT_TRUE (!bytes_left)) @@ -922,7 +922,7 @@ retry: buffer_map_addr += cpy->len; desc_len += cpy->len; - CLIB_PREFETCH (&rxvq->desc, CLIB_CACHE_LINE_BYTES, LOAD); + clib_prefetch_load (&rxvq->desc); } // Check if vlib buffer has more data. If not, get more or break. |