stats: update EIO stats for snoop filter changes

4 files changed, 24 insertions, 19 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 91582aaaf..05a6679ef 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
@@ -24,6 +24,7 @@ mem_mode=atomic
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -110,7 +111,7 @@ chkpt=
 errout=cerr
 eventq_index=0
 file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
-input=None
+input=cin
 kvmInSE=false
 max_stack_size=67108864
 output=cout
diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.json b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.json
index 559630530..ad487c6c5 100644
--- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.json
+++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-atomic/config.json
@@ -159,13 +159,15 @@
                     "peer": "system.membus.slave[1]", 
                     "role": "MASTER"
                 }, 
-                "interrupts": {
-                    "eventq_index": 0, 
-                    "path": "system.cpu.interrupts", 
-                    "type": "AlphaInterrupts", 
-                    "name": "interrupts", 
-                    "cxx_class": "AlphaISA::Interrupts"
-                }, 
+                "interrupts": [
+                    {
+                        "eventq_index": 0, 
+                        "path": "system.cpu.interrupts", 
+                        "type": "AlphaInterrupts", 
+                        "name": "interrupts", 
+                        "cxx_class": "AlphaISA::Interrupts"
+                    }
+                ], 
                 "dcache_port": {
                     "peer": "system.membus.slave[2]", 
                     "role": "MASTER"
@@ -190,7 +192,7 @@
                         "path": "system.cpu.workload", 
                         "max_stack_size": 67108864, 
                         "type": "EioProcess", 
-                        "input": "None"
+                        "input": "cin"
                     }
                 ], 
                 "name": "cpu", 
@@ -226,9 +228,10 @@
                 }
             }
         ], 
-        "num_work_ids": 16, 
+        "multi_thread": false, 
+        "work_begin_cpu_id_exit": -1, 
         "work_item_id": -1, 
-        "work_begin_cpu_id_exit": -1
+        "num_work_ids": 16
     }, 
     "time_sync_period": 100000000000, 
     "eventq_index": 0, 
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 d5f5ca1c8..e811a5ed8 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,10 +1,11 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Mar  7 2015 13:46:57
-gem5 started Mar  7 2015 13:47:23
-gem5 executing on zizzer2
+gem5 compiled Oct  1 2015 18:05:22
+gem5 started Oct  1 2015 18:06:58
+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 /z/stever/hg/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/20.eio-short/alpha/eio/simple-atomic
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 main dictionary has 1245 entries
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 3003773af..7d740f406 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,11 +4,11 @@ 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                                1781493                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1781360                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              890669168                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 214316                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                 811683                       # Simulator instruction rate (inst/s)
+host_op_rate                                   811655                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              405835892                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 218708                       # Number of bytes of host memory used
+host_seconds                                     0.62                       # Real time elapsed on the host
 sim_insts                                      500001                       # Number of instructions simulated
 sim_ops                                        500001                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts