X86: Update the regressions for the fact that rdtsc does something now.

diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini b/tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini
index b66960bf97a4113bcd35d95ce817fe55d9f62382..3572e375e56eab082a1bb72353321e07f2e96b24 100644 (file)
--- a/tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/00.gzip/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=0
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:134217727
 zero=false
 port=system.membus.port[0]

diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt
index 186158b96ebf3db5a7eb691da406620077939a18..e830c139f3e98df6043347e8f2c3766d70ff623a 100644 (file)
--- a/tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1240763                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 175872                       # Number of bytes of host memory used
-host_seconds                                  1292.50                       # Real time elapsed on the host
-host_tick_rate                              738827746                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1980122                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 190864                       # Number of bytes of host memory used
+host_seconds                                   809.89                       # Real time elapsed on the host
+host_tick_rate                             1179088562                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                  1603680167                       # Number of instructions simulated
+sim_insts                                  1603680170                       # Number of instructions simulated
 sim_seconds                                  0.954932                       # Number of seconds simulated
-sim_ticks                                954931687500                       # Number of ticks simulated
+sim_ticks                                954931689000                       # 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                       1909863376                       # number of cpu cycles simulated
-system.cpu.num_insts                       1603680167                       # Number of instructions executed
+system.cpu.numCycles                       1909863379                       # number of cpu cycles simulated
+system.cpu.num_insts                       1603680170                       # Number of instructions executed
 system.cpu.num_refs                         607157396                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls              18                       # Number of system calls
 

diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/stderr b/tests/long/00.gzip/ref/x86/linux/simple-atomic/stderr
index 01076d21a9325faee9d013f7dd2b438b51c729d6..cbad25dfbf631e53b214225f713d8bcf6ba03193 100644 (file)
--- a/tests/long/00.gzip/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/00.gzip/ref/x86/linux/simple-atomic/stderr
@@ -2,5 +2,4 @@
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented
 warn: Increasing stack size by one page.

diff --git a/tests/long/00.gzip/ref/x86/linux/simple-atomic/stdout b/tests/long/00.gzip/ref/x86/linux/simple-atomic/stdout
index b0a68cad2a669f365601d89a6bccf803ca0463e5..1c14170f7e747e08efe89ac1b8b380c1f3d16365 100644 (file)
--- a/tests/long/00.gzip/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/00.gzip/ref/x86/linux/simple-atomic/stdout
@@ -31,14 +31,14 @@ Uncompressed data compared correctly
 Tested 1MB buffer: OK!
 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Oct 21 2007 20:57:52
-M5 started Sun Oct 21 21:35:26 2007
-M5 executing on nacho
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:59:05 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/00.gzip/x86/linux/simple-atomic tests/run.py long/00.gzip/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 954931687500 because target called exit()
+Exiting @ tick 954931689000 because target called exit()

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini b/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
index 527f1b385055d91ce5d3c01ec458f90135655b83..d878cb4247c8b64334483cbb1e460196eff178bc 100644 (file)
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=55300000000
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:268435455
 zero=false
 port=system.membus.port[0]

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
index 7942861967de8a05618bfa3d1a53de5e62ce05dd..e8cd3750d3551f24a8c5fa5d4aed13eb45637b7a 100644 (file)
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1168424                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 310284                       # Number of bytes of host memory used
-host_seconds                                   230.78                       # Real time elapsed on the host
-host_tick_rate                              718029499                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1615040                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 325376                       # Number of bytes of host memory used
+host_seconds                                   166.96                       # Real time elapsed on the host
+host_tick_rate                              992489174                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                   269642969                       # Number of instructions simulated
+sim_insts                                   269642972                       # Number of instructions simulated
 sim_seconds                                  0.165704                       # Number of seconds simulated
-sim_ticks                                165703616000                       # Number of ticks simulated
+sim_ticks                                165703617500                       # 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                        331407233                       # number of cpu cycles simulated
-system.cpu.num_insts                        269642969                       # Number of instructions executed
+system.cpu.numCycles                        331407236                       # number of cpu cycles simulated
+system.cpu.num_insts                        269642972                       # Number of instructions executed
 system.cpu.num_refs                         124052668                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls             429                       # Number of system calls
 

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
index 863f1adb9e42e0be39a3aaf3234c3284efdaa242..d81394784dcf5eb223a4da2fd48d571a92056486 100644 (file)
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
@@ -1,5 +1,4 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
+0: system.remote_gdb.listener: listening for remote gdb on port 7002
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
index 743c3e8f14d33f16bad3b5824948bd8483d79c70..4bc9476139f9fd87dede1a31d0617da05f1cfde7 100644 (file)
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
@@ -16,14 +16,14 @@ checksum                   : 68389
 optimal
 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Oct 21 2007 20:57:52
-M5 started Sun Oct 21 21:57:00 2007
-M5 executing on nacho
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:59:05 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/10.mcf/x86/linux/simple-atomic tests/run.py long/10.mcf/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 165703616000 because target called exit()
+Exiting @ tick 165703617500 because target called exit()

diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini b/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
index 10efbab5feb2302781edf16569fb23571ed3b4cd..af0a9ce637f68195b5dc848041b121d3e7044f44 100644 (file)
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=114600000000
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:134217727
 zero=false
 port=system.membus.port[0]

diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt
index 727d390d005c3548b39cb431286f7eb449fef6dc..902cda39a5ba6bbdc4d3a8598272a96d9b725143 100644 (file)
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 830115                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 150180                       # Number of bytes of host memory used
-host_seconds                                  1788.44                       # Real time elapsed on the host
-host_tick_rate                              482678947                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1972929                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 194468                       # Number of bytes of host memory used
+host_seconds                                   752.49                       # Real time elapsed on the host
+host_tick_rate                             1147180666                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                  1484611664                       # Number of instructions simulated
+sim_insts                                  1484611667                       # Number of instructions simulated
 sim_seconds                                  0.863243                       # Number of seconds simulated
-sim_ticks                                863243462500                       # Number of ticks simulated
+sim_ticks                                863243464000                       # 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                       1726486926                       # number of cpu cycles simulated
-system.cpu.num_insts                       1484611664                       # Number of instructions executed
+system.cpu.numCycles                       1726486929                       # number of cpu cycles simulated
+system.cpu.num_insts                       1484611667                       # Number of instructions executed
 system.cpu.num_refs                         533543283                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls             541                       # Number of system calls
 

diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/stderr b/tests/long/20.parser/ref/x86/linux/simple-atomic/stderr
index 46a429e22eec0eadde14680bcf56f44bd23cd0d7..67ea3cc5a99ad57595a4b901d1ba905f2f6fa5d1 100644 (file)
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/stderr
@@ -1,8 +1,7 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
+0: system.remote_gdb.listener: listening for remote gdb on port 7001
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented
 warn: Increasing stack size by one page.
 warn: Increasing stack size by one page.
 warn: Increasing stack size by one page.

diff --git a/tests/long/20.parser/ref/x86/linux/simple-atomic/stdout b/tests/long/20.parser/ref/x86/linux/simple-atomic/stdout
index 3c6b146764b9fb0aa7510c24fbcbe6c5e4aeae9d..7332263ab9e3999330a7e5599885189bc286a152 100644 (file)
--- a/tests/long/20.parser/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/20.parser/ref/x86/linux/simple-atomic/stdout
@@ -64,9 +64,9 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Feb 16 2008 13:01:44
-M5 started Sat Feb 16 13:01:45 2008
-M5 executing on zizzer
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:59:05 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/20.parser/x86/linux/simple-atomic tests/run.py long/20.parser/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 863243462500 because target called exit()
+Exiting @ tick 863243464000 because target called exit()

diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
index 322bfab4b39050262937f00895796064ce6b53f3..d18301e7c5907d0172b97620969ec16102fc0e92 100644 (file)
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=0
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:134217727
 zero=false
 port=system.membus.port[0]

diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
index 03017061d1c149a5b209732faa834053673346b2..fbb7f4253a65dd9c6ea96c65db7ab545aec2cfc9 100644 (file)
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1084871                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 175684                       # Number of bytes of host memory used
-host_seconds                                  4236.15                       # Real time elapsed on the host
-host_tick_rate                              662497504                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1920772                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 190768                       # Number of bytes of host memory used
+host_seconds                                  2392.62                       # Real time elapsed on the host
+host_tick_rate                             1172956454                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                  4595672201                       # Number of instructions simulated
+sim_insts                                  4595672204                       # Number of instructions simulated
 sim_seconds                                  2.806437                       # Number of seconds simulated
-sim_ticks                                2806436542000                       # Number of ticks simulated
+sim_ticks                                2806436543500                       # 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                       5612873085                       # number of cpu cycles simulated
-system.cpu.num_insts                       4595672201                       # Number of instructions executed
+system.cpu.numCycles                       5612873088                       # number of cpu cycles simulated
+system.cpu.num_insts                       4595672204                       # Number of instructions executed
 system.cpu.num_refs                        1686312529                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls              33                       # Number of system calls
 

diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
index 46a429e22eec0eadde14680bcf56f44bd23cd0d7..e75f35ba125b1a488ebc4b62172e556876e5ed05 100644 (file)
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
@@ -1,8 +1,7 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
+0: system.remote_gdb.listener: listening for remote gdb on port 7004
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented
 warn: Increasing stack size by one page.
 warn: Increasing stack size by one page.
 warn: Increasing stack size by one page.

diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout
index 1a0378ca61ef66e2386ed720dc90adb37c15eb67..dd2b3c1b82f8e5356d3d5279c9951a246d629e7d 100644 (file)
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout
@@ -14,14 +14,14 @@ Uncompressed data compared correctly
 Tested 1MB buffer: OK!
 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Oct 21 2007 20:57:52
-M5 started Sun Oct 21 22:20:45 2007
-M5 executing on nacho
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:59:05 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/60.bzip2/x86/linux/simple-atomic tests/run.py long/60.bzip2/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 2806436542000 because target called exit()
+Exiting @ tick 2806436543500 because target called exit()

diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini b/tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini
index 0644df8647985f1c6f491e3696f0a05e669c1df2..f3b9dea12b4c4878a962fa78930bf4cdd07b1745 100644 (file)
--- a/tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/70.twolf/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=0
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:134217727
 zero=false
 port=system.membus.port[0]

diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt
index db17fc7d716d35cea0b9711d5b22f6b8a5eb1d57..47792068ce39066b1b31da7c109686b9654d38f1 100644 (file)
--- a/tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/70.twolf/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1304954                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 183200                       # Number of bytes of host memory used
-host_seconds                                   167.36                       # Real time elapsed on the host
-host_tick_rate                              776224834                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1448506                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 197928                       # Number of bytes of host memory used
+host_seconds                                   150.78                       # Real time elapsed on the host
+host_tick_rate                              861614355                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                   218399764                       # Number of instructions simulated
+sim_insts                                   218399767                       # Number of instructions simulated
 sim_seconds                                  0.129911                       # Number of seconds simulated
-sim_ticks                                129910855000                       # Number of ticks simulated
+sim_ticks                                129910856500                       # 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                        259821711                       # number of cpu cycles simulated
-system.cpu.num_insts                        218399764                       # Number of instructions executed
+system.cpu.numCycles                        259821714                       # number of cpu cycles simulated
+system.cpu.num_insts                        218399767                       # Number of instructions executed
 system.cpu.num_refs                          77164404                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls             395                       # Number of system calls
 

diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/stderr b/tests/long/70.twolf/ref/x86/linux/simple-atomic/stderr
index 6947c985e678da9fe5ca7fcfdd66b7717ba89fb8..1ba198a7089523d31852ed8a890b1c0535767ba9 100644 (file)
--- a/tests/long/70.twolf/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/70.twolf/ref/x86/linux/simple-atomic/stderr
@@ -1,7 +1,6 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
+0: system.remote_gdb.listener: listening for remote gdb on port 7003
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented
 warn: Increasing stack size by one page.
 warn: Increasing stack size by one page.

