cnat: fixes & prepare maglev

Notable changes:
- ip[46]-cnat-snat is renamed to cnat-snat-ip[46]
- indent fixes
- common trace primitives
- bihash is now 40_56 with alias

Type: refactor

Change-Id: I0a82cfe3b40efd96473e51061d7135ffe412ddfc
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>

1 files changed, 0 insertions, 112 deletions

diff --git a/src/plugins/cnat/bihash_40_48.h b/src/plugins/cnat/bihash_40_48.h
deleted file mode 100644
index df345cec357..00000000000
--- a/src/plugins/cnat/bihash_40_48.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#undef BIHASH_TYPE
-#undef BIHASH_KVP_PER_PAGE
-#undef BIHASH_32_64_SVM
-#undef BIHASH_ENABLE_STATS
-#undef BIHASH_KVP_AT_BUCKET_LEVEL
-#undef BIHASH_LAZY_INSTANTIATE
-#undef BIHASH_BUCKET_PREFETCH_CACHE_LINES
-
-#define BIHASH_TYPE _40_48
-#define BIHASH_KVP_PER_PAGE 2
-#define BIHASH_KVP_AT_BUCKET_LEVEL 1
-#define BIHASH_LAZY_INSTANTIATE 1
-#define BIHASH_BUCKET_PREFETCH_CACHE_LINES 2
-
-#ifndef __included_bihash_40_48_h__
-#define __included_bihash_40_48_h__
-
-#include <vppinfra/crc32.h>
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/xxhash.h>
-
-typedef struct
-{
-  u64 key[5];
-  u64 value[6];
-} clib_bihash_kv_40_48_t;
-
-static inline int
-clib_bihash_is_free_40_48 (const clib_bihash_kv_40_48_t * v)
-{
-  /* Free values are clib_memset to 0xff, check a bit... */
-  if (v->key[0] == ~0ULL && v->value[0] == ~0ULL)
-    return 1;
-  return 0;
-}
-
-static inline u64
-clib_bihash_hash_40_48 (const clib_bihash_kv_40_48_t * v)
-{
-#ifdef clib_crc32c_uses_intrinsics
-  return clib_crc32c ((u8 *) v->key, 40);
-#else
-  u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2] ^ v->key[3] ^ v->key[4];
-  return clib_xxhash (tmp);
-#endif
-}
-
-static inline u8 *
-format_bihash_kvp_40_48 (u8 * s, va_list * args)
-{
-  clib_bihash_kv_40_48_t *v = va_arg (*args, clib_bihash_kv_40_48_t *);
-
-  s =
-    format (s,
-	    "key %llu %llu %llu %llu %llu value %llu %llu %llu %llu %llu %u",
-	    v->key[0], v->key[1], v->key[2], v->key[3], v->key[4],
-	    v->value[0], v->value[1], v->value[2], v->value[3], v->value[4],
-	    v->value[5]);
-  return s;
-}
-
-static inline int
-clib_bihash_key_compare_40_48 (u64 * a, u64 * b)
-{
-#if defined (CLIB_HAVE_VEC512)
-  u64x8 v;
-  v = u64x8_load_unaligned (a) ^ u64x8_load_unaligned (b);
-  return (u64x8_is_zero_mask (v) & 0x1f) == 0;
-#elif defined (CLIB_HAVE_VEC256)
-  u64x4 v = { a[4] ^ b[4], 0, 0, 0 };
-  v |= u64x4_load_unaligned (a) ^ u64x4_load_unaligned (b);
-  return u64x4_is_all_zero (v);
-#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_UNALIGNED_LOAD_STORE)
-  u64x2 v = { a[4] ^ b[4], 0 };
-  v |= u64x2_load_unaligned (a) ^ u64x2_load_unaligned (b);
-  v |= u64x2_load_unaligned (a + 2) ^ u64x2_load_unaligned (b + 2);
-  return u64x2_is_all_zero (v);
-#else
-  return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2]) | (a[3] ^ b[3])
-	  | (a[4] ^ b[4])) == 0;
-#endif
-}
-
-#undef __included_bihash_template_h__
-#include <vppinfra/bihash_template.h>
-
-#endif /* __included_bihash_40_48_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */