Fixing libmsr build issues on Ubuntu.

- Removing profile.h include from test source files.
- Updating build notes for libmsr, msrmod, and powmon.

Signed-off-by: Stephanie Labasan <[email protected]>

Author: Stephanie Labasan

README

@@ -33,7 +33,9 @@ Installation
 Installation is simple. You will need [CMAKE](http://www.cmake.org) version 2.8
 or higher and GCC. In most cases, the installation is as follows:
 
-	$ cmake . -DCMAKE_PREFIX_INSTALL=build/
+    $ cmake . -DCMAKE_INSTALL_PREFIX=${HOME}/build/libmsr
+    $ make
+    $ make install
 
 The installation depends on a `master.h` file, which defines the offsets for
 several MSRs given a particular architecture (e.g., Sandy Bridge, Ivy Bridge,

TODO

@@ -11,12 +11,6 @@ Ongoing
 
 - [2016-08-08] Finish tagging PCI configuration (CSR) files with Doxygen tags.
 
-- [2016-08-11] Check functionality of signalCombined.c once batch operation is
-  fixed. There may be some changes.
-
-- [2016-08-11] Check functionality of powmon with current libmsr status. Remove
-  check for older version of libmsr.
-
 - [2016-08-11] Add member variables for converted bit fields (i.e.,
   human-readable values) in performance counter structs. Current implementation
   only stores raw values of bit fields.

demoapps/powmon/README.md

@@ -0,0 +1,25 @@
+POWMON
+======
+This directory contains three libmsr-based power monitors.
+
+powmon 
+------
+Samples and prints power consumption and allocation per socket for
+systems with two sockets
+
+power_wrapper_static
+--------------------
+Samples and prints power consumption and allocation per socket for systems with
+two sockets after setting a power cap
+
+power_wrapper_dynamic 
+--------------------
+Samples and prints power consumption and allocation per socket for systems with
+two sockets and adjusts the cap stepwise every 500 ms
+
+
+Notes
+-----
+Each monitor includes a usage string. All three monitors are wrappers around
+some other process that will be executing on the node and include logic so that
+only one monitor is run per node.

demoapps/powmon/README.txt

@@ -1,7 +1,3 @@
 v0.0 alpha
 This tool is in alpha and has not been fully tested. Additionally, updates will
 be sparse.
-
-To install, modify the LIBMSR_LIB and LIBMSR_INC variables in the Makefile so
-that the path links to libmsr.so (only tested on v0.1.14 and newer) and 
-to the location of the libmsr header files, respectively.

msrmod/README.md

@@ -10,7 +10,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/libmsr_dump_data.c

@@ -10,7 +10,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/libmsr_test.c

@@ -10,7 +10,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/power_unit_test.c

@@ -12,7 +12,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/pstate_test.c

@@ -10,7 +10,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/read_rapl_data.c

@@ -10,7 +10,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"

test/translate_pkg_rapl_limit.c

@@ -12,7 +12,6 @@
 #include "msr_thermal.h"
 #include "msr_counters.h"
 #include "msr_clocks.h"
-#include "profile.h"
 #include "msr_misc.h"
 #include "msr_turbo.h"
 #include "csr_core.h"