More regression updates.

Get rid of caches in simple-timing config for now.

tests/SConscript:
    another line for diff to ignore
tests/configs/simple-timing.py:
    turn off caches for now
tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout:
    update for inst/tick rate (old one was debug?)
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr:
tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout:
    works now (no caches)

--HG--
extra : convert_revision : 472030f63297346976db6274a78235c93d4eef8e

5 files changed, 35 insertions, 39 deletions

diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
index c4c381b93..5a34fde5e 100644
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini
@@ -48,13 +48,13 @@ text_file=m5stats.txt
 
 [system]
 type=System
-children=cpu physmem workload
+children=cpu membus physmem
 mem_mode=atomic
 physmem=system.physmem
 
 [system.cpu]
 type=TimingSimpleCPU
-children=mem
+children=workload
 clock=1
 defer_registration=false
 function_trace=false
@@ -63,11 +63,18 @@ max_insts_all_threads=0
 max_insts_any_thread=500000
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.cpu.mem
+mem=system.physmem
 system=system
-workload=system.workload
+workload=system.cpu.workload
 
-[system.cpu.mem]
+[system.cpu.workload]
+type=EioProcess
+chkpt=
+file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+output=cout
+system=system
+
+[system.membus]
 type=Bus
 bus_id=0
 
@@ -76,13 +83,6 @@ type=PhysicalMemory
 file=
 latency=1
 
-[system.workload]
-type=EioProcess
-chkpt=
-file=/z/ktlim2/clean/newmem-merge/tests/test-progs/anagram/bin/anagram-vshort.eio.gz
-output=cout
-system=system
-
 [trace]
 bufsize=0
 dump_on_exit=false
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
index 882db9c06..7032b9607 100644
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
@@ -16,26 +16,26 @@ type=System
 physmem=system.physmem
 mem_mode=atomic
 
-[system.workload]
+[system.membus]
+type=Bus
+bus_id=0
+
+[system.cpu.workload]
 type=EioProcess
-file=/z/ktlim2/clean/newmem-merge/tests/test-progs/anagram/bin/anagram-vshort.eio.gz
+file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
 chkpt=
 output=cout
 system=system
 
-[system.cpu.mem]
-type=Bus
-bus_id=0
-
 [system.cpu]
 type=TimingSimpleCPU
 max_insts_any_thread=500000
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.cpu.mem
+mem=system.physmem
 system=system
-workload=system.workload
+workload=system.cpu.workload
 clock=1
 defer_registration=false
 // width not specified
@@ -81,6 +81,7 @@ print_data=true
 print_iregs=false
 print_fetchseq=false
 print_cpseq=false
+print_reg_delta=false
 pc_symbol=true
 intel_format=false
 trace_system=client
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
index 5f7766bac..51ee5923a 100644
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 781730                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 147616                       # Number of bytes of host memory used
-host_seconds                                     0.64                       # Real time elapsed on the host
-host_tick_rate                                1063244                       # Simulator tick rate (ticks/s)
+host_inst_rate                                 833953                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 146496                       # Number of bytes of host memory used
+host_seconds                                     0.60                       # Real time elapsed on the host
+host_tick_rate                                1134676                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                      500000                       # Number of instructions simulated
 sim_seconds                                  0.000001                       # Number of seconds simulated
@@ -13,6 +13,6 @@ system.cpu.not_idle_fraction                        1                       # Pe
 system.cpu.numCycles                                0                       # number of cpu cycles simulated
 system.cpu.num_insts                           500000                       # Number of instructions executed
 system.cpu.num_refs                            182203                       # Number of memory references
-system.workload.PROG:num_syscalls                  18                       # Number of system calls
+system.cpu.workload.PROG:num_syscalls              18                       # Number of system calls
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr
index 6f99fb456..4e444fa6b 100644
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr
@@ -1,11 +1,3 @@
-Traceback (most recent call last):
-  File "<string>", line 1, in ?
-  File "build/ALPHA_SE/python/m5/main.py", line 314, in main
-    execfile(sys.argv[0], scope)
-  File "tests/run.py", line 18, in ?
-    execfile(os.path.join(tests_root, 'configs', config + '.py'))
-  File "tests/configs/simple-timing.py", line 13, in ?
-    MyCache(size = '2MB'))
-  File "build/ALPHA_SE/python/m5/objects/BaseCPU.py", line 52, in addTwoLevelCacheHierarchy
-    self.l2cache.cpu_side = toL2Bus.port
-NameError: global name 'toL2Bus' is not defined
+warn: Entering event queue @ 0.  Starting simulation...
+
+gzip: stdout: Broken pipe
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout
index bb29247b4..2157d4af6 100644
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout
@@ -1,11 +1,14 @@
-M5 Simulator System
+main dictionary has 1245 entries
+49508 bytes wasted
+>M5 Simulator System
 
 Copyright (c) 2001-2006
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Aug 16 2006 13:05:10
-M5 started Wed Aug 16 14:41:54 2006
+M5 compiled Aug 16 2006 17:47:32
+M5 started Wed Aug 16 18:40:03 2006
 M5 executing on zizzer.eecs.umich.edu
 command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/quick/20.eio-short/alpha/eio/simple-timing tests/run.py quick/20.eio-short/alpha/eio/simple-timing
+Exiting @ tick 680774 because a thread reached the max instruction count