From 1a7802598b3c3d667f7150269f6a26d977ce575c Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Tue, 4 Aug 2015 10:29:13 +0100 Subject: [PATCH] stats: Update stats for tgen to reflect CommMonitor changes The name of the stack distance stats changed slightly when the stack distance calculator was redesigned as a probe. Update the reference stats to reflect this. --- .../ref/null/none/tgen-simple-mem/config.ini | 22 +++-- .../ref/null/none/tgen-simple-mem/simout | 9 +- .../ref/null/none/tgen-simple-mem/stats.txt | 97 ++++++++++--------- 3 files changed, 69 insertions(+), 59 deletions(-) diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini index 91ff0eb51..0c06c4a1a 100644 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini @@ -81,7 +81,7 @@ slave=system.monitor.master system.system_port [system.monitor] type=CommMonitor -children=stack_dist_calc +children=stackdist trace bandwidth_bins=20 burst_length_bins=20 clk_domain=system.clk_domain @@ -99,25 +99,33 @@ latency_bins=20 outstanding_bins=20 read_addr_mask=18446744073709551615 sample_period=1000000000 -stack_dist_calc=system.monitor.stack_dist_calc system=system -trace_compress=true -trace_enable=true -trace_file=monitor.ptrc.gz transaction_bins=20 write_addr_mask=18446744073709551615 master=system.membus.slave[0] slave=system.cpu.port -[system.monitor.stack_dist_calc] -type=StackDistCalc +[system.monitor.stackdist] +type=StackDistProbe disable_linear_hists=false disable_log_hists=false eventq_index=0 +line_size=64 linear_hist_bins=16 log_hist_bins=32 +manager=system.monitor +probe_name=PktRequest +system=system verify=true +[system.monitor.trace] +type=MemTraceProbe +eventq_index=0 +manager=system.monitor +probe_name=PktRequest +trace_compress=true +trace_file=monitor.ptrc.gz + [system.physmem] type=SimpleMemory bandwidth=73.000000 diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout index ccbd2154c..01f1d48fb 100755 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout @@ -1,10 +1,11 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 22 2014 16:54:17 -gem5 started Jan 22 2014 17:29:05 -gem5 executing on u200540-lin -command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/70.tgen/null/none/tgen-simple-mem -re tests/run.py build/NULL/tests/opt/quick/se/70.tgen/null/none/tgen-simple-mem +gem5 compiled Jun 17 2015 08:02:53 +gem5 started Jun 17 2015 09:01:31 +gem5 executing on e104799-lin +command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/70.tgen/null/none/tgen-simple-mem -re /work/gem5/outgoing/gem5_2/tests/run.py build/NULL/tests/opt/quick/se/70.tgen/null/none/tgen-simple-mem + Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... Exiting @ tick 100000000000 because simulate() limit reached diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt index 2416b8ce8..0520a1aac 100644 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt @@ -38,54 +38,6 @@ system.membus.reqLayer0.occupancy 66667328 # La system.membus.reqLayer0.utilization 0.1 # Layer utilization (%) system.membus.respLayer0.occupancy 13338000 # Layer occupancy (ticks) system.membus.respLayer0.utilization 0.0 # Layer utilization (%) -system.monitor.stack_dist_calc.readLinearHist::samples 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::mean nan # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::gmean nan # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::stdev nan # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::0 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::1 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::2 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::3 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::4 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::5 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::6 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::7 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::8 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::9 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::10 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::11 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::12 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::13 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::14 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::15 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLinearHist::total 0 # Reads linear distribution -system.monitor.stack_dist_calc.readLogHist::samples 0 # Reads logarithmic distribution -system.monitor.stack_dist_calc.writeLinearHist::samples 6676 # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::mean 3330.061863 # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::gmean 3328.226314 # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::stdev 68.678195 # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::0-255 1 0.01% 0.01% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::256-511 0 0.00% 0.01% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::512-767 1 0.01% 0.03% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::768-1023 1 0.01% 0.04% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::1024-1279 0 0.00% 0.04% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::1280-1535 0 0.00% 0.04% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::1536-1791 2 0.03% 0.07% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::1792-2047 1 0.01% 0.09% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::2048-2303 0 0.00% 0.09% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::2304-2559 0 0.00% 0.09% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::2560-2815 0 0.00% 0.09% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::2816-3071 1 0.01% 0.10% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::3072-3327 1 0.01% 0.12% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::3328-3583 6666 99.85% 99.97% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::3584-3839 2 0.03% 100.00% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::3840-4095 0 0.00% 100.00% # Writes linear distribution -system.monitor.stack_dist_calc.writeLinearHist::total 6676 # Writes linear distribution -system.monitor.stack_dist_calc.writeLogHist::samples 6676 # Writes logarithmic distribution -system.monitor.stack_dist_calc.writeLogHist::7 1 # Writes logarithmic distribution -system.monitor.stack_dist_calc.writeLogHist::9 2 # Writes logarithmic distribution -system.monitor.stack_dist_calc.writeLogHist::10 3 # Writes logarithmic distribution -system.monitor.stack_dist_calc.writeLogHist::11 6670 # Writes logarithmic distribution system.monitor.readBurstLengthHist::samples 1 # Histogram of burst lengths of transmitted packets system.monitor.readBurstLengthHist::mean 64 # Histogram of burst lengths of transmitted packets system.monitor.readBurstLengthHist::gmean 64.000000 # Histogram of burst lengths of transmitted packets @@ -424,5 +376,54 @@ system.monitor.writeTransHist::4352-4607 0 0.00% 100.00% # Hi system.monitor.writeTransHist::4608-4863 0 0.00% 100.00% # Histogram of read transactions per sample period system.monitor.writeTransHist::4864-5119 0 0.00% 100.00% # Histogram of read transactions per sample period system.monitor.writeTransHist::total 100 # Histogram of read transactions per sample period +system.monitor.stackdist.readLinearHist::samples 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::mean nan # Reads linear distribution +system.monitor.stackdist.readLinearHist::gmean nan # Reads linear distribution +system.monitor.stackdist.readLinearHist::stdev nan # Reads linear distribution +system.monitor.stackdist.readLinearHist::0 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::1 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::2 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::3 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::4 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::5 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::6 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::7 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::8 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::9 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::10 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::11 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::12 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::13 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::14 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::15 0 # Reads linear distribution +system.monitor.stackdist.readLinearHist::total 0 # Reads linear distribution +system.monitor.stackdist.readLogHist::samples 0 # Reads logarithmic distribution +system.monitor.stackdist.writeLinearHist::samples 6677 # Writes linear distribution +system.monitor.stackdist.writeLinearHist::mean 3330.175827 # Writes linear distribution +system.monitor.stackdist.writeLinearHist::gmean 3328.329174 # Writes linear distribution +system.monitor.stackdist.writeLinearHist::stdev 69.301570 # Writes linear distribution +system.monitor.stackdist.writeLinearHist::0-255 1 0.01% 0.01% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::256-511 0 0.00% 0.01% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::512-767 1 0.01% 0.03% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::768-1023 1 0.01% 0.04% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::1024-1279 0 0.00% 0.04% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::1280-1535 0 0.00% 0.04% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::1536-1791 2 0.03% 0.07% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::1792-2047 1 0.01% 0.09% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::2048-2303 0 0.00% 0.09% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::2304-2559 0 0.00% 0.09% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::2560-2815 0 0.00% 0.09% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::2816-3071 1 0.01% 0.10% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::3072-3327 1 0.01% 0.12% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::3328-3583 6666 99.84% 99.96% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::3584-3839 2 0.03% 99.99% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::3840-4095 1 0.01% 100.00% # Writes linear distribution +system.monitor.stackdist.writeLinearHist::total 6677 # Writes linear distribution +system.monitor.stackdist.writeLogHist::samples 6677 # Writes logarithmic distribution +system.monitor.stackdist.writeLogHist::7 1 # Writes logarithmic distribution +system.monitor.stackdist.writeLogHist::9 2 # Writes logarithmic distribution +system.monitor.stackdist.writeLogHist::10 3 # Writes logarithmic distribution +system.monitor.stackdist.writeLogHist::11 6671 # Writes logarithmic distribution +system.monitor.stackdist.infinity 6657 # Number of requests with infinite stack distance ---------- End Simulation Statistics ----------