mem: Remove units from stats description

The change https://gem5-review.googlesource.com/c/public/gem5/+/40622
allows units to be shown in stats dump, the units in stats
descriptions are nolonger necessary. This change removes units
from stats descriptions. However, for units that are multiples
of a supported unit (e.g. MegaBytes), the units in the descriptions
are kept until unit prefixes are supported.

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

diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index 33379afdcfd8cc78a09d6de086ca60c3e29a37a2..a3e4db839d46536d55670785c2e50ab5454b002a 100644 (file)
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -123,13 +123,13 @@ AbstractMemory::MemStats::MemStats(AbstractMemory &_mem)
     ADD_STAT(numOther, UNIT_COUNT,
              "Number of other requests responded to by this memory"),
     ADD_STAT(bwRead, UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Total read bandwidth from this memory (bytes/s)"),
+             "Total read bandwidth from this memory"),
     ADD_STAT(bwInstRead, UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Instruction read bandwidth from this memory (bytes/s)"),
+             "Instruction read bandwidth from this memory"),
     ADD_STAT(bwWrite, UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Write bandwidth from this memory (bytes/s)"),
+             "Write bandwidth from this memory"),
     ADD_STAT(bwTotal, UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Total bandwidth to/from this memory (bytes/s)")
+             "Total bandwidth to/from this memory")
 {
 }
 

diff --git a/src/mem/cache/compressors/base.cc b/src/mem/cache/compressors/base.cc
index e83cb6b631de7977575aa8f6446b17629dfa5d68..87f41a437f17c98dda7aac22e4f4297234c04e32 100644 (file)
--- a/src/mem/cache/compressors/base.cc
+++ b/src/mem/cache/compressors/base.cc
@@ -233,11 +233,10 @@ Base::BaseStats::BaseStats(Base& _compressor)
     ADD_STAT(compressionSize, UNIT_COUNT,
              "Number of blocks that were compressed to this power of two "
              "size"),
-    ADD_STAT(compressionSizeBits, UNIT_BIT,
-             "Total compressed data size, in bits"),
+    ADD_STAT(compressionSizeBits, UNIT_BIT, "Total compressed data size"),
     ADD_STAT(avgCompressionSizeBits,
              UNIT_RATE(Stats::Units::Bit, Stats::Units::Count),
-             "Average compression size, in bits"),
+             "Average compression size"),
     ADD_STAT(decompressions, UNIT_COUNT, "Total number of decompressions")
 {
 }

diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc
index dffc8d1f0caaeed4b419f163ecafca7164acaced..8807a737254fb70760bcb430fdcf12a655bd6d77 100644 (file)
--- a/src/mem/comm_monitor.cc
+++ b/src/mem/comm_monitor.cc
@@ -110,23 +110,23 @@ CommMonitor::MonitorStats::MonitorStats(Stats::Group *parent,
       readBytes(0),
       ADD_STAT(readBandwidthHist,
                UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-               "Histogram of read bandwidth per sample period (bytes/s)"),
+               "Histogram of read bandwidth per sample period"),
       ADD_STAT(totalReadBytes, UNIT_BYTE, "Number of bytes read"),
       ADD_STAT(averageReadBandwidth,
                UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-               "Average read bandwidth (bytes/s)",
+               "Average read bandwidth",
                totalReadBytes / simSeconds),
 
       writtenBytes(0),
       ADD_STAT(writeBandwidthHist,
                UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-               "Histogram of write bandwidth (bytes/s)"),
+               "Histogram of write bandwidth"),
       ADD_STAT(totalWrittenBytes,
                UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
                "Number of bytes written"),
       ADD_STAT(averageWriteBandwidth,
                UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-               "Average write bandwidth (bytes/s)",
+               "Average write bandwidth",
                totalWrittenBytes / simSeconds),
 
       disableLatencyHists(params.disable_latency_hists),

diff --git a/src/mem/mem_ctrl.cc b/src/mem/mem_ctrl.cc
index 63c62aea5b181c41b68a2b159fd94dde5b821ab3..607d9941d707d109d7cd53863f9af96ff61572a0 100644 (file)
--- a/src/mem/mem_ctrl.cc
+++ b/src/mem/mem_ctrl.cc
@@ -1249,10 +1249,10 @@ MemCtrl::CtrlStats::CtrlStats(MemCtrl &_ctrl)
              "Per-requestor bytes write to memory"),
     ADD_STAT(requestorReadRate,
              UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Per-requestor bytes read from memory rate (Bytes/sec)"),
+             "Per-requestor bytes read from memory rate"),
     ADD_STAT(requestorWriteRate,
              UNIT_RATE(Stats::Units::Byte, Stats::Units::Second),
-             "Per-requestor bytes write to memory rate (Bytes/sec)"),
+             "Per-requestor bytes write to memory rate"),
     ADD_STAT(requestorReadAccesses, UNIT_COUNT,
              "Per-requestor read serviced memory accesses"),
     ADD_STAT(requestorWriteAccesses, UNIT_COUNT,

diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index 82be0f4ec955278fc41964a2128d760178b982b1..ca72a7cc07d07882fc802bb8123bd8fbfc40b85c 100644 (file)
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -285,9 +285,9 @@ MemCtrl::MemCtrlStats::MemCtrlStats(MemCtrl &mc)
              "values"),
 
     ADD_STAT(priorityMinLatency, UNIT_SECOND,
-             "per QoS priority minimum request to response latency (s)"),
+             "per QoS priority minimum request to response latency"),
     ADD_STAT(priorityMaxLatency, UNIT_SECOND,
-             "per QoS priority maximum request to response latency (s)"),
+             "per QoS priority maximum request to response latency"),
     ADD_STAT(numReadWriteTurnArounds, UNIT_COUNT,
              "Number of turnarounds from READ to WRITE"),
     ADD_STAT(numWriteReadTurnArounds, UNIT_COUNT,

diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc
index 94829a7fd483e0f709fb266e6046026a358bd6fc..41ad5857403faf489331b647ed5218ed4d32cb5c 100644 (file)
--- a/src/mem/xbar.cc
+++ b/src/mem/xbar.cc
@@ -67,8 +67,7 @@ BaseXBar::BaseXBar(const BaseXBarParams &p)
       ADD_STAT(pktCount, UNIT_COUNT,
                "Packet count per connected requestor and responder"),
       ADD_STAT(pktSize, UNIT_BYTE,
-               "Cumulative packet size per connected requestor and responder "
-               "(bytes)")
+               "Cumulative packet size per connected requestor and responder")
 {
 }