ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add x86_64 perfmon tables

Browse Source 
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>
This commit is contained in:
Dave Barach 2018-10-24 15:54:52 -04:00 committed by Florin Coras
parent 380c1676e2
commit 5f1fd46573
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-root/scripts/find-dev-contents
View File

@ -28,8 +28,8 @@ do
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

23
src/plugins/perfmon/CMakeLists.txt
View File

@ -18,21 +18,8 @@ add_vpp_plugin(perfmon
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
)

BIN
src/plugins/perfmon/PerfmonTables.tar.xz Normal file
View File

Binary file not shown.

7
src/plugins/perfmon/parse_util.c
View File

@ -71,8 +71,11 @@ perfmon_parse_table (perfmon_main_t * pm, char *path, char *table_name)
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;