From 9ebd244991f473cacc1f73ff4877f2472af3a8fc Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 12 Jun 2008 00:42:52 -0400 Subject: X86: Update the regressions for the fact that rdtsc does something now. --- .../long/00.gzip/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../long/00.gzip/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/long/00.gzip/ref/x86/linux/simple-atomic/stderr | 1 - tests/long/00.gzip/ref/x86/linux/simple-atomic/stdout | 10 +++++----- tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr | 3 +-- tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout | 10 +++++----- .../20.parser/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../20.parser/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/long/20.parser/ref/x86/linux/simple-atomic/stderr | 3 +-- tests/long/20.parser/ref/x86/linux/simple-atomic/stdout | 8 ++++---- .../long/60.bzip2/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr | 3 +-- tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout | 10 +++++----- .../long/70.twolf/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../70.twolf/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/long/70.twolf/ref/x86/linux/simple-atomic/stderr | 3 +-- tests/long/70.twolf/ref/x86/linux/simple-atomic/stdout | 12 +++++++----- .../00.hello/ref/x86/linux/simple-atomic/config.ini | 3 +++ .../00.hello/ref/x86/linux/simple-atomic/m5stats.txt | 16 ++++++++-------- tests/quick/00.hello/ref/x86/linux/simple-atomic/stderr | 1 - tests/quick/00.hello/ref/x86/linux/simple-atomic/stdout | 10 +++++----- 24 files changed, 101 insertions(+), 87 deletions(-) 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 b66960bf9..3572e375e 100644 --- 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 186158b96..e830c139f 100644 --- 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 01076d21a..cbad25dfb 100644 --- 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 b0a68cad2..1c14170f7 100644 --- 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 527f1b385..d878cb424 100644 --- 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 794286196..e8cd3750d 100644 --- 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 863f1adb9..d81394784 100644 --- 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 743c3e8f1..4bc947613 100644 --- 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 10efbab5f..af0a9ce63 100644 --- 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 727d390d0..902cda39a 100644 --- 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 46a429e22..67ea3cc5a 100644 --- 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 3c6b14676..7332263ab 100644 --- 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 322bfab4b..d18301e7c 100644 --- 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 03017061d..fbb7f4253 100644 --- 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 46a429e22..e75f35ba1 100644 --- 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 1a0378ca6..dd2b3c1b8 100644 --- 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 0644df864..f3b9dea12 100644 --- 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 db17fc7d7..47792068c 100644 --- 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 6947c985e..1ba198a70 100644 --- 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 4f9067256..3e37f91d8 100644 --- 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 74f6c930e..6d8421e24 100644 --- 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 f834f694b..647bad718 100644 --- 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 863f1adb9..3d07bd911 100644 --- 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 302f58c0c..065bf1388 100644 --- 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() -- cgit v1.2.3