stats: changes due to o3 cpu and ruby message buffer patches

7 files changed, 24 insertions, 80 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
index 33f9c5fe9..489f9221e 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
@@ -569,7 +569,6 @@ system.cpu.timesIdled                             272                       # Nu
 system.cpu.idleCycles                           27051                       # Total number of cycles that the CPU has spent unscheduled due to idling
 system.cpu.committedInsts                        6372                       # Number of Instructions Simulated
 system.cpu.committedOps                          6372                       # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total                  6372                       # Number of Instructions Simulated
 system.cpu.cpi                               6.599341                       # CPI: Cycles Per Instruction
 system.cpu.cpi_total                         6.599341                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.151530                       # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
index 3f8bf1cf2..27b1ed20b 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -133,16 +134,6 @@ latency_var=0
 null=true
 range=0:134217727
 
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -294,9 +285,6 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
 slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.ruby.l2_cntrl0]
@@ -349,6 +337,7 @@ 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
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
index 351b1338b..088293227 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -17,9 +17,9 @@ system.ruby.clk_domain.clock                        1                       # Cl
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message
 system.ruby.delayHist::samples                   9645                       # delay histogram for all message
-system.ruby.delayHist::mean                  0.060135                       # delay histogram for all message
-system.ruby.delayHist::stdev                 0.486773                       # delay histogram for all message
-system.ruby.delayHist                    |        9500     98.50%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |         145      1.50%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for all message
+system.ruby.delayHist::mean                  0.120270                       # delay histogram for all message
+system.ruby.delayHist::stdev                 0.973545                       # delay histogram for all message
+system.ruby.delayHist                    |        9500     98.50%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |           0      0.00%     98.50% |         145      1.50%    100.00% |           0      0.00%    100.00% # delay histogram for all message
 system.ruby.delayHist::total                     9645                       # delay histogram for all message
 system.ruby.outstanding_req_hist::bucket_size            1                      
 system.ruby.outstanding_req_hist::max_bucket            9                      
@@ -333,9 +333,9 @@ system.ruby.network.routers3.throttle2.msg_bytes.Response_Control::1         940
 system.ruby.delayVCHist.vnet_0::bucket_size            1                       # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_0::max_bucket            9                       # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_0::samples          2725                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean         0.212844                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev        0.897981                       # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0           |        2580     94.68%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |         145      5.32%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% |           0      0.00%    100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean         0.425688                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev        1.795962                       # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0           |        2580     94.68%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |           0      0.00%     94.68% |         145      5.32%    100.00% |           0      0.00%    100.00% # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_0::total            2725                       # delay histogram for vnet_0
 system.ruby.delayVCHist.vnet_1::bucket_size            1                       # delay histogram for vnet_1
 system.ruby.delayVCHist.vnet_1::max_bucket            9                       # delay histogram for vnet_1
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 6929a8fb6..2cd590f14 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
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -133,16 +134,6 @@ latency_var=0
 null=true
 range=0:134217727
 
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -279,9 +270,6 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
 slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.ruby.l2_cntrl0]
@@ -333,6 +321,7 @@ 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
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 815cf3090..e94a21fc3 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
 null=true
 range=0:134217727
 
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -290,9 +281,6 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
 slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.ruby.l2_cntrl0]
@@ -346,6 +334,7 @@ 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
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index 539f8d093..39febcadf 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
 null=true
 range=0:134217727
 
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -314,9 +305,6 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
 slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.ruby.memctrl_clk_domain]
@@ -336,6 +324,7 @@ endpoint_bandwidth=1000
 eventq_index=0
 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
 ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
index 13126b600..a2d0a5bf8 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
 profile=0
 progress_interval=0
 simpoint_start_insts=
+socket_id=0
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
 null=true
 range=0:134217727
 
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -262,9 +253,6 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
 slave=system.cpu.icache_port system.cpu.dcache_port
 
 [system.ruby.memctrl_clk_domain]
@@ -284,6 +272,7 @@ endpoint_bandwidth=1000
 eventq_index=0
 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
 number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
 ruby_system=system.ruby