stats: updates due to c0db268f811b

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 1d40a69d95a2bd73208bfa044eac0cdb2fa775b9..3f8bf1cf2807216f2c3240854731ac8ece2f255e 100644 (file)
--- 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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -282,6 +294,9 @@ 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]
@@ -436,7 +451,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

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 761e8d7f0c2ad4d38987f821bb97461b6092990d..4b046f0c22664dc98a7a1ed53ec0dcc00d759e00 100644 (file)
--- 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
@@ -4,15 +4,17 @@ sim_seconds                                  0.000139                       # Nu
 sim_ticks                                      138616                       # Number of ticks simulated
 final_tick                                     138616                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22907                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22905                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 496843                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 174712                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                  14698                       # Simulator instruction rate (inst/s)
+host_op_rate                                    14697                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 318804                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 174728                       # Number of bytes of host memory used
+host_seconds                                     0.43                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

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 055a078bd56467b4b8ea4c1f3963b6a16afb137d..6929a8fb60756667c8d489a99f475319b3de093e 100644 (file)
--- 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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -267,6 +279,9 @@ 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]
@@ -420,7 +435,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

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 3a3645fb47dfab0395ec4c6e2b1256410ee0ae33..a823504ed37057101589b9e5140380963c52171b 100644 (file)
--- 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,15 +4,17 @@ 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                                  22851                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22850                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 420529                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 177976                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                  21881                       # Simulator instruction rate (inst/s)
+host_op_rate                                    21879                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 402676                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 177980                       # Number of bytes of host memory used
+host_seconds                                     0.29                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

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 c839235490401e4c205c789b60f06845abd8da1c..815cf309034a6884873f5f5658b88da3ba89d7fa 100644 (file)
--- 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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -278,6 +290,9 @@ 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]
@@ -433,7 +448,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
index b5c621d62c35e4404e51f90328b548f3f58544b6..3dd68ffbc5f694c44b87dc3c8bb0c3114472343d 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000114                       # Nu
 sim_ticks                                      113627                       # Number of ticks simulated
 final_tick                                     113627                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  33215                       # Simulator instruction rate (inst/s)
-host_op_rate                                    33212                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 590518                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 174836                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  28822                       # Simulator instruction rate (inst/s)
+host_op_rate                                    28819                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 512426                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 175880                       # Number of bytes of host memory used
+host_seconds                                     0.22                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

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 bbaaafb7c53e8b41fdc6ff8e896a5d09f29a2469..539f8d093714164faa3ac4a4adb384b2a646474e 100644 (file)
--- 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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -302,6 +314,9 @@ 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]
@@ -396,7 +411,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
index 7a51fb6d2b0c51e946378b3467dd52d17bb1d9f8..2bb84ee83b878bded07737b2728724bc825b59c9 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000093                       # Nu
 sim_ticks                                       93341                       # Number of ticks simulated
 final_tick                                      93341                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  36927                       # Simulator instruction rate (inst/s)
-host_op_rate                                    36923                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 539288                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 175784                       # Number of bytes of host memory used
-host_seconds                                     0.17                       # Real time elapsed on the host
+host_inst_rate                                  31508                       # Simulator instruction rate (inst/s)
+host_op_rate                                    31505                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 460155                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 175808                       # Number of bytes of host memory used
+host_seconds                                     0.20                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

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 080d250b79c54d061f90b0d32ea53e922d4f18db..13126b600aa23450a0b912ae08d344945dfe0c0e 100644 (file)
--- 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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/linux/hello
+executable=tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -250,6 +262,9 @@ 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]
@@ -344,7 +359,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
index 8955920f6c765fe81f6684293419b9b160c05260..277fa1d2eb9c2bda2802750e14e2ed324d1be5c8 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000144                       # Nu
 sim_ticks                                      143853                       # Number of ticks simulated
 final_tick                                     143853                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  33822                       # Simulator instruction rate (inst/s)
-host_op_rate                                    33819                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 761273                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 174328                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  14935                       # Simulator instruction rate (inst/s)
+host_op_rate                                    14935                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 336198                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 174340                       # Number of bytes of host memory used
+host_seconds                                     0.43                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
index 8168c285ce9536004fd4b8140852fe1475b74024..96554f51dda7e99d22a6ce3b773cbc2ca5024e80 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/tru64/hello
+executable=tests/test-progs/hello/bin/alpha/tru64/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -282,6 +294,9 @@ 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]
@@ -436,7 +451,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
index 32cd3394392d5dce20d1691a22ecf55ef7fc99b3..24dc22b08c71bcf5574f41106c548fe828c90de8 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000053                       # Nu
 sim_ticks                                       52548                       # Number of ticks simulated
 final_tick                                      52548                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  18733                       # Simulator instruction rate (inst/s)
