build: fix rpm build error with test_infra

[vpp.git] / src / vppinfra / cpu.h

diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
index 8d2465b..a30401a 100644 (file)
--- a/src/vppinfra/cpu.h
+++ b/src/vppinfra/cpu.h
@@ -24,7 +24,9 @@
   _ (hsw, "Intel Haswell")                                                    \
   _ (trm, "Intel Tremont")                                                    \
   _ (skx, "Intel Skylake (server) / Cascade Lake")                            \
-  _ (icl, "Intel Ice Lake")
+  _ (icl, "Intel Ice Lake")                                                   \
+  _ (adl, "Intel Alder Lake")                                                 \
+  _ (spr, "Intel Sapphire Rapids")
 #elif defined(__aarch64__)
 #define foreach_march_variant                                                 \
   _ (octeontx2, "Marvell Octeon TX2")                                         \
@@ -45,12 +47,6 @@ typedef enum
     CLIB_MARCH_TYPE_N_VARIANTS
 } clib_march_variant_type_t;
 
-#if __GNUC__ > 4  && !__clang__ && CLIB_DEBUG == 0
-#define CLIB_CPU_OPTIMIZED __attribute__ ((optimize ("O3")))
-#else
-#define CLIB_CPU_OPTIMIZED
-#endif
-
 #ifdef CLIB_MARCH_VARIANT
 #define __CLIB_MULTIARCH_FN(a,b) a##_##b
 #define _CLIB_MULTIARCH_FN(a,b) __CLIB_MULTIARCH_FN(a,b)
@@ -87,7 +83,10 @@ clib_march_select_fn_ptr (clib_march_fn_registration * r)
   return rv;
 }
 
-#define CLIB_MARCH_FN_POINTER(fn) \
+#define CLIB_MARCH_FN_POINTER(fn)                                             \
+  (__typeof__ (fn) *) clib_march_select_fn_ptr (fn##_march_fn_registrations);
+
+#define CLIB_MARCH_FN_VOID_POINTER(fn)                                        \
   clib_march_select_fn_ptr (fn##_march_fn_registrations);
 
 #define _CLIB_MARCH_FN_REGISTRATION(fn) \
@@ -126,6 +125,7 @@ _CLIB_MARCH_FN_REGISTRATION(fn)
   _ (avx, 1, ecx, 28)                                                         \
   _ (rdrand, 1, ecx, 30)                                                      \
   _ (avx2, 7, ebx, 5)                                                         \
+  _ (bmi2, 7, ebx, 8)                                                         \
   _ (rtm, 7, ebx, 11)                                                         \
   _ (pqm, 7, ebx, 12)                                                         \
   _ (pqe, 7, ebx, 15)                                                         \
@@ -140,6 +140,8 @@ _CLIB_MARCH_FN_REGISTRATION(fn)
   _ (avx512_vpopcntdq, 7, ecx, 14)                                            \
   _ (movdiri, 7, ecx, 27)                                                     \
   _ (movdir64b, 7, ecx, 28)                                                   \
+  _ (enqcmd, 7, ecx, 29)                                                      \
+  _ (avx512_fp16, 7, edx, 23)                                                 \
   _ (invariant_tsc, 0x80000007, edx, 8)
 
 #define foreach_aarch64_flags \
@@ -167,8 +169,10 @@ _ (asimddp,    20) \
 _ (sha512,     21) \
 _ (sve,        22)
 
-u32 clib_get_current_cpu_id ();
-u32 clib_get_current_numa_node ();
+u32 clib_get_current_cpu_id (void);
+u32 clib_get_current_numa_node (void);
+
+typedef int (*clib_cpu_supports_func_t) (void);
 
 #if defined(__x86_64__)
 #include "cpuid.h"
@@ -185,8 +189,6 @@ clib_get_cpuid (const u32 lev, u32 * eax, u32 * ebx, u32 * ecx, u32 * edx)
   return 1;
 }
 
-typedef int (*clib_cpu_supports_func_t) ();
-
 #define _(flag, func, reg, bit) \
 static inline int                                                      \
 clib_cpu_supports_ ## flag()                                           \
@@ -239,6 +241,14 @@ clib_cpu_supports_aes ()
 #endif
 }
 
