Merge tag '2024-03-16' into push-2024-03-16

Change-Id: If2bcd7b901c6d927be6b6ec30c5a26bf335d18ff

CONTRIBUTING.md

@@ -8,10 +8,10 @@ We warmly welcome contributions from everyone. If you wish to submit patches, pl
 License
 --------------------------------------------------------------------------------
 
-(Intel® PCM) is licensed using a [BSD 3-clause license](https://github.com/intel/pcm/blob/master/LICENSE). All code submitted to the project is required to carry that license.
+Intel® PCM is licensed using a [BSD 3-clause license](https://github.com/intel/pcm/blob/master/LICENSE). All code submitted to the project is required to carry that license.
 
 --------------------------------------------------------------------------------
 Coding Style
 --------------------------------------------------------------------------------
 
-While we don't enforce stringent coding style requirements, we do encourage adherence to standard coding style practices, such as those outlined in the Google C++ Style Guide (https://google.github.io/styleguide/cppguide.html). When submitting patches, we request that you maintain the style consistency with the surrounding code. We discourage the use of tabs; please use 4 spaces for indentation instead.
+While we don't enforce stringent coding style requirements, we do encourage adherence to standard coding style practices, such as those outlined in the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html). When submitting patches, we request that you maintain the style consistency with the surrounding code. We discourage the use of tabs; please use 4 spaces for indentation instead.

src/pcm.cpp

@@ -93,8 +93,7 @@ void print_help(const string & prog_name)
         << "                                        to a file, in case filename is provided\n"
         << "                                        the format used is documented here: https://www.intel.com/content/www/us/en/developer/articles/technical/intel-pcm-column-names-decoder-ring.html\n";
     cout << "  -i[=number] | /i[=number]          => allow to determine number of iterations\n";
-    cout << "  -m=integer | /m=integer            => metrics version (default = 1). If version is 2\n"
-         << "                                        then a few alternative metrics are shown (UTIL=C0 residency for cores, CFREQ=core frequency in GHz).\n";
+    cout << "  -m=integer | /m=integer            => metrics version (default = 2)\n";
     print_enforce_flush_option_help();
     print_help_force_rtm_abort_mode(37);
     cout << " Examples:\n";
@@ -359,7 +358,7 @@ void print_output(PCM * m,
         drawStackedBar(" Core    C-state distribution", CoreCStateStackedBar, 80);
         drawStackedBar(" Package C-state distribution", PackageCStateStackedBar, 80);
 
-        if (m->getNumCores() == m->getNumOnlineCores())
+        if (m->getNumCores() == m->getNumOnlineCores() && false)
         {
             cout << "\n PHYSICAL CORE IPC                 : " << getCoreIPC(sstate1, sstate2) << " => corresponds to " << 100. * (getCoreIPC(sstate1, sstate2) / double(m->getMaxIPC())) << " % utilization for cores in active state";
             cout << "\n Instructions per nominal CPU cycle: " << getTotalExecUsage(sstate1, sstate2) << " => corresponds to " << 100. * (getTotalExecUsage(sstate1, sstate2) / double(m->getMaxIPC())) << " % core utilization over time interval\n";
@@ -393,7 +392,9 @@ void print_output(PCM * m,
             cout << "\n";
         }
 
+#if 0
         cout << " SMI count: " << getSMICount(sstate1, sstate2) << "\n";
+#endif
     }
 
     if (show_socket_output)
@@ -1290,7 +1291,7 @@ int mainThrows(int argc, char * argv[])
     bool reset_pmu = false;
     bool disable_JKT_workaround = false; // as per http://software.intel.com/en-us/articles/performance-impact-when-sampling-certain-llc-events-on-snb-ep-with-vtune
     bool enforceFlush = false;
-    int metricVersion = 1;
+    int metricVersion = 2;
 
     parsePID(argc, argv, pid);
 
@@ -1389,7 +1390,7 @@ int mainThrows(int argc, char * argv[])
             }
             if (metricVersion == 0)
             {
-                metricVersion = 1;
+                metricVersion = 2;
             }
             continue;
         }