diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-12-23 13:19:15 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2021-12-24 23:18:15 +0000 |
| commit | 9ff617c1ac83c9e4a376959afdac6ae1e3981671 (patch) | |
| tree | 5ad1a9c5930c4a6515dab8cb283a3b7dddf7565d /src/vnet/ip/ip4_mtrie.h | |
| parent | b32bd70c1e83fff90d060ea1bbb41eb55e3f62b1 (diff) | |
ip: remove archaic vector code from mtrie
Type: improvement
Change-Id: Ib39478a2e6991d721c4ba3ea61c97bfb07238016
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/ip/ip4_mtrie.h')
| -rw-r--r-- | src/vnet/ip/ip4_mtrie.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h index ec417c9a9f7..16c524745be 100644 --- a/src/vnet/ip/ip4_mtrie.h +++ b/src/vnet/ip/ip4_mtrie.h @@ -65,14 +65,7 @@ typedef struct ip4_mtrie_16_ply_t_ /** * The leaves/slots/buckets to be filed with leafs */ - union - { - ip4_mtrie_leaf_t leaves[PLY_16_SIZE]; - -#ifdef CLIB_HAVE_VEC128 - u32x4 leaves_as_u32x4[PLY_16_SIZE / 4]; -#endif - }; + ip4_mtrie_leaf_t leaves[PLY_16_SIZE]; /** * Prefix length for terminal leaves. @@ -85,17 +78,11 @@ typedef struct ip4_mtrie_16_ply_t_ */ typedef struct ip4_mtrie_8_ply_t_ { + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); /** * The leaves/slots/buckets to be filed with leafs */ - union - { - ip4_mtrie_leaf_t leaves[256]; - -#ifdef CLIB_HAVE_VEC128 - u32x4 leaves_as_u32x4[256 / 4]; -#endif - }; + ip4_mtrie_leaf_t leaves[256]; /** * Prefix length for leaves/ply. @@ -113,9 +100,6 @@ typedef struct ip4_mtrie_8_ply_t_ * 'non-empty'. Otherwise it is the value of the cover. */ i32 dst_address_bits_base; - - /* Pad to cache line boundary. */ - u8 pad[CLIB_CACHE_LINE_BYTES - 2 * sizeof (i32)]; } ip4_mtrie_8_ply_t; STATIC_ASSERT (0 == sizeof (ip4_mtrie_8_ply_t) % CLIB_CACHE_LINE_BYTES, |