Update reference outputs

--HG--
extra : convert_revision : df9cf835e0910df1e8e80152825fde9327d4aadb

diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..029e66f894ed2e3be5ab823fb19ea34bfe680cb2 100644 (file)
--- a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt
+++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt
@@ -0,0 +1,18 @@
+
+---------- Begin Simulation Statistics ----------
+host_inst_rate                                   2486                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 146652                       # Number of bytes of host memory used
+host_seconds                                     1.04                       # Real time elapsed on the host
+host_tick_rate                                   2484                       # Simulator tick rate (ticks/s)
+sim_freq                                 1000000000000                       # Frequency of simulated ticks
+sim_insts                                        2578                       # Number of instructions simulated
+sim_seconds                                  0.000000                       # Number of seconds simulated
+sim_ticks                                        2577                       # Number of ticks simulated
+system.cpu.idle_fraction                            0                       # Percentage of idle cycles
+system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
+system.cpu.numCycles                             2578                       # number of cpu cycles simulated
+system.cpu.num_insts                             2578                       # Number of instructions executed
+system.cpu.num_refs                               710                       # Number of memory references
+system.cpu.workload.PROG:num_syscalls               4                       # Number of system calls
+
+---------- End Simulation Statistics   ----------

diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2154cff274c94cea54870a5cde16fb61cba32a6 100644 (file)
--- a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr
+++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr
@@ -0,0 +1,3 @@
+warn: Entering event queue @ 0.  Starting simulation...
+warn: Increasing stack 0x11ff92000:0x11ff9b000 to 0x11ff90000:0x11ff9b000 because of access to 0x11ff91ff8
+warn: ignoring syscall sigprocmask(1, 18446744073709547831, ...)

diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0b884e31ac2469a04f0fb607ed1bee183557061f 100644 (file)
--- a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout
+++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout
@@ -0,0 +1,13 @@
+Hello world!
+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:52 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/quick/00.hello/alpha/linux/simple-atomic tests/run.py quick/00.hello/alpha/linux/simple-atomic
+Exiting @ tick 2577 because target called exit()

diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5659ba97e96974bee3d7a70d9c339454bcaddd1f 100644 (file)
--- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt
+++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt
@@ -0,0 +1,18 @@
+
+---------- Begin Simulation Statistics ----------
+host_inst_rate                                   6870                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 147292                       # Number of bytes of host memory used
+host_seconds                                     0.82                       # Real time elapsed on the host
+host_tick_rate                                   6865                       # Simulator tick rate (ticks/s)
+sim_freq                                 1000000000000                       # Frequency of simulated ticks
+sim_insts                                        5657                       # Number of instructions simulated
+sim_seconds                                  0.000000                       # Number of seconds simulated
+sim_ticks                                        5656                       # Number of ticks simulated
+system.cpu.idle_fraction                            0                       # Percentage of idle cycles
+system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
+system.cpu.numCycles                             5657                       # number of cpu cycles simulated
+system.cpu.num_insts                             5657                       # Number of instructions executed
+system.cpu.num_refs                              2055                       # Number of memory references
+system.cpu.workload.PROG:num_syscalls              13                       # Number of system calls
+
+---------- End Simulation Statistics   ----------

diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f33d007a70b37a7e6201730fa80d8b6c20e4d66d 100644 (file)
--- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr
+++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr
@@ -0,0 +1,2 @@
+warn: Entering event queue @ 0.  Starting simulation...
+warn: Increasing stack size by one page.

diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9414b50142e2266d953cba7de3138b28757c4232 100644 (file)
--- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout
+++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout
@@ -0,0 +1,13 @@
+Hello World!
+M5 Simulator System
+
+Copyright (c) 2001-2006
+The Regents of The University of Michigan
+All Rights Reserved
+
+
+M5 compiled Aug 16 2006 13:10:25
+M5 started Wed Aug 16 14:41:57 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/test/opt/quick/00.hello/mips/linux/simple-atomic tests/run.py quick/00.hello/mips/linux/simple-atomic
+Exiting @ tick 5656 because target called exit()

diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..27de77ab630f49616ec0248012d391c7783528f6 100644 (file)
--- a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt
+++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt
@@ -0,0 +1,18 @@
+
+---------- Begin Simulation Statistics ----------
+host_inst_rate                                   3565                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 147204                       # Number of bytes of host memory used
+host_seconds                                     1.25                       # Real time elapsed on the host
+host_tick_rate                                   3564                       # Simulator tick rate (ticks/s)
+sim_freq                                 1000000000000                       # Frequency of simulated ticks
+sim_insts                                        4450                       # Number of instructions simulated
+sim_seconds                                  0.000000                       # Number of seconds simulated
+sim_ticks                                        4449                       # Number of ticks simulated
+system.cpu.idle_fraction                            0                       # Percentage of idle cycles
+system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
+system.cpu.numCycles                             4450                       # number of cpu cycles simulated
+system.cpu.num_insts                             4450                       # Number of instructions executed
+system.cpu.num_refs                               960                       # Number of memory references
+system.cpu.workload.PROG:num_syscalls              11                       # Number of system calls
+
+---------- End Simulation Statistics   ----------

diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7873672f209ab2395a7ab94b99739d00306aeee1 100644 (file)
--- a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr
+++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr
@@ -0,0 +1,3 @@
+warn: More than two loadable segments in ELF object.
+warn: Ignoring segment @ 0x0 length 0x0.
+warn: Entering event queue @ 0.  Starting simulation...

diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6c17750cc1e14d433cc310d8d6a08183d2a22ab7 100644 (file)
--- a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout
+++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout
@@ -0,0 +1,12 @@
+Hello World!M5 Simulator System
+
+Copyright (c) 2001-2006
+The Regents of The University of Michigan
+All Rights Reserved
+
+
+M5 compiled Aug 16 2006 13:15:12
+M5 started Wed Aug 16 14:42:01 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/SPARC_SE/m5.opt -d build/SPARC_SE/test/opt/quick/00.hello/sparc/linux/simple-atomic tests/run.py quick/00.hello/sparc/linux/simple-atomic
+Exiting @ tick 4449 because target called exit()

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
index 77644ba5ce4fd79c4475f8cab4df2c3af93b6ab9..fdd1f3de1cf5e61856c8f771bc6e3f4c9c7caa8d 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
@@ -57,7 +57,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=system.physmem
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 system_rev=1024
 system_type=34
 
@@ -82,7 +82,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.membus
+mem=system.physmem
 profile=0
 simulate_stalls=false
 system=system
@@ -110,7 +110,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.membus
+mem=system.physmem
 profile=0
 simulate_stalls=false
 system=system
@@ -542,7 +542,6 @@ system=system
 
 [trace]
 bufsize=0
-cycle=0
 dump_on_exit=false
 file=cout
 flags=

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
index dc59ece72c7c7f2319aaedbc4b3f98857eb1143b..737ee6611c5fc433f2f7358d46f16722b00f6bf9 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
@@ -20,7 +20,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 console=/dist/m5/system/binaries/console
 pal=/dist/m5/system/binaries/ts_osfpal
 boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 init_param=0
 system_type=34
 system_rev=1024
@@ -86,7 +86,7 @@ max_insts_any_thread=0
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.membus
+mem=system.physmem
 system=system
 itb=system.cpu0.itb
 dtb=system.cpu0.dtb
@@ -113,7 +113,7 @@ max_insts_any_thread=0
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.membus
+mem=system.physmem
 system=system
 itb=system.cpu1.itb
 dtb=system.cpu1.dtb
@@ -492,7 +492,6 @@ bus_id=0
 [trace]
 flags=
 start=0
-cycle=0
 bufsize=0
 file=cout
 dump_on_exit=false
