diff options
| -rw-r--r-- | kern/linux/linux_system.cc | 2 | ||||
| -rw-r--r-- | util/stats/info.py | 3 | ||||
| -rwxr-xr-x | util/stats/stats.py | 107 |
3 files changed, 80 insertions, 32 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc index 12bfafd6b..29bd39857 100644 --- a/kern/linux/linux_system.cc +++ b/kern/linux/linux_system.cc @@ -244,7 +244,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(LinuxSystem) INIT_PARAM_DFLT(system_rev, "Revision of system we are emulating", 1<<10), INIT_PARAM_DFLT(bin, "is this system to be binned", false), INIT_PARAM(binned_fns, "functions to be broken down and binned"), - INIT_PARAM_DFLT(bin_int, "is interrupt code binned seperately?", false) + INIT_PARAM_DFLT(bin_int, "is interrupt code binned seperately?", true) END_INIT_SIM_OBJECT_PARAMS(LinuxSystem) diff --git a/util/stats/info.py b/util/stats/info.py index a94563cf9..15a4a7d73 100644 --- a/util/stats/info.py +++ b/util/stats/info.py @@ -152,9 +152,8 @@ class Statistic(object): def __setattr__(self, attr, value): if attr == 'bins' or attr == 'ticks': if attr == 'bins': - global db if value is not None: - value = db.getBin(value) + value = source.getBin(value) elif attr == 'samples' and type(value) is str: value = [ int(x) for x in value.split() ] diff --git a/util/stats/stats.py b/util/stats/stats.py index ca868b926..233eab521 100755 --- a/util/stats/stats.py +++ b/util/stats/stats.py @@ -41,24 +41,22 @@ def unique(list): def graphdata(runs, tag, label, value): import info - configs = ['std', 'csa', 'ht1', 'ht4', 'htx', 'ocm', 'occ', 'ocp' ] + configs = ['stx', 'ste', 'hte', 'htd', 'ocm', 'occ', 'ocp' ] benchmarks = [ 'm', 's' ] dmas = [ 'x', 'd', 'b' ] - caches = [ '1', '2', '3', '4', '5' ] - systems = [ 'M' ] + caches = [ '2', '4' ] checkpoints = [ '1' ] names = [] for bench in benchmarks: for dma in dmas: for cache in caches: - for sys in systems: - for cpt in checkpoints: - names.append([bench, dma, cache, sys, cpt]) + for cpt in checkpoints: + names.append([bench, dma, cache, cpt]) - for bench,dma,cache,sys,cpt in names: - base = '%s.%s.%s.%s.%s' % (bench, dma, cache, sys, cpt) - fname = '/n/ziff/z/binkertn/graph/test0/data/%s.%s.dat' % (tag, base) + for bench,dma,cache,cpt in names: + base = '%s.%s.%s.%s' % (bench, dma, cache, cpt) + fname = 'data/%s.%s.dat' % (tag, base) f = open(fname, 'w') print >>f, '#set TITLE = %s' % base print >>f, '#set xlbl = Configuration' @@ -68,8 +66,8 @@ def graphdata(runs, tag, label, value): for speed,freq in zip(['s', 'q'],['4GHz','10GHz']): print >>f, '"%s"' % freq, for conf in configs: - name = '%s.%s.%s.%s.%s.%s.%s' % (conf, bench, dma, speed, - cache, sys, cpt) + name = '%s.%s.%s.%s.%s.%s' % (conf, bench, dma, speed, cache, + cpt) run = info.source.allRunNames[name] info.display_run = run.run; val = float(value) @@ -180,6 +178,26 @@ def commands(options, command, args): if options.graph: graphdata(runs, stat.name, stat.name, stat) else: + if options.binned: + print 'kernel ticks' + stat.bins = 'kernel' + printdata(runs, stat) + + print 'idle ticks' + stat.bins = 'idle' + printdata(runs, stat) + + print 'user ticks' + stat.bins = 'user' + printdata(runs, stat) + + print 'interrupt ticks' + stat.bins = 'user' + printdata(runs, stat) + + print 'total ticks' + + stat.bins = None print stat.name printdata(runs, stat) return @@ -250,7 +268,7 @@ def commands(options, command, args): return if command == 'packets': - packets = system.tsunami.nsgige.rxPackets + packets = system.tsunami.etherdev.rxPackets if options.graph: graphdata(runs, 'packets', 'Packets', packets) else: @@ -258,12 +276,12 @@ def commands(options, command, args): return if command == 'ppt' or command == 'tpp': - ppt = system.tsunami.nsgige.rxPackets / sim_ticks + ppt = system.tsunami.etherdev.rxPackets / sim_ticks printdata(runs, ppt, command == 'tpp') return if command == 'pps': - pps = system.tsunami.nsgige.rxPackets / sim_seconds + pps = system.tsunami.etherdev.rxPackets / sim_seconds if options.graph: graphdata(runs, 'pps', 'Packets/s', pps) else: @@ -271,7 +289,7 @@ def commands(options, command, args): return if command == 'bpt' or command == 'tpb': - bytes = system.tsunami.nsgige.rxBytes + system.tsunami.nsgige.txBytes + bytes = system.tsunami.etherdev.rxBytes + system.tsunami.etherdev.txBytes bpt = bytes / sim_ticks * 8 if options.graph: graphdata(runs, 'bpt', 'bps / Hz', bpt) @@ -280,7 +298,7 @@ def commands(options, command, args): return if command == 'bptb' or command == 'tpbb': - bytes = system.tsunami.nsgige.rxBytes + system.tsunami.nsgige.txBytes + bytes = system.tsunami.etherdev.rxBytes + system.tsunami.etherdev.txBytes print 'kernel stats' bytes.bins = 'kernel' @@ -297,7 +315,7 @@ def commands(options, command, args): return if command == 'bytes': - stat = system.tsunami.nsgige.rxBytes + system.tsunami.nsgige.txBytes + stat = system.tsunami.etherdev.rxBytes + system.tsunami.etherdev.txBytes if options.binned: print '%s kernel stats' % stat.name @@ -319,7 +337,7 @@ def commands(options, command, args): return if command == 'rxbps': - gbps = system.tsunami.nsgige.rxBandwidth / 1e9 + gbps = system.tsunami.etherdev.rxBandwidth / 1e9 if options.graph: graphdata(runs, 'rxbps', 'Bandwidth (Gbps)', gbps) else: @@ -327,7 +345,7 @@ def commands(options, command, args): return if command == 'txbps': - gbps = system.tsunami.nsgige.txBandwidth / 1e9 + gbps = system.tsunami.etherdev.txBandwidth / 1e9 if options.graph: graphdata(runs, 'txbps', 'Bandwidth (Gbps)', gbps) else: @@ -335,8 +353,8 @@ def commands(options, command, args): return if command == 'bps': - rxbps = system.tsunami.nsgige.rxBandwidth - txbps = system.tsunami.nsgige.txBandwidth + rxbps = system.tsunami.etherdev.rxBandwidth + txbps = system.tsunami.etherdev.txBandwidth gbps = (rxbps + txbps) / 1e9 if options.graph: graphdata(runs, 'bps', 'Bandwidth (Gbps)', gbps) @@ -345,7 +363,7 @@ def commands(options, command, args): return if command == 'misses': - stat = system.L3.overall_mshr_misses + stat = system.L2.overall_mshr_misses if options.binned: print '%s kernel stats' % stat.name stat.bins = 'kernel' @@ -369,9 +387,9 @@ def commands(options, command, args): return if command == 'mpkb': - misses = system.L3.overall_mshr_misses - rxbytes = system.tsunami.nsgige.rxBytes - txbytes = system.tsunami.nsgige.txBytes + misses = system.L2.overall_mshr_misses + rxbytes = system.tsunami.etherdev.rxBytes + txbytes = system.tsunami.etherdev.txBytes if options.binned: print 'mpkb kernel stats' @@ -411,14 +429,45 @@ def commands(options, command, args): printdata(runs, system.full_cpu.FETCH__count) return + if command == 'bpp': + ed = system.tsunami.etherdev + bpp = (ed.rxBytes + ed.txBytes) / (ed.rxPackets + ed.txPackets) + if options.graph: + graphdata(runs, 'bpp', 'Bytes / Packet', bpp) + else: + printdata(runs, bpp) + return + if command == 'rxbpp': - bpp = system.tsunami.nsgige.rxBytes / system.tsunami.nsgige.rxPackets - printdata(run, 8 * bpp) + bpp = system.tsunami.etherdev.rxBytes / system.tsunami.etherdev.rxPackets + if options.graph: + graphdata(runs, 'rxbpp', 'Receive Bytes / Packet', bpp) + else: + printdata(runs, bpp) return if command == 'txbpp': - bpp = system.tsunami.nsgige.txBytes / system.tsunami.nsgige.txPackets - printdata(run, 8 * bpp) + bpp = system.tsunami.etherdev.txBytes / system.tsunami.etherdev.txPackets + if options.graph: + graphdata(runs, 'txbpp', 'Transmit Bytes / Packet', bpp) + else: + printdata(runs, bpp) + return + + if command == 'rtp': + rtp = system.tsunami.etherdev.rxPackets / system.tsunami.etherdev.txPackets + if options.graph: + graphdata(runs, 'rtp', 'rxPackets / txPackets', rtp) + else: + printdata(runs, rtp) + return + + if command == 'rtb': + rtb = system.tsunami.etherdev.rxBytes / system.tsunami.etherdev.txBytes + if options.graph: + graphdata(runs, 'rtb', 'rxBytes / txBytes', rtb) + else: + printdata(runs, rtb) return raise CommandException |