Merge pull request #908 from intel/push-2025-02-12

Push 2025 02 12

Author: rdementi

Intel-PMT

@@ -13,3 +13,5 @@
 `PCM_NO_MAIN_EXCEPTION_HANDLER=1` :  don't catch exceptions in the main function of pcm tools (a debugging option)
 
 `PCM_ENFORCE_MBM=1` :  force-enable Memory Bandwidth Monitoring (MBM) metrics (LocalMemoryBW = LMB) and (RemoteMemoryBW = RMB) on processors with RDT/MBM errata
+
+`PCM_DEBUG_LEVEL=x` :  x is an integer defining debug output level. level = 0 (default): minimal or no debug info, > 0 increases verbosity

doc/ENVVAR_README.md

@@ -62,7 +62,7 @@ int mainThrows(int argc, char * argv[])
         {
         case 'w':
             write = true;
-            value = (pcm::uint32)read_number(optarg);
+            value = read_number(optarg);
             break;
         case 'd':
             dec = true;
@@ -126,7 +126,7 @@ int mainThrows(int argc, char * argv[])
                 continue;
             }
             TPMIHandle h(i, requestedID, requestedRelativeOffset, !write);
-            auto one = [&](const size_t p)
+            auto one = [&](const size_t p, uint64 value)
             {
                 if (!dec)
                     std::cout << std::hex << std::showbase;
@@ -152,7 +152,7 @@ int mainThrows(int argc, char * argv[])
             {
                 if (p < h.getNumEntries())
                 {
-                    one(p);
+                    one(p, value);
                 }
             }
         }

perfmon

@@ -29,6 +29,8 @@ extern char ** environ;
 #include <glob.h>
 #endif
 
+#include "debug.h"
+
 namespace pcm {
 
 
@@ -46,6 +48,17 @@ bool isInKeepList(const StringType& varName, const std::vector<StringType>& keep
     return false;
 }
 
+void setDefaultDebugLevel()
+{
+    auto strDebugLevel = pcm::safe_getenv("PCM_DEBUG_LEVEL");
+    if (strDebugLevel.empty() == false)
+    {
+        auto intDebugLevel = std::stoi(strDebugLevel);
+        debug::dyn_debug_level(intDebugLevel);
+        DBG(0, "Debug level set to ", intDebugLevel);
+    }
+}
+
 #if defined(_MSC_VER)
 
 void eraseEnvironmentVariables(const std::vector<std::wstring>& keepList) {

src/cpucounters.cpp

@@ -40,6 +40,7 @@
 #ifdef __linux__
 #include <unistd.h>
 #endif
+
 namespace pcm {
 
     template <class T>
@@ -81,6 +82,7 @@ namespace pcm {
     #define PCM_STRING(x) (x)
 #endif
     void eraseEnvironmentVariables(const std::vector<StringType>& keepList);
+    void setDefaultDebugLevel();
 }
 
 #ifdef _MSC_VER
@@ -103,6 +105,7 @@ int main(int argc, char * argv[]) \
     PCM_SET_DLL_DIR \
     if (pcm::safe_getenv("PCM_NO_MAIN_EXCEPTION_HANDLER") == std::string("1")) return mainThrows(argc, argv); \
     try { \
+        setDefaultDebugLevel(); \
         return mainThrows(argc, argv); \
     } catch(const std::runtime_error & e) \
     { \

src/pcm-tpmi.cpp

@@ -22,6 +22,13 @@ if [ "$?" -ne "0" ]; then
    exit 1
 fi
 
+echo Testing pcm with PCM_DEBUG_LEVEL=100
+PCM_DEBUG_LEVEL=100 ./pcm -r -- sleep 1
+if [ "$?" -ne "0" ]; then
+   echo "Error in pcm"
+   exit 1
+fi
+
 echo Testing pcm w/o env vars
 ./pcm -r -- sleep 1
 if [ "$?" -ne "0" ]; then