Merge pull request #416 from opcm/push-2022-07-22

Push 2022 07 22

Author: opcm

.github/workflows/ci-test.yml

@@ -75,3 +75,9 @@ jobs:
       with:
         name: test-log-raw-json-${{ github.sha }}
         path: build/bin/raw_json.json
+
+    - name: upload-artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-log-raw-edp-offlined-cores-${{ github.sha }}
+        path: build/bin/raw_edp_offlined_cores.txt

CMakeLists.txt

@@ -13,6 +13,19 @@ include(GNUInstallDirs)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
+# Check for pcm*.x artifacts generated by an old build scenario using Makefiles
+file(GLOB_RECURSE PCM_X_ARTIFACTS ${CMAKE_CURRENT_SOURCE_DIR}/*.x)
+foreach(file ${PCM_X_ARTIFACTS})
+    file(REMOVE ${file})
+    message(STATUS "Removing old artifact from current source directory : ${file}")
+endforeach()
+if(PCM_X_ARTIFACTS)
+    message(WARNING
+	  " Old pcm utilities (.x) were indicated in build folder.\n"
+          " Old binaries are expected to be installed in system.\n"
+          " Make sure to install the new binaries(run 'cmake --install .') after building.)")
+endif()
+
 message(STATUS "System: ${CMAKE_SYSTEM}")
 if(UNIX AND NOT APPLE)
     if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")

scripts/pmu-query.py

@@ -4,7 +4,8 @@
 import urllib.parse
 import json
 import csv
-import subprocess
+# subprocess is used as multiplatform approach, usage is verified (20-07-2022)
+import subprocess  # nosec
 import sys
 import platform
 import getopt
@@ -31,7 +32,8 @@
     sys.exit(-2)
 
 if filename is None:
-    map_file_raw = urllib.request.urlopen("https://download.01.org/perfmon/mapfile.csv").read().decode('utf-8')
+    # vefified that link to mapfile.csv is safe and correct (20-07-2022)
+    map_file_raw = urllib.request.urlopen("https://download.01.org/perfmon/mapfile.csv").read().decode('utf-8')  # nosec
     map_dict = csv.DictReader(io.StringIO(map_file_raw), delimiter=',')
     map_file = []
     core_path = ""
@@ -67,7 +69,8 @@
             print(model)
 
     if core_path:
-        json_core_data = urllib.request.urlopen(
+        # vefified that links, created on base of map_file are correct (20-07-2022)
+        json_core_data = urllib.request.urlopen(  # nosec
             "https://download.01.org/perfmon" + core_path
         )
         core_events = json.load(json_core_data)
@@ -79,7 +82,8 @@
         sys.exit(-1)
 
     if offcore_path:
-        json_offcore_data = urllib.request.urlopen(
+        # vefified that links, created on base of map_file are correct (20-07-2022)
+        json_offcore_data = urllib.request.urlopen(  # nosec
             "https://download.01.org/perfmon" + offcore_path
         )
         offcore_events = json.load(json_offcore_data)

src/cpucounters.cpp

@@ -1383,31 +1383,39 @@ bool PCM::discoverSystemTopology()
 
 void PCM::printSystemTopology() const
 {
-    if (num_cores == num_online_cores && hybrid == false)
+    const bool all_cores_online_no_hybrid = (num_cores == num_online_cores && hybrid == false);
+
+    if (all_cores_online_no_hybrid)
     {
       std::cerr << "Number of physical cores: " << (num_cores/threads_per_core) << "\n";
     }
 
     std::cerr << "Number of logical cores: " << num_cores << "\n";
     std::cerr << "Number of online logical cores: " << num_online_cores << "\n";
 
-    if (num_cores == num_online_cores && hybrid == false)
+    if (all_cores_online_no_hybrid)
     {
       std::cerr << "Threads (logical cores) per physical core: " << threads_per_core << "\n";
     }
     else
     {
+        std::cerr << "Threads (logical cores) per physical core: " << threads_per_core << " (maybe imprecise due to core offlining/hybrid CPU)\n";
         std::cerr << "Offlined cores: ";
         for (int i = 0; i < (int)num_cores; ++i)
             if(isCoreOnline((int32)i) == false)
                 std::cerr << i << " ";
         std::cerr << "\n";
     }
     std::cerr << "Num sockets: " << num_sockets << "\n";
-    if (num_phys_cores_per_socket > 0 && hybrid == false)
+    if (all_cores_online_no_hybrid)
     {
         std::cerr << "Physical cores per socket: " << num_phys_cores_per_socket << "\n";
     }
+    else
+    {
+        std::cerr << "Physical cores per socket: " << num_cores / num_sockets / threads_per_core << " (maybe imprecise due to core offlining/hybrid CPU)\n";
+    }
+
     if (hybrid == false)
     {
         std::cerr << "Last level cache slices per socket: " << getMaxNumOfCBoxes() << "\n";
@@ -2218,10 +2226,11 @@ void PCM::printDetailedSystemTopology()
         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;
+        size_t counter = 0;
         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->os_id >= 0) ? it->os_id : counter)
                 << std::setw(16) << it->thread_id
                 << std::setw(16) << it->core_id
                 << std::setw(16) << it->tile_id
@@ -2235,6 +2244,8 @@ void PCM::printDetailedSystemTopology()
             // 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);
+
+            ++counter;
         }
         std::cerr << "=====  Placement on packages  =====\n";
         std::cerr << "Package Id.    Core Id.     Processors\n";

src/mmio.cpp

@@ -71,7 +71,7 @@ class PCMPmem : public WinPmem {
 
 std::shared_ptr<WinPmem> WinPmemMMIORange::pmem;
 Mutex WinPmemMMIORange::mutex;
-bool WinPmemMMIORange::writeSupported;
+bool WinPmemMMIORange::writeSupported = false;
 
 WinPmemMMIORange::WinPmemMMIORange(uint64 baseAddr_, uint64 /* size_ */, bool readonly_) : startAddr(baseAddr_), readonly(readonly_)
 {

src/pcm-raw.cpp

@@ -1005,7 +1005,7 @@ void printRow(const std::string & EventName, MetricFunc metricFunc, const std::v
 
     for (uint32 core = 0; core < m->getNumCores(); ++core)
     {
-        if (!(m->isCoreOnline(core) == false || (show_partial_core_output && ycores.test(core) == false)))
+        if (!(show_partial_core_output && ycores.test(core) == false))
         {
             if (outputType == Header1) {
                 cout << separator << "SKT" << m->getSocketId(core) << "CORE" << core;
@@ -1465,7 +1465,7 @@ void print(const PCM::RawPMUConfigs& curPMUConfigs,
         {
             for (uint32 core = 0; core < m->getNumCores(); ++core)
             {
-                if (m->isCoreOnline(core) == false || (show_partial_core_output && ycores.test(core) == false))
+                if (show_partial_core_output && ycores.test(core) == false)
                     continue;
 
                 const uint64 fixedCtrValues[] = {

tests/test.sh

@@ -341,5 +341,23 @@ if [ "$?" -ne "0" ]; then
     exit 1
 fi
 
+echo Testing pcm-raw with -edp and offlined cores
+
+online_offline_cores() {
+    for i in {5..10};
+    do
+        echo $1 > /sys/devices/system/cpu/cpu$i/online
+    done
+}
+
+online_offline_cores 0
+./pcm-raw -edp -out raw_edp_offlined_cores.txt 0.25 -tr -i=4 -el event_file_test.txt
+if [ "$?" -ne "0" ]; then
+    online_offline_cores 1
+    echo "Error in pcm-raw with offlined cores"
+    exit 1
+fi
+online_offline_cores 1
+
 
 popd