Merge iceaxe.:/Volumes/work/research/m5/head

into  iceaxe.:/Volumes/work/research/m5/merge

src/cpu/simple/base.cc:
src/kern/kernel_stats.cc:
src/kern/kernel_stats.hh:
src/kern/system_events.cc:
src/kern/system_events.hh:
src/python/m5/objects/System.py:
src/sim/system.cc:
src/sim/system.hh:
    hand merge

--HG--
rename : build/SConstruct => SConstruct
rename : SConscript => src/SConscript
rename : arch/alpha/freebsd/system.cc => src/arch/alpha/freebsd/system.cc
rename : arch/alpha/linux/system.cc => src/arch/alpha/linux/system.cc
rename : arch/alpha/linux/system.hh => src/arch/alpha/linux/system.hh
rename : arch/alpha/system.cc => src/arch/alpha/system.cc
rename : arch/alpha/tru64/system.cc => src/arch/alpha/tru64/system.cc
rename : base/statistics.cc => src/base/statistics.cc
rename : base/statistics.hh => src/base/statistics.hh
rename : base/stats/mysql.cc => src/base/stats/mysql.cc
rename : base/stats/mysql.hh => src/base/stats/mysql.hh
rename : base/stats/statdb.cc => src/base/stats/statdb.cc
rename : base/stats/statdb.hh => src/base/stats/statdb.hh
rename : base/stats/text.cc => src/base/stats/text.cc
rename : base/stats/text.hh => src/base/stats/text.hh
rename : cpu/simple/cpu.cc => src/cpu/simple/base.cc
rename : kern/kernel_stats.cc => src/kern/kernel_stats.cc
rename : kern/kernel_stats.hh => src/kern/kernel_stats.hh
rename : kern/system_events.cc => src/kern/system_events.cc
rename : kern/system_events.hh => src/kern/system_events.hh
rename : python/m5/objects/System.py => src/python/m5/objects/System.py
rename : sim/system.cc => src/sim/system.cc
rename : sim/system.hh => src/sim/system.hh
rename : test/stattest.cc => src/unittest/stattest.cc
extra : convert_revision : 4bb576a2bf5e32784efc48030bd776c6c7c29a7c

1 files changed, 3 insertions, 31 deletions

diff --git a/util/stats/stats.py b/util/stats/stats.py
index fa0dad513..2aa0d4e0b 100755
--- a/util/stats/stats.py
+++ b/util/stats/stats.py
@@ -39,7 +39,6 @@ Usage: %s [-E] [-F] [ -G <get> ] [-d <db> ] [-g <graphdir> ] [-h <host>] [-p]
 
        commands    extra parameters   description
        ----------- ------------------ ---------------------------------------
-       bins        [regex]            List bins (only matching regex)
        formula     <formula>          Evaluated formula specified
        formulas    [regex]            List formulas (only matching regex)
        runs        none               List all runs in database
@@ -142,16 +141,6 @@ def commands(options, command, args):
 
         return
 
-    if command == 'bins':
-        if len(args) == 0:
-            source.listBins()
-        elif len(args) == 1:
-            source.listBins(args[0])
-        else:
-            raise CommandException
-
-        return
-
     if command == 'formulas':
         if len(args) == 0:
             source.listFormulas()
@@ -281,7 +270,7 @@ def commands(options, command, args):
             if options.graph:
                 output.graph(stat.name, options.graphdir)
             else:
-                output.display(stat.name, options.binned, options.printmode)
+                output.display(stat.name, options.printmode)
 
         return
 
@@ -301,22 +290,10 @@ def commands(options, command, args):
         if options.graph:
             output.graph(command, options.graphdir, proxy)
         else:
-            output.display(command, options.binned, options.printmode)
-
-    if command == 'usertime':
-        import copy
-        user = copy.copy(system.run0.numCycles)
-        user.bins = 'user'
-
-        output.stat = user / system.run0.numCycles
-        output.ylabel = 'User Fraction'
-
-        display()
-        return
+            output.display(command, options.printmode)
 
     if command == 'ticks':
         output.stat = system.run0.numCycles
-        output.binstats = [ system.run0.numCycles ]
 
         display()
         return
@@ -403,7 +380,6 @@ def commands(options, command, args):
 
     if command == 'mpkb':
         output.stat = misses / (bytes / 1024)
-        output.binstats = [ misses ]
         output.ylabel = 'Misses / KB'
         display()
         return
@@ -411,7 +387,6 @@ def commands(options, command, args):
     if command == 'ipkb':
         interrupts = system.run0.kern.faults[4]
         output.stat = interrupts / kbytes
-        output.binstats = [ interrupts ]
         output.ylabel = 'Interrupts / KB'
         display()
         return
@@ -448,7 +423,6 @@ if __name__ == '__main__':
     options.runs = None
     options.system = 'client'
     options.method = None
-    options.binned = False
     options.graph = False
     options.ticks = False
     options.printmode = 'G'
@@ -456,10 +430,8 @@ if __name__ == '__main__':
     options.jobfile = None
     options.all = False
 
-    opts, args = getopts(sys.argv[1:], '-BEFJad:g:h:j:m:pr:s:u:T:')
+    opts, args = getopts(sys.argv[1:], '-EFJad:g:h:j:m:pr:s:u:T:')
     for o,a in opts:
-        if o == '-B':
-            options.binned = True
         if o == '-E':
             options.printmode = 'E'
         if o == '-F':