X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcpu.h;h=750b3934df94300b3093956362e25a415730de5c;hb=7ff514b32c8b41366b408acf2c535298546c6d42;hp=31a6e5b48e060ab6fad93afb7b49baccd1065ccb;hpb=65ec33bd006406c220cb6acb93fdd97894b0107c;p=vpp.git

diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
index 31a6e5b48e0..750b3934df9 100644
--- a/src/vppinfra/cpu.h
+++ b/src/vppinfra/cpu.h
@@ -116,6 +116,7 @@ _CLIB_MARCH_FN_REGISTRATION(fn)
 #endif
 #define foreach_x86_64_flags \
 _ (sse3,     1, ecx, 0)   \
+_ (pclmulqdq, 1, ecx, 1)  \
 _ (ssse3,    1, ecx, 9)   \
 _ (sse41,    1, ecx, 19)  \
 _ (sse42,    1, ecx, 20)  \
@@ -131,6 +132,9 @@ _ (x86_aes,  1, ecx, 25)  \
 _ (sha,      7, ebx, 29)  \
 _ (vaes,     7, ecx, 9)   \
 _ (vpclmulqdq, 7, ecx, 10)   \
+_ (avx512_vnni, 7, ecx, 11)   \
+_ (avx512_bitalg, 7, ecx, 12)   \
+_ (avx512_vpopcntdq, 7, ecx, 14)   \
 _ (invariant_tsc, 0x80000007, edx, 8)
 
 
@@ -234,7 +238,7 @@ static inline int clib_cpu_supports_ ## flag() { return 0; }
   static inline int
 clib_cpu_supports_aes ()
 {
-#if defined (__aarch64__)
+#if defined(__x86_64__)
   return clib_cpu_supports_x86_aes ();
 #elif defined (__aarch64__)
   return clib_cpu_supports_aarch64_aes ();
@@ -244,15 +248,23 @@ clib_cpu_supports_aes ()
 }
 
 static inline int
-clib_cpu_march_priority_avx512 ()
+clib_cpu_march_priority_icl ()
+{
+  if (clib_cpu_supports_avx512_bitalg ())
+    return 200;
+  return -1;
+}
+
+static inline int
+clib_cpu_march_priority_skx ()
 {
   if (clib_cpu_supports_avx512f ())
-    return 20;
+    return 100;
   return -1;
 }
 
 static inline int
-clib_cpu_march_priority_avx2 ()
+clib_cpu_march_priority_hsw ()
 {
   if (clib_cpu_supports_avx2 ())
     return 50;
@@ -315,18 +327,32 @@ clib_cpu_part ()
   return part;
 }
 
-#define AARCH64_CPU_IMPLEMENTER_THUNERDERX2 0x43
-#define AARCH64_CPU_PART_THUNERDERX2        0x0af
+#define AARCH64_CPU_IMPLEMENTER_CAVIUM      0x43
+#define AARCH64_CPU_PART_THUNDERX2          0x0af
+#define AARCH64_CPU_PART_OCTEONTX2T96       0x0b2
+#define AARCH64_CPU_PART_OCTEONTX2T98       0x0b1
 #define AARCH64_CPU_IMPLEMENTER_QDF24XX     0x51
 #define AARCH64_CPU_PART_QDF24XX            0xc00
 #define AARCH64_CPU_IMPLEMENTER_CORTEXA72   0x41
 #define AARCH64_CPU_PART_CORTEXA72          0xd08
+#define AARCH64_CPU_IMPLEMENTER_NEOVERSEN1  0x41
+#define AARCH64_CPU_PART_NEOVERSEN1         0xd0c
+
+static inline int
+clib_cpu_march_priority_octeontx2 ()
+{
+  if ((AARCH64_CPU_IMPLEMENTER_CAVIUM == clib_cpu_implementer ()) &&
+      ((AARCH64_CPU_PART_OCTEONTX2T96 == clib_cpu_part ())
+       || AARCH64_CPU_PART_OCTEONTX2T98 == clib_cpu_part ()))
+    return 20;
+  return -1;
+}
 
 static inline int
 clib_cpu_march_priority_thunderx2t99 ()
 {
-  if ((AARCH64_CPU_IMPLEMENTER_THUNERDERX2 == clib_cpu_implementer ()) &&
-      (AARCH64_CPU_PART_THUNERDERX2 == clib_cpu_part ()))
+  if ((AARCH64_CPU_IMPLEMENTER_CAVIUM == clib_cpu_implementer ()) &&
+      (AARCH64_CPU_PART_THUNDERX2 == clib_cpu_part ()))
     return 20;
   return -1;
 }
@@ -349,6 +375,15 @@ clib_cpu_march_priority_cortexa72 ()
   return -1;
 }
 
+static inline int
+clib_cpu_march_priority_neoversen1 ()
+{
+  if ((AARCH64_CPU_IMPLEMENTER_NEOVERSEN1 == clib_cpu_implementer ()) &&
+      (AARCH64_CPU_PART_NEOVERSEN1 == clib_cpu_part ()))
+    return 10;
+  return -1;
+}
+
 #ifdef CLIB_MARCH_VARIANT
 #define CLIB_MARCH_FN_PRIORITY() CLIB_MARCH_SFX(clib_cpu_march_priority)()
 #else