@@ -528,6 +527,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/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
index bc318cec0ca3dc420fa1bf034c13d35bc7da49c5..a0cc28b231fd932bbc35832d7165a0f7047fdf1e 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 677052                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 195656                       # Number of bytes of host memory used
-host_seconds                                    93.44                       # Real time elapsed on the host
-host_tick_rate                               38056235                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1386533                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 194484                       # Number of bytes of host memory used
+host_seconds                                    45.63                       # Real time elapsed on the host
+host_tick_rate                               77934911                       # Simulator tick rate (ticks/s)
 sim_freq                                   2000000000                       # Frequency of simulated ticks
 sim_insts                                    63264995                       # Number of instructions simulated
 sim_seconds                                  1.778030                       # Number of seconds simulated

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
index ea7591277b24227e3c6b4abed49b2aa71e706e11..fe3ad68ab7c3b89bacdf85bfb9438d2d490303f9 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
@@ -1,6 +1,6 @@
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
-Listening for console connection on port 3457
-0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
-0: system.remote_gdb.listener: listening for remote gdb #1 on port 7002
+Listening for console connection on port 3456
+0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
+0: system.remote_gdb.listener: listening for remote gdb #1 on port 7001
 warn: Entering event queue @ 0.  Starting simulation...
 warn: 195722: Trying to launch CPU number 1!

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
index cc4170f8168122957d56d0e11306bfc7bf157b06..4dab1dfbd694013ac8dc56ebedaccb203483fd92 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 27 2006 16:54:00
-M5 started Thu Jul 27 17:12:14 2006
-M5 executing on zamp.eecs.umich.edu
-command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/linux-mpboot/atomic tests/linux-mpboot/run.py
-Exiting @ cycle 3556060806 because m5_exit instruction encountered
+M5 compiled Aug 16 2006 13:33:58
+M5 started Wed Aug 16 14:38:40 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual
+Exiting @ tick 3556060806 because m5_exit instruction encountered

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
index 3da9202dd474f0831a6acc15d76c4d052581b24d..2ee207b2e033961c0b4cfd2350df802cb2fd2846 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
@@ -57,7 +57,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=system.physmem
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 system_rev=1024
 system_type=34
 
@@ -82,7 +82,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.membus
+mem=system.physmem
 profile=0
 simulate_stalls=false
 system=system
@@ -514,7 +514,6 @@ system=system
 
 [trace]
 bufsize=0
-cycle=0
 dump_on_exit=false
 file=cout
 flags=

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
index d876486838f5230299d3f33356ce8874e58a5479..0183088628fe6d016eca97918af8cbcdf3f4cb78 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
@@ -20,7 +20,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 console=/dist/m5/system/binaries/console
 pal=/dist/m5/system/binaries/ts_osfpal
 boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 init_param=0
 system_type=34
 system_rev=1024
@@ -86,7 +86,7 @@ max_insts_any_thread=0
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.membus
+mem=system.physmem
 system=system
 itb=system.cpu.itb
 dtb=system.cpu.dtb
@@ -465,7 +465,6 @@ bus_id=0
 [trace]
 flags=
 start=0
-cycle=0
 bufsize=0
 file=cout
 dump_on_exit=false
@@ -501,6 +500,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/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
index 9939c1755e9eb9dafd1c712b12924962aa1f3fd6..6e83016e93383e23f9934e81eb8efc357720192a 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 505604                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 195484                       # Number of bytes of host memory used
-host_seconds                                   118.53                       # Real time elapsed on the host
-host_tick_rate                               29473706                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1410348                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 194320                       # Number of bytes of host memory used
+host_seconds                                    42.49                       # Real time elapsed on the host
+host_tick_rate                               82214431                       # Simulator tick rate (ticks/s)
 sim_freq                                   2000000000                       # Frequency of simulated ticks
 sim_insts                                    59929520                       # Number of instructions simulated
 sim_seconds                                  1.746773                       # Number of seconds simulated

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
index 81e161af4bf3e16c0ffaa1eef77750188af3d59c..5c4d8c01eea3ad7726eee01857e494b695ba1893 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 27 2006 16:54:00
-M5 started Thu Jul 27 17:10:13 2006
-M5 executing on zamp.eecs.umich.edu
-command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/linux-boot/atomic tests/linux-boot/run.py
-Exiting @ cycle 3493545624 because m5_exit instruction encountered
+M5 compiled Aug 16 2006 13:33:58
+M5 started Wed Aug 16 14:37:55 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-atomic
+Exiting @ tick 3493545624 because m5_exit instruction encountered

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
index 0e3ca395332fc03db756b4a83b636abd0fa45324..430daba543457fd64240d01db08438cab6977fac 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
@@ -57,7 +57,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=timing
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=system.physmem
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 system_rev=1024
 system_type=34
 
@@ -82,7 +82,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.membus
+mem=system.physmem
 profile=0
 system=system
 
@@ -108,7 +108,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
-mem=system.membus
+mem=system.physmem
 profile=0
 system=system
 
@@ -538,7 +538,6 @@ system=system
 
 [trace]
 bufsize=0
-cycle=0
 dump_on_exit=false
 file=cout
 flags=

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
index 3d49bfedb15847d532c703e867d5814fba21926f..96c734e1522e20b62cab3f54964033fef6618c7c 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
@@ -20,7 +20,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 console=/dist/m5/system/binaries/console
 pal=/dist/m5/system/binaries/ts_osfpal
 boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=/z/ktlim2/clean/newmem-merge/tests/halt.sh
+readfile=tests/halt.sh
 init_param=0
 system_type=34
 system_rev=1024
@@ -86,7 +86,7 @@ max_insts_any_thread=0
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.membus
+mem=system.physmem
 system=system
 itb=system.cpu0.itb
 dtb=system.cpu0.dtb
@@ -113,7 +113,7 @@ max_insts_any_thread=0
 max_insts_all_threads=0
 max_loads_any_thread=0
 max_loads_all_threads=0
-mem=system.membus
+mem=system.physmem
 system=system
 itb=system.cpu1.itb
 dtb=system.cpu1.dtb
@@ -492,7 +492,6 @@ bus_id=0
 [trace]
 flags=
 start=0
-cycle=0
 bufsize=0
 file=cout
 dump_on_exit=false
@@ -528,6 +527,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/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
index d3b8bc00500956133da4150b45d36e11479d21e8..532e948497807271652799b8aeae95efeb4b496f 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 502011                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 195696                       # Number of bytes of host memory used
-host_seconds                                   125.67                       # Real time elapsed on the host
-host_tick_rate                               28164267                       # Simulator tick rate (ticks/s)
+host_inst_rate                                 868070                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 194536                       # Number of bytes of host memory used
+host_seconds                                    72.68                       # Real time elapsed on the host
+host_tick_rate                               48701109                       # Simulator tick rate (ticks/s)
 sim_freq                                   2000000000                       # Frequency of simulated ticks
 sim_insts                                    63088076                       # Number of instructions simulated
 sim_seconds                                  1.769718                       # Number of seconds simulated

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
index 719722c8fb414b796a8a870b2205fb0249c31f52..2191bd088ee2bd66526482efdfa1666f91ff577d 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
@@ -1,6 +1,6 @@
       0: system.tsunami.io.rtc: Real-time clock set to Sun Jan  1 00:00:00 2006
 Listening for console connection on port 3456
 0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
