diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:52 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:52 -0500 |
| commit | fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a (patch) | |
| tree | ec6cf719a27b279e250d9201c6af5143df649003 /tests/quick/se/00.hello | |
| parent | 2cbe7c705be1cce44c5581fa58569cd95cc0f62d (diff) | |
| download | gem5-fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a.tar.xz | |
stats: updates due to recent ruby and x86 changes
Also updates many out of date config files.
Diffstat (limited to 'tests/quick/se/00.hello')
50 files changed, 992 insertions, 182 deletions
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini index 38d5b70ef..24e61bda7 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/inorder-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -78,6 +82,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 stageTracing=false stageWidth=4 switched_out=false @@ -253,7 +258,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/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 @@ -267,9 +272,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -282,9 +297,9 @@ master=system.physmem.port slave=system.system_port system.cpu.l2cache.mem_side [system.physmem] -type=SimpleDRAM +type=DRAMCtrl activation_limit=4 -addr_mapping=RaBaChCo +addr_mapping=RoRaBaChCo banks_per_rank=8 burst_length=8 channels=1 @@ -295,27 +310,33 @@ device_rowbuffer_size=1024 devices_per_rank=8 eventq_index=0 in_addr_map=true +max_accesses_per_row=16 mem_sched_policy=frfcfs +min_writes_per_switch=16 null=false -page_policy=open +page_policy=open_adaptive range=0:134217727 ranks_per_channel=2 read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 -write_buffer_size=32 -write_high_thresh_perc=70 -write_low_thresh_perc=0 +tXAW=30000 +write_buffer_size=64 +write_high_thresh_perc=85 +write_low_thresh_perc=50 port=system.membus.master[0] [system.voltage_domain] diff --git a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini index 13c1420d9..ad6cd6709 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -96,6 +99,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -169,6 +173,7 @@ funcUnits=system.cpu.executeFuncUnits.funcUnits0 system.cpu.executeFuncUnits.fun [system.cpu.executeFuncUnits.funcUnits0] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits0.opClasses @@ -208,6 +213,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits1] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits1.opClasses @@ -247,6 +253,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits2] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits2.opClasses @@ -286,6 +293,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits3] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=9 opClasses=system.cpu.executeFuncUnits.funcUnits3.opClasses @@ -306,6 +314,7 @@ opClass=IntDiv [system.cpu.executeFuncUnits.funcUnits4] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits4.opClasses @@ -470,6 +479,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits5] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits5.opClasses @@ -514,6 +524,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits6] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits6.opClasses @@ -644,7 +655,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/arm/projectscratch/pd/sysrandd/dist/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 @@ -658,9 +669,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -697,15 +718,19 @@ read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 +tXAW=30000 write_buffer_size=64 write_high_thresh_perc=85 write_low_thresh_perc=50 diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini index 4f260b234..48d1fef73 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -601,7 +604,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/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 @@ -615,9 +618,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini index 06ea19107..e3af4adf8 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=atomic mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=dtb interrupts isa itb tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -69,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -109,7 +115,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/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 @@ -123,9 +129,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain 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 27b1ed20b..1a2ad4916 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -111,7 +116,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 @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -171,6 +186,9 @@ ruby_system=system.ruby to_mem_ctrl_latency=1 transitions_per_cycle=4 version=0 +requestToDir=system.ruby.network.master[5] +responseFromDir=system.ruby.network.slave[6] +responseToDir=system.ruby.network.master[6] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -210,7 +228,7 @@ children=L1Dcache L1Icache prefetcher sequencer L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 enable_prefetch=false eventq_index=0 @@ -227,6 +245,11 @@ sequencer=system.ruby.l1_cntrl0.sequencer to_l2_latency=1 transitions_per_cycle=4 version=0 +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] +unblockFromL1Cache=system.ruby.network.slave[2] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -272,7 +295,7 @@ unit_filter=8 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -304,6 +327,12 @@ ruby_system=system.ruby to_l1_latency=1 transitions_per_cycle=4 version=0 +DirRequestFromL2Cache=system.ruby.network.slave[3] +L1RequestFromL2Cache=system.ruby.network.slave[4] +L1RequestToL2Cache=system.ruby.network.master[3] +responseFromL2Cache=system.ruby.network.slave[5] +responseToL2Cache=system.ruby.network.master[4] +unblockToL2Cache=system.ruby.network.master[2] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -342,6 +371,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l2_cntrl0.unblockToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.unblockFromL1Cache system.ruby.l2_cntrl0.DirRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink 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 088293227..372180bd6 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 @@ -68,7 +68,7 @@ system.ruby.l1_cntrl0.prefetcher.pages_crossed 0 system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks 0 # number of misses for blocks that were prefetched, yet missed system.ruby.network.routers0.percent_links_utilized 3.776801 system.ruby.network.routers0.msg_count.Control::0 1490 -system.ruby.network.routers0.msg_count.Request_Control::0 1041 +system.ruby.network.routers0.msg_count.Request_Control::2 1041 system.ruby.network.routers0.msg_count.Response_Data::1 1490 system.ruby.network.routers0.msg_count.Response_Control::1 1336 system.ruby.network.routers0.msg_count.Response_Control::2 799 @@ -76,7 +76,7 @@ system.ruby.network.routers0.msg_count.Writeback_Data::0 145 system.ruby.network.routers0.msg_count.Writeback_Data::1 141 system.ruby.network.routers0.msg_count.Writeback_Control::0 291 system.ruby.network.routers0.msg_bytes.Control::0 11920 -system.ruby.network.routers0.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers0.msg_bytes.Request_Control::2 8328 system.ruby.network.routers0.msg_bytes.Response_Data::1 107280 system.ruby.network.routers0.msg_bytes.Response_Control::1 10688 system.ruby.network.routers0.msg_bytes.Response_Control::2 6392 @@ -88,7 +88,7 @@ system.ruby.l2_cntrl0.L2cache.demand_misses 1460 # system.ruby.l2_cntrl0.L2cache.demand_accesses 1490 # Number of cache demand accesses system.ruby.network.routers1.percent_links_utilized 7.333389 system.ruby.network.routers1.msg_count.Control::0 2950 -system.ruby.network.routers1.msg_count.Request_Control::0 1041 +system.ruby.network.routers1.msg_count.Request_Control::2 1041 system.ruby.network.routers1.msg_count.Response_Data::1 3227 system.ruby.network.routers1.msg_count.Response_Control::1 3963 system.ruby.network.routers1.msg_count.Response_Control::2 799 @@ -96,7 +96,7 @@ system.ruby.network.routers1.msg_count.Writeback_Data::0 145 system.ruby.network.routers1.msg_count.Writeback_Data::1 141 system.ruby.network.routers1.msg_count.Writeback_Control::0 291 system.ruby.network.routers1.msg_bytes.Control::0 23600 -system.ruby.network.routers1.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers1.msg_bytes.Request_Control::2 8328 system.ruby.network.routers1.msg_bytes.Response_Data::1 232344 system.ruby.network.routers1.msg_bytes.Response_Control::1 31704 system.ruby.network.routers1.msg_bytes.Response_Control::2 6392 @@ -126,7 +126,7 @@ system.ruby.network.routers2.msg_bytes.Response_Data::1 125064 system.ruby.network.routers2.msg_bytes.Response_Control::1 21016 system.ruby.network.routers3.percent_links_utilized 4.888926 system.ruby.network.routers3.msg_count.Control::0 2950 -system.ruby.network.routers3.msg_count.Request_Control::0 1041 +system.ruby.network.routers3.msg_count.Request_Control::2 1041 system.ruby.network.routers3.msg_count.Response_Data::1 3227 system.ruby.network.routers3.msg_count.Response_Control::1 3963 system.ruby.network.routers3.msg_count.Response_Control::2 799 @@ -134,7 +134,7 @@ system.ruby.network.routers3.msg_count.Writeback_Data::0 145 system.ruby.network.routers3.msg_count.Writeback_Data::1 141 system.ruby.network.routers3.msg_count.Writeback_Control::0 291 system.ruby.network.routers3.msg_bytes.Control::0 23600 -system.ruby.network.routers3.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers3.msg_bytes.Request_Control::2 8328 system.ruby.network.routers3.msg_bytes.Response_Data::1 232344 system.ruby.network.routers3.msg_bytes.Response_Control::1 31704 system.ruby.network.routers3.msg_bytes.Response_Control::2 6392 @@ -246,10 +246,10 @@ system.cpu.op_class::IprAccess 0 0.00% 100.00% # Cl system.cpu.op_class::InstPrefetch 0 0.00% 100.00% # Class of executed instruction system.cpu.op_class::total 6400 # Class of executed instruction system.ruby.network.routers0.throttle0.link_utilization 5.369871 -system.ruby.network.routers0.throttle0.msg_count.Request_Control::0 1041 +system.ruby.network.routers0.throttle0.msg_count.Request_Control::2 1041 system.ruby.network.routers0.throttle0.msg_count.Response_Data::1 1490 system.ruby.network.routers0.throttle0.msg_count.Response_Control::1 436 -system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::2 8328 system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::1 107280 system.ruby.network.routers0.throttle0.msg_bytes.Response_Control::1 3488 system.ruby.network.routers0.throttle1.link_utilization 2.183731 @@ -282,11 +282,11 @@ system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Data::1 10152 system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Control::0 2328 system.ruby.network.routers1.throttle1.link_utilization 7.219585 system.ruby.network.routers1.throttle1.msg_count.Control::0 1460 -system.ruby.network.routers1.throttle1.msg_count.Request_Control::0 1041 +system.ruby.network.routers1.throttle1.msg_count.Request_Control::2 1041 system.ruby.network.routers1.throttle1.msg_count.Response_Data::1 1767 system.ruby.network.routers1.throttle1.msg_count.Response_Control::1 1611 system.ruby.network.routers1.throttle1.msg_bytes.Control::0 11680 -system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::2 8328 system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::1 127224 system.ruby.network.routers1.throttle1.msg_bytes.Response_Control::1 12888 system.ruby.network.routers2.throttle0.link_utilization 1.849714 @@ -302,10 +302,10 @@ system.ruby.network.routers2.throttle1.msg_count.Response_Control::1 145 system.ruby.network.routers2.throttle1.msg_bytes.Response_Data::1 105120 system.ruby.network.routers2.throttle1.msg_bytes.Response_Control::1 11616 system.ruby.network.routers3.throttle0.link_utilization 5.369871 -system.ruby.network.routers3.throttle0.msg_count.Request_Control::0 1041 +system.ruby.network.routers3.throttle0.msg_count.Request_Control::2 1041 system.ruby.network.routers3.throttle0.msg_count.Response_Data::1 1490 system.ruby.network.routers3.throttle0.msg_count.Response_Control::1 436 -system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::0 8328 +system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::2 8328 system.ruby.network.routers3.throttle0.msg_bytes.Response_Data::1 107280 system.ruby.network.routers3.throttle0.msg_bytes.Response_Control::1 3488 system.ruby.network.routers3.throttle1.link_utilization 7.447192 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 2cd590f14..850afe8f9 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -111,7 +116,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 @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -170,6 +185,10 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +forwardFromDir=system.ruby.network.slave[6] +requestToDir=system.ruby.network.master[5] +responseFromDir=system.ruby.network.slave[5] +responseToDir=system.ruby.network.master[6] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -209,7 +228,7 @@ children=L1Dcache L1Icache sequencer L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 l2_select_num_bits=0 @@ -223,6 +242,10 @@ sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 use_timeout_latency=50 version=0 +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -257,7 +280,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -288,6 +311,12 @@ response_latency=2 ruby_system=system.ruby transitions_per_cycle=4 version=0 +GlobalRequestFromL2Cache=system.ruby.network.slave[2] +GlobalRequestToL2Cache=system.ruby.network.master[2] +L1RequestFromL2Cache=system.ruby.network.slave[3] +L1RequestToL2Cache=system.ruby.network.master[3] +responseFromL2Cache=system.ruby.network.slave[4] +responseToL2Cache=system.ruby.network.master[4] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -326,6 +355,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l2_cntrl0.GlobalRequestToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l2_cntrl0.GlobalRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink 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 e94a21fc3..f2c71623d 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -174,6 +189,14 @@ reissue_wakeup_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[10] +dmaResponseFromDir=system.ruby.network.slave[9] +persistentFromDir=system.ruby.network.slave[8] +persistentToDir=system.ruby.network.master[9] +requestFromDir=system.ruby.network.slave[6] +requestToDir=system.ruby.network.master[7] +responseFromDir=system.ruby.network.slave[7] +responseToDir=system.ruby.network.master[8] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -214,7 +237,7 @@ L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache N_tokens=2 buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 dynamic_timeout_enabled=true eventq_index=0 @@ -234,6 +257,12 @@ sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 use_timeout_latency=50 version=0 +persistentFromL1Cache=system.ruby.network.slave[2] +persistentToL1Cache=system.ruby.network.master[2] +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -268,7 +297,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -301,6 +330,13 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +GlobalRequestFromL2Cache=system.ruby.network.slave[3] +GlobalRequestToL2Cache=system.ruby.network.master[3] +L1RequestFromL2Cache=system.ruby.network.slave[4] +L1RequestToL2Cache=system.ruby.network.master[4] +persistentToL2Cache=system.ruby.network.master[6] +responseFromL2Cache=system.ruby.network.slave[5] +responseToL2Cache=system.ruby.network.master[5] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -339,6 +375,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l1_cntrl0.persistentToL1Cache system.ruby.l2_cntrl0.GlobalRequestToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.l2_cntrl0.persistentToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir system.ruby.dir_cntrl0.persistentToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.persistentFromL1Cache system.ruby.l2_cntrl0.GlobalRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.requestFromDir system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.persistentFromDir system.ruby.dir_cntrl0.dmaResponseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink 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 39febcadf..07e8d6849 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -173,6 +188,13 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[5] +dmaResponseFromDir=system.ruby.network.slave[5] +forwardFromDir=system.ruby.network.slave[3] +requestToDir=system.ruby.network.master[4] +responseFromDir=system.ruby.network.slave[4] +responseToDir=system.ruby.network.master[3] +unblockToDir=system.ruby.network.master[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -229,7 +251,7 @@ L1Icache=system.ruby.l1_cntrl0.L1Icache L2cache=system.ruby.l1_cntrl0.L2cache buffer_size=0 cache_response_latency=10 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -243,6 +265,11 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] +unblockFromCache=system.ruby.network.slave[2] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -292,7 +319,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -329,6 +356,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.unblockToDir system.ruby.dir_cntrl0.responseToDir system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.l1_cntrl0.unblockFromCache system.ruby.dir_cntrl0.forwardFromDir system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink 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 a2d0a5bf8..253b90903 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -170,6 +185,11 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[3] +dmaResponseFromDir=system.ruby.network.slave[3] +forwardFromDir=system.ruby.network.slave[4] +requestToDir=system.ruby.network.master[2] +responseFromDir=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -209,7 +229,7 @@ children=cacheMemory sequencer buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -221,6 +241,10 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.cacheMemory] type=RubyCache @@ -240,7 +264,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 eventq_index=0 @@ -277,6 +301,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini index b0e615a7c..0eb5daf95 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -63,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -218,7 +224,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/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 @@ -232,9 +238,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini index 45336acc0..a68327a1f 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -96,6 +99,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -169,6 +173,7 @@ funcUnits=system.cpu.executeFuncUnits.funcUnits0 system.cpu.executeFuncUnits.fun [system.cpu.executeFuncUnits.funcUnits0] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits0.opClasses @@ -208,6 +213,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits1] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits1.opClasses @@ -247,6 +253,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits2] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits2.opClasses @@ -286,6 +293,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits3] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=9 opClasses=system.cpu.executeFuncUnits.funcUnits3.opClasses @@ -306,6 +314,7 @@ opClass=IntDiv [system.cpu.executeFuncUnits.funcUnits4] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits4.opClasses @@ -470,6 +479,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits5] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits5.opClasses @@ -514,6 +524,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits6] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits6.opClasses @@ -644,7 +655,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/arm/projectscratch/pd/sysrandd/dist/test-progs/hello/bin/alpha/tru64/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -658,9 +669,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -697,15 +718,19 @@ read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 +tXAW=30000 write_buffer_size=64 write_high_thresh_perc=85 write_low_thresh_perc=50 diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr index 32998f270..0b3033cd9 100644..100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr @@ -1,2 +1,2 @@ warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini index a04bfcdcc..fb08ec46d 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini @@ -17,6 +17,7 @@ clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -603,7 +604,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/alpha/tru64/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini index aca9f495e..79159fdc0 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=atomic mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=dtb interrupts isa itb tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -69,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -109,7 +115,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/alpha/tru64/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -123,9 +129,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simerr index 32998f270..0b3033cd9 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simerr @@ -1,2 +1,2 @@ warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) 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 1f5f9ed94..00c794fb7 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -171,6 +186,9 @@ ruby_system=system.ruby to_mem_ctrl_latency=1 transitions_per_cycle=4 version=0 +requestToDir=system.ruby.network.master[5] +responseFromDir=system.ruby.network.slave[6] +responseToDir=system.ruby.network.master[6] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -210,7 +228,7 @@ children=L1Dcache L1Icache prefetcher sequencer L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 enable_prefetch=false eventq_index=0 @@ -227,6 +245,11 @@ sequencer=system.ruby.l1_cntrl0.sequencer to_l2_latency=1 transitions_per_cycle=4 version=0 +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] +unblockFromL1Cache=system.ruby.network.slave[2] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -272,7 +295,7 @@ unit_filter=8 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -304,6 +327,12 @@ ruby_system=system.ruby to_l1_latency=1 transitions_per_cycle=4 version=0 +DirRequestFromL2Cache=system.ruby.network.slave[3] +L1RequestFromL2Cache=system.ruby.network.slave[4] +L1RequestToL2Cache=system.ruby.network.master[3] +responseFromL2Cache=system.ruby.network.slave[5] +responseToL2Cache=system.ruby.network.master[4] +unblockToL2Cache=system.ruby.network.master[2] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -342,6 +371,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l2_cntrl0.unblockToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.unblockFromL1Cache system.ruby.l2_cntrl0.DirRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr index a30a2a95c..a26365a1c 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr @@ -3,4 +3,4 @@ warn: rounding error > tolerance warn: rounding error > tolerance 0.072760 rounded to 0 warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) 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 a58d5939b..8e4167e07 100644 --- 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,11 +4,11 @@ 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 36298 # Simulator instruction rate (inst/s) -host_op_rate 36291 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 739863 # Simulator tick rate (ticks/s) -host_mem_usage 159844 # Number of bytes of host memory used -host_seconds 0.07 # Real time elapsed on the host +host_inst_rate 17447 # Simulator instruction rate (inst/s) +host_op_rate 17445 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 355681 # Simulator tick rate (ticks/s) +host_mem_usage 176684 # Number of bytes of host memory used +host_seconds 0.15 # 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 @@ -57,6 +57,7 @@ system.ruby.l1_cntrl0.L1Dcache.demand_accesses 709 system.ruby.l1_cntrl0.L1Icache.demand_hits 2285 # Number of cache demand hits system.ruby.l1_cntrl0.L1Icache.demand_misses 300 # Number of cache demand misses system.ruby.l1_cntrl0.L1Icache.demand_accesses 2585 # Number of cache demand accesses +system.cpu.clk_domain.clock 1 # Clock period in ticks system.ruby.l1_cntrl0.prefetcher.miss_observed 0 # number of misses observed system.ruby.l1_cntrl0.prefetcher.allocated_streams 0 # number of streams allocated for prefetching system.ruby.l1_cntrl0.prefetcher.prefetches_requested 0 # number of prefetch requests made @@ -68,7 +69,7 @@ system.ruby.l1_cntrl0.prefetcher.pages_crossed 0 system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks 0 # number of misses for blocks that were prefetched, yet missed system.ruby.network.routers0.percent_links_utilized 3.786062 system.ruby.network.routers0.msg_count.Control::0 572 -system.ruby.network.routers0.msg_count.Request_Control::0 431 +system.ruby.network.routers0.msg_count.Request_Control::2 431 system.ruby.network.routers0.msg_count.Response_Data::1 572 system.ruby.network.routers0.msg_count.Response_Control::1 493 system.ruby.network.routers0.msg_count.Response_Control::2 272 @@ -76,7 +77,7 @@ system.ruby.network.routers0.msg_count.Writeback_Data::0 45 system.ruby.network.routers0.msg_count.Writeback_Data::1 62 system.ruby.network.routers0.msg_count.Writeback_Control::0 79 system.ruby.network.routers0.msg_bytes.Control::0 4576 -system.ruby.network.routers0.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers0.msg_bytes.Request_Control::2 3448 system.ruby.network.routers0.msg_bytes.Response_Data::1 41184 system.ruby.network.routers0.msg_bytes.Response_Control::1 3944 system.ruby.network.routers0.msg_bytes.Response_Control::2 2176 @@ -88,7 +89,7 @@ system.ruby.l2_cntrl0.L2cache.demand_misses 547 # system.ruby.l2_cntrl0.L2cache.demand_accesses 572 # Number of cache demand accesses system.ruby.network.routers1.percent_links_utilized 7.293332 system.ruby.network.routers1.msg_count.Control::0 1119 -system.ruby.network.routers1.msg_count.Request_Control::0 431 +system.ruby.network.routers1.msg_count.Request_Control::2 431 system.ruby.network.routers1.msg_count.Response_Data::1 1222 system.ruby.network.routers1.msg_count.Response_Control::1 1468 system.ruby.network.routers1.msg_count.Response_Control::2 272 @@ -96,7 +97,7 @@ system.ruby.network.routers1.msg_count.Writeback_Data::0 45 system.ruby.network.routers1.msg_count.Writeback_Data::1 62 system.ruby.network.routers1.msg_count.Writeback_Control::0 79 system.ruby.network.routers1.msg_bytes.Control::0 8952 -system.ruby.network.routers1.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers1.msg_bytes.Request_Control::2 3448 system.ruby.network.routers1.msg_bytes.Response_Data::1 87984 system.ruby.network.routers1.msg_bytes.Response_Control::1 11744 system.ruby.network.routers1.msg_bytes.Response_Control::2 2176 @@ -125,7 +126,7 @@ system.ruby.network.routers2.msg_bytes.Response_Data::1 46800 system.ruby.network.routers2.msg_bytes.Response_Control::1 7800 system.ruby.network.routers3.percent_links_utilized 4.862221 system.ruby.network.routers3.msg_count.Control::0 1119 -system.ruby.network.routers3.msg_count.Request_Control::0 431 +system.ruby.network.routers3.msg_count.Request_Control::2 431 system.ruby.network.routers3.msg_count.Response_Data::1 1222 system.ruby.network.routers3.msg_count.Response_Control::1 1468 system.ruby.network.routers3.msg_count.Response_Control::2 272 @@ -133,7 +134,7 @@ system.ruby.network.routers3.msg_count.Writeback_Data::0 45 system.ruby.network.routers3.msg_count.Writeback_Data::1 62 system.ruby.network.routers3.msg_count.Writeback_Control::0 79 system.ruby.network.routers3.msg_bytes.Control::0 8952 -system.ruby.network.routers3.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers3.msg_bytes.Request_Control::2 3448 system.ruby.network.routers3.msg_bytes.Response_Data::1 87984 system.ruby.network.routers3.msg_bytes.Response_Control::1 11744 system.ruby.network.routers3.msg_bytes.Response_Control::2 2176 @@ -152,7 +153,6 @@ system.ruby.network.msg_byte.Response_Data 263952 system.ruby.network.msg_byte.Response_Control 41760 system.ruby.network.msg_byte.Writeback_Data 23112 system.ruby.network.msg_byte.Writeback_Control 1896 -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 @@ -245,10 +245,10 @@ system.cpu.op_class::IprAccess 0 0.00% 100.00% # Cl system.cpu.op_class::InstPrefetch 0 0.00% 100.00% # Class of executed instruction system.cpu.op_class::total 2585 # Class of executed instruction system.ruby.network.routers0.throttle0.link_utilization 5.426467 -system.ruby.network.routers0.throttle0.msg_count.Request_Control::0 431 +system.ruby.network.routers0.throttle0.msg_count.Request_Control::2 431 system.ruby.network.routers0.throttle0.msg_count.Response_Data::1 572 system.ruby.network.routers0.throttle0.msg_count.Response_Control::1 124 -system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::2 3448 system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::1 41184 system.ruby.network.routers0.throttle0.msg_bytes.Response_Control::1 992 system.ruby.network.routers0.throttle1.link_utilization 2.145657 @@ -281,11 +281,11 @@ system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Data::1 4464 system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Control::0 632 system.ruby.network.routers1.throttle1.link_utilization 7.243853 system.ruby.network.routers1.throttle1.msg_count.Control::0 547 -system.ruby.network.routers1.throttle1.msg_count.Request_Control::0 431 +system.ruby.network.routers1.throttle1.msg_count.Request_Control::2 431 system.ruby.network.routers1.throttle1.msg_count.Response_Data::1 675 system.ruby.network.routers1.throttle1.msg_count.Response_Control::1 560 system.ruby.network.routers1.throttle1.msg_bytes.Control::0 4376 -system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::2 3448 system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::1 48600 system.ruby.network.routers1.throttle1.msg_bytes.Response_Control::1 4480 system.ruby.network.routers2.throttle0.link_utilization 1.817386 @@ -301,10 +301,10 @@ system.ruby.network.routers2.throttle1.msg_count.Response_Control::1 53 system.ruby.network.routers2.throttle1.msg_bytes.Response_Data::1 39384 system.ruby.network.routers2.throttle1.msg_bytes.Response_Control::1 4312 system.ruby.network.routers3.throttle0.link_utilization 5.426467 -system.ruby.network.routers3.throttle0.msg_count.Request_Control::0 431 +system.ruby.network.routers3.throttle0.msg_count.Request_Control::2 431 system.ruby.network.routers3.throttle0.msg_count.Response_Data::1 572 system.ruby.network.routers3.throttle0.msg_count.Response_Control::1 124 -system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::0 3448 +system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::2 3448 system.ruby.network.routers3.throttle0.msg_bytes.Response_Data::1 41184 system.ruby.network.routers3.throttle0.msg_bytes.Response_Control::1 992 system.ruby.network.routers3.throttle1.link_utilization 7.342810 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 b2a981b16..46d0fbb12 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -170,6 +185,10 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +forwardFromDir=system.ruby.network.slave[6] +requestToDir=system.ruby.network.master[5] +responseFromDir=system.ruby.network.slave[5] +responseToDir=system.ruby.network.master[6] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -209,7 +228,7 @@ children=L1Dcache L1Icache sequencer L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 l2_select_num_bits=0 @@ -223,6 +242,10 @@ sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 use_timeout_latency=50 version=0 +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -257,7 +280,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -288,6 +311,12 @@ response_latency=2 ruby_system=system.ruby transitions_per_cycle=4 version=0 +GlobalRequestFromL2Cache=system.ruby.network.slave[2] +GlobalRequestToL2Cache=system.ruby.network.master[2] +L1RequestFromL2Cache=system.ruby.network.slave[3] +L1RequestToL2Cache=system.ruby.network.master[3] +responseFromL2Cache=system.ruby.network.slave[4] +responseToL2Cache=system.ruby.network.master[4] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -326,6 +355,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l2_cntrl0.GlobalRequestToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l2_cntrl0.GlobalRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr index a30a2a95c..a26365a1c 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr @@ -3,4 +3,4 @@ warn: rounding error > tolerance warn: rounding error > tolerance 0.072760 rounded to 0 warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) 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 40b91a3e0..be173178b 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -174,6 +189,14 @@ reissue_wakeup_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[10] +dmaResponseFromDir=system.ruby.network.slave[9] +persistentFromDir=system.ruby.network.slave[8] +persistentToDir=system.ruby.network.master[9] +requestFromDir=system.ruby.network.slave[6] +requestToDir=system.ruby.network.master[7] +responseFromDir=system.ruby.network.slave[7] +responseToDir=system.ruby.network.master[8] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -214,7 +237,7 @@ L1Dcache=system.ruby.l1_cntrl0.L1Dcache L1Icache=system.ruby.l1_cntrl0.L1Icache N_tokens=2 buffer_size=0 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 dynamic_timeout_enabled=true eventq_index=0 @@ -234,6 +257,12 @@ sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 use_timeout_latency=50 version=0 +persistentFromL1Cache=system.ruby.network.slave[2] +persistentToL1Cache=system.ruby.network.master[2] +requestFromL1Cache=system.ruby.network.slave[0] +requestToL1Cache=system.ruby.network.master[0] +responseFromL1Cache=system.ruby.network.slave[1] +responseToL1Cache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -268,7 +297,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -301,6 +330,13 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +GlobalRequestFromL2Cache=system.ruby.network.slave[3] +GlobalRequestToL2Cache=system.ruby.network.master[3] +L1RequestFromL2Cache=system.ruby.network.slave[4] +L1RequestToL2Cache=system.ruby.network.master[4] +persistentToL2Cache=system.ruby.network.master[6] +responseFromL2Cache=system.ruby.network.slave[5] +responseToL2Cache=system.ruby.network.master[5] [system.ruby.l2_cntrl0.L2cache] type=RubyCache @@ -339,6 +375,8 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l1_cntrl0.persistentToL1Cache system.ruby.l2_cntrl0.GlobalRequestToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.l2_cntrl0.persistentToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir system.ruby.dir_cntrl0.persistentToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.persistentFromL1Cache system.ruby.l2_cntrl0.GlobalRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.requestFromDir system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.persistentFromDir system.ruby.dir_cntrl0.dmaResponseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr index a30a2a95c..a26365a1c 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr @@ -3,4 +3,4 @@ warn: rounding error > tolerance warn: rounding error > tolerance 0.072760 rounded to 0 warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) 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 861278961..1143e388b 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -173,6 +188,13 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[5] +dmaResponseFromDir=system.ruby.network.slave[5] +forwardFromDir=system.ruby.network.slave[3] +requestToDir=system.ruby.network.master[4] +responseFromDir=system.ruby.network.slave[4] +responseToDir=system.ruby.network.master[3] +unblockToDir=system.ruby.network.master[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -229,7 +251,7 @@ L1Icache=system.ruby.l1_cntrl0.L1Icache L2cache=system.ruby.l1_cntrl0.L2cache buffer_size=0 cache_response_latency=10 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -243,6 +265,11 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] +unblockFromCache=system.ruby.network.slave[2] [system.ruby.l1_cntrl0.L1Dcache] type=RubyCache @@ -292,7 +319,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.L1Dcache deadlock_threshold=500000 eventq_index=0 @@ -329,6 +356,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.unblockToDir system.ruby.dir_cntrl0.responseToDir system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.l1_cntrl0.unblockFromCache system.ruby.dir_cntrl0.forwardFromDir system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr index a30a2a95c..a26365a1c 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr @@ -3,4 +3,4 @@ warn: rounding error > tolerance warn: rounding error > tolerance 0.072760 rounded to 0 warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) 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 46419073b..670d15d2e 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -122,6 +127,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -151,7 +164,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -170,6 +185,11 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[3] +dmaResponseFromDir=system.ruby.network.slave[3] +forwardFromDir=system.ruby.network.slave[4] +requestToDir=system.ruby.network.master[2] +responseFromDir=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -209,7 +229,7 @@ children=cacheMemory sequencer buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -221,6 +241,10 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.cacheMemory] type=RubyCache @@ -240,7 +264,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 eventq_index=0 @@ -277,6 +301,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr index a30a2a95c..a26365a1c 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr @@ -3,4 +3,4 @@ warn: rounding error > tolerance warn: rounding error > tolerance 0.072760 rounded to 0 warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini index 7ab4d5c2a..42a419874 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -63,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -218,7 +224,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/alpha/tru64/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello gid=100 input=cin max_stack_size=67108864 @@ -232,9 +238,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simerr index 32998f270..0b3033cd9 100755 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simerr +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simerr @@ -1,2 +1,2 @@ warn: Sockets disabled, not accepting gdb connections -warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...) +warn: ignoring syscall sigprocmask(1, ...) diff --git a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini index 75d524231..f4127b6ce 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -98,6 +101,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -207,6 +211,7 @@ funcUnits=system.cpu.executeFuncUnits.funcUnits0 system.cpu.executeFuncUnits.fun [system.cpu.executeFuncUnits.funcUnits0] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits0.opClasses @@ -246,6 +251,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits1] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits1.opClasses @@ -285,6 +291,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits2] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits2.opClasses @@ -324,6 +331,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits3] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=9 opClasses=system.cpu.executeFuncUnits.funcUnits3.opClasses @@ -344,6 +352,7 @@ opClass=IntDiv [system.cpu.executeFuncUnits.funcUnits4] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits4.opClasses @@ -508,6 +517,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits5] type=MinorFU children=opClasses timings +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits5.opClasses @@ -552,6 +562,7 @@ opClasses= [system.cpu.executeFuncUnits.funcUnits6] type=MinorFU children=opClasses +cantForwardFromFUIndices= eventq_index=0 issueLat=1 opClasses=system.cpu.executeFuncUnits.funcUnits6.opClasses @@ -742,7 +753,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/arm/projectscratch/pd/sysrandd/dist/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -756,9 +767,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -795,15 +816,19 @@ read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 +tXAW=30000 write_buffer_size=64 write_high_thresh_perc=85 write_low_thresh_perc=50 diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini index ec211ffe2..6c1f65269 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -849,7 +852,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -863,9 +866,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini index 812706715..db525069f 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -699,7 +702,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -713,9 +716,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini index baee5cb0e..a0f588ff6 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=atomic @@ -37,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=checker dstage2_mmu dtb interrupts isa istage2_mmu itb tracer workload +branchPred=Null checker=system.cpu.checker clk_domain=system.cpu_clk_domain cpu_id=0 @@ -72,6 +76,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -107,6 +112,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.checker.tracer @@ -353,7 +359,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -367,9 +373,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini index 02f18b1ff..d8b9bcc6e 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=atomic @@ -37,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=dstage2_mmu dtb interrupts isa istage2_mmu itb tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -72,6 +76,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -208,7 +213,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -222,9 +227,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini index b833e8e3a..017bc1348 100644 --- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=TimingSimpleCPU children=dcache dstage2_mmu dtb icache interrupts isa istage2_mmu itb l2cache toL2Bus tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -66,6 +70,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -317,7 +322,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/arm/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -331,9 +336,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini index 734275a58..a47df6208 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/linux/inorder-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -78,6 +82,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 stageTracing=false stageWidth=4 switched_out=false @@ -255,7 +260,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/mips/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -269,9 +274,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -284,9 +299,9 @@ master=system.physmem.port slave=system.system_port system.cpu.l2cache.mem_side [system.physmem] -type=SimpleDRAM +type=DRAMCtrl activation_limit=4 -addr_mapping=RaBaChCo +addr_mapping=RoRaBaChCo banks_per_rank=8 burst_length=8 channels=1 @@ -297,27 +312,33 @@ device_rowbuffer_size=1024 devices_per_rank=8 eventq_index=0 in_addr_map=true +max_accesses_per_row=16 mem_sched_policy=frfcfs +min_writes_per_switch=16 null=false -page_policy=open +page_policy=open_adaptive range=0:134217727 ranks_per_channel=2 read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 -write_buffer_size=32 -write_high_thresh_perc=70 -write_low_thresh_perc=0 +tXAW=30000 +write_buffer_size=64 +write_high_thresh_perc=85 +write_low_thresh_perc=50 port=system.membus.master[0] [system.voltage_domain] diff --git a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini index d92641c25..1f8305e4e 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -603,7 +606,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/mips/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -617,9 +620,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini index cb74c0ee3..a20aef42c 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=atomic mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=dtb interrupts isa itb tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -69,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -111,7 +117,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/mips/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -125,9 +131,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain 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 a69535826..e05997c32 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -124,6 +129,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -153,7 +166,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -172,6 +187,11 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[3] +dmaResponseFromDir=system.ruby.network.slave[3] +forwardFromDir=system.ruby.network.slave[4] +requestToDir=system.ruby.network.master[2] +responseFromDir=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -211,7 +231,7 @@ children=cacheMemory sequencer buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -223,6 +243,10 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.cacheMemory] type=RubyCache @@ -242,7 +266,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 eventq_index=0 @@ -279,6 +303,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini index 943508ee9..1ce9455cf 100644 --- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -63,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -220,7 +226,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/mips/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -234,9 +240,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini index 6b18ed844..e341fc69a 100644 --- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -601,7 +604,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/power/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/power/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -615,9 +618,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini index ab39b14ed..0aa78ac08 100644 --- a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=atomic mem_ranges= memories=system.physmem @@ -36,13 +38,16 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=dtb interrupts isa itb tracer workload UnifiedTLB=true +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -70,6 +75,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -109,7 +115,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/power/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/power/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -123,9 +129,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini index 74f6fdcd8..facfb2ae6 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/linux/inorder-timing/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=timing mem_ranges= memories=system.physmem @@ -36,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -78,6 +82,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 stageTracing=false stageWidth=4 switched_out=false @@ -252,7 +257,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/sparc/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -266,9 +271,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain @@ -281,9 +296,9 @@ master=system.physmem.port slave=system.system_port system.cpu.l2cache.mem_side [system.physmem] -type=SimpleDRAM +type=DRAMCtrl activation_limit=4 -addr_mapping=RaBaChCo +addr_mapping=RoRaBaChCo banks_per_rank=8 burst_length=8 channels=1 @@ -294,27 +309,33 @@ device_rowbuffer_size=1024 devices_per_rank=8 eventq_index=0 in_addr_map=true +max_accesses_per_row=16 mem_sched_policy=frfcfs +min_writes_per_switch=16 null=false -page_policy=open +page_policy=open_adaptive range=0:134217727 ranks_per_channel=2 read_buffer_size=32 static_backend_latency=10000 static_frontend_latency=10000 tBURST=5000 +tCK=1250 tCL=13750 tRAS=35000 tRCD=13750 tREFI=7800000 -tRFC=300000 +tRFC=260000 tRP=13750 -tRRD=6250 +tRRD=6000 +tRTP=7500 +tRTW=2500 +tWR=15000 tWTR=7500 -tXAW=40000 -write_buffer_size=32 -write_high_thresh_perc=70 -write_low_thresh_perc=0 +tXAW=30000 +write_buffer_size=64 +write_high_thresh_perc=85 +write_low_thresh_perc=50 port=system.membus.master[0] [system.voltage_domain] diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini index 463649278..f6abe18a9 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=atomic @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -71,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -110,7 +114,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=tests/test-progs/hello/bin/sparc/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -124,9 +128,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain 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 d718c5982..abf61111c 100644 --- 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,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -121,6 +126,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -150,7 +163,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -169,6 +184,11 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[3] +dmaResponseFromDir=system.ruby.network.slave[3] +forwardFromDir=system.ruby.network.slave[4] +requestToDir=system.ruby.network.master[2] +responseFromDir=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -208,7 +228,7 @@ children=cacheMemory sequencer buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -220,6 +240,10 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.cacheMemory] type=RubyCache @@ -239,7 +263,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 eventq_index=0 @@ -276,6 +300,8 @@ number_of_virtual_networks=10 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 ruby_system=system.ruby topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini index 70dd00dc5..102ae8d7c 100644 --- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -65,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -219,7 +223,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=tests/test-progs/hello/bin/sparc/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -233,9 +237,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini index 016cd0c8d..2be4f154a 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -634,7 +637,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/x86/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -648,9 +651,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini index eb1883caa..db49faad7 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini @@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 +load_offset=0 mem_mode=atomic mem_ranges= memories=system.physmem @@ -36,12 +38,15 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] type=AtomicSimpleCPU children=apic_clk_domain dtb interrupts isa itb tracer workload +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -69,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -142,7 +148,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=/dist/test-progs/hello/bin/x86/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -156,9 +162,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain 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 b7b166102..93964b6e7 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000 [system] type=System -children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain +children=clk_domain cpu dvfs_handler 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= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0] [system.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -65,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -81,7 +85,9 @@ eventq_index=0 [system.cpu.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu.dtb] @@ -143,7 +149,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -154,6 +160,14 @@ simpoint=0 system=system uid=100 +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000 + [system.physmem] type=SimpleMemory bandwidth=0.000000 @@ -166,16 +180,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 @@ -193,7 +197,9 @@ randomization=false [system.ruby.clk_domain] type=SrcClockDomain clock=1 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.ruby.dir_cntrl0] @@ -212,6 +218,11 @@ recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=4 version=0 +dmaRequestToDir=system.ruby.network.master[3] +dmaResponseFromDir=system.ruby.network.slave[3] +forwardFromDir=system.ruby.network.slave[4] +requestToDir=system.ruby.network.master[2] +responseFromDir=system.ruby.network.slave[2] [system.ruby.dir_cntrl0.directory] type=RubyDirectoryMemory @@ -251,7 +262,7 @@ children=cacheMemory sequencer buffer_size=0 cacheMemory=system.ruby.l1_cntrl0.cacheMemory cache_response_latency=12 -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain cluster_id=0 eventq_index=0 issue_latency=2 @@ -263,6 +274,10 @@ send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=4 version=0 +forwardToCache=system.ruby.network.master[0] +requestFromCache=system.ruby.network.slave[0] +responseFromCache=system.ruby.network.slave[1] +responseToCache=system.ruby.network.master[1] [system.ruby.l1_cntrl0.cacheMemory] type=RubyCache @@ -282,7 +297,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl0.sequencer] type=RubySequencer access_phys_mem=false -clk_domain=system.ruby.clk_domain +clk_domain=system.cpu.clk_domain dcache=system.ruby.l1_cntrl0.cacheMemory deadlock_threshold=500000 eventq_index=0 @@ -296,9 +311,6 @@ 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] @@ -318,10 +330,13 @@ 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 topology=Crossbar +master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir +slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir [system.ruby.network.ext_links0] type=SimpleExtLink diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini index 25de1cc29..a819aa859 100644 --- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini +++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain +children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -65,6 +68,7 @@ numThreads=1 profile=0 progress_interval=0 simpoint_start_insts= +socket_id=0 switched_out=false system=system tracer=system.cpu.tracer @@ -253,7 +257,7 @@ env= errout=cerr euid=100 eventq_index=0 -executable=tests/test-progs/hello/bin/x86/linux/hello +executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello gid=100 input=cin max_stack_size=67108864 @@ -267,9 +271,19 @@ uid=100 [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.membus] type=CoherentBus clk_domain=system.clk_domain |