Add CPU detection functions

Change-Id: Id7ea0410d6a789000c747c36a7e50076e31dc29a
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/vpp/app/version.c b/vpp/app/version.c
index 1c1f7a6..5eb1fc5 100644 (file)
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 #include <vlib/vlib.h>
  * limitations under the License.
  */
 #include <vlib/vlib.h>

+#include <vppinfra/cpu.h>

 #include <app/version.h>
 
 #if DPDK > 0
 #include <app/version.h>
 
 #if DPDK > 0


@@ -26,9 +27,8 @@ static char * vpe_version_string =
     " built by " VPP_BUILD_USER 
     " on " VPP_BUILD_HOST 
     " at " VPP_BUILD_DATE;
     " built by " VPP_BUILD_USER 
     " on " VPP_BUILD_HOST 
     " at " VPP_BUILD_DATE;

-static char * vpe_dir_string = "Built in " VPP_BUILD_TOPDIR;

 
 

-static char * vpe_compiler = "Compiled with "
+static char * vpe_compiler =

 #if defined(__INTEL_COMPILER)
 #define __(x) #x
 #define _(x) __(x)
 #if defined(__INTEL_COMPILER)
 #define __(x) #x
 #define _(x) __(x)


@@ -48,17 +48,25 @@ show_vpe_version_command_fn (vlib_main_t * vm,
                 unformat_input_t * input,
                 vlib_cli_command_t * cmd)
 {
                 unformat_input_t * input,
                 vlib_cli_command_t * cmd)
 {

-  vlib_cli_output (vm, "%s", vpe_version_string);

   if (unformat (input, "verbose"))
     {
   if (unformat (input, "verbose"))
     {

-      vlib_cli_output (vm, "%s", vpe_dir_string);
-      vlib_cli_output (vm, "%s", vpe_compiler);
+#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
+      _("Version", "%s", "v" VPP_BUILD_VER);
+      _("Compiled by", "%s", VPP_BUILD_USER);
+      _("Compile host", "%s", VPP_BUILD_HOST);
+      _("Compile date", "%s", VPP_BUILD_DATE);
+      _("Compile location", "%s", VPP_BUILD_TOPDIR);
+      _("Compiler", "%s", vpe_compiler);
+      _("CPU model name", "%U", format_cpu_model_name);
+      _("CPU microarchitecture", "%U", format_cpu_uarch);

 #if DPDK > 0
 #if DPDK > 0

-      vlib_cli_output (vm, "DPDK version is %s", rte_version());
-      vlib_cli_output (vm, "DPDK EAL init arguments: %v",
-                       dpdk_main.eal_init_args_str);
+      _("DPDK Version", "%s", rte_version());
+      _("DPDK EAL init args", "%s", dpdk_main.eal_init_args_str);

 #endif
 #endif

+#undef _

     }
     }

+  else
+    vlib_cli_output (vm, "%s", vpe_version_string);

   return 0;
 }
 
   return 0;
 }
 

diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
index 04ee6b7..9d89ce7 100644 (file)
--- a/vpp/vnet/main.c
+++ b/vpp/vnet/main.c
@@ -64,6 +64,7 @@ int main (int argc, char * argv[])
     void vlib_set_get_handoff_structure_cb (void *cb);
 
 #if __x86_64__
     void vlib_set_get_handoff_structure_cb (void *cb);
 
 #if __x86_64__

+    __builtin_cpu_init ();

     const char * msg = "ERROR: This binary requires CPU with %s extensions.\n";
 #define _(a,b) \
     if (!__builtin_cpu_supports(a))    \
     const char * msg = "ERROR: This binary requires CPU with %s extensions.\n";
 #define _(a,b) \
     if (!__builtin_cpu_supports(a))    \

diff --git a/vppinfra/Makefile.am b/vppinfra/Makefile.am
index e3a7d46..3a40016 100644 (file)
--- a/vppinfra/Makefile.am
+++ b/vppinfra/Makefile.am
@@ -168,6 +168,7 @@ nobase_include_HEADERS = \
   vppinfra/byte_order.h \
   vppinfra/cache.h \
   vppinfra/clib.h \
   vppinfra/byte_order.h \
   vppinfra/cache.h \
   vppinfra/clib.h \

+  vppinfra/cpu.h \

   vppinfra/elf.h \
   vppinfra/elf_clib.h \
   vppinfra/elog.h \
   vppinfra/elf.h \
   vppinfra/elf_clib.h \
   vppinfra/elog.h \


@@ -224,6 +225,7 @@ nobase_include_HEADERS = \
 CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \
 CLIB_CORE = \
   vppinfra/asm_x86.c \
   vppinfra/backtrace.c \

+  vppinfra/cpu.c \

   vppinfra/elf.c \
   vppinfra/elog.c \
   vppinfra/error.c \
   vppinfra/elf.c \
   vppinfra/elog.c \
   vppinfra/error.c \

