sim: Rename ProbePoints namespace as probing

As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::ProbePoints became ::probing.

"probing" was chosen over "probe_points" because the
namespace contains more than solely probe points; it
contains all classes related to the act of probing.

Change-Id: I44567974a521707593739a2bd5933391803e5b51
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45412
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>

src/arch/arm/tlb.cc

@@ -574,7 +574,7 @@ TLB::TlbStats::TlbStats(Stats::Group *parent)
 void
 TLB::regProbePoints()
 {
-    ppRefills.reset(new ProbePoints::PMU(getProbeManager(), "Refills"));
+    ppRefills.reset(new probing::PMU(getProbeManager(), "Refills"));
 }
 
 Fault

src/arch/arm/tlb.hh

@@ -200,7 +200,7 @@ class TLB : public BaseTLB
     } stats;
 
     /** PMU probe for TLB refills */
-    ProbePoints::PMUUPtr ppRefills;
+    probing::PMUUPtr ppRefills;
 
     int rangeMRU; //On lookup, only move entries ahead when outside rangeMRU
 

src/cpu/base.cc

@@ -324,11 +324,11 @@ BaseCPU::startup()
 
 }
 
-ProbePoints::PMUUPtr
+probing::PMUUPtr
 BaseCPU::pmuProbePoint(const char *name)
 {
-    ProbePoints::PMUUPtr ptr;
-    ptr.reset(new ProbePoints::PMU(getProbeManager(), name));
+    probing::PMUUPtr ptr;
+    ptr.reset(new probing::PMU(getProbeManager(), name));
 
     return ptr;
 }

src/cpu/base.hh

@@ -468,7 +468,7 @@ class BaseCPU : public ClockedObject
      * @param name Name of the probe point.
      * @return A unique_ptr to the new probe point.
      */
-    ProbePoints::PMUUPtr pmuProbePoint(const char *name);
+    probing::PMUUPtr pmuProbePoint(const char *name);
 
     /**
      * Instruction commit probe point.
@@ -478,22 +478,22 @@ class BaseCPU : public ClockedObject
      * instruction. However, CPU models committing bundles of
      * instructions may call notify once for the entire bundle.
      */
-    ProbePoints::PMUUPtr ppRetiredInsts;
-    ProbePoints::PMUUPtr ppRetiredInstsPC;
+    probing::PMUUPtr ppRetiredInsts;
+    probing::PMUUPtr ppRetiredInstsPC;
 
     /** Retired load instructions */
-    ProbePoints::PMUUPtr ppRetiredLoads;
+    probing::PMUUPtr ppRetiredLoads;
     /** Retired store instructions */
-    ProbePoints::PMUUPtr ppRetiredStores;
+    probing::PMUUPtr ppRetiredStores;
 
     /** Retired branches (any type) */
-    ProbePoints::PMUUPtr ppRetiredBranches;
+    probing::PMUUPtr ppRetiredBranches;
 
     /** CPU cycle counter even if any thread Context is suspended*/
-    ProbePoints::PMUUPtr ppAllCycles;
+    probing::PMUUPtr ppAllCycles;
 
     /** CPU cycle counter, only counts if any thread contexts is active **/
-    ProbePoints::PMUUPtr ppActiveCycles;
+    probing::PMUUPtr ppActiveCycles;
 
     /**
      * ProbePoint that signals transitions of threadContexts sets.

src/cpu/pred/bpred_unit.cc

@@ -95,11 +95,11 @@ BPredUnit::BPredUnitStats::BPredUnitStats(Stats::Group *parent)
     BTBHitRatio.precision(6);
 }
 
-ProbePoints::PMUUPtr
+probing::PMUUPtr
 BPredUnit::pmuProbePoint(const char *name)
 {
-    ProbePoints::PMUUPtr ptr;
-    ptr.reset(new ProbePoints::PMU(getProbeManager(), name));
+    probing::PMUUPtr ptr;
+    ptr.reset(new probing::PMU(getProbeManager(), name));
 
     return ptr;
 }

src/cpu/pred/bpred_unit.hh

@@ -325,7 +325,7 @@ class BPredUnit : public SimObject
      * @param name Name of the probe point.
      * @return A unique_ptr to the new probe point.
      */
-    ProbePoints::PMUUPtr pmuProbePoint(const char *name);
+    probing::PMUUPtr pmuProbePoint(const char *name);
 
 
     /**
@@ -333,10 +333,10 @@ class BPredUnit : public SimObject
      *
      * @note This counter includes speculative branches.
      */
