Merge pull request #721 from intel/push-2024-04-13

Push 2024 04 13

Author: rdementi

scripts/grafana/clean.sh

@@ -1,4 +1,4 @@
 
-
+sh stop.sh
 rm -rf provisioning/datasources
 rm -rf *_volume

scripts/grafana/start-prometheus.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

scripts/grafana/start.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

src/cpucounters.h

@@ -591,6 +591,7 @@ class PCM_API PCM
     friend class UncoreCounterState;
     friend class Socket;
     friend class ServerUncore;
+    friend class ClientUncore;
     friend class PerfVirtualControlRegister;
     friend class Aggregator;
     friend class ServerUncorePMUs;

src/dashboard.cpp

@@ -823,7 +823,7 @@ std::string getPCMDashboardJSON(const PCMDashboardType type, int ns, int nu, int
         auto panel = std::make_shared<GraphPanel>(0, y, width, height, std::string("Socket") +  S + " Energy Consumption", "Watt", false);
         auto panel1 = std::make_shared<BarGaugePanel>(width, y, max_width - width, height, std::string("Current Socket") +  S + " Energy Consumption (Watt)");
         y += height;
-        for (auto &m : {"Package Joules Consumed", "DRAM Joules Consumed"})
+        for (auto &m : {"Package Joules Consumed", "DRAM Joules Consumed", "PP0 Joules Consumed", "PP1 Joules Consumed"})
         {
           auto t = createTarget(m, influxDBUncore_Uncore_Counters(S, m), prometheusCounters(S, m, false));
           panel->push(t);

src/pcm-sensor-server.cpp

@@ -311,8 +311,11 @@ class JSONPrinter : Visitor
         printUncoreCounterState( before, after );
     }
 
-    virtual void dispatch( ClientUncore* ) override {
+    virtual void dispatch( ClientUncore* cu) override {
         printCounter( "Object", "ClientUncore" );
+        SocketCounterState before = getSocketCounter( aggPair_.first,  cu->socketID() );
+        SocketCounterState after  = getSocketCounter( aggPair_.second, cu->socketID() );
+        printUncoreCounterState( before, after );
     }
 
     virtual void dispatch( Core* c ) override {
@@ -427,8 +430,12 @@ class JSONPrinter : Visitor
         printCounter( "Persistent Memory Reads",       getBytesReadFromPMM    ( before, after ) );
         printCounter( "Embedded DRAM Writes",          getBytesWrittenToEDC   ( before, after ) );
         printCounter( "Embedded DRAM Reads",           getBytesReadFromEDC    ( before, after ) );
+        printCounter( "Memory Controller IA Requests", getIARequestBytesFromMC( before, after ) );
+        printCounter( "Memory Controller GT Requests", getGTRequestBytesFromMC( before, after ) );
         printCounter( "Memory Controller IO Requests", getIORequestBytesFromMC( before, after ) );
         printCounter( "Package Joules Consumed",       getConsumedJoules      ( before, after ) );
+        printCounter( "PP0 Joules Consumed",           getConsumedJoules      ( 0, before, after ) );
+        printCounter( "PP1 Joules Consumed",           getConsumedJoules      ( 1, before, after ) );
         printCounter( "DRAM Joules Consumed",          getDRAMConsumedJoules  ( before, after ) );
         uint32 i = 0;
         for ( ; i < ( PCM::MAX_C_STATE ); ++i ) {
@@ -597,7 +604,11 @@ class PrometheusPrinter : Visitor
         printUncoreCounterState( before, after );
     }
 
-    virtual void dispatch( ClientUncore* ) override {
+    virtual void dispatch( ClientUncore* cu) override {
+        printComment( std::string( "Uncore Counters Socket " ) + std::to_string( cu->socketID() ) );
+        SocketCounterState before = getSocketCounter( aggPair_.first,  cu->socketID() );
+        SocketCounterState after  = getSocketCounter( aggPair_.second, cu->socketID() );
+        printUncoreCounterState( before, after );
     }
 
     virtual void dispatch( Core* c ) override {
@@ -700,8 +711,12 @@ class PrometheusPrinter : Visitor
         printCounter( "Persistent Memory Reads",       getBytesReadFromPMM    ( before, after ) );
         printCounter( "Embedded DRAM Writes",          getBytesWrittenToEDC   ( before, after ) );
         printCounter( "Embedded DRAM Reads",           getBytesReadFromEDC    ( before, after ) );
+        printCounter( "Memory Controller IA Requests", getIARequestBytesFromMC( before, after ) );
+        printCounter( "Memory Controller GT Requests", getGTRequestBytesFromMC( before, after ) );
         printCounter( "Memory Controller IO Requests", getIORequestBytesFromMC( before, after ) );
         printCounter( "Package Joules Consumed",       getConsumedJoules      ( before, after ) );
+        printCounter( "PP0 Joules Consumed",           getConsumedJoules      ( 0, before, after ) );
+        printCounter( "PP1 Joules Consumed",           getConsumedJoules      ( 1, before, after ) );
         printCounter( "DRAM Joules Consumed",          getDRAMConsumedJoules  ( before, after ) );
         uint32 i = 0;
         for ( ; i <= ( PCM::MAX_C_STATE ); ++i ) {

src/topology.cpp

@@ -18,6 +18,18 @@ UncoreCounterState ServerUncore::uncoreCounterState( void ) const
     return ucs;
 }
 
+UncoreCounterState ClientUncore::uncoreCounterState( void ) const
+{
+    UncoreCounterState ucs;
+    // Fill the ucs
+    PCM* pcm = PCM::getInstance();
+    pcm->readAndAggregateUncoreMCCounters( socketID(), ucs );
+    pcm->readAndAggregateEnergyCounters( socketID(), ucs );
+    pcm->readAndAggregatePackageCStateResidencies( refCore()->msrHandle(), ucs );
+
+    return ucs;
+}
+
 Socket::Socket( PCM* m, int32 apicID, int32 logicalID )
     : pcm_(m), refCore_(nullptr), apicID_(apicID), logicalID_(logicalID)
 {

src/topology.h

@@ -261,11 +261,7 @@ class ClientUncore : public Uncore
         v.dispatch( this );
     }
 
-    virtual UncoreCounterState uncoreCounterState( void ) const override {
-        UncoreCounterState ucs;
-        // TODO: Fill the ucs
-        return ucs;
-    }
+    virtual UncoreCounterState uncoreCounterState( void ) const override;
 };
 
 class Socket : public SystemObject {