X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcpu.h;h=769bdb56e828db9263a42762cf8c9f0104dff562;hb=60a107c8fd8874694ec72fb526d4d393bf36d1ee;hp=8d2465ba4d62b9edc3f29748e05fd4bc911c6daa;hpb=8e1384f7bf2e806e0d65d07af38da269ef1b8338;p=vpp.git

diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
index 8d2465ba4d6..769bdb56e82 100644
--- a/src/vppinfra/cpu.h
+++ b/src/vppinfra/cpu.h
@@ -45,12 +45,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 +81,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 +123,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 +138,7 @@ _CLIB_MARCH_FN_REGISTRATION(fn)
   _ (avx512_vpopcntdq, 7, ecx, 14)                                            \
   _ (movdiri, 7, ecx, 27)                                                     \
   _ (movdir64b, 7, ecx, 28)                                                   \
+  _ (avx512_fp16, 7, edx, 23)                                                 \
   _ (invariant_tsc, 0x80000007, edx, 8)
 
 #define foreach_aarch64_flags \
@@ -167,8 +166,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 +186,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()						\
@@ -271,6 +270,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 +420,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 +439,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