output adaptation for edp parsing

Change-Id: If23d35cc7930199c203e1adc4e58b5c6d13c0bcc

Author: rdementi

src/cpucounters.cpp

@@ -609,6 +609,8 @@ bool PCM::detectModel()
 
     pcm_cpuid(7, 0, cpuinfo);
 
+    std::cerr << "\n=====  Processor information  =====\n";
+
 #ifdef __linux__
     auto checkLinuxCpuinfoFlag = [](const std::string& flag) -> bool
     {
@@ -1361,69 +1363,6 @@ bool PCM::discoverSystemTopology()
 
 #endif //end of ifdef _MSC_VER
 
-    // produce debug output similar to Intel MPI cpuinfo
-#ifndef PCM_DEBUG_TOPOLOGY
-    if (safe_getenv("PCM_PRINT_TOPOLOGY") == "1")
-#endif
-    {
-        std::cerr << "=====  Processor identification  =====\n";
-        std::cerr << "Processor       Thread Id.      Core Id.        Tile Id.        Package Id.     Core Type.  Native CPU Model.\n";
-        std::map<uint32, std::vector<uint32> > os_id_by_core, os_id_by_tile, core_id_by_socket;
-        for (auto it = topology.begin(); it != topology.end(); ++it)
-        {
-            std::cerr << std::left << std::setfill(' ')
-                << std::setw(16) << it->os_id
-                << std::setw(16) << it->thread_id
-                << std::setw(16) << it->core_id
-                << std::setw(16) << it->tile_id
-                << std::setw(16) << it->socket
-                << std::setw(16) << it->getCoreTypeStr()
-                << std::setw(16) << it->native_cpu_model
-                << "\n";
-            if (std::find(core_id_by_socket[it->socket].begin(), core_id_by_socket[it->socket].end(), it->core_id)
-                == core_id_by_socket[it->socket].end())
-                core_id_by_socket[it->socket].push_back(it->core_id);
-            // add socket offset to distinguish cores and tiles from different sockets
-            os_id_by_core[(it->socket << 15) + it->core_id].push_back(it->os_id);
-            os_id_by_tile[(it->socket << 15) + it->tile_id].push_back(it->os_id);
-        }
-        std::cerr << "=====  Placement on packages  =====\n";
-        std::cerr << "Package Id.    Core Id.     Processors\n";
-        for (auto pkg = core_id_by_socket.begin(); pkg != core_id_by_socket.end(); ++pkg)
-        {
-            auto core_id = pkg->second.begin();
-            std::cerr << std::left << std::setfill(' ') << std::setw(15) << pkg->first << *core_id;
-            for (++core_id; core_id != pkg->second.end(); ++core_id)
-            {
-                std::cerr << "," << *core_id;
-            }
-            std::cerr << "\n";
-        }
-        std::cerr << "\n=====  Core/Tile sharing  =====\n";
-        std::cerr << "Level      Processors\nCore       ";
-        for (auto core = os_id_by_core.begin(); core != os_id_by_core.end(); ++core)
-        {
-            auto os_id = core->second.begin();
-            std::cerr << "(" << *os_id;
-            for (++os_id; os_id != core->second.end(); ++os_id) {
-                std::cerr << "," << *os_id;
-            }
-            std::cerr << ")";
-        }
-        std::cerr << "\nTile / L2$ ";
-        for (auto core = os_id_by_tile.begin(); core != os_id_by_tile.end(); ++core)
-        {
-            auto os_id = core->second.begin();
-            std::cerr << "(" << *os_id;
-            for (++os_id; os_id != core->second.end(); ++os_id) {
-                std::cerr << "," << *os_id;
-            }
-            std::cerr << ")";
-        }
-        std::cerr << "\n";
-        std::cerr << "\n";
-    }
-
     if(num_cores == 0) {
         num_cores = (int32)topology.size();
     }
@@ -2268,6 +2207,8 @@ PCM::PCM() :
 
     showSpecControlMSRs();
 
+    printDetailedSystemTopology();
+
     initEnergyMonitoring();
 
     initUncoreObjects();
@@ -2288,6 +2229,72 @@ 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
+    {
+        std::cerr << "\n=====  Processor topology  =====\n";
+        std::cerr << "OS_Processor    Thread_Id       Core_Id         Tile_Id         Package_Id      Core_Type   Native_CPU_Model\n";
+        std::map<uint32, std::vector<uint32> > os_id_by_core, os_id_by_tile, core_id_by_socket;
+        for (auto it = topology.begin(); it != topology.end(); ++it)
+        {
+            std::cerr << std::left << std::setfill(' ')
+                << std::setw(16) << it->os_id
+                << std::setw(16) << it->thread_id
+                << std::setw(16) << it->core_id
+                << std::setw(16) << it->tile_id
+                << std::setw(16) << it->socket
+                << std::setw(16) << it->getCoreTypeStr()
+                << std::setw(16) << it->native_cpu_model
+                << "\n";
+            if (std::find(core_id_by_socket[it->socket].begin(), core_id_by_socket[it->socket].end(), it->core_id)
+                == core_id_by_socket[it->socket].end())
+                core_id_by_socket[it->socket].push_back(it->core_id);
+            // add socket offset to distinguish cores and tiles from different sockets
+            os_id_by_core[(it->socket << 15) + it->core_id].push_back(it->os_id);
+            os_id_by_tile[(it->socket << 15) + it->tile_id].push_back(it->os_id);
+        }
+        std::cerr << "=====  Placement on packages  =====\n";
+        std::cerr << "Package Id.    Core Id.     Processors\n";
+        for (auto pkg = core_id_by_socket.begin(); pkg != core_id_by_socket.end(); ++pkg)
+        {
+            auto core_id = pkg->second.begin();
+            std::cerr << std::left << std::setfill(' ') << std::setw(15) << pkg->first << *core_id;
+            for (++core_id; core_id != pkg->second.end(); ++core_id)
+            {
+                std::cerr << "," << *core_id;
+            }
+            std::cerr << "\n";
+        }
+        std::cerr << "\n=====  Core/Tile sharing  =====\n";
+        std::cerr << "Level      Processors\nCore       ";
+        for (auto core = os_id_by_core.begin(); core != os_id_by_core.end(); ++core)
+        {
+            auto os_id = core->second.begin();
+            std::cerr << "(" << *os_id;
+            for (++os_id; os_id != core->second.end(); ++os_id) {
+                std::cerr << "," << *os_id;
+            }
+            std::cerr << ")";
+        }
+        std::cerr << "\nTile / L2$ ";
+        for (auto core = os_id_by_tile.begin(); core != os_id_by_tile.end(); ++core)
+        {
+            auto os_id = core->second.begin();
+            std::cerr << "(" << *os_id;
+            for (++os_id; os_id != core->second.end(); ++os_id) {
+                std::cerr << "," << *os_id;
+            }
+            std::cerr << ")";
+        }
+        std::cerr << "\n";
+        std::cerr << "\n";
+    }
+}
+
 void PCM::enableJKTWorkaround(bool enable)
 {
     if(disable_JKT_workaround) return;

src/cpucounters.h

@@ -938,6 +938,7 @@ class PCM_API PCM
     bool initMSR();
     bool detectNominalFrequency();
     void showSpecControlMSRs();
+    void printDetailedSystemTopology();
     void initEnergyMonitoring();
     void initUncoreObjects();
     /*!