diff --git a/vppinfra/vppinfra/cpu.c b/vppinfra/vppinfra/cpu.c
new file mode 100644 (file)
index 0000000..852f986
--- /dev/null
+++ b/vppinfra/vppinfra/cpu.c
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+#include <vppinfra/clib.h>
+#include <vppinfra/format.h>
+#include <vppinfra/cpu.h>
+
+#if __x86_64__
+#include <cpuid.h>
+#endif
+
+#define foreach_x86_cpu_uarch \
+ _(0x06, 0x3d, "Broadwell", "Broadwell") \
+ _(0x06, 0x3f, "Haswell", "Haswell-E") \
+ _(0x06, 0x3c, "Haswell", "Haswell") \
+ _(0x06, 0x3e, "IvyBridge", "IvyBridge-E/EN/EP") \
+ _(0x06, 0x3a, "IvyBridge", "IvyBridge") \
+ _(0x06, 0x2a, "SandyBridge", "SandyBridge") \
+ _(0x06, 0x2d, "SandyBridge", "SandyBridge-E/EN/EP") \
+ _(0x06, 0x25, "Westmere", "Arrandale,Clarksdale") \
+ _(0x06, 0x2c, "Westmere", "Westmere-EP/EX,Gulftown") \
+ _(0x06, 0x2f, "Westmere", "Westmere-EX") \
+ _(0x06, 0x1e, "Nehalem", "Clarksfield,Lynnfield,Jasper Forest") \
+ _(0x06, 0x1a, "Nehalem", "Nehalem-EP,Bloomfield)") \
+ _(0x06, 0x2e, "Nehalem", "Nehalem-EX") \
+ _(0x06, 0x17, "Penryn", "Yorkfield,Wolfdale,Penryn,Harpertown (DP)") \
+ _(0x06, 0x1d, "Penryn", "Dunnington (MP)") \
+ _(0x06, 0x37, "Atom", "Bay Trail") \
+ _(0x06, 0x36, "Atom", "Cedarview") \
+ _(0x06, 0x26, "Atom", "Lincroft") \
+ _(0x06, 0x1c, "Atom", "Pineview/Silverthorne")
+
+u8 *
+format_cpu_uarch (u8 * s, va_list * args)
+{
+#if __x86_64__
+  u32 __attribute__((unused)) eax, ebx, ecx, edx;
+  u8 model, family;
+
+  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
+    return format (s, "unknown (missing cpuid)");
+
+  model = ((eax >> 4) & 0x0f) | ((eax >> 12) & 0xf0);
+  family = (eax >> 8) & 0x0f;
+
+#define _(f,m,a,c) if ((model == m) && (family == f)) return format(s, "%s (%s)", a, c);
+  foreach_x86_cpu_uarch
+#undef _
+  return format (s, "unknown (family 0x%02x model 0x%02x)", family, model);
+
+#else /* ! __x86_64__ */
+  return format (s, "unknown");
+#endif
+}
+
+u8 *
+format_cpu_model_name (u8 * s, va_list * args)
+{
+#if __x86_64__
+  u32 __attribute__((unused)) eax, ebx, ecx, edx;
+  u8 * name = 0;
+  u32 * name_u32;
+
+  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0)
+    return format (s, "unknown (missing cpuid)");
+
+  __get_cpuid (0x80000000, &eax, &ebx, &ecx, &edx);
+  if (eax < 0x80000004)
+    return format (s, "unknown (missing ext feature)");
+
+  vec_validate(name, 48);
+  name_u32 = (u32 *) name;
+
+  __get_cpuid (0x80000002, &eax, &ebx, &ecx, &edx);
+  name_u32[0] = eax;
+  name_u32[1] = ebx;
+  name_u32[2] = ecx;
+  name_u32[3] = edx;
+
+  __get_cpuid (0x80000003, &eax, &ebx, &ecx, &edx);
+  name_u32[4] = eax;
+  name_u32[5] = ebx;
+  name_u32[6] = ecx;
+  name_u32[7] = edx;
+
+  __get_cpuid (0x80000004, &eax, &ebx, &ecx, &edx);
+  name_u32[8] = eax;
+  name_u32[9] = ebx;
+  name_u32[10] = ecx;
+  name_u32[11] = edx;
+
+  s = format (s, "%s", name);
+  vec_free(name);
+  return s;
+
+#else /* ! __x86_64__ */
+  return format (s, "unknown");
+#endif
+}
\ No newline at end of file

diff --git a/vppinfra/vppinfra/cpu.h b/vppinfra/vppinfra/cpu.h
new file mode 100644 (file)
index 0000000..79cdf74
--- /dev/null
+++ b/vppinfra/vppinfra/cpu.h
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+#ifndef included_clib_cpu_h
+#define included_clib_cpu_h
+
+format_function_t format_cpu_uarch;
+format_function_t format_cpu_model_name;
+
+#endif
\ No newline at end of file