From de489e1997ee6c37aaf6e876e32622f6c648fe95 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 16 Nov 2015 05:08:57 -0600 Subject: stats: updates due to recent chagnesets --- .../se/00.hello/ref/x86/linux/o3-timing/config.ini | 17 ++++- .../se/00.hello/ref/x86/linux/o3-timing/simout | 12 +-- .../se/00.hello/ref/x86/linux/o3-timing/stats.txt | 10 +-- .../ref/x86/linux/simple-atomic/config.ini | 1 + .../se/00.hello/ref/x86/linux/simple-atomic/simout | 11 ++- .../00.hello/ref/x86/linux/simple-atomic/stats.txt | 10 +-- .../ref/x86/linux/simple-timing-ruby/config.ini | 87 +--------------------- .../ref/x86/linux/simple-timing-ruby/simerr | 1 + .../ref/x86/linux/simple-timing-ruby/simout | 10 ++- .../ref/x86/linux/simple-timing-ruby/stats.txt | 10 +-- .../ref/x86/linux/simple-timing/config.ini | 17 ++++- .../se/00.hello/ref/x86/linux/simple-timing/simout | 11 +-- .../00.hello/ref/x86/linux/simple-timing/stats.txt | 10 +-- 13 files changed, 82 insertions(+), 125 deletions(-) (limited to 'tests/quick/se/00.hello/ref/x86/linux') diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini index 98c8dbffa..7f9baef70 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini @@ -24,6 +24,7 @@ mem_mode=timing mem_ranges= memories=system.physmem mmap_using_noreserve=false +multi_thread=false num_work_ids=16 readfile= symbolfile= @@ -161,6 +162,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=2 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -177,6 +179,7 @@ system=system tags=system.cpu.dcache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=false cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] @@ -518,6 +521,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=2 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -534,6 +538,7 @@ system=system tags=system.cpu.icache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=true cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] @@ -584,6 +589,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=8 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -600,6 +606,7 @@ system=system tags=system.cpu.l2cache.tags tgts_per_mshr=12 write_buffers=8 +writeback_clean=false cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] @@ -615,12 +622,13 @@ size=2097152 [system.cpu.toL2Bus] type=CoherentXBar +children=snoop_filter clk_domain=system.cpu_clk_domain eventq_index=0 forward_latency=0 frontend_latency=1 response_latency=1 -snoop_filter=Null +snoop_filter=system.cpu.toL2Bus.snoop_filter snoop_response_latency=1 system=system use_default_range=false @@ -628,6 +636,13 @@ width=32 master=system.cpu.l2cache.cpu_side slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port +[system.cpu.toL2Bus.snoop_filter] +type=SnoopFilter +eventq_index=0 +lookup_latency=0 +max_capacity=8388608 +system=system + [system.cpu.tracer] type=ExeTracer eventq_index=0 diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout index 4d21570e3..9966ec55f 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout @@ -1,12 +1,14 @@ +Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simout +Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Apr 22 2015 08:10:29 -gem5 started Apr 22 2015 09:21:48 -gem5 executing on phenom -command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing +gem5 compiled Nov 15 2015 15:16:56 +gem5 started Nov 15 2015 15:17:38 +gem5 executing on ribera.cs.wisc.edu, pid 9899 +command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... Hello world! -Exiting @ tick 21143500 because target called exit() +Exiting @ tick 20818000 because target called exit() diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt index afb527d16..b913f5d1c 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000021 # Nu sim_ticks 20818000 # Number of ticks simulated final_tick 20818000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 50154 # Simulator instruction rate (inst/s) -host_op_rate 90851 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 194020392 # Simulator tick rate (ticks/s) -host_mem_usage 314048 # Number of bytes of host memory used -host_seconds 0.11 # Real time elapsed on the host +host_inst_rate 30520 # Simulator instruction rate (inst/s) +host_op_rate 55287 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 118073605 # Simulator tick rate (ticks/s) +host_mem_usage 307952 # Number of bytes of host memory used +host_seconds 0.18 # Real time elapsed on the host sim_insts 5380 # Number of instructions simulated sim_ops 9747 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini index 938ee4ed9..a53809e58 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini @@ -24,6 +24,7 @@ mem_mode=atomic mem_ranges= memories=system.physmem mmap_using_noreserve=false +multi_thread=false num_work_ids=16 readfile= symbolfile= diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout index 6330d042a..32e53cc0f 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout @@ -1,10 +1,13 @@ +Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simout +Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 22 2014 17:10:34 -gem5 started Jan 22 2014 17:30:08 -gem5 executing on u200540-lin -command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic +gem5 compiled Nov 15 2015 15:16:56 +gem5 started Nov 15 2015 15:17:25 +gem5 executing on ribera.cs.wisc.edu, pid 9884 +command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic + Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... Hello world! diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt index decb816ca..532569e1f 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000006 # Nu sim_ticks 5615000 # Number of ticks simulated final_tick 5615000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 96804 # Simulator instruction rate (inst/s) -host_op_rate 175298 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 100934348 # Simulator tick rate (ticks/s) -host_mem_usage 242164 # Number of bytes of host memory used -host_seconds 0.06 # Real time elapsed on the host +host_inst_rate 64313 # Simulator instruction rate (inst/s) +host_op_rate 116481 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 67080627 # Simulator tick rate (ticks/s) +host_mem_usage 295912 # Number of bytes of host memory used +host_seconds 0.08 # Real time elapsed on the host sim_insts 5381 # Number of instructions simulated sim_ops 9748 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini index 56411f6d5..98eb89639 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini @@ -24,6 +24,7 @@ mem_mode=timing mem_ranges=0:268435455 memories=system.mem_ctrls mmap_using_noreserve=false +multi_thread=false num_work_ids=16 readfile= symbolfile= @@ -260,6 +261,7 @@ eventq_index=0 hot_lines=false memory_size_bits=48 num_of_sequencers=1 +number_of_virtual_networks=5 phys_mem=Null randomization=false @@ -308,7 +310,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 slave=system.ruby.network.master[3] [system.ruby.dir_cntrl0.dmaResponseFromDir] @@ -317,7 +318,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 master=system.ruby.network.slave[3] [system.ruby.dir_cntrl0.forwardFromDir] @@ -326,7 +326,6 @@ buffer_size=0 eventq_index=0 ordered=false randomization=false -recycle_latency=10 master=system.ruby.network.slave[4] [system.ruby.dir_cntrl0.requestToDir] @@ -335,7 +334,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 slave=system.ruby.network.master[2] [system.ruby.dir_cntrl0.responseFromDir] @@ -344,7 +342,6 @@ buffer_size=0 eventq_index=0 ordered=false randomization=false -recycle_latency=10 master=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.responseFromMemory] @@ -353,7 +350,6 @@ buffer_size=0 eventq_index=0 ordered=false randomization=false -recycle_latency=10 [system.ruby.l1_cntrl0] type=L1Cache_Controller @@ -408,7 +404,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 slave=system.ruby.network.master[0] [system.ruby.l1_cntrl0.mandatoryQueue] @@ -417,7 +412,6 @@ buffer_size=0 eventq_index=0 ordered=false randomization=false -recycle_latency=10 [system.ruby.l1_cntrl0.requestFromCache] type=MessageBuffer @@ -425,7 +419,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 master=system.ruby.network.slave[0] [system.ruby.l1_cntrl0.responseFromCache] @@ -434,7 +427,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 master=system.ruby.network.slave[1] [system.ruby.l1_cntrl0.responseToCache] @@ -443,7 +435,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=10 slave=system.ruby.network.master[1] [system.ruby.l1_cntrl0.sequencer] @@ -486,7 +477,6 @@ int_link_buffers=system.ruby.network.int_link_buffers00 system.ruby.network.int_ int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 netifs= number_of_virtual_networks=5 -recycle_latency=0 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar @@ -519,7 +509,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers01] type=MessageBuffer @@ -527,7 +516,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers02] type=MessageBuffer @@ -535,7 +523,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers03] type=MessageBuffer @@ -543,7 +530,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers04] type=MessageBuffer @@ -551,7 +537,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers05] type=MessageBuffer @@ -559,7 +544,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers06] type=MessageBuffer @@ -567,7 +551,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers07] type=MessageBuffer @@ -575,7 +558,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers08] type=MessageBuffer @@ -583,7 +565,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers09] type=MessageBuffer @@ -591,7 +572,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers10] type=MessageBuffer @@ -599,7 +579,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers11] type=MessageBuffer @@ -607,7 +586,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers12] type=MessageBuffer @@ -615,7 +593,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers13] type=MessageBuffer @@ -623,7 +600,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers14] type=MessageBuffer @@ -631,7 +607,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers15] type=MessageBuffer @@ -639,7 +614,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers16] type=MessageBuffer @@ -647,7 +621,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers17] type=MessageBuffer @@ -655,7 +628,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers18] type=MessageBuffer @@ -663,7 +635,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_link_buffers19] type=MessageBuffer @@ -671,7 +642,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.int_links0] type=SimpleIntLink @@ -699,7 +669,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer clk_domain=system.ruby.clk_domain eventq_index=0 port_buffers=system.ruby.network.routers0.port_buffers00 system.ruby.network.routers0.port_buffers01 system.ruby.network.routers0.port_buffers02 system.ruby.network.routers0.port_buffers03 system.ruby.network.routers0.port_buffers04 system.ruby.network.routers0.port_buffers05 system.ruby.network.routers0.port_buffers06 system.ruby.network.routers0.port_buffers07 system.ruby.network.routers0.port_buffers08 system.ruby.network.routers0.port_buffers09 system.ruby.network.routers0.port_buffers10 system.ruby.network.routers0.port_buffers11 system.ruby.network.routers0.port_buffers12 system.ruby.network.routers0.port_buffers13 system.ruby.network.routers0.port_buffers14 -recycle_latency=0 router_id=0 virt_nets=5 @@ -709,7 +678,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers01] type=MessageBuffer @@ -717,7 +685,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers02] type=MessageBuffer @@ -725,7 +692,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers03] type=MessageBuffer @@ -733,7 +699,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers04] type=MessageBuffer @@ -741,7 +706,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers05] type=MessageBuffer @@ -749,7 +713,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers06] type=MessageBuffer @@ -757,7 +720,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers07] type=MessageBuffer @@ -765,7 +727,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers08] type=MessageBuffer @@ -773,7 +734,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers09] type=MessageBuffer @@ -781,7 +741,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers10] type=MessageBuffer @@ -789,7 +748,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers11] type=MessageBuffer @@ -797,7 +755,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers12] type=MessageBuffer @@ -805,7 +762,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers13] type=MessageBuffer @@ -813,7 +769,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers0.port_buffers14] type=MessageBuffer @@ -821,7 +776,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1] type=Switch @@ -829,7 +783,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer clk_domain=system.ruby.clk_domain eventq_index=0 port_buffers=system.ruby.network.routers1.port_buffers00 system.ruby.network.routers1.port_buffers01 system.ruby.network.routers1.port_buffers02 system.ruby.network.routers1.port_buffers03 system.ruby.network.routers1.port_buffers04 system.ruby.network.routers1.port_buffers05 system.ruby.network.routers1.port_buffers06 system.ruby.network.routers1.port_buffers07 system.ruby.network.routers1.port_buffers08 system.ruby.network.routers1.port_buffers09 system.ruby.network.routers1.port_buffers10 system.ruby.network.routers1.port_buffers11 system.ruby.network.routers1.port_buffers12 system.ruby.network.routers1.port_buffers13 system.ruby.network.routers1.port_buffers14 -recycle_latency=0 router_id=1 virt_nets=5 @@ -839,7 +792,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers01] type=MessageBuffer @@ -847,7 +799,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers02] type=MessageBuffer @@ -855,7 +806,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers03] type=MessageBuffer @@ -863,7 +813,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers04] type=MessageBuffer @@ -871,7 +820,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers05] type=MessageBuffer @@ -879,7 +827,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers06] type=MessageBuffer @@ -887,7 +834,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers07] type=MessageBuffer @@ -895,7 +841,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers08] type=MessageBuffer @@ -903,7 +848,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers09] type=MessageBuffer @@ -911,7 +855,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers10] type=MessageBuffer @@ -919,7 +862,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers11] type=MessageBuffer @@ -927,7 +869,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers12] type=MessageBuffer @@ -935,7 +876,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers13] type=MessageBuffer @@ -943,7 +883,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers1.port_buffers14] type=MessageBuffer @@ -951,7 +890,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2] type=Switch @@ -959,7 +897,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer clk_domain=system.ruby.clk_domain eventq_index=0 port_buffers=system.ruby.network.routers2.port_buffers00 system.ruby.network.routers2.port_buffers01 system.ruby.network.routers2.port_buffers02 system.ruby.network.routers2.port_buffers03 system.ruby.network.routers2.port_buffers04 system.ruby.network.routers2.port_buffers05 system.ruby.network.routers2.port_buffers06 system.ruby.network.routers2.port_buffers07 system.ruby.network.routers2.port_buffers08 system.ruby.network.routers2.port_buffers09 system.ruby.network.routers2.port_buffers10 system.ruby.network.routers2.port_buffers11 system.ruby.network.routers2.port_buffers12 system.ruby.network.routers2.port_buffers13 system.ruby.network.routers2.port_buffers14 system.ruby.network.routers2.port_buffers15 system.ruby.network.routers2.port_buffers16 system.ruby.network.routers2.port_buffers17 system.ruby.network.routers2.port_buffers18 system.ruby.network.routers2.port_buffers19 -recycle_latency=0 router_id=2 virt_nets=5 @@ -969,7 +906,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers01] type=MessageBuffer @@ -977,7 +913,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers02] type=MessageBuffer @@ -985,7 +920,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers03] type=MessageBuffer @@ -993,7 +927,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers04] type=MessageBuffer @@ -1001,7 +934,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers05] type=MessageBuffer @@ -1009,7 +941,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers06] type=MessageBuffer @@ -1017,7 +948,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers07] type=MessageBuffer @@ -1025,7 +955,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers08] type=MessageBuffer @@ -1033,7 +962,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers09] type=MessageBuffer @@ -1041,7 +969,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers10] type=MessageBuffer @@ -1049,7 +976,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers11] type=MessageBuffer @@ -1057,7 +983,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers12] type=MessageBuffer @@ -1065,7 +990,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers13] type=MessageBuffer @@ -1073,7 +997,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers14] type=MessageBuffer @@ -1081,7 +1004,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers15] type=MessageBuffer @@ -1089,7 +1011,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers16] type=MessageBuffer @@ -1097,7 +1018,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers17] type=MessageBuffer @@ -1105,7 +1025,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers18] type=MessageBuffer @@ -1113,7 +1032,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.ruby.network.routers2.port_buffers19] type=MessageBuffer @@ -1121,7 +1039,6 @@ buffer_size=0 eventq_index=0 ordered=true randomization=false -recycle_latency=0 [system.sys_port_proxy] type=RubyPortProxy diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr index 21ea544b2..22fffb44f 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr @@ -6,3 +6,4 @@ warn: rounding error > tolerance 1.250000 rounded to 1 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes) warn: Sockets disabled, not accepting gdb connections +warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files! diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout index ac116669b..8de8535c6 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout @@ -1,10 +1,12 @@ +Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby/simout +Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Aug 13 2015 19:59:06 -gem5 started Aug 13 2015 20:18:58 -gem5 executing on artery -command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby +gem5 compiled Nov 15 2015 15:16:56 +gem5 started Nov 15 2015 15:17:48 +gem5 executing on ribera.cs.wisc.edu, pid 9909 +command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby Global frequency set at 1000000000 ticks per second info: Entering event queue @ 0. Starting simulation... diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt index 10e4434eb..bd1187e03 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000088 # Nu sim_ticks 87948 # Number of ticks simulated final_tick 87948 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000 # Frequency of simulated ticks -host_inst_rate 39587 # Simulator instruction rate (inst/s) -host_op_rate 71707 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 646904 # Simulator tick rate (ticks/s) -host_mem_usage 417864 # Number of bytes of host memory used -host_seconds 0.14 # Real time elapsed on the host +host_inst_rate 42645 # Simulator instruction rate (inst/s) +host_op_rate 77244 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 696812 # Simulator tick rate (ticks/s) +host_mem_usage 463856 # Number of bytes of host memory used +host_seconds 0.13 # Real time elapsed on the host sim_insts 5381 # Number of instructions simulated sim_ops 9748 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini index 940daad92..986daff98 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini @@ -24,6 +24,7 @@ mem_mode=timing mem_ranges= memories=system.physmem mmap_using_noreserve=false +multi_thread=false num_work_ids=16 readfile= symbolfile= @@ -89,6 +90,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=2 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -105,6 +107,7 @@ system=system tags=system.cpu.dcache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=false cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] @@ -139,6 +142,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=2 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -155,6 +159,7 @@ system=system tags=system.cpu.icache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=true cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] @@ -205,6 +210,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=8 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -221,6 +227,7 @@ system=system tags=system.cpu.l2cache.tags tgts_per_mshr=12 write_buffers=8 +writeback_clean=false cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] @@ -236,12 +243,13 @@ size=2097152 [system.cpu.toL2Bus] type=CoherentXBar +children=snoop_filter clk_domain=system.cpu_clk_domain eventq_index=0 forward_latency=0 frontend_latency=1 response_latency=1 -snoop_filter=Null +snoop_filter=system.cpu.toL2Bus.snoop_filter snoop_response_latency=1 system=system use_default_range=false @@ -249,6 +257,13 @@ width=32 master=system.cpu.l2cache.cpu_side slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port +[system.cpu.toL2Bus.snoop_filter] +type=SnoopFilter +eventq_index=0 +lookup_latency=0 +max_capacity=8388608 +system=system + [system.cpu.tracer] type=ExeTracer eventq_index=0 diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout index ac02fa74d..b1c38e57d 100755 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout @@ -3,11 +3,12 @@ Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-tim gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Feb 15 2014 16:30:59 -gem5 started Feb 15 2014 16:31:13 -gem5 executing on ribera.cs.wisc.edu -command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing +gem5 compiled Nov 15 2015 15:16:56 +gem5 started Nov 15 2015 15:17:36 +gem5 executing on ribera.cs.wisc.edu, pid 9893 +command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing + Global frequency set at 1000000000000 ticks per second info: Entering event queue @ 0. Starting simulation... Hello world! -Exiting @ tick 28358000 because target called exit() +Exiting @ tick 30886500 because target called exit() diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt index c28a44ceb..552701faf 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 0.000031 # Nu sim_ticks 30886500 # Number of ticks simulated final_tick 30886500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 150745 # Simulator instruction rate (inst/s) -host_op_rate 272977 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 864611035 # Simulator tick rate (ticks/s) -host_mem_usage 310988 # Number of bytes of host memory used -host_seconds 0.04 # Real time elapsed on the host +host_inst_rate 96344 # Simulator instruction rate (inst/s) +host_op_rate 174473 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 552644692 # Simulator tick rate (ticks/s) +host_mem_usage 305908 # Number of bytes of host memory used +host_seconds 0.06 # Real time elapsed on the host sim_insts 5381 # Number of instructions simulated sim_ops 9748 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts -- cgit v1.2.3