rename Processor Counter Monitor to Intel(r) Performance Counter Monitor

Change-Id: I30cb2012d58569c78cb3ca1a5abe89d665992f38

CMakeLists.txt

@@ -120,9 +120,9 @@ if(UNIX)
     set(CPACK_PACKAGE_NAME    "pcm")
     set(CPACK_PACKAGE_VERSION "0000")
 
-    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Processor Counter Monitor (PCM)")
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Intel(r) Performance Counter Monitor (Intel(r) PCM)")
     set(CPACK_PACKAGE_DESCRIPTION "\
-    Processor Counter Monitor (PCM) is an application programming\n\
+    Intel(r) Performance Counter Monitor (Intel(r) PCM) is an application programming\n\
     interface (API) and a set of tools based on the API to monitor\n\
     performance and energy metrics of Intel(r) Core(tm), Xeon(r), Atom(tm)\n\
     and Xeon Phi(tm) processors. PCM works on Linux, Windows, Mac OS X,\n\

Doxyfile

@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "Processor Counter Monitor" 
+PROJECT_NAME           = "Intel(r) Performance Counter Monitor" 
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 

README.md

@@ -1,10 +1,10 @@
 --------------------------------------------------------------------------------
-Processor Counter Monitor (PCM)
+Intel® Performance Counter Monitor (Intel® PCM)
 --------------------------------------------------------------------------------
 
 [PCM Tools](#pcm-tools) | [Building PCM](#building-pcm-tools) | [Downloading Pre-Compiled PCM](#downloading-pre-compiled-pcm-tools) | [FAQ](#frequently-asked-questions-faq) | [API Documentation](#pcm-api-documentation) | [Environment Variables](#pcm-environment-variables) | [Compilation Options](#custom-compilation-options)
 
-Processor Counter Monitor (PCM) is an application programming interface (API) and a set of tools based on the API to monitor performance and energy metrics of Intel® Core™, Xeon®, Atom™ and Xeon Phi™ processors. PCM works on Linux, Windows, Mac OS X, FreeBSD, DragonFlyBSD and ChromeOS operating systems.
+Intel® Performance Counter Monitor (Intel® PCM) is an application programming interface (API) and a set of tools based on the API to monitor performance and energy metrics of Intel® Core™, Xeon®, Atom™ and Xeon Phi™ processors. PCM works on Linux, Windows, Mac OS X, FreeBSD, DragonFlyBSD and ChromeOS operating systems.
 
 *Github repository statistics:* ![Custom badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fhetthbszh0.execute-api.us-east-2.amazonaws.com%2Fdefault%2Fpcm-clones) ![Custom badge](https://img.shields.io/endpoint?url=https%3A%2F%2F5urjfrshcd.execute-api.us-east-2.amazonaws.com%2Fdefault%2Fpcm-yesterday-clones) ![Custom badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fcsqqh18g3l.execute-api.us-east-2.amazonaws.com%2Fdefault%2Fpcm-today-clones)
 

doc/DOCKER_README.md

@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-How To Run Processor Counter Monitor Server Container from GitHub Container Repository or Docker Hub
+How To Run Intel(r) Performance Counter Monitor Server Container from GitHub Container Repository or Docker Hub
 --------------------------------------------------------------------------------
 
 As root user:

doc/PCM-EXPORTER.md

@@ -1,4 +1,4 @@
-# Processor Counter Monitor (PCM) Prometheus exporter [![Build Status](https://travis-ci.com/opcm/pcm.svg?branch=master)](https://travis-ci.com/opcm/pcm)
+# Intel® Performance Counter Monitor (Intel® PCM) Prometheus exporter [![Build Status](https://travis-ci.com/opcm/pcm.svg?branch=master)](https://travis-ci.com/opcm/pcm)
 
 
 pcm-sensor-server is a collector exposing Intel processor metrics over http in JSON or Prometheus (exporter text based) format. Also [available as a docker container](DOCKER_README.md).

pcm.spec

@@ -2,7 +2,7 @@
 Name:            pcm
 Version:         0
 Release:         0
-Summary:         Processor Counter Monitor
+Summary:         Intel(r) Performance Counter Monitor
 Group:           System/Monitoring
 License:         BSD-3-Clause
 Url:             https://github.com/opcm/pcm/archive
@@ -17,7 +17,7 @@ BuildRequires:  cmake
 
 %description
 
-Processor Counter Monitor (PCM) is an application programming interface (API) and a set of tools based on the API to monitor performance and energy metrics of Intel(r) Core(tm), Xeon(r), Atom(tm) and Xeon Phi(tm) processors. PCM works on Linux, Windows, Mac OS X, FreeBSD and DragonFlyBSD operating systems.
+Intel(r) Performance Counter Monitor (Intel(r) PCM) is an application programming interface (API) and a set of tools based on the API to monitor performance and energy metrics of Intel(r) Core(tm), Xeon(r), Atom(tm) and Xeon Phi(tm) processors. PCM works on Linux, Windows, Mac OS X, FreeBSD and DragonFlyBSD operating systems.
 
 %prep
 %setup -n pcm-master

scripts/grafana/README.md

@@ -21,7 +21,7 @@ Installation of the grafana front-end (can be on any *host* system with connecti
        - `start.sh` script starts telegraf/influxdb/grafana containers
        - `start-prometheus.sh` is an alternative script which starts prometheus + grafana containers: `sudo sh start-prometheus.sh target_system_address:9738`
        - Don't use `localhost` to specify the `target_system_address` if the *host* and the target are the same machine because `localhost` resolves to the own private IP address of the docker container when accessed inside the container. The external IP address or hostname should be used instead.
-4.  Start your browser at http://*host*:3000/ and then login with admin user, password admin . Change the password and then click on "**Home**" (left top corner) -> "Processor Counter Monitor (PCM) Dashboard"
+4.  Start your browser at http://*host*:3000/ and then login with admin user, password admin . Change the password and then click on "**Home**" (left top corner) -> "Intel® Performance Counter Monitor (Intel® PCM) Dashboard"
 5.  You can also stop and delete the containers when needed: `sudo sh stop.sh`
 
 ![pcm grafana output](https://raw.githubusercontent.com/wiki/opcm/pcm/pcm-dashboard-full.png)

src/cpucounters.cpp

@@ -2934,10 +2934,10 @@ void PCM::checkError(const PCM::ErrorCode code)
     case PCM::Success:
         break;
     case PCM::MSRAccessDenied:
-        std::cerr << "Access to Processor Counter Monitor has denied (no MSR or PCI CFG space access).\n";
+        std::cerr << "Access to Intel(r) Performance Counter Monitor has denied (no MSR or PCI CFG space access).\n";
         exit(EXIT_FAILURE);
     case PCM::PMUBusy:
-        std::cerr << "Access to Processor Counter Monitor has denied (Performance Monitoring Unit is occupied by other application)\n";
+        std::cerr << "Access to Intel(r) Performance Counter Monitor has denied (Performance Monitoring Unit is occupied by other application)\n";
         std::cerr << "Try to stop the application that uses PMU, or reset PMU configuration from PCM application itself\n";
         std::cerr << "You can try to reset PMU configuration now. Try to reset? (y/n)\n";
         char yn;
@@ -2949,7 +2949,7 @@ void PCM::checkError(const PCM::ErrorCode code)
         }
         exit(EXIT_FAILURE);
     default:
-        std::cerr << "Access to Processor Counter Monitor has denied (Unknown error).\n";
+        std::cerr << "Access to Intel(r) Performance Counter Monitor has denied (Unknown error).\n";
         exit(EXIT_FAILURE);
     }
 }

src/dashboard.cpp

@@ -532,7 +532,7 @@ std::string getPCMDashboardJSON(const PCMDashboardType type, int ns, int nu, int
     {
         hostname = buffer;
     }
-    Dashboard dashboard("Processor Counter Monitor (PCM) Dashboard - " + hostname);
+    Dashboard dashboard("Intel(r) Performance Counter Monitor (Intel(r) PCM) Dashboard - " + hostname);
     auto createTarget = [type](const std::string& title, const std::string& inluxdbMetric, const std::string& prometheusExpr) -> std::shared_ptr<Target>
     {
         std::shared_ptr<Target> t;

src/pcm-core.cpp

@@ -271,7 +271,7 @@ int main(int argc, char * argv[])
 	set_signal_handlers();
 
 	cerr << "\n";
-	cerr << " Processor Counter Monitor: Core Monitoring Utility \n";
+	cerr << " Intel(r) Performance Counter Monitor: Core Monitoring Utility \n";
 	cerr << "\n";
 
 	double delay = -1.0;

src/pcm-iio.cpp

@@ -1153,7 +1153,7 @@ int main(int argc, char * argv[])
 
     set_signal_handlers();
 
-    std::cout << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    std::cout << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
     std::cout << "\n This utility measures Skylake-SP IIO information\n\n";
 
     string program = string(argv[0]);

src/pcm-latency.cpp

@@ -466,7 +466,7 @@ int main(int argc, char * argv[])
 
     set_signal_handlers();
 
-    std::cout << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    std::cout << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
     std::cout << "\n This utility measures Latency information\n\n";
     bool enable_pmm = false;
     bool enable_verbose = false;

src/pcm-memory.cpp

@@ -978,7 +978,7 @@ int main(int argc, char * argv[])
     set_signal_handlers();
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor: Memory Bandwidth Monitoring Utility " << PCM_VERSION << "\n";
+    cerr << " Intel(r) Performance Counter Monitor: Memory Bandwidth Monitoring Utility " << PCM_VERSION << "\n";
     cerr << "\n";
 
     cerr << " This utility measures memory bandwidth per channel or per DIMM rank in real-time\n";

src/pcm-mmio.cpp

@@ -50,7 +50,7 @@ void doOp(const uint64 address, const uint64 offset, const bool write, T value,
 
 int main(int argc, char * argv[])
 {
-    std::cout << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    std::cout << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
 
     std::cout << "\n MMIO register read/write utility\n\n";
 

src/pcm-msr.cpp

@@ -32,7 +32,7 @@ void print_usage(const char * progname)
 
 int main(int argc, char * argv[])
 {
-    std::cout << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    std::cout << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
 
     std::cout << "\n MSR read/write utility\n\n";
 

src/pcm-numa.cpp

@@ -99,7 +99,7 @@ int main(int argc, char * argv[])
     set_signal_handlers();
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor: NUMA monitoring utility \n";
+    cerr << " Intel(r) Performance Counter Monitor: NUMA monitoring utility \n";
     cerr << "\n";
 
     double delay = -1.0;

src/pcm-pcicfg.cpp

@@ -30,7 +30,7 @@ void print_usage(const char * progname)
 
 int main(int argc, char * argv[])
 {
-    std::cout << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    std::cout << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
 
     std::cout << "\n PCICFG read/write utility\n\n";
 

src/pcm-pcie.cpp

@@ -124,7 +124,7 @@ int main(int argc, char * argv[])
     set_signal_handlers();
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor: PCIe Bandwidth Monitoring Utility \n";
+    cerr << " Intel(r) Performance Counter Monitor: PCIe Bandwidth Monitoring Utility \n";
     cerr << " This utility measures PCIe bandwidth in real-time\n";
     cerr << "\n";
     print_events();

src/pcm-power.cpp

@@ -138,7 +138,7 @@ int main(int argc, char * argv[])
 
     set_signal_handlers();
 
-    cerr << "\n Processor Counter Monitor " << PCM_VERSION << "\n";
+    cerr << "\n Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
     cerr << "\n Power Monitoring Utility\n";
 
     int imc_profile = 0;

src/pcm-raw.cpp

@@ -1827,7 +1827,7 @@ int main(int argc, char* argv[])
     set_real_time_priority(true);
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor: Raw Event Monitoring Utility \n";
+    cerr << " Intel(r) Performance Counter Monitor: Raw Event Monitoring Utility \n";
     cerr << "\n";
 
     std::vector<PCM::RawPMUConfigs> PMUConfigs(1);

src/pcm-tsx.cpp

@@ -270,7 +270,7 @@ int main(int argc, char * argv[])
 
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor: Intel(r) Transactional Synchronization Extensions Monitoring Utility \n";
+    cerr << " Intel(r) Performance Counter Monitor: Intel(r) Transactional Synchronization Extensions Monitoring Utility \n";
     cerr << "\n";
 
     double delay = -1.0;

src/pcm.cpp

@@ -1146,7 +1146,7 @@ int main(int argc, char * argv[])
     set_signal_handlers();
 
     cerr << "\n";
-    cerr << " Processor Counter Monitor " << PCM_VERSION << "\n";
+    cerr << " Intel(r) Performance Counter Monitor " << PCM_VERSION << "\n";
     cerr << "\n";
 
     cerr << "\n";
@@ -1329,14 +1329,14 @@ int main(int argc, char * argv[])
     case PCM::Success:
         break;
     case PCM::MSRAccessDenied:
-        cerr << "Access to Processor Counter Monitor has denied (no MSR or PCI CFG space access).\n";
+        cerr << "Access to Intel(r) Performance Counter Monitor has denied (no MSR or PCI CFG space access).\n";
         exit(EXIT_FAILURE);
     case PCM::PMUBusy:
-        cerr << "Access to Processor Counter Monitor has denied (Performance Monitoring Unit is occupied by other application). Try to stop the application that uses PMU.\n";
+        cerr << "Access to Intel(r) Performance Counter Monitor has denied (Performance Monitoring Unit is occupied by other application). Try to stop the application that uses PMU.\n";
         cerr << "Alternatively you can try running PCM with option -r to reset PMU.\n";
         exit(EXIT_FAILURE);
     default:
-        cerr << "Access to Processor Counter Monitor has denied (Unknown error).\n";
+        cerr << "Access to Intel(r) Performance Counter Monitor has denied (Unknown error).\n";
         exit(EXIT_FAILURE);
     }
 

src/windows/PCMInstaller.h

@@ -72,7 +72,7 @@ namespace PMUService {
             this->serviceInstaller1->Description = L"This service provides performance counters for perfmon to show hardware events ov" 
                 L"er time such as Clockticks, Instruction Retired,  Cache Misses and Memory Bandwi" 
                 L"dth.";
-            this->serviceInstaller1->DisplayName = L"Processor Counter Monitor Service";
+            this->serviceInstaller1->DisplayName = L"Intel(r) Performance Counter Monitor Service";
             this->serviceInstaller1->ServiceName = L"PCMService";
             this->serviceInstaller1->StartType = System::ServiceProcess::ServiceStartMode::Automatic;
             // 

src/windows/PCMService.h

@@ -140,7 +140,7 @@ namespace PCMServiceNS {
                 counterCollection->Add( counter );
                 counter = gcnew CounterCreationData(MetricCoreResC7Base, "", PerformanceCounterType::RawBase);
                 counterCollection->Add(counter);
-                PerformanceCounterCategory::Create(CountersCore, "Processor Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
+                PerformanceCounterCategory::Create(CountersCore, "Intel(r) Performance Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
             }
 
             if (collectionInformation_->socket)
@@ -186,15 +186,15 @@ namespace PCMServiceNS {
                 counterCollection->Add( counter );
                 counter = gcnew CounterCreationData(MetricSocketResC10Base, "", PerformanceCounterType::RawBase);
                 counterCollection->Add(counter);
-                PerformanceCounterCategory::Create(CountersSocket, "Processor Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
+                PerformanceCounterCategory::Create(CountersSocket, "Intel(r) Performance Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
             }
 
             if (collectionInformation_->qpi)
             {
                 counterCollection->Clear();
                 counter = gcnew CounterCreationData(MetricQpiBand, L"Displays the incoming bandwidth in bytes/s of this " + gcnew System::String(m_->xPI()) + L" link", PerformanceCounterType::CounterDelta64);
                 counterCollection->Add( counter );
-                PerformanceCounterCategory::Create(CountersQpi, "Processor Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
+                PerformanceCounterCategory::Create(CountersQpi, "Intel(r) Performance Counter Monitor", PerformanceCounterCategoryType::MultiInstance, counterCollection);
             }
 
             log_->WriteEntry(Globals::ServiceName, "New categories added.");