Add x86_64 perfmon tables
The license issue is resolved, so we can package the .json
files. Added to the vpp-dev package in .tar.xz form, which saves a lot
of space.
Updated the perfmon error log entry: tell folks where to find the
compressed tarball, and how to extract it.
Change-Id: I3ed351fbf154cc3ba22d5f9c666acff77a2a14cf
Signed-off-by: Dave Barach <dave@barachs.net>
diff --git a/build-root/scripts/find-dev-contents b/build-root/scripts/find-dev-contents
index 73ba95b..0f11045 100755
--- a/build-root/scripts/find-dev-contents
+++ b/build-root/scripts/find-dev-contents
@@ -28,8 +28,8 @@
fi
done
-# Perf monitor .json files
-for i in $(find ${1}/vpp/share/vpp/plugins/perfmon -name *.json -type f -print); do
+# Perf monitor .json tarball
+for i in $(find ${1}/vpp/share/vpp/plugins/perfmon -name *.tar.xz -type f -print); do
echo ../${i} /usr/share/vpp/plugins/perfmon >> ${2}
done
diff --git a/src/plugins/perfmon/CMakeLists.txt b/src/plugins/perfmon/CMakeLists.txt
index 30e1f2c..845dd3c 100644
--- a/src/plugins/perfmon/CMakeLists.txt
+++ b/src/plugins/perfmon/CMakeLists.txt
@@ -18,21 +18,8 @@
parse_util.c
)
-# Reenable / extend when .json file license issue fixed
-#
-# set (PERFMON_JSON_FILES
-# haswell_core_v28.json
-# haswellx_core_v20.json
-# ivybridge_core_v21.json
-# ivytown_core_v20.json
-# jaketown_core_v20.json
-# sandybridge_core_v16.json
-# skylake_core_v42.json
-# skylakex_core_v1.12.json
-# )
-
-# install(
-# FILES ${PERFMON_JSON_FILES}
-# DESTINATION share/vpp/plugins/perfmon
-# COMPONENT vpp-dev
-# )
+install(
+ FILES PerfmonTables.tar.xz
+ DESTINATION share/vpp/plugins/perfmon
+ COMPONENT vpp-dev
+)
diff --git a/src/plugins/perfmon/PerfmonTables.tar.xz b/src/plugins/perfmon/PerfmonTables.tar.xz
new file mode 100644
index 0000000..f31dfe0
--- /dev/null
+++ b/src/plugins/perfmon/PerfmonTables.tar.xz
Binary files differ
diff --git a/src/plugins/perfmon/parse_util.c b/src/plugins/perfmon/parse_util.c
index 9ffaa32..6abb645 100644
--- a/src/plugins/perfmon/parse_util.c
+++ b/src/plugins/perfmon/parse_util.c
@@ -71,8 +71,11 @@
vlib_log_err (pm->log_class,
"Failed to read CPU-specific counter table");
vlib_log_err (pm->log_class,
- "Download from https://download.01.org/perfmon, "
- "and install as %s", json_filename);
+ "Please install the vpp-dev package and then:");
+ vlib_log_err
+ (pm->log_class, "cd %s; sudo tar Jxf PerfmonTables.tar.xz", path);
+ vlib_log_err (pm->log_class, "and restart vpp.");
+
vec_free (json_filename);
clib_error_report (error);
return ht;