svm: march svm_fifo take 2

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

diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h
index 6504c7b..c636cf8 100644 (file)
--- a/src/vppinfra/cpu.h
+++ b/src/vppinfra/cpu.h
@@ -34,7 +34,7 @@
 
 
 #if __GNUC__ > 4  && !__clang__
-#define CLIB_CPU_OPTIMIZED __attribute__ ((optimize ("tree-vectorize")))
+#define CLIB_CPU_OPTIMIZED __attribute__ ((optimize ("O3")))
 #else
 #define CLIB_CPU_OPTIMIZED
 #endif
@@ -51,14 +51,16 @@
   return & fn;                                                         \
 }
 
-#ifdef CLIB_MULTIARCH_VARIANT
+#ifdef CLIB_MARCH_VARIANT
 #define __CLIB_MULTIARCH_FN(a,b) a##_##b
 #define _CLIB_MULTIARCH_FN(a,b) __CLIB_MULTIARCH_FN(a,b)
-#define CLIB_MULTIARCH_FN(fn) _CLIB_MULTIARCH_FN(fn,CLIB_MULTIARCH_VARIANT)
+#define CLIB_MULTIARCH_FN(fn) _CLIB_MULTIARCH_FN(fn,CLIB_MARCH_VARIANT)
 #else
 #define CLIB_MULTIARCH_FN(fn) fn
 #endif
 
+#define CLIB_MARCH_SFX CLIB_MULTIARCH_FN
+
 #define foreach_x86_64_flags \
 _ (sse3,     1, ecx, 0)   \
 _ (ssse3,    1, ecx, 9)   \
@@ -165,8 +167,58 @@ clib_cpu_supports_aes ()
 #endif
 }
 
+static inline int
+clib_cpu_march_priority_avx512 ()
+{
+  if (clib_cpu_supports_avx512f ())
+    return 20;
+  return -1;
+}
+
+static inline int
+clib_cpu_march_priority_avx2 ()
+{
+  if (clib_cpu_supports_avx2 ())
+    return 10;
+  return -1;
+}
+
+#ifdef CLIB_MARCH_VARIANT
+#define CLIB_MARCH_FN_PRIORITY() CLIB_MARCH_SFX(clib_cpu_march_priority)()
+#else
+#define CLIB_MARCH_FN_PRIORITY() 0
+#endif
 #endif /* included_clib_cpu_h */
 
+#define CLIB_MARCH_FN_CONSTRUCTOR(fn)                                  \
+static void __clib_constructor                                                 \
+CLIB_MARCH_SFX(fn ## _march_constructor) (void)                                \
+{                                                                      \
+  if (CLIB_MARCH_FN_PRIORITY() > fn ## _selected_priority)             \
+    {                                                                  \
+      fn ## _selected = & CLIB_MARCH_SFX (fn ## _ma);                  \
+      fn ## _selected_priority = CLIB_MARCH_FN_PRIORITY();             \
+    }                                                                  \
+}                                                                      \
+
+#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)
+#else
+#define CLIB_MARCH_FN(fn, rtype, _args...)                             \
+  static rtype CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (fn ## _ma)(_args);   \
+  extern int (*fn ## _selected) (_args);                               \
+  extern int fn ## _selected_priority;                                 \
+  CLIB_MARCH_FN_CONSTRUCTOR (fn)                                       \
+  static rtype CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (fn ## _ma)(_args)
+#endif
+
+#define CLIB_MARCH_FN_SELECT(fn) (* fn ## _selected)
+
 format_function_t format_cpu_uarch;
 format_function_t format_cpu_model_name;
 format_function_t format_cpu_flags;