+static inline int
+clib_cpu_march_priority_spr ()
+{
+  if (clib_cpu_supports_enqcmd ())
+    return 300;
+  return -1;
+}
+
 static inline int
 clib_cpu_march_priority_icl ()
 {
@@ -247,6 +257,14 @@ clib_cpu_march_priority_icl ()
   return -1;
 }
 
+static inline int
+clib_cpu_march_priority_adl ()
+{
+  if (clib_cpu_supports_movdiri () && clib_cpu_supports_avx2 ())
+    return 150;
+  return -1;
+}
+
 static inline int
 clib_cpu_march_priority_skx ()
 {
@@ -259,7 +277,7 @@ static inline int
 clib_cpu_march_priority_trm ()
 {
   if (clib_cpu_supports_movdiri ())
-    return 60;
+    return 40;
   return -1;
 }
 
@@ -271,6 +289,24 @@ clib_cpu_march_priority_hsw ()
   return -1;
 }
 
+#define X86_CPU_ARCH_PERF_FUNC 0xA
+
+static inline int
+clib_get_pmu_counter_count (u8 *fixed, u8 *general)
+{
+#if defined(__x86_64__)
+  u32 __clib_unused eax = 0, ebx = 0, ecx = 0, edx = 0;
+  clib_get_cpuid (X86_CPU_ARCH_PERF_FUNC, &eax, &ebx, &ecx, &edx);
+
+  *general = (eax & 0xFF00) >> 8;
+  *fixed = (edx & 0xF);
+
+  return 1;
+#else
+  return 0;
+#endif
+}
+
 static inline u32
 clib_cpu_implementer ()
 {
@@ -403,19 +439,18 @@ CLIB_MARCH_SFX(fn ## _march_constructor) (void)                           \
 }                                                                      \
 
 #ifndef CLIB_MARCH_VARIANT
-#define CLIB_MARCH_FN(fn, rtype, _args...)                             \
-  static rtype CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (fn ## _ma)(_args);   \
-  rtype (*fn ## _selected) (_args) = & CLIB_MARCH_SFX (fn ## _ma);     \
-  int fn ## _selected_priority = 0;                                    \
-  static inline rtype CLIB_CPU_OPTIMIZED                               \
-  CLIB_MARCH_SFX (fn ## _ma)(_args)
+#define CLIB_MARCH_FN(fn, rtype, _args...)                                    \
+  static rtype CLIB_MARCH_SFX (fn##_ma) (_args);                              \
+  rtype (*fn##_selected) (_args) = &CLIB_MARCH_SFX (fn##_ma);                 \
+  int fn##_selected_priority = 0;                                             \
+  static inline rtype CLIB_MARCH_SFX (fn##_ma) (_args)
 #else
-#define CLIB_MARCH_FN(fn, rtype, _args...)                             \
-  static rtype CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (fn ## _ma)(_args);   \
-  extern rtype (*fn ## _selected) (_args);                             \
-  extern int fn ## _selected_priority;                                 \
-  CLIB_MARCH_FN_CONSTRUCTOR (fn)                                       \
-  static rtype CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (fn ## _ma)(_args)
+#define CLIB_MARCH_FN(fn, rtype, _args...)                                    \
+  static rtype CLIB_MARCH_SFX (fn##_ma) (_args);                              \
+  extern rtype (*fn##_selected) (_args);                                      \
+  extern int fn##_selected_priority;                                          \
+  CLIB_MARCH_FN_CONSTRUCTOR (fn)                                              \
+  static rtype CLIB_MARCH_SFX (fn##_ma) (_args)
 #endif
 
 #define CLIB_MARCH_FN_SELECT(fn) (* fn ## _selected)
@@ -423,6 +458,7 @@ CLIB_MARCH_SFX(fn ## _march_constructor) (void)                             \
 format_function_t format_cpu_uarch;
 format_function_t format_cpu_model_name;
 format_function_t format_cpu_flags;
+format_function_t format_march_variant;
 
 /*
  * fd.io coding-style-patch-verification: ON