diff options
16 files changed, 71 insertions, 67 deletions
diff --git a/tests/quick/00.hello/ref/mips/linux/inorder-timing/simout b/tests/quick/00.hello/ref/mips/linux/inorder-timing/simout index c1c5244ab..581c531f6 100755 --- a/tests/quick/00.hello/ref/mips/linux/inorder-timing/simout +++ b/tests/quick/00.hello/ref/mips/linux/inorder-timing/simout @@ -5,9 +5,9 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Dec 29 2009 23:25:57 -M5 revision b49d467587f8 6811 default processinit.patch qtip tip -M5 started Dec 29 2009 23:25:59 +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:09 M5 executing on fajita command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/inorder-timing -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/inorder-timing Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/00.hello/ref/mips/linux/inorder-timing/stats.txt b/tests/quick/00.hello/ref/mips/linux/inorder-timing/stats.txt index b595ba043..d55c721ca 100644 --- a/tests/quick/00.hello/ref/mips/linux/inorder-timing/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/inorder-timing/stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 2950 # Simulator instruction rate (inst/s) -host_mem_usage 204636 # Number of bytes of host memory used -host_seconds 1.98 # Real time elapsed on the host -host_tick_rate 15157943 # Simulator tick rate (ticks/s) +host_inst_rate 10400 # Simulator instruction rate (inst/s) +host_mem_usage 205896 # Number of bytes of host memory used +host_seconds 0.56 # Real time elapsed on the host +host_tick_rate 53415864 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 5827 # Number of instructions simulated sim_seconds 0.000030 # Number of seconds simulated diff --git a/tests/quick/00.hello/ref/mips/linux/o3-timing/simout b/tests/quick/00.hello/ref/mips/linux/o3-timing/simout index b41344694..74dedc1d0 100755 --- a/tests/quick/00.hello/ref/mips/linux/o3-timing/simout +++ b/tests/quick/00.hello/ref/mips/linux/o3-timing/simout @@ -5,9 +5,9 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Dec 29 2009 23:25:57 -M5 revision b49d467587f8 6811 default processinit.patch qtip tip -M5 started Dec 29 2009 23:25:59 +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:10 M5 executing on fajita command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/o3-timing -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/o3-timing Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/00.hello/ref/mips/linux/o3-timing/stats.txt b/tests/quick/00.hello/ref/mips/linux/o3-timing/stats.txt index 730eb5611..85a5a75dd 100644 --- a/tests/quick/00.hello/ref/mips/linux/o3-timing/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/o3-timing/stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 2622 # Simulator instruction rate (inst/s) -host_mem_usage 204532 # Number of bytes of host memory used -host_seconds 1.97 # Real time elapsed on the host -host_tick_rate 7130320 # Simulator tick rate (ticks/s) +host_inst_rate 48407 # Simulator instruction rate (inst/s) +host_mem_usage 206048 # Number of bytes of host memory used +host_seconds 0.11 # Real time elapsed on the host +host_tick_rate 131379529 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 5169 # Number of instructions simulated sim_seconds 0.000014 # Number of seconds simulated diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/config.ini b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/config.ini index cae17207c..eb0e10d29 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/config.ini +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/config.ini @@ -135,7 +135,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port [system.physmem] type=RubyMemory clock=1 -config_file=build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-atomic-ruby/ruby.config +config_file=build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic-ruby/ruby.config debug=false debug_file=ruby.debug file= @@ -143,8 +143,10 @@ latency=30000 latency_var=0 null=false num_cpus=1 +num_dmas=1 phase=0 -range=0:134217727 +ports_per_core=2 +range=0:1073741823 stats_file=ruby.stats zero=false port=system.membus.port[0] diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simerr b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simerr index aece78b32..9a6ce1210 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simerr +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simerr @@ -1,4 +1,4 @@ -["-r", "tests/configs/../../src/mem/ruby/config/MI_example-homogeneous.rb", "-p", "1", "-m", "1", "-s", "1024"] +["-r", "tests/configs/../../src/mem/ruby/config/MI_example-homogeneous.rb", "-p", "1", "-m", "1", "-s", "1024", "-C", "32768", "-A", "8", "-D", "1"] print config: 1 warn: Sockets disabled, not accepting gdb connections For more information see: http://www.m5sim.org/warn/d946bea6 diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simout b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simout index 7408d6fc9..7ac0ea8eb 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simout +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simout @@ -5,13 +5,13 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Oct 6 2009 20:51:47 -M5 revision 300266bf68ec+ 6674+ default tip -M5 started Oct 6 2009 20:51:48 -M5 executing on zooks -command line: build/MIPS_SE/m5.fast -d build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-atomic-ruby -re tests/run.py build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-atomic-ruby +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:09 +M5 executing on fajita +command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic-ruby -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic-ruby Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... info: Increasing stack size by one page. Hello World! -Exiting @ tick 2842500 because target called exit() +Exiting @ tick 2913500 because target called exit() diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/stats.txt index 94d67cedd..3e60620c5 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/stats.txt @@ -1,13 +1,13 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 27672 # Simulator instruction rate (inst/s) -host_mem_usage 1265116 # Number of bytes of host memory used -host_seconds 0.21 # Real time elapsed on the host -host_tick_rate 13820616 # Simulator tick rate (ticks/s) +host_inst_rate 57498 # Simulator instruction rate (inst/s) +host_mem_usage 2303472 # Number of bytes of host memory used +host_seconds 0.10 # Real time elapsed on the host +host_tick_rate 28699061 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks -sim_insts 5685 # Number of instructions simulated +sim_insts 5827 # Number of instructions simulated sim_seconds 0.000003 # Number of seconds simulated -sim_ticks 2842500 # Number of ticks simulated +sim_ticks 2913500 # Number of ticks simulated system.cpu.dtb.accesses 0 # DTB accesses system.cpu.dtb.hits 0 # DTB hits system.cpu.dtb.misses 0 # DTB misses @@ -28,9 +28,9 @@ system.cpu.itb.write_accesses 0 # DT system.cpu.itb.write_hits 0 # DTB write hits system.cpu.itb.write_misses 0 # DTB write misses system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles -system.cpu.numCycles 5686 # number of cpu cycles simulated -system.cpu.num_insts 5685 # Number of instructions executed -system.cpu.num_refs 2058 # Number of memory references -system.cpu.workload.PROG:num_syscalls 13 # Number of system calls +system.cpu.numCycles 5828 # number of cpu cycles simulated +system.cpu.num_insts 5827 # Number of instructions executed +system.cpu.num_refs 2090 # Number of memory references +system.cpu.workload.PROG:num_syscalls 8 # Number of system calls ---------- End Simulation Statistics ---------- diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/simout b/tests/quick/00.hello/ref/mips/linux/simple-atomic/simout index 026347b81..a364f6e08 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/simout +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/simout @@ -5,9 +5,9 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Dec 29 2009 23:25:57 -M5 revision b49d467587f8 6811 default processinit.patch qtip tip -M5 started Dec 29 2009 23:25:59 +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:10 M5 executing on fajita command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-atomic Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stats.txt index 8df79712b..090c28d32 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 2846 # Simulator instruction rate (inst/s) -host_mem_usage 196092 # Number of bytes of host memory used -host_seconds 2.05 # Real time elapsed on the host -host_tick_rate 1422983 # Simulator tick rate (ticks/s) +host_inst_rate 449580 # Simulator instruction rate (inst/s) +host_mem_usage 197348 # Number of bytes of host memory used +host_seconds 0.01 # Real time elapsed on the host +host_tick_rate 220987561 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 5827 # Number of instructions simulated sim_seconds 0.000003 # Number of seconds simulated diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/config.ini index 1562d7d6a..a290f96a4 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/config.ini +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/config.ini @@ -132,7 +132,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port [system.physmem] type=RubyMemory clock=1 -config_file=build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-timing-ruby/ruby.config +config_file=build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing-ruby/ruby.config debug=false debug_file=ruby.debug file= @@ -140,8 +140,10 @@ latency=30000 latency_var=0 null=false num_cpus=1 +num_dmas=1 phase=0 -range=0:134217727 +ports_per_core=2 +range=0:1073741823 stats_file=ruby.stats zero=false port=system.membus.port[0] diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simerr b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simerr index aece78b32..9a6ce1210 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simerr +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simerr @@ -1,4 +1,4 @@ -["-r", "tests/configs/../../src/mem/ruby/config/MI_example-homogeneous.rb", "-p", "1", "-m", "1", "-s", "1024"] +["-r", "tests/configs/../../src/mem/ruby/config/MI_example-homogeneous.rb", "-p", "1", "-m", "1", "-s", "1024", "-C", "32768", "-A", "8", "-D", "1"] print config: 1 warn: Sockets disabled, not accepting gdb connections For more information see: http://www.m5sim.org/warn/d946bea6 diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simout b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simout index 6c7350461..cf385d81f 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simout +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simout @@ -5,13 +5,13 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Oct 6 2009 20:43:14 -M5 revision 300266bf68ec 6674 default tip -M5 started Oct 6 2009 20:47:38 -M5 executing on zooks -command line: build/MIPS_SE/m5.fast -d build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-timing-ruby -re tests/run.py build/MIPS_SE/tests/fast/quick/00.hello/mips/linux/simple-timing-ruby +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:09 +M5 executing on fajita +command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing-ruby -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing-ruby Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... info: Increasing stack size by one page. Hello World! -Exiting @ tick 23227000 because target called exit() +Exiting @ tick 23749000 because target called exit() diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt index 15c68a6b0..8a4afd8c9 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt @@ -1,13 +1,13 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 3701 # Simulator instruction rate (inst/s) -host_mem_usage 1265204 # Number of bytes of host memory used -host_seconds 1.54 # Real time elapsed on the host -host_tick_rate 15119806 # Simulator tick rate (ticks/s) +host_inst_rate 6560 # Simulator instruction rate (inst/s) +host_mem_usage 2303716 # Number of bytes of host memory used +host_seconds 0.89 # Real time elapsed on the host +host_tick_rate 26729951 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks -sim_insts 5685 # Number of instructions simulated -sim_seconds 0.000023 # Number of seconds simulated -sim_ticks 23227000 # Number of ticks simulated +sim_insts 5827 # Number of instructions simulated +sim_seconds 0.000024 # Number of seconds simulated +sim_ticks 23749000 # Number of ticks simulated system.cpu.dtb.accesses 0 # DTB accesses system.cpu.dtb.hits 0 # DTB hits system.cpu.dtb.misses 0 # DTB misses @@ -28,9 +28,9 @@ system.cpu.itb.write_accesses 0 # DT system.cpu.itb.write_hits 0 # DTB write hits system.cpu.itb.write_misses 0 # DTB write misses system.cpu.not_idle_fraction 1 # Percentage of non-idle cycles -system.cpu.numCycles 46454 # number of cpu cycles simulated -system.cpu.num_insts 5685 # Number of instructions executed -system.cpu.num_refs 2058 # Number of memory references -system.cpu.workload.PROG:num_syscalls 13 # Number of system calls +system.cpu.numCycles 47498 # number of cpu cycles simulated +system.cpu.num_insts 5827 # Number of instructions executed +system.cpu.num_refs 2090 # Number of memory references +system.cpu.workload.PROG:num_syscalls 8 # Number of system calls ---------- End Simulation Statistics ---------- diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing/simout b/tests/quick/00.hello/ref/mips/linux/simple-timing/simout index 13b401e4c..f5b9b6f90 100755 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing/simout +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing/simout @@ -5,9 +5,9 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Dec 29 2009 23:25:57 -M5 revision b49d467587f8 6811 default processinit.patch qtip tip -M5 started Dec 29 2009 23:25:59 +M5 compiled Jan 2 2010 07:01:31 +M5 revision a538feb8a617 6813 default qtip tip qbase fixhelp.patch +M5 started Jan 2 2010 07:03:09 M5 executing on fajita command line: build/MIPS_SE/m5.opt -d build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing -re tests/run.py build/MIPS_SE/tests/opt/quick/00.hello/mips/linux/simple-timing Global frequency set at 1000000000000 ticks per second diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing/stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-timing/stats.txt index d7a673f52..14247d496 100644 --- a/tests/quick/00.hello/ref/mips/linux/simple-timing/stats.txt +++ b/tests/quick/00.hello/ref/mips/linux/simple-timing/stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 2804 # Simulator instruction rate (inst/s) -host_mem_usage 203720 # Number of bytes of host memory used -host_seconds 2.08 # Real time elapsed on the host -host_tick_rate 15782115 # Simulator tick rate (ticks/s) +host_inst_rate 21056 # Simulator instruction rate (inst/s) +host_mem_usage 204976 # Number of bytes of host memory used +host_seconds 0.28 # Real time elapsed on the host +host_tick_rate 118397165 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 5827 # Number of instructions simulated sim_seconds 0.000033 # Number of seconds simulated |