-    ProbePoints::PMUUPtr ppBranches;
+    probing::PMUUPtr ppBranches;
 
     /** Miss-predicted branches */
-    ProbePoints::PMUUPtr ppMisses;
+    probing::PMUUPtr ppMisses;
 
     /** @} */
 };

src/mem/comm_monitor.cc

@@ -68,8 +68,8 @@ CommMonitor::init()
 void
 CommMonitor::regProbePoints()
 {
-    ppPktReq.reset(new ProbePoints::Packet(getProbeManager(), "PktRequest"));
-    ppPktResp.reset(new ProbePoints::Packet(getProbeManager(), "PktResponse"));
+    ppPktReq.reset(new probing::Packet(getProbeManager(), "PktRequest"));
+    ppPktResp.reset(new probing::Packet(getProbeManager(), "PktResponse"));
 }
 
 Port &
@@ -252,7 +252,7 @@ CommMonitor::MonitorStats::MonitorStats(Stats::Group *parent,
 
 void
 CommMonitor::MonitorStats::updateReqStats(
-    const ProbePoints::PacketInfo& pkt_info, bool is_atomic,
+    const probing::PacketInfo& pkt_info, bool is_atomic,
     bool expects_response)
 {
     if (pkt_info.cmd.isRead()) {
@@ -319,7 +319,7 @@ CommMonitor::MonitorStats::updateReqStats(
 
 void
 CommMonitor::MonitorStats::updateRespStats(
-    const ProbePoints::PacketInfo& pkt_info, Tick latency, bool is_atomic)
+    const probing::PacketInfo& pkt_info, Tick latency, bool is_atomic)
 {
     if (pkt_info.cmd.isRead()) {
         // Decrement number of outstanding read requests
@@ -354,7 +354,7 @@ CommMonitor::recvAtomic(PacketPtr pkt)
 {
     const bool expects_response(pkt->needsResponse() &&
                                 !pkt->cacheResponding());
-    ProbePoints::PacketInfo req_pkt_info(pkt);
+    probing::PacketInfo req_pkt_info(pkt);
     ppPktReq->notify(req_pkt_info);
 
     const Tick delay(memSidePort.sendAtomic(pkt));
@@ -365,7 +365,7 @@ CommMonitor::recvAtomic(PacketPtr pkt)
 
     // Some packets, such as WritebackDirty, don't need response.
     assert(pkt->isResponse() || !expects_response);
-    ProbePoints::PacketInfo resp_pkt_info(pkt);
+    probing::PacketInfo resp_pkt_info(pkt);
     ppPktResp->notify(resp_pkt_info);
     return delay;
 }
@@ -384,7 +384,7 @@ CommMonitor::recvTimingReq(PacketPtr pkt)
 
     // Store relevant fields of packet, because packet may be modified
     // or even deleted when sendTiming() is called.
-    const ProbePoints::PacketInfo pkt_info(pkt);
+    const probing::PacketInfo pkt_info(pkt);
 
     const bool expects_response(pkt->needsResponse() &&
                                 !pkt->cacheResponding());
@@ -425,7 +425,7 @@ CommMonitor::recvTimingResp(PacketPtr pkt)
 
     // Store relevant fields of packet, because packet may be modified
     // or even deleted when sendTiming() is called.
-    const ProbePoints::PacketInfo pkt_info(pkt);
+    const probing::PacketInfo pkt_info(pkt);
 
     Tick latency = 0;
     CommMonitorSenderState* received_state =

src/mem/comm_monitor.hh

@@ -382,9 +382,9 @@ class CommMonitor : public SimObject
          */
         MonitorStats(Stats::Group *parent, const CommMonitorParams &params);
 
-        void updateReqStats(const ProbePoints::PacketInfo& pkt, bool is_atomic,
+        void updateReqStats(const probing::PacketInfo& pkt, bool is_atomic,
                             bool expects_response);
-        void updateRespStats(const ProbePoints::PacketInfo& pkt, Tick latency,
+        void updateRespStats(const probing::PacketInfo& pkt, Tick latency,
                              bool is_atomic);
     };
 
@@ -416,10 +416,10 @@ class CommMonitor : public SimObject
      */
 
     /** Successfully forwarded request packet */
-    ProbePoints::PacketUPtr ppPktReq;
+    probing::PacketUPtr ppPktReq;
 
     /** Successfully forwarded response packet */
-    ProbePoints::PacketUPtr ppPktResp;
+    probing::PacketUPtr ppPktResp;
 
     /** @} */
 };

src/mem/probes/base.hh

@@ -69,10 +69,10 @@ class BaseMemProbe : public SimObject
     /**
      * Callback to analyse intercepted Packets.
      */
-    virtual void handleRequest(const ProbePoints::PacketInfo &pkt_info) = 0;
+    virtual void handleRequest(const probing::PacketInfo &pkt_info) = 0;
 
   private:
-    class PacketListener : public ProbeListenerArgBase<ProbePoints::PacketInfo>
+    class PacketListener : public ProbeListenerArgBase<probing::PacketInfo>
     {
       public:
         PacketListener(BaseMemProbe &_parent,
@@ -80,7 +80,7 @@ class BaseMemProbe : public SimObject
             : ProbeListenerArgBase(pm, name),
               parent(_parent) {}
 
-        void notify(const ProbePoints::PacketInfo &pkt_info) override {
+        void notify(const probing::PacketInfo &pkt_info) override {
             parent.handleRequest(pkt_info);
         }
 

src/mem/probes/mem_footprint.cc

@@ -92,7 +92,7 @@ MemFootprintProbe::insertAddr(Addr addr, AddrSet *set, uint64_t limit)
 }
 
 void
-MemFootprintProbe::handleRequest(const ProbePoints::PacketInfo &pi)
+MemFootprintProbe::handleRequest(const probing::PacketInfo &pi)
 {
     if (!pi.cmd.isRequest() || !system->isMemAddr(pi.addr))
         return;

src/mem/probes/mem_footprint.hh

@@ -69,7 +69,7 @@ class MemFootprintProbe : public BaseMemProbe
     const uint64_t totalPagesInMem;
 
     void insertAddr(Addr addr, AddrSet *set, uint64_t limit);
-    void handleRequest(const ProbePoints::PacketInfo &pkt_info) override;
+    void handleRequest(const probing::PacketInfo &pkt_info) override;
 
     struct MemFootprintProbeStats : public Stats::Group
     {

src/mem/probes/mem_trace.cc

@@ -103,7 +103,7 @@ MemTraceProbe::closeStreams()
 }
 
 void
-MemTraceProbe::handleRequest(const ProbePoints::PacketInfo &pkt_info)
+MemTraceProbe::handleRequest(const probing::PacketInfo &pkt_info)
 {
     ProtoMessage::Packet pkt_msg;
 

src/mem/probes/mem_trace.hh

@@ -51,7 +51,7 @@ class MemTraceProbe : public BaseMemProbe
     MemTraceProbe(const MemTraceProbeParams &params);
 
   protected:
-    void handleRequest(const ProbePoints::PacketInfo &pkt_info) override;
+    void handleRequest(const probing::PacketInfo &pkt_info) override;
 
     /**
      * Callback to flush and close all open output streams on exit. If

src/mem/probes/stack_dist.cc

@@ -93,7 +93,7 @@ StackDistProbeStats::StackDistProbeStats(StackDistProbe *parent)
 }
 
 void
-StackDistProbe::handleRequest(const ProbePoints::PacketInfo &pkt_info)
+StackDistProbe::handleRequest(const probing::PacketInfo &pkt_info)
 {
     // only capturing read and write requests (which allocate in the
     // cache)

src/mem/probes/stack_dist.hh

@@ -51,7 +51,7 @@ class StackDistProbe : public BaseMemProbe
     StackDistProbe(const StackDistProbeParams &params);
 
   protected:
-    void handleRequest(const ProbePoints::PacketInfo &pkt_info) override;
+    void handleRequest(const probing::PacketInfo &pkt_info) override;
 
   protected:
     // Cache line size to simulate

src/sim/probe/mem.hh

@@ -43,7 +43,9 @@
 #include "mem/packet.hh"
 #include "sim/probe/probe.hh"
 
-namespace ProbePoints {
+GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
+namespace probing
+{
 
 /**
  * A struct to hold on to the essential fields from a packet, so that

src/sim/probe/pmu.hh

@@ -42,7 +42,9 @@
 
 #include "sim/probe/probe.hh"
 
-namespace ProbePoints {
+GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
+namespace probing
+{
 
 /**
  * PMU probe point

src/sim/probe/probe.hh

@@ -79,7 +79,9 @@ struct ProbeListenerObjectParams;
  * common instrumentation interface for devices such as PMUs that have
  * different implementations in different ISAs.
  */
-namespace ProbePoints {
+GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
+namespace probing
+{
 /* Note: This is only here for documentation purposes, new probe
  * points should normally be declared in their own header files. See
  * for example pmu.hh.