-host_op_rate                                    18730                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 381878                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 173280                       # Number of bytes of host memory used
-host_seconds                                     0.14                       # Real time elapsed on the host
+host_inst_rate                                  15623                       # Simulator instruction rate (inst/s)
+host_op_rate                                    15622                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 318507                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 173288                       # Number of bytes of host memory used
+host_seconds                                     0.17                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 647bb1e23e04738d610ef3b340bce12f2bcd8cc0..5bf00383f40936309935fa6df8d1e082e15945f0 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/tru64/hello
+executable=tests/test-progs/hello/bin/alpha/tru64/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -267,6 +279,9 @@ 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]
@@ -420,7 +435,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 0ccaf16684a78819c9dcc141b4749f56cbb63bb3..9dd7d55148cad21f393bc6e3abd9b0396201ba0e 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000045                       # Nu
 sim_ticks                                       44968                       # Number of ticks simulated
 final_tick                                      44968                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  20165                       # Simulator instruction rate (inst/s)
-host_op_rate                                    20162                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 351768                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 175636                       # Number of bytes of host memory used
-host_seconds                                     0.13                       # Real time elapsed on the host
+host_inst_rate                                  18935                       # Simulator instruction rate (inst/s)
+host_op_rate                                    18932                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 330302                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 175652                       # Number of bytes of host memory used
+host_seconds                                     0.14                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
index 2bf0001daf0f6c8622cf2e569de281b59ae5128a..215d8c7dd4e86619c6718a2619f0d61b86d4f47a 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/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 ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/tru64/hello
+executable=tests/test-progs/hello/bin/alpha/tru64/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -278,6 +290,9 @@ 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]
@@ -433,7 +448,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 40fe0873433869283da96cf07a76cea0761cc060..5c6f736b01c08b66dd05d781e6cdc138c22e697d 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000043                       # Nu
 sim_ticks                                       43073                       # Number of ticks simulated
 final_tick                                      43073                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  26989                       # Simulator instruction rate (inst/s)
-host_op_rate                                    26984                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 450937                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 173396                       # Number of bytes of host memory used
-host_seconds                                     0.10                       # Real time elapsed on the host
+host_inst_rate                                  22164                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22160                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 370326                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 173416                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
index 1829ec00a3cf30bc81275b906dd9148b4198a7cb..80f383f10bd6bdd2938de66099709994dc223f33 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/tru64/hello
+executable=tests/test-progs/hello/bin/alpha/tru64/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -302,6 +314,9 @@ 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]
@@ -396,7 +411,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
index 7c03420298a562fb7b332c11198cc4a0bf25c1db..f07876b7c942909abcc3acf53feba1bff370f4af 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000035                       # Nu
 sim_ticks                                       35432                       # Number of ticks simulated
 final_tick                                      35432                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  26797                       # Simulator instruction rate (inst/s)
-host_op_rate                                    26791                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 368294                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 174352                       # Number of bytes of host memory used
-host_seconds                                     0.10                       # Real time elapsed on the host
+host_inst_rate                                  22204                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22201                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 305145                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 174496                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 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                      

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
index 360da34a5468e54daaf09ed594a52f38b385cd33..06b17a49190b9c8b21603857a089cc6b1c0ccc53 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -108,7 +110,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/alpha/tru64/hello
+executable=tests/test-progs/hello/bin/alpha/tru64/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -131,6 +133,16 @@ 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
@@ -250,6 +262,9 @@ 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]
@@ -344,7 +359,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
index 97736bd696f4eda0b99aaf1a59759e96710995ad..5c88cf46ffeb57efa8512e6be5504939de8d6eef 100644 (file)
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000052                       # Nu
 sim_ticks                                       52498                       # Number of ticks simulated
 final_tick                                      52498                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  23247                       # Simulator instruction rate (inst/s)
-host_op_rate                                    23243                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 473432                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 172892                       # Number of bytes of host memory used
-host_seconds                                     0.11                       # Real time elapsed on the host
+host_inst_rate                                  10658                       # Simulator instruction rate (inst/s)
+host_op_rate                                    10657                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 217095                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 172908                       # Number of bytes of host memory used
+host_seconds                                     0.24                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
index d40656fb37fe5c7383f9c81ec438e325f0a1fb9d..bb822211b006caf20f1fc3a138c29d71729e92c8 100644 (file)
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -18,6 +18,7 @@ eventq_index=0
 init_param=0
 kernel=
 load_addr_mask=1099511627775
+load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
 memories=system.physmem
@@ -42,6 +43,7 @@ voltage_domain=system.voltage_domain
 [system.cpu]
 type=TimingSimpleCPU
 children=clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
 checker=Null
 clk_domain=system.cpu.clk_domain
 cpu_id=0
@@ -110,7 +112,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/dist/test-progs/hello/bin/mips/linux/hello
+executable=tests/test-progs/hello/bin/mips/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -133,6 +135,16 @@ 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
@@ -252,6 +264,9 @@ 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]
@@ -346,7 +361,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
index 12d80d97492c6892e7bb021a77b0d929b815ece7..debae82030a3f929faa2820a09860972e214fa2a 100644 (file)
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000125                       # Nu
 sim_ticks                                      125334                       # Number of ticks simulated
 final_tick                                     125334                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  31744                       # Simulator instruction rate (inst/s)
-host_op_rate                                    31741                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 684175                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 176152                       # Number of bytes of host memory used
+host_inst_rate                                  32356                       # Simulator instruction rate (inst/s)
+host_op_rate                                    32352                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 697352                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 176168                       # Number of bytes of host memory used
 host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        5814                       # Number of instructions simulated
 sim_ops                                          5814                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index d08f49a303675dc98055af0b482d68449ab7487d..ff0dc56e61ddf6c4608110b3c59cfd5c59e29f74 100644 (file)
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -132,6 +132,16 @@ 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
@@ -251,6 +261,9 @@ 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]
@@ -345,7 +358,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index 2370dec638b0783725c226d8b7a475a5b333b6e3..e608505da770a0304820df1c56b737cf9619c44b 100644 (file)
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,15 +4,17 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      107952                       # Number of ticks simulated
 final_tick                                     107952                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  31490                       # Simulator instruction rate (inst/s)
-host_op_rate                                    31486                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 638004                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 182480                       # Number of bytes of host memory used
-host_seconds                                     0.17                       # Real time elapsed on the host
+host_inst_rate                                   1705                       # Simulator instruction rate (inst/s)
+host_op_rate                                     1705                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                  34543                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 182496                       # Number of bytes of host memory used
+host_seconds                                     3.13                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # 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.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message

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 b20ae7d8891a596c4b414963ee9356134aceacc5..b7b16610208cb3ef3ebc863078b73f4518a9416f 100644 (file)
--- 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
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -166,6 +166,16 @@ 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
@@ -286,6 +296,9 @@ using_network_tester=false
 using_ruby_tester=false
 version=0
 master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
+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.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
 
 [system.ruby.memctrl_clk_domain]
@@ -380,7 +393,6 @@ ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
 system=system
-using_network_tester=false
 using_ruby_tester=false
 version=0
 slave=system.system_port

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 8fc84aed478771cc8d3b01da314e8900442c3698..36b84562428cb837a22b5cdd6d8d17e4a59392f1 100644 (file)
--- 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,15 +4,17 @@ sim_seconds                                  0.000122                       # Nu
 sim_ticks                                      121759                       # Number of ticks simulated
 final_tick                                     121759                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  29778                       # Simulator instruction rate (inst/s)
-host_op_rate                                    53940                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 673676                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 193492                       # Number of bytes of host memory used
-host_seconds                                     0.18                       # Real time elapsed on the host
+host_inst_rate                                  27489                       # Simulator instruction rate (inst/s)
+host_op_rate                                    49793                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 621883                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 193512                       # Number of bytes of host memory used
+host_seconds                                     0.20                       # 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
 system.clk_domain.clock                             1                       # Clock period in ticks
+system.piobus.throughput                            0                       # Throughput (bytes/s)
+system.piobus.data_through_bus                      0                       # Total data (bytes)
 system.ruby.clk_domain.clock                        1                       # Clock period in ticks
 system.ruby.delayHist::bucket_size                  1                       # delay histogram for all message
 system.ruby.delayHist::max_bucket                   9                       # delay histogram for all message