test: Update eio ref outputs due to recent changes

Actual stats updates covering period since original ref outputs
were clobbered.

4 files changed, 39 insertions, 23 deletions

diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.ini b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
index 7c413d69b..3fc579691 100644
--- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
+++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
@@ -16,7 +16,6 @@ load_addr_mask=1099511627775
 mem_mode=atomic
 memories=system.physmem
 num_work_ids=16
-physmem=system.physmem
 readfile=
 symbolfile=
 work_begin_ckpt_count=0
@@ -39,6 +38,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
+fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
@@ -85,19 +85,20 @@ output=cout
 system=system
 
 [system.membus]
-type=Bus
+type=CoherentBus
 block_size=64
-bus_id=0
 clock=1000
 header_cycles=1
 use_default_range=false
-width=64
-master=system.physmem.port[0]
+width=8
+master=system.physmem.port
 slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
 
 [system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30000
 latency_var=0
 null=false
diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simerr b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simerr
index 850fc5669..b8e6dc45f 100755
--- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simerr
+++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simerr
@@ -1,3 +1,4 @@
+warn: CoherentBus system.membus has no snooping ports attached!
 warn: Sockets disabled, not accepting gdb connections
 warn: Prefetch instructions in Alpha do not do anything
 warn: Prefetch instructions in Alpha do not do anything
diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simout b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simout
index 94e5c0a9b..3fdf9580f 100755
--- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simout
+++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/simout
@@ -1,8 +1,10 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/20.eio-short/alpha/eio/simple-atomic/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/20.eio-short/alpha/eio/simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 29 2012 00:47:21
-gem5 started Feb 29 2012 00:51:57
+gem5 compiled Jul 22 2012 20:21:46
+gem5 started Jul 23 2012 00:28:55
 gem5 executing on zizzer
 command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/20.eio-short/alpha/eio/simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/se/20.eio-short/alpha/eio/simple-atomic
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/stats.txt b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/stats.txt
index 5065b3dff..32e1aa3e7 100644
--- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/stats.txt
+++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000250                       # Nu
 sim_ticks                                   250015500                       # Number of ticks simulated
 final_tick                                  250015500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                3174528                       # Simulator instruction rate (inst/s)
-host_op_rate                                  3174125                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1586983445                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 203780                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                1870393                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1870272                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              935134836                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 212756                       # Number of bytes of host memory used
+host_seconds                                     0.27                       # Real time elapsed on the host
 sim_insts                                      500001                       # Number of instructions simulated
 sim_ops                                        500001                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                     2872676                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read                2000076                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                   417562                       # Number of bytes written to this memory
-system.physmem.num_reads                       624454                       # Number of read requests responded to by this memory
-system.physmem.num_writes                       56340                       # Number of write requests responded to by this memory
-system.physmem.num_other                            0                       # Number of other requests responded to by this memory
-system.physmem.bw_read                    11489991621                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                7999808012                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                    1670144451                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                   13160136072                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst           2000076                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data            872600                       # Number of bytes read from this memory
+system.physmem.bytes_read::total              2872676                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst      2000076                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total         2000076                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data         417562                       # Number of bytes written to this memory
+system.physmem.bytes_written::total            417562                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst             500019                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data             124435                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total                624454                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data             56340                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total                56340                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst           7999808012                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data           3490183609                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total             11489991621                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst      7999808012                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total         7999808012                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data          1670144451                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total             1670144451                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst          7999808012                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data          5160328060                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total            13160136072                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv