From 5aaa392f2e0a0b133760d1e88d05e6ea0b9f43f8 Mon Sep 17 00:00:00 2001 From: Hoa Nguyen Date: Thu, 4 Feb 2021 15:24:43 -0800 Subject: [PATCH] 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 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40655 Tested-by: kokoro Reviewed-by: Jason Lowe-Power Reviewed-by: Daniel Carvalho Maintainer: Jason Lowe-Power --- src/mem/abstract_mem.cc | 8 ++++---- src/mem/cache/compressors/base.cc | 5 ++--- src/mem/comm_monitor.cc | 8 ++++---- src/mem/mem_ctrl.cc | 4 ++-- src/mem/qos/mem_ctrl.cc | 4 ++-- src/mem/xbar.cc | 3 +-- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc index 33379afdc..a3e4db839 100644 --- 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 e83cb6b63..87f41a437 100644 --- 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 dffc8d1f0..8807a7372 100644 --- 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 63c62aea5..607d9941d 100644 --- 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 82be0f4ec..ca72a7cc0 100644 --- 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 94829a7fd..41ad58574 100644 --- 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") { } -- 2.30.2