diff --git a/tests/long/70.twolf/ref/x86/linux/simple-atomic/stdout b/tests/long/70.twolf/ref/x86/linux/simple-atomic/stdout
index 4f9067256a8622527f834bc721bc1319d5600fd0..3e37f91d8d345696f336547b19cfca9bca7239f3 100644 (file)
--- a/tests/long/70.twolf/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/70.twolf/ref/x86/linux/simple-atomic/stdout
@@ -13,14 +13,16 @@ Authors: Carl Sechen, Bill Swartz
 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 
 122 123 124 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Oct 21 2007 20:57:52
-M5 started Sun Oct 21 23:31:23 2007
-M5 executing on nacho
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:59:05 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/70.twolf/x86/linux/simple-atomic tests/run.py long/70.twolf/x86/linux/simple-atomic
+Couldn't unlink  build/X86_SE/tests/fast/long/70.twolf/x86/linux/simple-atomic/smred.sav
+Couldn't unlink  build/X86_SE/tests/fast/long/70.twolf/x86/linux/simple-atomic/smred.sv2
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 129910855000 because target called exit()
+Exiting @ tick 129910856500 because target called exit()

diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini
index 74f6c930e85ad46f5bcc8fd7ab79185f031efada..6d8421e24001860880d48704cc4a090b1b4e56ab 100644 (file)
--- a/tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/quick/00.hello/ref/x86/linux/simple-atomic/config.ini
@@ -58,6 +58,7 @@ max_stack_size=67108864
 output=cout
 pid=100
 ppid=99
+simpoint=0
 system=system
 uid=100
 
@@ -66,6 +67,7 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
@@ -74,6 +76,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
 range=0:134217727
 zero=false
 port=system.membus.port[0]

diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt
index f834f694b4f37c6aaf76da37234caa93301a69bb..647bad718eb2a49de398e5ed682fcd62352d9a69 100644 (file)
--- a/tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/quick/00.hello/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                  21996                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 172228                       # Number of bytes of host memory used
-host_seconds                                     0.39                       # Real time elapsed on the host
-host_tick_rate                               12789916                       # Simulator tick rate (ticks/s)
+host_inst_rate                                  13844                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 186312                       # Number of bytes of host memory used
+host_seconds                                     0.61                       # Real time elapsed on the host
+host_tick_rate                                8053994                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                        8472                       # Number of instructions simulated
+sim_insts                                        8475                       # Number of instructions simulated
 sim_seconds                                  0.000005                       # Number of seconds simulated
-sim_ticks                                     4930500                       # Number of ticks simulated
+sim_ticks                                     4932000                       # 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                             9862                       # number of cpu cycles simulated
-system.cpu.num_insts                             8472                       # Number of instructions executed
+system.cpu.numCycles                             9865                       # number of cpu cycles simulated
+system.cpu.num_insts                             8475                       # Number of instructions executed
 system.cpu.num_refs                              1765                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls              11                       # Number of system calls
 

diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/x86/linux/simple-atomic/stderr
index 863f1adb9e42e0be39a3aaf3234c3284efdaa242..3d07bd9110b463632b6f1b4bb2c1c2b3f06e2280 100644 (file)
--- a/tests/quick/00.hello/ref/x86/linux/simple-atomic/stderr
+++ b/tests/quick/00.hello/ref/x86/linux/simple-atomic/stderr
@@ -2,4 +2,3 @@
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
-warn: instruction 'rdtsc' unimplemented

diff --git a/tests/quick/00.hello/ref/x86/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/x86/linux/simple-atomic/stdout
index 302f58c0c190402d710e4a9cd43fc1c8f3bb6f75..065bf1388e89c51cdf987aa54b80e9eebe172678 100644 (file)
--- a/tests/quick/00.hello/ref/x86/linux/simple-atomic/stdout
+++ b/tests/quick/00.hello/ref/x86/linux/simple-atomic/stdout
@@ -1,14 +1,14 @@
 Hello world!
 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Oct 25 2007 18:49:38
-M5 started Thu Oct 25 18:49:42 2007
-M5 executing on nacho
+M5 compiled Apr 21 2008 13:57:00
+M5 started Mon Apr 21 13:57:01 2008
+M5 executing on tater
 command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/quick/00.hello/x86/linux/simple-atomic tests/run.py quick/00.hello/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
-Exiting @ tick 4930500 because target called exit()
+Exiting @ tick 4932000 because target called exit()