aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vlib/vlib/cli.c34
-rw-r--r--vpp/app/version.c3
2 files changed, 34 insertions, 3 deletions
diff --git a/vlib/vlib/cli.c b/vlib/vlib/cli.c
index a54298505ab..2d141115857 100644
--- a/vlib/vlib/cli.c
+++ b/vlib/vlib/cli.c
@@ -38,6 +38,7 @@
*/
#include <vlib/vlib.h>
+#include <vppinfra/cpu.h>
/* Root of all show commands. */
/* *INDENT-OFF* */
@@ -634,6 +635,39 @@ VLIB_CLI_COMMAND (show_memory_usage_command, static) = {
/* *INDENT-ON* */
static clib_error_t *
+show_cpu (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c);
+ _("Model name", "%U", format_cpu_model_name);
+ _("Microarchitecture", "%U", format_cpu_uarch);
+ _("Flags", "%U", format_cpu_flags);
+ _("Base frequency", "%.2f GHz",
+ ((f64) vm->clib_time.clocks_per_second) * 1e-9);
+#undef _
+ return 0;
+}
+
+/*?
+ * Displays various information about the CPU.
+ *
+ * @cliexpar
+ * @cliexstart{show cpu}
+ * Model name: Intel(R) Xeon(R) CPU E5-2667 v4 @ 3.20GHz
+ * Microarchitecture: Broadwell (Broadwell-EP/EX)
+ * Flags: sse3 ssse3 sse41 sse42 avx avx2 aes
+ * Base Frequency: 3.20 GHz
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_cpu_command, static) = {
+ .path = "show cpu",
+ .short_help = "Show cpu information",
+ .function = show_cpu,
+};
+
+/* *INDENT-ON* */
+static clib_error_t *
enable_disable_memory_trace (vlib_main_t * vm,
unformat_input_t * input,
vlib_cli_command_t * cmd)
diff --git a/vpp/app/version.c b/vpp/app/version.c
index cf442df3db4..f8840811ab4 100644
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -55,9 +55,6 @@ show_vpe_version_command_fn (vlib_main_t * vm,
_("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);
- _("CPU flags", "%U", format_cpu_flags);
_("Current PID", "%d", getpid ());
#if DPDK > 0
_("DPDK Version", "%s", rte_version ());