pcm-raw: implement simplified edp option

Change-Id: Ifd6253987fd00b2ebddbe5244d0899a77e731647

Author: rdementi

src/cpucounters.cpp

@@ -2207,7 +2207,12 @@ PCM::PCM() :
 
     showSpecControlMSRs();
 
-    printDetailedSystemTopology();
+#ifndef PCM_DEBUG_TOPOLOGY
+    if (safe_getenv("PCM_PRINT_TOPOLOGY") == "1")
+#endif
+    {
+        printDetailedSystemTopology();
+    }
 
     initEnergyMonitoring();
 
@@ -2232,9 +2237,7 @@ PCM::PCM() :
 void PCM::printDetailedSystemTopology()
 {
     // produce debug output similar to Intel MPI cpuinfo
-#ifndef PCM_DEBUG_TOPOLOGY
-    if (safe_getenv("PCM_PRINT_TOPOLOGY") == "1")
-#endif
+    if (true)
     {
         std::cerr << "\n=====  Processor topology  =====\n";
         std::cerr << "OS_Processor    Thread_Id       Core_Id         Tile_Id         Package_Id      Core_Type   Native_CPU_Model\n";

src/cpucounters.h

@@ -938,7 +938,6 @@ class PCM_API PCM
     bool initMSR();
     bool detectNominalFrequency();
     void showSpecControlMSRs();
-    void printDetailedSystemTopology();
     void initEnergyMonitoring();
     void initUncoreObjects();
     /*!
@@ -1057,6 +1056,9 @@ class PCM_API PCM
         return *systemTopology;
     }
 
+    //! prints detailed system topology
+    void printDetailedSystemTopology();
+
     /*!
              \brief checks if QOS monitoring support present
 

src/pcm-raw.cpp

@@ -43,7 +43,6 @@
 #endif
 
 #include <vector>
-#define PCM_DELAY_DEFAULT 1.0 // in seconds
 #define PCM_DELAY_MIN 0.015 // 15 milliseconds is practical on most modern CPUs
 #define MAX_CORES 4096
 
@@ -82,6 +81,7 @@ void print_usage(const string progname)
     cerr << "  -el event_list.txt | /el event_list.txt  => read event list from event_list.txt file, \n";
     cerr << "                                              each line represents an event,\n";
     cerr << "                                              event groups are separated by a semicolon\n";
+    cerr << "  -edp | /edp                            => 'edp' output mode\n";
     print_help_force_rtm_abort_mode(41);
     cerr << " Examples:\n";
     cerr << "  " << progname << " 1                   => print counters every second without core and socket output\n";
@@ -91,6 +91,7 @@ void print_usage(const string progname)
 }
 
 bool verbose = false;
+double defaultDelay = 1.0; // in seconds
 
 PCM::RawEventConfig initCoreConfig()
 {
@@ -1871,6 +1872,16 @@ int main(int argc, char* argv[])
             argc--;
             continue;
         }
+        else if (
+            strncmp(*argv, "-edp", 4) == 0 ||
+            strncmp(*argv, "/edp", 4) == 0)
+        {
+            sampleSeparator = true;
+            defaultDelay = 0.1;
+            transpose = true;
+            m->printDetailedSystemTopology();
+            continue;
+        }
         else if (strncmp(*argv, "-el", 3) == 0 || strncmp(*argv, "/el", 3) == 0)
         {
             argv++;
@@ -2016,8 +2027,7 @@ int main(int argc, char* argv[])
         m->setBlocked(false);
     }
 
-
-    if (delay <= 0.0) delay = PCM_DELAY_DEFAULT;
+    if (delay <= 0.0) delay = defaultDelay;
 
     cerr << "Update every " << delay << " seconds\n";