stats: update stats for cache occupancy and clock domain changes

4 files changed, 60 insertions, 24 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 454f386da..055a078bd 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -1,7 +1,9 @@
 [root]
 type=Root
 children=system
+eventq_index=0
 full_system=false
+sim_quantum=0
 time_sync_enable=false
 time_sync_period=100000000
 time_sync_spin_threshold=100000
@@ -12,6 +14,7 @@ children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
+eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -33,6 +36,7 @@ system_port=system.sys_port_proxy.slave[0]
 [system.clk_domain]
 type=SrcClockDomain
 clock=1
+eventq_index=0
 voltage_domain=system.voltage_domain
 
 [system.cpu]
@@ -45,6 +49,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
+eventq_index=0
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
@@ -68,24 +73,31 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 [system.cpu.clk_domain]
 type=SrcClockDomain
 clock=1
+eventq_index=0
 voltage_domain=system.voltage_domain
 
 [system.cpu.dtb]
 type=AlphaTLB
+eventq_index=0
 size=64
 
 [system.cpu.interrupts]
 type=AlphaInterrupts
+eventq_index=0
 
 [system.cpu.isa]
 type=AlphaISA
+eventq_index=0
+system=system
 
 [system.cpu.itb]
 type=AlphaTLB
+eventq_index=0
 size=48
 
 [system.cpu.tracer]
 type=ExeTracer
+eventq_index=0
 
 [system.cpu.workload]
 type=LiveProcess
@@ -95,7 +107,8 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/regression/test-progs/hello/bin/alpha/linux/hello
+eventq_index=0
+executable=/dist/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -111,6 +124,7 @@ type=SimpleMemory
 bandwidth=0.000000
 clk_domain=system.clk_domain
 conf_table_reported=true
+eventq_index=0
 in_addr_map=true
 latency=30
 latency_var=0
@@ -119,18 +133,22 @@ range=0:134217727
 
 [system.ruby]
 type=RubySystem
-children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network profiler
+children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
+eventq_index=0
+hot_lines=false
 mem_size=268435456
 no_mem_vec=false
+num_of_sequencers=1
 random_seed=1234
 randomization=false
-stats_filename=ruby.stats
 
 [system.ruby.clk_domain]
 type=SrcClockDomain
 clock=1
+eventq_index=0
 voltage_domain=system.voltage_domain
 
 [system.ruby.dir_cntrl0]
@@ -138,9 +156,10 @@ type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
 clk_domain=system.ruby.clk_domain
-cntrl_id=2
+cluster_id=0
 directory=system.ruby.dir_cntrl0.directory
 directory_latency=6
+eventq_index=0
 memBuffer=system.ruby.dir_cntrl0.memBuffer
 number_of_TBEs=256
 peer=Null
@@ -151,6 +170,7 @@ version=0
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
+eventq_index=0
 map_levels=4
 numa_high_bit=5
 size=268435456
@@ -167,6 +187,7 @@ basic_bus_busy_time=2
 clk_domain=system.ruby.memctrl_clk_domain
 dimm_bit_0=12
 dimms_per_channel=2
+eventq_index=0
 mem_ctl_latency=12
 mem_fixed_delay=0
 mem_random_arbitrate=0
@@ -186,7 +207,8 @@ L1Dcache=system.ruby.l1_cntrl0.L1Dcache
 L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
 clk_domain=system.ruby.clk_domain
-cntrl_id=0
+cluster_id=0
+eventq_index=0
 l2_select_num_bits=0
 number_of_TBEs=256
 peer=Null
@@ -204,6 +226,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
+eventq_index=0
 is_icache=false
 latency=3
 replacement_policy=PSEUDO_LRU
@@ -218,6 +241,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
+eventq_index=0
 is_icache=true
 latency=3
 replacement_policy=PSEUDO_LRU
@@ -233,6 +257,7 @@ access_phys_mem=false
 clk_domain=system.ruby.clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=500000
+eventq_index=0
 icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
@@ -250,7 +275,8 @@ children=L2cache
 L2cache=system.ruby.l2_cntrl0.L2cache
 buffer_size=0
 clk_domain=system.ruby.clk_domain
-cntrl_id=1
+cluster_id=0
+eventq_index=0
 number_of_TBEs=256
 peer=Null
 recycle_latency=10
@@ -265,6 +291,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
+eventq_index=0
 is_icache=false
 latency=15
 replacement_policy=PSEUDO_LRU
@@ -278,6 +305,7 @@ tagArrayBanks=1
 type=DerivedClockDomain
 clk_divider=3
 clk_domain=system.ruby.clk_domain
+eventq_index=0
 
 [system.ruby.network]
 type=SimpleNetwork
@@ -287,6 +315,7 @@ buffer_size=0
 clk_domain=system.ruby.clk_domain
 control_msg_size=8
 endpoint_bandwidth=1000
+eventq_index=0
 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
 number_of_virtual_networks=10
@@ -297,6 +326,7 @@ topology=Crossbar
 [system.ruby.network.ext_links0]
 type=SimpleExtLink
 bandwidth_factor=16
+eventq_index=0
 ext_node=system.ruby.l1_cntrl0
 int_node=system.ruby.network.routers0
 latency=1