-0: system.remote_gdb.listener: listening for remote gdb #1 on port 7003
+0: system.remote_gdb.listener: listening for remote gdb #1 on port 7001
 warn: Entering event queue @ 0.  Starting simulation...
 warn: 271342: Trying to launch CPU number 1!

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
index e91c140458a34211260db1b759ef58f65c45bac9..55bb62d6cd975926391cbd23dd32b03118ddc40d 100644 (file)
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 27 2006 16:54:00
-M5 started Thu Jul 27 17:12:18 2006
-M5 executing on zamp.eecs.umich.edu
-command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/linux-mpboot/timing tests/linux-mpboot/run.py --timing
-Exiting @ cycle 3539435029 because m5_exit instruction encountered
+M5 compiled Aug 16 2006 13:33:58
+M5 started Wed Aug 16 14:40:36 2006
+M5 executing on zizzer.eecs.umich.edu
+command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/test/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual
+Exiting @ tick 3539435029 because m5_exit instruction encountered

diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
index 4cbe1fce61c6a64371e97eb26f7b65edd5478813..d322a7a403df1b0ae58df91fa801c70a8a1f4f43 100644 (file)
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/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=AtomicSimpleCPU
-children=mem
+children=workload
 clock=1
 defer_registration=false
 function_trace=false
@@ -63,13 +63,20 @@ 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
 simulate_stalls=false
 system=system
 width=1
-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
 
@@ -78,13 +85,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-atomic/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
index 65a9f6f7f5d0e4923dd7f66ced782f9be2251101..32bafae43eb488fc56d1b3da139e8207566a3c72 100644 (file)
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/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=AtomicSimpleCPU
 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=1
@@ -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-atomic/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
index 29c0b91acb0ea0deba841eafb1162664207cf272..e917730707dfd6c5476229a84c8decd165642292 100644 (file)
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt
@@ -1,9 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1310554                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 147620                       # Number of bytes of host memory used
-host_seconds                                     0.38                       # Real time elapsed on the host
-host_tick_rate                                1308843                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1501109                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 146480                       # Number of bytes of host memory used
+host_seconds                                     0.33                       # Real time elapsed on the host
+host_tick_rate                                1499216                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                      500000                       # Number of instructions simulated
 sim_seconds                                  0.000000                       # Number of seconds simulated
@@ -13,6 +13,6 @@ system.cpu.not_idle_fraction                        1                       # Pe
 system.cpu.numCycles                           500000                       # number of cpu cycles simulated
 system.cpu.num_insts                           500000                       # Number of instructions executed
 system.cpu.num_refs                            182204                       # 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-atomic/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout
index 80b37e259c86edddb9069b79210ac7e7b25ba444..2fa2166aa28aea9a784bdf367b532bc0c892430b 100644 (file)
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout
+++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout
@@ -7,8 +7,8 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 27 2006 17:25:03
-M5 started Thu Jul 27 17:25:11 2006
-M5 executing on zamp.eecs.umich.edu
-command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/test1/atomic tests/test1/run.py
+M5 compiled Aug 16 2006 13:05:10
+M5 started Wed Aug 16 14:41:54 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-atomic tests/run.py quick/20.eio-short/alpha/eio/simple-atomic
 Exiting @ tick 499999 because a thread reached the max instruction count

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 4e444fa6b696d736479945ce10422b51e207150a..6f99fb4567b0284e9673b517ccd26ccc2f10cabf 100644 (file)
--- 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,3 +1,11 @@
-warn: Entering event queue @ 0.  Starting simulation...
-
-gzip: stdout: Broken pipe
+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

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 c14f4a3c912e480a19b32b127dbc2b8cb46fd69a..bb29247b48ea059b1b3e5a30f9d1011326dcae74 100644 (file)
--- 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,14 +1,11 @@
-main dictionary has 1245 entries
-49508 bytes wasted
->M5 Simulator System
+M5 Simulator System
 
 Copyright (c) 2001-2006
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 27 2006 17:25:03
-M5 started Thu Jul 27 17:25:14 2006
-M5 executing on zamp.eecs.umich.edu
-command line: build/ALPHA_SE/m5.opt -d build/ALPHA_SE/test/opt/test1/timing tests/test1/run.py --timing
-Exiting @ tick 680774 because a thread reached the max instruction count
+M5 compiled Aug 16 2006 13:05:10
+M5 started Wed Aug 16 14:41:54 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