Update reference outputs

--HG--
extra : convert_revision : df9cf835e0910df1e8e80152825fde9327d4aadb

14 files changed, 50 insertions, 53 deletions

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 77644ba5c..fdd1f3de1 100644
--- 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 dc59ece72..737ee6611 100644
--- 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 bc318cec0..a0cc28b23 100644
--- 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 ea7591277..fe3ad68ab 100644
--- 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 cc4170f81..4dab1dfbd 100644
--- 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 3da9202dd..2ee207b2e 100644
--- 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 d87648683..018308862 100644
--- 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 9939c1755..6e83016e9 100644
--- 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 81e161af4..5c4d8c01e 100644
--- 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 0e3ca3953..430daba54 100644
--- 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 3d49bfedb..96c734e15 100644
--- 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 d3b8bc005..532e94849 100644
--- 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 719722c8f..2191bd088 100644
--- 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 e91c14045..55bb62d6c 100644
--- 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