@@ -306,6 +336,7 @@ weight=1
 [system.ruby.network.ext_links1]
 type=SimpleExtLink
 bandwidth_factor=16
+eventq_index=0
 ext_node=system.ruby.l2_cntrl0
 int_node=system.ruby.network.routers1
 latency=1
@@ -315,6 +346,7 @@ weight=1
 [system.ruby.network.ext_links2]
 type=SimpleExtLink
 bandwidth_factor=16
+eventq_index=0
 ext_node=system.ruby.dir_cntrl0
 int_node=system.ruby.network.routers2
 latency=1
@@ -324,6 +356,7 @@ weight=1
 [system.ruby.network.int_links0]
 type=SimpleIntLink
 bandwidth_factor=16
+eventq_index=0
 latency=1
 link_id=3
 node_a=system.ruby.network.routers0
@@ -333,6 +366,7 @@ weight=1
 [system.ruby.network.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
+eventq_index=0
 latency=1
 link_id=4
 node_a=system.ruby.network.routers1
@@ -342,6 +376,7 @@ weight=1
 [system.ruby.network.int_links2]
 type=SimpleIntLink
 bandwidth_factor=16
+eventq_index=0
 latency=1
 link_id=5
 node_a=system.ruby.network.routers2
@@ -351,38 +386,36 @@ weight=1
 [system.ruby.network.routers0]
 type=Switch
 clk_domain=system.ruby.clk_domain
+eventq_index=0
 router_id=0
 virt_nets=10
 
 [system.ruby.network.routers1]
 type=Switch
 clk_domain=system.ruby.clk_domain
+eventq_index=0
 router_id=1
 virt_nets=10
 
 [system.ruby.network.routers2]
 type=Switch
 clk_domain=system.ruby.clk_domain
+eventq_index=0
 router_id=2
 virt_nets=10
 
 [system.ruby.network.routers3]
 type=Switch
 clk_domain=system.ruby.clk_domain
+eventq_index=0
 router_id=3
 virt_nets=10
 
-[system.ruby.profiler]
-type=RubyProfiler
-all_instructions=false
-hot_lines=false
-num_of_sequencers=1
-ruby_system=system.ruby
-
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
 clk_domain=system.clk_domain
+eventq_index=0
 ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
@@ -394,5 +427,6 @@ slave=system.system_port
 
 [system.voltage_domain]
 type=VoltageDomain
+eventq_index=0
 voltage=1.000000
 
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
index bbc0c797e..86244d4bf 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
@@ -3,4 +3,3 @@ warn: rounding error > tolerance
 warn: rounding error > tolerance
     0.072760 rounded to 0
 warn: Sockets disabled, not accepting gdb connections
-hack: be nice to actually delete the event here
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
index 7aebf91e4..e44640397 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
-Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 22 2013 05:36:12
-gem5 started Sep 22 2013 05:36:34
-gem5 executing on zizzer
+gem5 compiled Jan 22 2014 16:42:56
+gem5 started Jan 22 2014 17:26:22
+gem5 executing on u200540-lin
 command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_CMP_directory
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 6769cc2eb..97b9e8b98 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,13 +4,16 @@ sim_seconds                                  0.000118                       # Nu
 sim_ticks                                      117611                       # Number of ticks simulated
 final_tick                                     117611                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  18637                       # Simulator instruction rate (inst/s)
-host_op_rate                                    18636                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 342978                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 174220                       # Number of bytes of host memory used
-host_seconds                                     0.34                       # Real time elapsed on the host
+host_inst_rate                                  23182                       # Simulator instruction rate (inst/s)
+host_op_rate                                    23181                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 426626                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 130676                       # Number of bytes of host memory used
+host_seconds                                     0.28                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
+system.voltage_domain.voltage                       1                       # Voltage in Volts
+system.clk_domain.clock                             1                       # Clock period in ticks
+system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.outstanding_req_hist::bucket_size            1                      
 system.ruby.outstanding_req_hist::max_bucket            9                      
 system.ruby.outstanding_req_hist::samples         8449                      
@@ -82,6 +85,7 @@ system.ruby.network.routers1.msg_bytes.Writeback_Control::0        21664
 system.ruby.network.routers1.msg_bytes.Writeback_Control::1        17488                      
 system.ruby.network.routers1.msg_bytes.Writeback_Control::2         7192                      
 system.ruby.network.routers1.msg_bytes.Unblock_Control::2        19768                      
+system.ruby.memctrl_clk_domain.clock                3                       # Clock period in ticks
 system.ruby.dir_cntrl0.memBuffer.memReq          1303                       # Total number of memory requests
 system.ruby.dir_cntrl0.memBuffer.memRead         1109                       # Number of memory reads
 system.ruby.dir_cntrl0.memBuffer.memWrite          194                       # Number of memory writes
@@ -139,6 +143,7 @@ system.ruby.network.msg_byte.ResponseL2hit_Data        54648
 system.ruby.network.msg_byte.Writeback_Data       334368                      
 system.ruby.network.msg_byte.Writeback_Control       139032                      
 system.ruby.network.msg_byte.Unblock_Control        59304                      
+system.cpu.clk_domain.clock                         1                       # Clock period in ticks
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv