diff options
Diffstat (limited to 'tests/quick/fs/10.linux-boot/ref/alpha/linux')
12 files changed, 662 insertions, 390 deletions
diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini index 573c7933c..f697c291f 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini @@ -8,19 +8,20 @@ time_sync_spin_threshold=100000000 [system] type=LinuxAlphaSystem -children=bridge cpu0 cpu1 disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami +children=bridge clk_domain cpu0 cpu1 cpu_clk_domain disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami voltage_domain boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -clock=1000 -console=/scratch/nilay/GEM5/system/binaries/console +cache_line_size=64 +clk_domain=system.clk_domain +console=/dist/m5/system/binaries/console init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=atomic mem_ranges=0:134217727 memories=system.physmem num_work_ids=16 -pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal +pal=/dist/m5/system/binaries/ts_osfpal readfile=tests/halt.sh symbolfile= system_rev=1024 @@ -36,7 +37,7 @@ system_port=system.membus.slave[0] [system.bridge] type=Bridge -clock=1000 +clk_domain=system.clk_domain delay=50000 ranges=8796093022208:18446744073709551615 req_size=16 @@ -44,12 +45,16 @@ resp_size=16 master=system.iobus.slave[0] slave=system.membus.master[0] +[system.clk_domain] +type=SrcClockDomain +clock=1000 +voltage_domain=system.voltage_domain + [system.cpu0] type=AtomicSimpleCPU children=dcache dtb icache interrupts isa itb tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=0 do_checkpoint_insts=true do_quiesce=true @@ -68,6 +73,10 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_interval=100000000 +simpoint_profile=false +simpoint_profile_file=simpoint.bb.gz +simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false switched_out=false @@ -80,10 +89,10 @@ icache_port=system.cpu0.icache.cpu_side [system.cpu0.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -94,22 +103,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu0.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu0.dcache_port mem_side=system.toL2Bus.slave[1] +[system.cpu0.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu0.dtb] type=AlphaTLB size=64 [system.cpu0.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -120,12 +138,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu0.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.toL2Bus.slave[0] +[system.cpu0.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu0.interrupts] type=AlphaInterrupts @@ -142,9 +169,8 @@ type=ExeTracer [system.cpu1] type=AtomicSimpleCPU children=dcache dtb icache interrupts isa itb tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=1 do_checkpoint_insts=true do_quiesce=true @@ -163,6 +189,10 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_interval=100000000 +simpoint_profile=false +simpoint_profile_file=simpoint.bb.gz +simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false switched_out=false @@ -175,10 +205,10 @@ icache_port=system.cpu1.icache.cpu_side [system.cpu1.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -189,22 +219,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu1.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu1.dcache_port mem_side=system.toL2Bus.slave[3] +[system.cpu1.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu1.dtb] type=AlphaTLB size=64 [system.cpu1.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -215,12 +254,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu1.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu1.icache_port mem_side=system.toL2Bus.slave[2] +[system.cpu1.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu1.interrupts] type=AlphaInterrupts @@ -234,6 +282,11 @@ size=48 [system.cpu1.tracer] type=ExeTracer +[system.cpu_clk_domain] +type=SrcClockDomain +clock=500 +voltage_domain=system.voltage_domain + [system.disk0] type=IdeDisk children=image @@ -251,7 +304,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -271,7 +324,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -280,8 +333,7 @@ sys=system [system.iobus] type=NoncoherentBus -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 use_default_range=true width=8 @@ -291,10 +343,10 @@ slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma [system.iocache] type=BaseCache +children=tags addr_ranges=0:134217727 assoc=8 -block_size=64 -clock=1000 +clk_domain=system.clk_domain forward_snoops=false hit_latency=50 is_top_level=true @@ -305,18 +357,27 @@ prefetcher=Null response_latency=50 size=1024 system=system +tags=system.iocache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.iobus.master[29] mem_side=system.membus.slave[2] +[system.iocache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.clk_domain +hit_latency=50 +size=1024 + [system.l2c] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=8 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=20 is_top_level=false @@ -327,18 +388,27 @@ prefetcher=Null response_latency=20 size=4194304 system=system +tags=system.l2c.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[1] +[system.l2c.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=20 +size=4194304 + [system.membus] type=CoherentBus children=badaddr_responder -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 +system=system use_default_range=false width=8 default=system.membus.badaddr_responder.pio @@ -347,7 +417,7 @@ slave=system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=0 pio_latency=100000 @@ -364,28 +434,35 @@ pio=system.membus.default [system.physmem] type=SimpleDRAM -addr_mapping=openmap +activation_limit=4 +addr_mapping=RaBaChCo banks_per_rank=8 -clock=1000 -conf_table_reported=false +burst_length=8 +channels=1 +clk_domain=system.clk_domain +conf_table_reported=true +device_bus_width=8 +device_rowbuffer_size=1024 +devices_per_rank=8 in_addr_map=true -lines_per_rowbuffer=64 -mem_sched_policy=fcfs +mem_sched_policy=frfcfs null=false page_policy=open range=0:134217727 ranks_per_channel=2 read_buffer_size=32 -tBURST=4000 -tCL=14000 -tRCD=14000 +static_backend_latency=10000 +static_frontend_latency=10000 +tBURST=5000 +tCL=13750 +tRCD=13750 tREFI=7800000 tRFC=300000 -tRP=14000 -tWTR=1000 +tRP=13750 +tWTR=7500 +tXAW=40000 write_buffer_size=32 write_thresh_perc=70 -zero=false port=system.membus.master[1] [system.simple_disk] @@ -396,7 +473,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -408,9 +485,9 @@ port=3456 [system.toL2Bus] type=CoherentBus -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain header_cycles=1 +system=system use_default_range=false width=8 master=system.l2c.cpu_side @@ -424,7 +501,7 @@ system=system [system.tsunami.backdoor] type=AlphaBackdoor -clock=1000 +clk_domain=system.clk_domain cpu=system.cpu0 disk=system.simple_disk pio_addr=8804682956800 @@ -436,7 +513,7 @@ pio=system.iobus.master[24] [system.tsunami.cchip] type=TsunamiCChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8803072344064 pio_latency=100000 system=system @@ -483,7 +560,7 @@ SubClassCode=0 SubsystemID=0 SubsystemVendorID=0 VendorID=4107 -clock=2000 +clk_domain=system.clk_domain config_latency=20000 dma_data_free=false dma_desc_free=false @@ -514,7 +591,7 @@ pio=system.iobus.master[27] [system.tsunami.fake_OROM] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8796093677568 pio_latency=100000 @@ -531,7 +608,7 @@ pio=system.iobus.master[8] [system.tsunami.fake_ata0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848432 pio_latency=100000 @@ -548,7 +625,7 @@ pio=system.iobus.master[19] [system.tsunami.fake_ata1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848304 pio_latency=100000 @@ -565,7 +642,7 @@ pio=system.iobus.master[20] [system.tsunami.fake_pnp_addr] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848569 pio_latency=100000 @@ -582,7 +659,7 @@ pio=system.iobus.master[9] [system.tsunami.fake_pnp_read0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848451 pio_latency=100000 @@ -599,7 +676,7 @@ pio=system.iobus.master[11] [system.tsunami.fake_pnp_read1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848515 pio_latency=100000 @@ -616,7 +693,7 @@ pio=system.iobus.master[12] [system.tsunami.fake_pnp_read2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848579 pio_latency=100000 @@ -633,7 +710,7 @@ pio=system.iobus.master[13] [system.tsunami.fake_pnp_read3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848643 pio_latency=100000 @@ -650,7 +727,7 @@ pio=system.iobus.master[14] [system.tsunami.fake_pnp_read4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848707 pio_latency=100000 @@ -667,7 +744,7 @@ pio=system.iobus.master[15] [system.tsunami.fake_pnp_read5] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848771 pio_latency=100000 @@ -684,7 +761,7 @@ pio=system.iobus.master[16] [system.tsunami.fake_pnp_read6] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848835 pio_latency=100000 @@ -701,7 +778,7 @@ pio=system.iobus.master[17] [system.tsunami.fake_pnp_read7] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848899 pio_latency=100000 @@ -718,7 +795,7 @@ pio=system.iobus.master[18] [system.tsunami.fake_pnp_write] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615850617 pio_latency=100000 @@ -735,7 +812,7 @@ pio=system.iobus.master[10] [system.tsunami.fake_ppc] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848891 pio_latency=100000 @@ -752,7 +829,7 @@ pio=system.iobus.master[7] [system.tsunami.fake_sm_chip] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848816 pio_latency=100000 @@ -769,7 +846,7 @@ pio=system.iobus.master[2] [system.tsunami.fake_uart1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848696 pio_latency=100000 @@ -786,7 +863,7 @@ pio=system.iobus.master[3] [system.tsunami.fake_uart2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848936 pio_latency=100000 @@ -803,7 +880,7 @@ pio=system.iobus.master[4] [system.tsunami.fake_uart3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848680 pio_latency=100000 @@ -820,7 +897,7 @@ pio=system.iobus.master[5] [system.tsunami.fake_uart4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848944 pio_latency=100000 @@ -837,7 +914,7 @@ pio=system.iobus.master[6] [system.tsunami.fb] type=BadDevice -clock=1000 +clk_domain=system.clk_domain devicename=FrameBuffer pio_addr=8804615848912 pio_latency=100000 @@ -884,7 +961,7 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 -clock=1000 +clk_domain=system.clk_domain config_latency=20000 ctrl_offset=0 disks=system.disk0 system.disk2 @@ -901,7 +978,7 @@ pio=system.iobus.master[25] [system.tsunami.io] type=TsunamiIO -clock=1000 +clk_domain=system.clk_domain frequency=976562500 pio_addr=8804615847936 pio_latency=100000 @@ -913,7 +990,7 @@ pio=system.iobus.master[22] [system.tsunami.pchip] type=TsunamiPChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8802535473152 pio_latency=100000 system=system @@ -923,7 +1000,8 @@ pio=system.iobus.master[1] [system.tsunami.pciconfig] type=PciConfigAll bus=0 -clock=1000 +clk_domain=system.clk_domain +pio_addr=0 pio_latency=30000 platform=system.tsunami size=16777216 @@ -932,7 +1010,7 @@ pio=system.iobus.default [system.tsunami.uart] type=Uart8250 -clock=1000 +clk_domain=system.clk_domain pio_addr=8804615848952 pio_latency=100000 platform=system.tsunami @@ -940,3 +1018,7 @@ system=system terminal=system.terminal pio=system.iobus.master[23] +[system.voltage_domain] +type=VoltageDomain +voltage=1.000000 + diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout index a62617d01..410351310 100755 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout @@ -3,13 +3,13 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/t gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 23 2013 13:29:14 -gem5 started Jan 23 2013 14:01:11 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Sep 24 2013 03:08:53 +gem5 started Sep 28 2013 03:05:50 +gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual -re tests/run.py build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux +info: kernel located at: /dist/m5/system/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 info: Entering event queue @ 0. Starting simulation... info: Launching CPU 1 @ 97861500 -Exiting @ tick 1870325497500 because m5_exit instruction encountered +Exiting @ tick 1870335643500 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt index 101a67dc8..1e009881b 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt @@ -4,11 +4,11 @@ sim_seconds 1.870336 # Nu sim_ticks 1870335643500 # Number of ticks simulated final_tick 1870335643500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1417566 # Simulator instruction rate (inst/s) -host_op_rate 1417565 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 41981821830 # Simulator tick rate (ticks/s) -host_mem_usage 308248 # Number of bytes of host memory used -host_seconds 44.55 # Real time elapsed on the host +host_inst_rate 2937220 # Simulator instruction rate (inst/s) +host_op_rate 2937218 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 86986978503 # Simulator tick rate (ticks/s) +host_mem_usage 308008 # Number of bytes of host memory used +host_seconds 21.50 # Real time elapsed on the host sim_insts 63154034 # Number of instructions simulated sim_ops 63154034 # Number of ops (including micro ops) simulated system.physmem.bytes_read::cpu0.inst 761216 # Number of bytes read from this memory @@ -198,23 +198,23 @@ system.physmem.avgGap nan # Av system.membus.throughput 42160246 # Throughput (bytes/s) system.membus.data_through_bus 78853810 # Total data (bytes) system.membus.snoop_data_through_bus 0 # Total snoop data (bytes) -system.l2c.tags.replacements 1000626 # number of replacements -system.l2c.tags.tagsinuse 65381.922487 # Cycle average of tags in use -system.l2c.tags.total_refs 2464723 # Total number of references to valid blocks. -system.l2c.tags.sampled_refs 1065768 # Sample count of references to valid blocks. -system.l2c.tags.avg_refs 2.312626 # Average number of references to valid blocks. -system.l2c.tags.warmup_cycle 838081000 # Cycle when the warmup percentage was hit. -system.l2c.tags.occ_blocks::writebacks 56158.706931 # Average occupied blocks per requestor -system.l2c.tags.occ_blocks::cpu0.inst 4894.235246 # Average occupied blocks per requestor -system.l2c.tags.occ_blocks::cpu0.data 4134.598984 # Average occupied blocks per requestor -system.l2c.tags.occ_blocks::cpu1.inst 174.423126 # Average occupied blocks per requestor -system.l2c.tags.occ_blocks::cpu1.data 19.958201 # Average occupied blocks per requestor -system.l2c.tags.occ_percent::writebacks 0.856914 # Average percentage of cache occupancy -system.l2c.tags.occ_percent::cpu0.inst 0.074680 # Average percentage of cache occupancy -system.l2c.tags.occ_percent::cpu0.data 0.063089 # Average percentage of cache occupancy -system.l2c.tags.occ_percent::cpu1.inst 0.002661 # Average percentage of cache occupancy -system.l2c.tags.occ_percent::cpu1.data 0.000305 # Average percentage of cache occupancy -system.l2c.tags.occ_percent::total 0.997649 # Average percentage of cache occupancy +system.l2c.tags.replacements 1000626 # number of replacements +system.l2c.tags.tagsinuse 65381.922487 # Cycle average of tags in use +system.l2c.tags.total_refs 2464723 # Total number of references to valid blocks. +system.l2c.tags.sampled_refs 1065768 # Sample count of references to valid blocks. +system.l2c.tags.avg_refs 2.312626 # Average number of references to valid blocks. +system.l2c.tags.warmup_cycle 838081000 # Cycle when the warmup percentage was hit. +system.l2c.tags.occ_blocks::writebacks 56158.706931 # Average occupied blocks per requestor +system.l2c.tags.occ_blocks::cpu0.inst 4894.235246 # Average occupied blocks per requestor +system.l2c.tags.occ_blocks::cpu0.data 4134.598984 # Average occupied blocks per requestor +system.l2c.tags.occ_blocks::cpu1.inst 174.423126 # Average occupied blocks per requestor +system.l2c.tags.occ_blocks::cpu1.data 19.958201 # Average occupied blocks per requestor +system.l2c.tags.occ_percent::writebacks 0.856914 # Average percentage of cache occupancy +system.l2c.tags.occ_percent::cpu0.inst 0.074680 # Average percentage of cache occupancy +system.l2c.tags.occ_percent::cpu0.data 0.063089 # Average percentage of cache occupancy +system.l2c.tags.occ_percent::cpu1.inst 0.002661 # Average percentage of cache occupancy +system.l2c.tags.occ_percent::cpu1.data 0.000305 # Average percentage of cache occupancy +system.l2c.tags.occ_percent::total 0.997649 # Average percentage of cache occupancy system.l2c.ReadReq_hits::cpu0.inst 873088 # number of ReadReq hits system.l2c.ReadReq_hits::cpu0.data 763068 # number of ReadReq hits system.l2c.ReadReq_hits::cpu1.inst 101908 # number of ReadReq hits @@ -326,15 +326,15 @@ system.l2c.cache_copies 0 # nu system.l2c.writebacks::writebacks 81316 # number of writebacks system.l2c.writebacks::total 81316 # number of writebacks system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.iocache.tags.replacements 41695 # number of replacements -system.iocache.tags.tagsinuse 0.435438 # Cycle average of tags in use -system.iocache.tags.total_refs 0 # Total number of references to valid blocks. -system.iocache.tags.sampled_refs 41711 # Sample count of references to valid blocks. -system.iocache.tags.avg_refs 0 # Average number of references to valid blocks. -system.iocache.tags.warmup_cycle 1685787165017 # Cycle when the warmup percentage was hit. -system.iocache.tags.occ_blocks::tsunami.ide 0.435438 # Average occupied blocks per requestor -system.iocache.tags.occ_percent::tsunami.ide 0.027215 # Average percentage of cache occupancy -system.iocache.tags.occ_percent::total 0.027215 # Average percentage of cache occupancy +system.iocache.tags.replacements 41695 # number of replacements +system.iocache.tags.tagsinuse 0.435438 # Cycle average of tags in use +system.iocache.tags.total_refs 0 # Total number of references to valid blocks. +system.iocache.tags.sampled_refs 41711 # Sample count of references to valid blocks. +system.iocache.tags.avg_refs 0 # Average number of references to valid blocks. +system.iocache.tags.warmup_cycle 1685787165017 # Cycle when the warmup percentage was hit. +system.iocache.tags.occ_blocks::tsunami.ide 0.435438 # Average occupied blocks per requestor +system.iocache.tags.occ_percent::tsunami.ide 0.027215 # Average percentage of cache occupancy +system.iocache.tags.occ_percent::total 0.027215 # Average percentage of cache occupancy system.iocache.ReadReq_misses::tsunami.ide 175 # number of ReadReq misses system.iocache.ReadReq_misses::total 175 # number of ReadReq misses system.iocache.WriteReq_misses::tsunami.ide 41552 # number of WriteReq misses @@ -562,15 +562,15 @@ system.toL2Bus.data_through_bus 246743154 # To system.toL2Bus.snoop_data_through_bus 10368 # Total snoop data (bytes) system.iobus.throughput 1460500 # Throughput (bytes/s) system.iobus.data_through_bus 2731626 # Total data (bytes) -system.cpu0.icache.tags.replacements 884406 # number of replacements -system.cpu0.icache.tags.tagsinuse 511.244754 # Cycle average of tags in use -system.cpu0.icache.tags.total_refs 56345130 # Total number of references to valid blocks. -system.cpu0.icache.tags.sampled_refs 884918 # Sample count of references to valid blocks. -system.cpu0.icache.tags.avg_refs 63.672713 # Average number of references to valid blocks. -system.cpu0.icache.tags.warmup_cycle 9786576500 # Cycle when the warmup percentage was hit. +system.cpu0.icache.tags.replacements 884406 # number of replacements +system.cpu0.icache.tags.tagsinuse 511.244754 # Cycle average of tags in use +system.cpu0.icache.tags.total_refs 56345130 # Total number of references to valid blocks. +system.cpu0.icache.tags.sampled_refs 884918 # Sample count of references to valid blocks. +system.cpu0.icache.tags.avg_refs 63.672713 # Average number of references to valid blocks. +system.cpu0.icache.tags.warmup_cycle 9786576500 # Cycle when the warmup percentage was hit. system.cpu0.icache.tags.occ_blocks::cpu0.inst 511.244754 # Average occupied blocks per requestor system.cpu0.icache.tags.occ_percent::cpu0.inst 0.998525 # Average percentage of cache occupancy -system.cpu0.icache.tags.occ_percent::total 0.998525 # Average percentage of cache occupancy +system.cpu0.icache.tags.occ_percent::total 0.998525 # Average percentage of cache occupancy system.cpu0.icache.ReadReq_hits::cpu0.inst 56345130 # number of ReadReq hits system.cpu0.icache.ReadReq_hits::total 56345130 # number of ReadReq hits system.cpu0.icache.demand_hits::cpu0.inst 56345130 # number of demand (read+write) hits @@ -604,15 +604,15 @@ system.cpu0.icache.avg_blocked_cycles::no_targets nan system.cpu0.icache.fast_writes 0 # number of fast writes performed system.cpu0.icache.cache_copies 0 # number of cache copies performed system.cpu0.icache.no_allocate_misses 0 # Number of misses that were no-allocate -system.cpu0.dcache.tags.replacements 1978683 # number of replacements -system.cpu0.dcache.tags.tagsinuse 507.129817 # Cycle average of tags in use -system.cpu0.dcache.tags.total_refs 13123756 # Total number of references to valid blocks. -system.cpu0.dcache.tags.sampled_refs 1979195 # Sample count of references to valid blocks. -system.cpu0.dcache.tags.avg_refs 6.630855 # Average number of references to valid blocks. -system.cpu0.dcache.tags.warmup_cycle 10840000 # Cycle when the warmup percentage was hit. +system.cpu0.dcache.tags.replacements 1978683 # number of replacements +system.cpu0.dcache.tags.tagsinuse 507.129817 # Cycle average of tags in use +system.cpu0.dcache.tags.total_refs 13123756 # Total number of references to valid blocks. +system.cpu0.dcache.tags.sampled_refs 1979195 # Sample count of references to valid blocks. +system.cpu0.dcache.tags.avg_refs 6.630855 # Average number of references to valid blocks. +system.cpu0.dcache.tags.warmup_cycle 10840000 # Cycle when the warmup percentage was hit. system.cpu0.dcache.tags.occ_blocks::cpu0.data 507.129817 # Average occupied blocks per requestor system.cpu0.dcache.tags.occ_percent::cpu0.data 0.990488 # Average percentage of cache occupancy -system.cpu0.dcache.tags.occ_percent::total 0.990488 # Average percentage of cache occupancy +system.cpu0.dcache.tags.occ_percent::total 0.990488 # Average percentage of cache occupancy system.cpu0.dcache.ReadReq_hits::cpu0.data 7298341 # number of ReadReq hits system.cpu0.dcache.ReadReq_hits::total 7298341 # number of ReadReq hits system.cpu0.dcache.WriteReq_hits::cpu0.data 5462261 # number of WriteReq hits @@ -799,15 +799,15 @@ system.cpu1.kern.mode_ticks::kernel 1373906500 0.07% 0.07% # nu system.cpu1.kern.mode_ticks::user 508289000 0.03% 0.10% # number of ticks spent at the given mode system.cpu1.kern.mode_ticks::idle 1868002681000 99.90% 100.00% # number of ticks spent at the given mode system.cpu1.kern.swap_context 471 # number of times the context was actually changed -system.cpu1.icache.tags.replacements 103103 # number of replacements -system.cpu1.icache.tags.tagsinuse 427.126317 # Cycle average of tags in use -system.cpu1.icache.tags.total_refs 5832124 # Total number of references to valid blocks. -system.cpu1.icache.tags.sampled_refs 103615 # Sample count of references to valid blocks. -system.cpu1.icache.tags.avg_refs 56.286484 # Average number of references to valid blocks. -system.cpu1.icache.tags.warmup_cycle 1868933191000 # Cycle when the warmup percentage was hit. +system.cpu1.icache.tags.replacements 103103 # number of replacements +system.cpu1.icache.tags.tagsinuse 427.126317 # Cycle average of tags in use +system.cpu1.icache.tags.total_refs 5832124 # Total number of references to valid blocks. +system.cpu1.icache.tags.sampled_refs 103615 # Sample count of references to valid blocks. +system.cpu1.icache.tags.avg_refs 56.286484 # Average number of references to valid blocks. +system.cpu1.icache.tags.warmup_cycle 1868933191000 # Cycle when the warmup percentage was hit. system.cpu1.icache.tags.occ_blocks::cpu1.inst 427.126317 # Average occupied blocks per requestor system.cpu1.icache.tags.occ_percent::cpu1.inst 0.834231 # Average percentage of cache occupancy -system.cpu1.icache.tags.occ_percent::total 0.834231 # Average percentage of cache occupancy +system.cpu1.icache.tags.occ_percent::total 0.834231 # Average percentage of cache occupancy system.cpu1.icache.ReadReq_hits::cpu1.inst 5832124 # number of ReadReq hits system.cpu1.icache.ReadReq_hits::total 5832124 # number of ReadReq hits system.cpu1.icache.demand_hits::cpu1.inst 5832124 # number of demand (read+write) hits @@ -841,15 +841,15 @@ system.cpu1.icache.avg_blocked_cycles::no_targets nan system.cpu1.icache.fast_writes 0 # number of fast writes performed system.cpu1.icache.cache_copies 0 # number of cache copies performed system.cpu1.icache.no_allocate_misses 0 # Number of misses that were no-allocate -system.cpu1.dcache.tags.replacements 62052 # number of replacements -system.cpu1.dcache.tags.tagsinuse 421.569557 # Cycle average of tags in use -system.cpu1.dcache.tags.total_refs 1836045 # Total number of references to valid blocks. -system.cpu1.dcache.tags.sampled_refs 62390 # Sample count of references to valid blocks. -system.cpu1.dcache.tags.avg_refs 29.428514 # Average number of references to valid blocks. -system.cpu1.dcache.tags.warmup_cycle 1851115695500 # Cycle when the warmup percentage was hit. +system.cpu1.dcache.tags.replacements 62052 # number of replacements +system.cpu1.dcache.tags.tagsinuse 421.569557 # Cycle average of tags in use +system.cpu1.dcache.tags.total_refs 1836045 # Total number of references to valid blocks. +system.cpu1.dcache.tags.sampled_refs 62390 # Sample count of references to valid blocks. +system.cpu1.dcache.tags.avg_refs 29.428514 # Average number of references to valid blocks. +system.cpu1.dcache.tags.warmup_cycle 1851115695500 # Cycle when the warmup percentage was hit. system.cpu1.dcache.tags.occ_blocks::cpu1.data 421.569557 # Average occupied blocks per requestor system.cpu1.dcache.tags.occ_percent::cpu1.data 0.823378 # Average percentage of cache occupancy -system.cpu1.dcache.tags.occ_percent::total 0.823378 # Average percentage of cache occupancy +system.cpu1.dcache.tags.occ_percent::total 0.823378 # Average percentage of cache occupancy system.cpu1.dcache.ReadReq_hits::cpu1.data 1109514 # number of ReadReq hits system.cpu1.dcache.ReadReq_hits::total 1109514 # number of ReadReq hits system.cpu1.dcache.WriteReq_hits::cpu1.data 707455 # number of WriteReq hits diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini index 50088b4ab..ac72e998f 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini @@ -8,19 +8,20 @@ time_sync_spin_threshold=100000000 [system] type=LinuxAlphaSystem -children=bridge cpu disk0 disk2 intrctrl iobus iocache membus physmem simple_disk terminal tsunami +children=bridge clk_domain cpu cpu_clk_domain disk0 disk2 intrctrl iobus iocache membus physmem simple_disk terminal tsunami voltage_domain boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -clock=1000 -console=/scratch/nilay/GEM5/system/binaries/console +cache_line_size=64 +clk_domain=system.clk_domain +console=/dist/m5/system/binaries/console init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=atomic mem_ranges=0:134217727 memories=system.physmem num_work_ids=16 -pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal +pal=/dist/m5/system/binaries/ts_osfpal readfile=tests/halt.sh symbolfile= system_rev=1024 @@ -36,7 +37,7 @@ system_port=system.membus.slave[0] [system.bridge] type=Bridge -clock=1000 +clk_domain=system.clk_domain delay=50000 ranges=8796093022208:18446744073709551615 req_size=16 @@ -44,12 +45,16 @@ resp_size=16 master=system.iobus.slave[0] slave=system.membus.master[0] +[system.clk_domain] +type=SrcClockDomain +clock=1000 +voltage_domain=system.voltage_domain + [system.cpu] type=AtomicSimpleCPU children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=0 do_checkpoint_insts=true do_quiesce=true @@ -68,6 +73,10 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_interval=100000000 +simpoint_profile=false +simpoint_profile_file=simpoint.bb.gz +simpoint_start_insts= simulate_data_stalls=false simulate_inst_stalls=false switched_out=false @@ -80,10 +89,10 @@ icache_port=system.cpu.icache.cpu_side [system.cpu.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -94,22 +103,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] +[system.cpu.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu.dtb] type=AlphaTLB size=64 [system.cpu.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -120,12 +138,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] +[system.cpu.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu.interrupts] type=AlphaInterrupts @@ -138,10 +165,10 @@ size=48 [system.cpu.l2cache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=8 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=20 is_top_level=false @@ -152,17 +179,26 @@ prefetcher=Null response_latency=20 size=4194304 system=system +tags=system.cpu.l2cache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] +[system.cpu.l2cache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=20 +size=4194304 + [system.cpu.toL2Bus] type=CoherentBus -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain header_cycles=1 +system=system use_default_range=false width=32 master=system.cpu.l2cache.cpu_side @@ -171,6 +207,11 @@ slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side [system.cpu.tracer] type=ExeTracer +[system.cpu_clk_domain] +type=SrcClockDomain +clock=500 +voltage_domain=system.voltage_domain + [system.disk0] type=IdeDisk children=image @@ -188,7 +229,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -208,7 +249,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -217,8 +258,7 @@ sys=system [system.iobus] type=NoncoherentBus -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 use_default_range=true width=8 @@ -228,10 +268,10 @@ slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma [system.iocache] type=BaseCache +children=tags addr_ranges=0:134217727 assoc=8 -block_size=64 -clock=1000 +clk_domain=system.clk_domain forward_snoops=false hit_latency=50 is_top_level=true @@ -242,18 +282,27 @@ prefetcher=Null response_latency=50 size=1024 system=system +tags=system.iocache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.iobus.master[29] mem_side=system.membus.slave[2] +[system.iocache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.clk_domain +hit_latency=50 +size=1024 + [system.membus] type=CoherentBus children=badaddr_responder -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 +system=system use_default_range=false width=8 default=system.membus.badaddr_responder.pio @@ -262,7 +311,7 @@ slave=system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side [system.membus.badaddr_responder] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=0 pio_latency=100000 @@ -279,28 +328,35 @@ pio=system.membus.default [system.physmem] type=SimpleDRAM -addr_mapping=openmap +activation_limit=4 +addr_mapping=RaBaChCo banks_per_rank=8 -clock=1000 -conf_table_reported=false +burst_length=8 +channels=1 +clk_domain=system.clk_domain +conf_table_reported=true +device_bus_width=8 +device_rowbuffer_size=1024 +devices_per_rank=8 in_addr_map=true -lines_per_rowbuffer=64 -mem_sched_policy=fcfs +mem_sched_policy=frfcfs null=false page_policy=open range=0:134217727 ranks_per_channel=2 read_buffer_size=32 -tBURST=4000 -tCL=14000 -tRCD=14000 +static_backend_latency=10000 +static_frontend_latency=10000 +tBURST=5000 +tCL=13750 +tRCD=13750 tREFI=7800000 tRFC=300000 -tRP=14000 -tWTR=1000 +tRP=13750 +tWTR=7500 +tXAW=40000 write_buffer_size=32 write_thresh_perc=70 -zero=false port=system.membus.master[1] [system.simple_disk] @@ -311,7 +367,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -329,7 +385,7 @@ system=system [system.tsunami.backdoor] type=AlphaBackdoor -clock=1000 +clk_domain=system.clk_domain cpu=system.cpu disk=system.simple_disk pio_addr=8804682956800 @@ -341,7 +397,7 @@ pio=system.iobus.master[24] [system.tsunami.cchip] type=TsunamiCChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8803072344064 pio_latency=100000 system=system @@ -388,7 +444,7 @@ SubClassCode=0 SubsystemID=0 SubsystemVendorID=0 VendorID=4107 -clock=2000 +clk_domain=system.clk_domain config_latency=20000 dma_data_free=false dma_desc_free=false @@ -419,7 +475,7 @@ pio=system.iobus.master[27] [system.tsunami.fake_OROM] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8796093677568 pio_latency=100000 @@ -436,7 +492,7 @@ pio=system.iobus.master[8] [system.tsunami.fake_ata0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848432 pio_latency=100000 @@ -453,7 +509,7 @@ pio=system.iobus.master[19] [system.tsunami.fake_ata1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848304 pio_latency=100000 @@ -470,7 +526,7 @@ pio=system.iobus.master[20] [system.tsunami.fake_pnp_addr] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848569 pio_latency=100000 @@ -487,7 +543,7 @@ pio=system.iobus.master[9] [system.tsunami.fake_pnp_read0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848451 pio_latency=100000 @@ -504,7 +560,7 @@ pio=system.iobus.master[11] [system.tsunami.fake_pnp_read1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848515 pio_latency=100000 @@ -521,7 +577,7 @@ pio=system.iobus.master[12] [system.tsunami.fake_pnp_read2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848579 pio_latency=100000 @@ -538,7 +594,7 @@ pio=system.iobus.master[13] [system.tsunami.fake_pnp_read3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848643 pio_latency=100000 @@ -555,7 +611,7 @@ pio=system.iobus.master[14] [system.tsunami.fake_pnp_read4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848707 pio_latency=100000 @@ -572,7 +628,7 @@ pio=system.iobus.master[15] [system.tsunami.fake_pnp_read5] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848771 pio_latency=100000 @@ -589,7 +645,7 @@ pio=system.iobus.master[16] [system.tsunami.fake_pnp_read6] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848835 pio_latency=100000 @@ -606,7 +662,7 @@ pio=system.iobus.master[17] [system.tsunami.fake_pnp_read7] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848899 pio_latency=100000 @@ -623,7 +679,7 @@ pio=system.iobus.master[18] [system.tsunami.fake_pnp_write] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615850617 pio_latency=100000 @@ -640,7 +696,7 @@ pio=system.iobus.master[10] [system.tsunami.fake_ppc] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848891 pio_latency=100000 @@ -657,7 +713,7 @@ pio=system.iobus.master[7] [system.tsunami.fake_sm_chip] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848816 pio_latency=100000 @@ -674,7 +730,7 @@ pio=system.iobus.master[2] [system.tsunami.fake_uart1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848696 pio_latency=100000 @@ -691,7 +747,7 @@ pio=system.iobus.master[3] [system.tsunami.fake_uart2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848936 pio_latency=100000 @@ -708,7 +764,7 @@ pio=system.iobus.master[4] [system.tsunami.fake_uart3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848680 pio_latency=100000 @@ -725,7 +781,7 @@ pio=system.iobus.master[5] [system.tsunami.fake_uart4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848944 pio_latency=100000 @@ -742,7 +798,7 @@ pio=system.iobus.master[6] [system.tsunami.fb] type=BadDevice -clock=1000 +clk_domain=system.clk_domain devicename=FrameBuffer pio_addr=8804615848912 pio_latency=100000 @@ -789,7 +845,7 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 -clock=1000 +clk_domain=system.clk_domain config_latency=20000 ctrl_offset=0 disks=system.disk0 system.disk2 @@ -806,7 +862,7 @@ pio=system.iobus.master[25] [system.tsunami.io] type=TsunamiIO -clock=1000 +clk_domain=system.clk_domain frequency=976562500 pio_addr=8804615847936 pio_latency=100000 @@ -818,7 +874,7 @@ pio=system.iobus.master[22] [system.tsunami.pchip] type=TsunamiPChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8802535473152 pio_latency=100000 system=system @@ -828,7 +884,8 @@ pio=system.iobus.master[1] [system.tsunami.pciconfig] type=PciConfigAll bus=0 -clock=1000 +clk_domain=system.clk_domain +pio_addr=0 pio_latency=30000 platform=system.tsunami size=16777216 @@ -837,7 +894,7 @@ pio=system.iobus.default [system.tsunami.uart] type=Uart8250 -clock=1000 +clk_domain=system.clk_domain pio_addr=8804615848952 pio_latency=100000 platform=system.tsunami @@ -845,3 +902,7 @@ system=system terminal=system.terminal pio=system.iobus.master[23] +[system.voltage_domain] +type=VoltageDomain +voltage=1.000000 + diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout index c4aa2f920..b63c77b44 100755 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout @@ -3,12 +3,12 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/t gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 23 2013 13:29:14 -gem5 started Jan 23 2013 14:01:49 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Sep 24 2013 03:08:53 +gem5 started Sep 28 2013 03:05:50 +gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-atomic Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux +info: kernel located at: /dist/m5/system/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 info: Entering event queue @ 0. Starting simulation... -Exiting @ tick 1829330593000 because m5_exit instruction encountered +Exiting @ tick 1829332269000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt index ee54d11d9..d5ea0605d 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 1.829332 # Nu sim_ticks 1829332269000 # Number of ticks simulated final_tick 1829332269000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1710493 # Simulator instruction rate (inst/s) -host_op_rate 1710492 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 52117657653 # Simulator tick rate (ticks/s) -host_mem_usage 306192 # Number of bytes of host memory used -host_seconds 35.10 # Real time elapsed on the host +host_inst_rate 2947908 # Simulator instruction rate (inst/s) +host_op_rate 2947905 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 89820884398 # Simulator tick rate (ticks/s) +host_mem_usage 305960 # Number of bytes of host memory used +host_seconds 20.37 # Real time elapsed on the host sim_insts 60038305 # Number of instructions simulated sim_ops 60038305 # Number of ops (including micro ops) simulated system.physmem.bytes_read::cpu.inst 857984 # Number of bytes read from this memory @@ -188,15 +188,15 @@ system.physmem.avgGap nan # Av system.membus.throughput 42552540 # Throughput (bytes/s) system.membus.data_through_bus 77842734 # Total data (bytes) system.membus.snoop_data_through_bus 0 # Total snoop data (bytes) -system.iocache.tags.replacements 41686 # number of replacements -system.iocache.tags.tagsinuse 1.225570 # Cycle average of tags in use -system.iocache.tags.total_refs 0 # Total number of references to valid blocks. -system.iocache.tags.sampled_refs 41702 # Sample count of references to valid blocks. -system.iocache.tags.avg_refs 0 # Average number of references to valid blocks. -system.iocache.tags.warmup_cycle 1685780659017 # Cycle when the warmup percentage was hit. -system.iocache.tags.occ_blocks::tsunami.ide 1.225570 # Average occupied blocks per requestor -system.iocache.tags.occ_percent::tsunami.ide 0.076598 # Average percentage of cache occupancy -system.iocache.tags.occ_percent::total 0.076598 # Average percentage of cache occupancy +system.iocache.tags.replacements 41686 # number of replacements +system.iocache.tags.tagsinuse 1.225570 # Cycle average of tags in use +system.iocache.tags.total_refs 0 # Total number of references to valid blocks. +system.iocache.tags.sampled_refs 41702 # Sample count of references to valid blocks. +system.iocache.tags.avg_refs 0 # Average number of references to valid blocks. +system.iocache.tags.warmup_cycle 1685780659017 # Cycle when the warmup percentage was hit. +system.iocache.tags.occ_blocks::tsunami.ide 1.225570 # Average occupied blocks per requestor +system.iocache.tags.occ_percent::tsunami.ide 0.076598 # Average percentage of cache occupancy +system.iocache.tags.occ_percent::total 0.076598 # Average percentage of cache occupancy system.iocache.ReadReq_misses::tsunami.ide 174 # number of ReadReq misses system.iocache.ReadReq_misses::total 174 # number of ReadReq misses system.iocache.WriteReq_misses::tsunami.ide 41552 # number of WriteReq misses @@ -416,15 +416,15 @@ system.tsunami.ethernet.postedInterrupts 0 # nu system.tsunami.ethernet.droppedPackets 0 # number of packets dropped system.iobus.throughput 1480181 # Throughput (bytes/s) system.iobus.data_through_bus 2707742 # Total data (bytes) -system.cpu.icache.tags.replacements 919609 # number of replacements -system.cpu.icache.tags.tagsinuse 511.215244 # Cycle average of tags in use -system.cpu.icache.tags.total_refs 59129907 # Total number of references to valid blocks. -system.cpu.icache.tags.sampled_refs 920121 # Sample count of references to valid blocks. -system.cpu.icache.tags.avg_refs 64.263186 # Average number of references to valid blocks. -system.cpu.icache.tags.warmup_cycle 9686972500 # Cycle when the warmup percentage was hit. -system.cpu.icache.tags.occ_blocks::cpu.inst 511.215244 # Average occupied blocks per requestor -system.cpu.icache.tags.occ_percent::cpu.inst 0.998467 # Average percentage of cache occupancy -system.cpu.icache.tags.occ_percent::total 0.998467 # Average percentage of cache occupancy +system.cpu.icache.tags.replacements 919609 # number of replacements +system.cpu.icache.tags.tagsinuse 511.215244 # Cycle average of tags in use +system.cpu.icache.tags.total_refs 59129907 # Total number of references to valid blocks. +system.cpu.icache.tags.sampled_refs 920121 # Sample count of references to valid blocks. +system.cpu.icache.tags.avg_refs 64.263186 # Average number of references to valid blocks. +system.cpu.icache.tags.warmup_cycle 9686972500 # Cycle when the warmup percentage was hit. +system.cpu.icache.tags.occ_blocks::cpu.inst 511.215244 # Average occupied blocks per requestor +system.cpu.icache.tags.occ_percent::cpu.inst 0.998467 # Average percentage of cache occupancy +system.cpu.icache.tags.occ_percent::total 0.998467 # Average percentage of cache occupancy system.cpu.icache.ReadReq_hits::cpu.inst 59129907 # number of ReadReq hits system.cpu.icache.ReadReq_hits::total 59129907 # number of ReadReq hits system.cpu.icache.demand_hits::cpu.inst 59129907 # number of demand (read+write) hits @@ -458,19 +458,19 @@ system.cpu.icache.avg_blocked_cycles::no_targets nan system.cpu.icache.fast_writes 0 # number of fast writes performed system.cpu.icache.cache_copies 0 # number of cache copies performed system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate -system.cpu.l2cache.tags.replacements 992301 # number of replacements -system.cpu.l2cache.tags.tagsinuse 65424.374219 # Cycle average of tags in use -system.cpu.l2cache.tags.total_refs 2433263 # Total number of references to valid blocks. -system.cpu.l2cache.tags.sampled_refs 1057464 # Sample count of references to valid blocks. -system.cpu.l2cache.tags.avg_refs 2.301036 # Average number of references to valid blocks. -system.cpu.l2cache.tags.warmup_cycle 614754000 # Cycle when the warmup percentage was hit. +system.cpu.l2cache.tags.replacements 992301 # number of replacements +system.cpu.l2cache.tags.tagsinuse 65424.374219 # Cycle average of tags in use +system.cpu.l2cache.tags.total_refs 2433263 # Total number of references to valid blocks. +system.cpu.l2cache.tags.sampled_refs 1057464 # Sample count of references to valid blocks. +system.cpu.l2cache.tags.avg_refs 2.301036 # Average number of references to valid blocks. +system.cpu.l2cache.tags.warmup_cycle 614754000 # Cycle when the warmup percentage was hit. system.cpu.l2cache.tags.occ_blocks::writebacks 56309.127841 # Average occupied blocks per requestor -system.cpu.l2cache.tags.occ_blocks::cpu.inst 4867.327126 # Average occupied blocks per requestor -system.cpu.l2cache.tags.occ_blocks::cpu.data 4247.919252 # Average occupied blocks per requestor +system.cpu.l2cache.tags.occ_blocks::cpu.inst 4867.327126 # Average occupied blocks per requestor +system.cpu.l2cache.tags.occ_blocks::cpu.data 4247.919252 # Average occupied blocks per requestor system.cpu.l2cache.tags.occ_percent::writebacks 0.859209 # Average percentage of cache occupancy system.cpu.l2cache.tags.occ_percent::cpu.inst 0.074270 # Average percentage of cache occupancy system.cpu.l2cache.tags.occ_percent::cpu.data 0.064818 # Average percentage of cache occupancy -system.cpu.l2cache.tags.occ_percent::total 0.998297 # Average percentage of cache occupancy +system.cpu.l2cache.tags.occ_percent::total 0.998297 # Average percentage of cache occupancy system.cpu.l2cache.ReadReq_hits::cpu.inst 906812 # number of ReadReq hits system.cpu.l2cache.ReadReq_hits::cpu.data 811232 # number of ReadReq hits system.cpu.l2cache.ReadReq_hits::total 1718044 # number of ReadReq hits @@ -538,15 +538,15 @@ system.cpu.l2cache.cache_copies 0 # nu system.cpu.l2cache.writebacks::writebacks 74291 # number of writebacks system.cpu.l2cache.writebacks::total 74291 # number of writebacks system.cpu.l2cache.no_allocate_misses 0 # Number of misses that were no-allocate -system.cpu.dcache.tags.replacements 2042706 # number of replacements -system.cpu.dcache.tags.tagsinuse 511.997802 # Cycle average of tags in use -system.cpu.dcache.tags.total_refs 14038427 # Total number of references to valid blocks. -system.cpu.dcache.tags.sampled_refs 2043218 # Sample count of references to valid blocks. -system.cpu.dcache.tags.avg_refs 6.870744 # Average number of references to valid blocks. -system.cpu.dcache.tags.warmup_cycle 10840000 # Cycle when the warmup percentage was hit. -system.cpu.dcache.tags.occ_blocks::cpu.data 511.997802 # Average occupied blocks per requestor -system.cpu.dcache.tags.occ_percent::cpu.data 0.999996 # Average percentage of cache occupancy -system.cpu.dcache.tags.occ_percent::total 0.999996 # Average percentage of cache occupancy +system.cpu.dcache.tags.replacements 2042706 # number of replacements +system.cpu.dcache.tags.tagsinuse 511.997802 # Cycle average of tags in use +system.cpu.dcache.tags.total_refs 14038427 # Total number of references to valid blocks. +system.cpu.dcache.tags.sampled_refs 2043218 # Sample count of references to valid blocks. +system.cpu.dcache.tags.avg_refs 6.870744 # Average number of references to valid blocks. +system.cpu.dcache.tags.warmup_cycle 10840000 # Cycle when the warmup percentage was hit. +system.cpu.dcache.tags.occ_blocks::cpu.data 511.997802 # Average occupied blocks per requestor +system.cpu.dcache.tags.occ_percent::cpu.data 0.999996 # Average percentage of cache occupancy +system.cpu.dcache.tags.occ_percent::total 0.999996 # Average percentage of cache occupancy system.cpu.dcache.ReadReq_hits::cpu.data 7807777 # number of ReadReq hits system.cpu.dcache.ReadReq_hits::total 7807777 # number of ReadReq hits system.cpu.dcache.WriteReq_hits::cpu.data 5848211 # number of WriteReq hits diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini index 007c56f0a..4764f4e77 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini @@ -8,19 +8,20 @@ time_sync_spin_threshold=100000000 [system] type=LinuxAlphaSystem -children=bridge cpu0 cpu1 disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami +children=bridge clk_domain cpu0 cpu1 cpu_clk_domain disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami voltage_domain boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -clock=1000 -console=/scratch/nilay/GEM5/system/binaries/console +cache_line_size=64 +clk_domain=system.clk_domain +console=/dist/m5/system/binaries/console init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=timing mem_ranges=0:134217727 memories=system.physmem num_work_ids=16 -pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal +pal=/dist/m5/system/binaries/ts_osfpal readfile=tests/halt.sh symbolfile= system_rev=1024 @@ -36,7 +37,7 @@ system_port=system.membus.slave[0] [system.bridge] type=Bridge -clock=1000 +clk_domain=system.clk_domain delay=50000 ranges=8796093022208:18446744073709551615 req_size=16 @@ -44,12 +45,16 @@ resp_size=16 master=system.iobus.slave[0] slave=system.membus.master[0] +[system.clk_domain] +type=SrcClockDomain +clock=1000 +voltage_domain=system.voltage_domain + [system.cpu0] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=0 do_checkpoint_insts=true do_quiesce=true @@ -67,6 +72,7 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_start_insts= switched_out=false system=system tracer=system.cpu0.tracer @@ -76,10 +82,10 @@ icache_port=system.cpu0.icache.cpu_side [system.cpu0.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -90,22 +96,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu0.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu0.dcache_port mem_side=system.toL2Bus.slave[1] +[system.cpu0.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu0.dtb] type=AlphaTLB size=64 [system.cpu0.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -116,12 +131,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu0.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.toL2Bus.slave[0] +[system.cpu0.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu0.interrupts] type=AlphaInterrupts @@ -138,9 +162,8 @@ type=ExeTracer [system.cpu1] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=1 do_checkpoint_insts=true do_quiesce=true @@ -158,6 +181,7 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_start_insts= switched_out=false system=system tracer=system.cpu1.tracer @@ -167,10 +191,10 @@ icache_port=system.cpu1.icache.cpu_side [system.cpu1.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -181,22 +205,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu1.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu1.dcache_port mem_side=system.toL2Bus.slave[3] +[system.cpu1.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu1.dtb] type=AlphaTLB size=64 [system.cpu1.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -207,12 +240,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu1.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu1.icache_port mem_side=system.toL2Bus.slave[2] +[system.cpu1.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu1.interrupts] type=AlphaInterrupts @@ -226,6 +268,11 @@ size=48 [system.cpu1.tracer] type=ExeTracer +[system.cpu_clk_domain] +type=SrcClockDomain +clock=500 +voltage_domain=system.voltage_domain + [system.disk0] type=IdeDisk children=image @@ -243,7 +290,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -263,7 +310,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -272,8 +319,7 @@ sys=system [system.iobus] type=NoncoherentBus -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 use_default_range=true width=8 @@ -283,10 +329,10 @@ slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma [system.iocache] type=BaseCache +children=tags addr_ranges=0:134217727 assoc=8 -block_size=64 -clock=1000 +clk_domain=system.clk_domain forward_snoops=false hit_latency=50 is_top_level=true @@ -297,18 +343,27 @@ prefetcher=Null response_latency=50 size=1024 system=system +tags=system.iocache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.iobus.master[29] mem_side=system.membus.slave[2] +[system.iocache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.clk_domain +hit_latency=50 +size=1024 + [system.l2c] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=8 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=20 is_top_level=false @@ -319,17 +374,25 @@ prefetcher=Null response_latency=20 size=4194304 system=system +tags=system.l2c.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[1] +[system.l2c.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=20 +size=4194304 + [system.membus] type=CoherentBus children=badaddr_responder -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 system=system use_default_range=false @@ -340,7 +403,7 @@ slave=system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=0 pio_latency=100000 @@ -358,19 +421,24 @@ pio=system.membus.default [system.physmem] type=SimpleDRAM activation_limit=4 -addr_mapping=openmap +addr_mapping=RaBaChCo banks_per_rank=8 +burst_length=8 channels=1 -clock=1000 -conf_table_reported=false +clk_domain=system.clk_domain +conf_table_reported=true +device_bus_width=8 +device_rowbuffer_size=1024 +devices_per_rank=8 in_addr_map=true -lines_per_rowbuffer=32 mem_sched_policy=frfcfs null=false page_policy=open range=0:134217727 ranks_per_channel=2 read_buffer_size=32 +static_backend_latency=10000 +static_frontend_latency=10000 tBURST=5000 tCL=13750 tRCD=13750 @@ -381,7 +449,6 @@ tWTR=7500 tXAW=40000 write_buffer_size=32 write_thresh_perc=70 -zero=false port=system.membus.master[1] [system.simple_disk] @@ -392,7 +459,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -404,8 +471,7 @@ port=3456 [system.toL2Bus] type=CoherentBus -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain header_cycles=1 system=system use_default_range=false @@ -421,7 +487,7 @@ system=system [system.tsunami.backdoor] type=AlphaBackdoor -clock=1000 +clk_domain=system.clk_domain cpu=system.cpu0 disk=system.simple_disk pio_addr=8804682956800 @@ -433,7 +499,7 @@ pio=system.iobus.master[24] [system.tsunami.cchip] type=TsunamiCChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8803072344064 pio_latency=100000 system=system @@ -480,7 +546,7 @@ SubClassCode=0 SubsystemID=0 SubsystemVendorID=0 VendorID=4107 -clock=2000 +clk_domain=system.clk_domain config_latency=20000 dma_data_free=false dma_desc_free=false @@ -511,7 +577,7 @@ pio=system.iobus.master[27] [system.tsunami.fake_OROM] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8796093677568 pio_latency=100000 @@ -528,7 +594,7 @@ pio=system.iobus.master[8] [system.tsunami.fake_ata0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848432 pio_latency=100000 @@ -545,7 +611,7 @@ pio=system.iobus.master[19] [system.tsunami.fake_ata1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848304 pio_latency=100000 @@ -562,7 +628,7 @@ pio=system.iobus.master[20] [system.tsunami.fake_pnp_addr] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848569 pio_latency=100000 @@ -579,7 +645,7 @@ pio=system.iobus.master[9] [system.tsunami.fake_pnp_read0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848451 pio_latency=100000 @@ -596,7 +662,7 @@ pio=system.iobus.master[11] [system.tsunami.fake_pnp_read1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848515 pio_latency=100000 @@ -613,7 +679,7 @@ pio=system.iobus.master[12] [system.tsunami.fake_pnp_read2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848579 pio_latency=100000 @@ -630,7 +696,7 @@ pio=system.iobus.master[13] [system.tsunami.fake_pnp_read3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848643 pio_latency=100000 @@ -647,7 +713,7 @@ pio=system.iobus.master[14] [system.tsunami.fake_pnp_read4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848707 pio_latency=100000 @@ -664,7 +730,7 @@ pio=system.iobus.master[15] [system.tsunami.fake_pnp_read5] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848771 pio_latency=100000 @@ -681,7 +747,7 @@ pio=system.iobus.master[16] [system.tsunami.fake_pnp_read6] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848835 pio_latency=100000 @@ -698,7 +764,7 @@ pio=system.iobus.master[17] [system.tsunami.fake_pnp_read7] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848899 pio_latency=100000 @@ -715,7 +781,7 @@ pio=system.iobus.master[18] [system.tsunami.fake_pnp_write] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615850617 pio_latency=100000 @@ -732,7 +798,7 @@ pio=system.iobus.master[10] [system.tsunami.fake_ppc] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848891 pio_latency=100000 @@ -749,7 +815,7 @@ pio=system.iobus.master[7] [system.tsunami.fake_sm_chip] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848816 pio_latency=100000 @@ -766,7 +832,7 @@ pio=system.iobus.master[2] [system.tsunami.fake_uart1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848696 pio_latency=100000 @@ -783,7 +849,7 @@ pio=system.iobus.master[3] [system.tsunami.fake_uart2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848936 pio_latency=100000 @@ -800,7 +866,7 @@ pio=system.iobus.master[4] [system.tsunami.fake_uart3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848680 pio_latency=100000 @@ -817,7 +883,7 @@ pio=system.iobus.master[5] [system.tsunami.fake_uart4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848944 pio_latency=100000 @@ -834,7 +900,7 @@ pio=system.iobus.master[6] [system.tsunami.fb] type=BadDevice -clock=1000 +clk_domain=system.clk_domain devicename=FrameBuffer pio_addr=8804615848912 pio_latency=100000 @@ -881,7 +947,7 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 -clock=1000 +clk_domain=system.clk_domain config_latency=20000 ctrl_offset=0 disks=system.disk0 system.disk2 @@ -898,7 +964,7 @@ pio=system.iobus.master[25] [system.tsunami.io] type=TsunamiIO -clock=1000 +clk_domain=system.clk_domain frequency=976562500 pio_addr=8804615847936 pio_latency=100000 @@ -910,7 +976,7 @@ pio=system.iobus.master[22] [system.tsunami.pchip] type=TsunamiPChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8802535473152 pio_latency=100000 system=system @@ -920,7 +986,8 @@ pio=system.iobus.master[1] [system.tsunami.pciconfig] type=PciConfigAll bus=0 -clock=1000 +clk_domain=system.clk_domain +pio_addr=0 pio_latency=30000 platform=system.tsunami size=16777216 @@ -929,7 +996,7 @@ pio=system.iobus.default [system.tsunami.uart] type=Uart8250 -clock=1000 +clk_domain=system.clk_domain pio_addr=8804615848952 pio_latency=100000 platform=system.tsunami @@ -937,3 +1004,7 @@ system=system terminal=system.terminal pio=system.iobus.master[23] +[system.voltage_domain] +type=VoltageDomain +voltage=1.000000 + diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout index 117d6c541..a33dd389d 100755 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout @@ -3,13 +3,13 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/t gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Mar 26 2013 14:38:52 -gem5 started Mar 26 2013 14:39:13 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Sep 24 2013 03:08:53 +gem5 started Sep 28 2013 03:05:51 +gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-timing-dual -re tests/run.py build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-timing-dual Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux +info: kernel located at: /dist/m5/system/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 info: Entering event queue @ 0. Starting simulation... -info: Launching CPU 1 @ 614109000 -Exiting @ tick 1955749107000 because m5_exit instruction encountered +info: Launching CPU 1 @ 675287000 +Exiting @ tick 1961841175000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal index aa80e0b5e..0d754b641 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/system.terminal @@ -17,8 +17,8 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
unix_boot_mem ends at FFFFFC0000078000
k_argc = 0
jumping to kernel at 0xFFFFFC0000310000, (PCBB 0xFFFFFC0000018180 pfn 1067) -
Entering slaveloop for cpu 1 my_rpb=FFFFFC0000018400
CallbackFixup 0 18000, t7=FFFFFC000070C000 +
Entering slaveloop for cpu 1 my_rpb=FFFFFC0000018400
Linux version 2.6.13 (hsul@zed.eecs.umich.edu) (gcc version 3.4.3) #1 SMP Sun Oct 8 19:52:07 EDT 2006
Booting GENERIC on Tsunami variation DP264 using machine vector DP264 from SRM
Major Options: SMP LEGACY_START VERBOSE_MCHECK @@ -27,7 +27,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
memcluster 1, usage 0, start 392, end 16384
freeing pages 1069:16384
reserving pages 1069:1070 -
4096K Bcache detected; load hit latency 40 cycles, load miss latency 123 cycles +
4096K Bcache detected; load hit latency 38 cycles, load miss latency 142 cycles
SMP: 2 CPUs probed -- cpu_present_mask = 3
Built 1 zonelists
Kernel command line: root=/dev/hda1 console=ttyS0 diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini index d8f41ddb0..54bf6e928 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini @@ -8,19 +8,20 @@ time_sync_spin_threshold=100000000 [system] type=LinuxAlphaSystem -children=bridge cpu disk0 disk2 intrctrl iobus iocache membus physmem simple_disk terminal tsunami +children=bridge clk_domain cpu cpu_clk_domain disk0 disk2 intrctrl iobus iocache membus physmem simple_disk terminal tsunami voltage_domain boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -clock=1000 -console=/scratch/nilay/GEM5/system/binaries/console +cache_line_size=64 +clk_domain=system.clk_domain +console=/dist/m5/system/binaries/console init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=timing mem_ranges=0:134217727 memories=system.physmem num_work_ids=16 -pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal +pal=/dist/m5/system/binaries/ts_osfpal readfile=tests/halt.sh symbolfile= system_rev=1024 @@ -36,7 +37,7 @@ system_port=system.membus.slave[0] [system.bridge] type=Bridge -clock=1000 +clk_domain=system.clk_domain delay=50000 ranges=8796093022208:18446744073709551615 req_size=16 @@ -44,12 +45,16 @@ resp_size=16 master=system.iobus.slave[0] slave=system.membus.master[0] +[system.clk_domain] +type=SrcClockDomain +clock=1000 +voltage_domain=system.voltage_domain + [system.cpu] type=TimingSimpleCPU children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer -branchPred=Null checker=Null -clock=500 +clk_domain=system.cpu_clk_domain cpu_id=0 do_checkpoint_insts=true do_quiesce=true @@ -67,6 +72,7 @@ max_loads_any_thread=0 numThreads=1 profile=0 progress_interval=0 +simpoint_start_insts= switched_out=false system=system tracer=system.cpu.tracer @@ -76,10 +82,10 @@ icache_port=system.cpu.icache.cpu_side [system.cpu.dcache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=4 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -90,22 +96,31 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu.dcache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] +[system.cpu.dcache.tags] +type=LRU +assoc=4 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu.dtb] type=AlphaTLB size=64 [system.cpu.icache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=1 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=2 is_top_level=true @@ -116,12 +131,21 @@ prefetcher=Null response_latency=2 size=32768 system=system +tags=system.cpu.icache.tags tgts_per_mshr=20 two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] +[system.cpu.icache.tags] +type=LRU +assoc=1 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=2 +size=32768 + [system.cpu.interrupts] type=AlphaInterrupts @@ -134,10 +158,10 @@ size=48 [system.cpu.l2cache] type=BaseCache +children=tags addr_ranges=0:18446744073709551615 assoc=8 -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain forward_snoops=true hit_latency=20 is_top_level=false @@ -148,17 +172,26 @@ prefetcher=Null response_latency=20 size=4194304 system=system +tags=system.cpu.l2cache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] +[system.cpu.l2cache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.cpu_clk_domain +hit_latency=20 +size=4194304 + [system.cpu.toL2Bus] type=CoherentBus -block_size=64 -clock=500 +clk_domain=system.cpu_clk_domain header_cycles=1 +system=system use_default_range=false width=32 master=system.cpu.l2cache.cpu_side @@ -167,6 +200,11 @@ slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side [system.cpu.tracer] type=ExeTracer +[system.cpu_clk_domain] +type=SrcClockDomain +clock=500 +voltage_domain=system.voltage_domain + [system.disk0] type=IdeDisk children=image @@ -184,7 +222,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -204,7 +242,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -213,8 +251,7 @@ sys=system [system.iobus] type=NoncoherentBus -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 use_default_range=true width=8 @@ -224,10 +261,10 @@ slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma [system.iocache] type=BaseCache +children=tags addr_ranges=0:134217727 assoc=8 -block_size=64 -clock=1000 +clk_domain=system.clk_domain forward_snoops=false hit_latency=50 is_top_level=true @@ -238,18 +275,27 @@ prefetcher=Null response_latency=50 size=1024 system=system +tags=system.iocache.tags tgts_per_mshr=12 two_queue=false write_buffers=8 cpu_side=system.iobus.master[29] mem_side=system.membus.slave[2] +[system.iocache.tags] +type=LRU +assoc=8 +block_size=64 +clk_domain=system.clk_domain +hit_latency=50 +size=1024 + [system.membus] type=CoherentBus children=badaddr_responder -block_size=64 -clock=1000 +clk_domain=system.clk_domain header_cycles=1 +system=system use_default_range=false width=8 default=system.membus.badaddr_responder.pio @@ -258,7 +304,7 @@ slave=system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side [system.membus.badaddr_responder] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=0 pio_latency=100000 @@ -275,28 +321,35 @@ pio=system.membus.default [system.physmem] type=SimpleDRAM -addr_mapping=openmap +activation_limit=4 +addr_mapping=RaBaChCo banks_per_rank=8 -clock=1000 -conf_table_reported=false +burst_length=8 +channels=1 +clk_domain=system.clk_domain +conf_table_reported=true +device_bus_width=8 +device_rowbuffer_size=1024 +devices_per_rank=8 in_addr_map=true -lines_per_rowbuffer=64 -mem_sched_policy=fcfs +mem_sched_policy=frfcfs null=false page_policy=open range=0:134217727 ranks_per_channel=2 read_buffer_size=32 -tBURST=4000 -tCL=14000 -tRCD=14000 +static_backend_latency=10000 +static_frontend_latency=10000 +tBURST=5000 +tCL=13750 +tRCD=13750 tREFI=7800000 tRFC=300000 -tRP=14000 -tWTR=1000 +tRP=13750 +tWTR=7500 +tXAW=40000 write_buffer_size=32 write_thresh_perc=70 -zero=false port=system.membus.master[1] [system.simple_disk] @@ -307,7 +360,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -325,7 +378,7 @@ system=system [system.tsunami.backdoor] type=AlphaBackdoor -clock=1000 +clk_domain=system.clk_domain cpu=system.cpu disk=system.simple_disk pio_addr=8804682956800 @@ -337,7 +390,7 @@ pio=system.iobus.master[24] [system.tsunami.cchip] type=TsunamiCChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8803072344064 pio_latency=100000 system=system @@ -384,7 +437,7 @@ SubClassCode=0 SubsystemID=0 SubsystemVendorID=0 VendorID=4107 -clock=2000 +clk_domain=system.clk_domain config_latency=20000 dma_data_free=false dma_desc_free=false @@ -415,7 +468,7 @@ pio=system.iobus.master[27] [system.tsunami.fake_OROM] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8796093677568 pio_latency=100000 @@ -432,7 +485,7 @@ pio=system.iobus.master[8] [system.tsunami.fake_ata0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848432 pio_latency=100000 @@ -449,7 +502,7 @@ pio=system.iobus.master[19] [system.tsunami.fake_ata1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848304 pio_latency=100000 @@ -466,7 +519,7 @@ pio=system.iobus.master[20] [system.tsunami.fake_pnp_addr] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848569 pio_latency=100000 @@ -483,7 +536,7 @@ pio=system.iobus.master[9] [system.tsunami.fake_pnp_read0] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848451 pio_latency=100000 @@ -500,7 +553,7 @@ pio=system.iobus.master[11] [system.tsunami.fake_pnp_read1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848515 pio_latency=100000 @@ -517,7 +570,7 @@ pio=system.iobus.master[12] [system.tsunami.fake_pnp_read2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848579 pio_latency=100000 @@ -534,7 +587,7 @@ pio=system.iobus.master[13] [system.tsunami.fake_pnp_read3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848643 pio_latency=100000 @@ -551,7 +604,7 @@ pio=system.iobus.master[14] [system.tsunami.fake_pnp_read4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848707 pio_latency=100000 @@ -568,7 +621,7 @@ pio=system.iobus.master[15] [system.tsunami.fake_pnp_read5] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848771 pio_latency=100000 @@ -585,7 +638,7 @@ pio=system.iobus.master[16] [system.tsunami.fake_pnp_read6] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848835 pio_latency=100000 @@ -602,7 +655,7 @@ pio=system.iobus.master[17] [system.tsunami.fake_pnp_read7] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848899 pio_latency=100000 @@ -619,7 +672,7 @@ pio=system.iobus.master[18] [system.tsunami.fake_pnp_write] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615850617 pio_latency=100000 @@ -636,7 +689,7 @@ pio=system.iobus.master[10] [system.tsunami.fake_ppc] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848891 pio_latency=100000 @@ -653,7 +706,7 @@ pio=system.iobus.master[7] [system.tsunami.fake_sm_chip] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848816 pio_latency=100000 @@ -670,7 +723,7 @@ pio=system.iobus.master[2] [system.tsunami.fake_uart1] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848696 pio_latency=100000 @@ -687,7 +740,7 @@ pio=system.iobus.master[3] [system.tsunami.fake_uart2] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848936 pio_latency=100000 @@ -704,7 +757,7 @@ pio=system.iobus.master[4] [system.tsunami.fake_uart3] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848680 pio_latency=100000 @@ -721,7 +774,7 @@ pio=system.iobus.master[5] [system.tsunami.fake_uart4] type=IsaFake -clock=1000 +clk_domain=system.clk_domain fake_mem=false pio_addr=8804615848944 pio_latency=100000 @@ -738,7 +791,7 @@ pio=system.iobus.master[6] [system.tsunami.fb] type=BadDevice -clock=1000 +clk_domain=system.clk_domain devicename=FrameBuffer pio_addr=8804615848912 pio_latency=100000 @@ -785,7 +838,7 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 -clock=1000 +clk_domain=system.clk_domain config_latency=20000 ctrl_offset=0 disks=system.disk0 system.disk2 @@ -802,7 +855,7 @@ pio=system.iobus.master[25] [system.tsunami.io] type=TsunamiIO -clock=1000 +clk_domain=system.clk_domain frequency=976562500 pio_addr=8804615847936 pio_latency=100000 @@ -814,7 +867,7 @@ pio=system.iobus.master[22] [system.tsunami.pchip] type=TsunamiPChip -clock=1000 +clk_domain=system.clk_domain pio_addr=8802535473152 pio_latency=100000 system=system @@ -824,7 +877,8 @@ pio=system.iobus.master[1] [system.tsunami.pciconfig] type=PciConfigAll bus=0 -clock=1000 +clk_domain=system.clk_domain +pio_addr=0 pio_latency=30000 platform=system.tsunami size=16777216 @@ -833,7 +887,7 @@ pio=system.iobus.default [system.tsunami.uart] type=Uart8250 -clock=1000 +clk_domain=system.clk_domain pio_addr=8804615848952 pio_latency=100000 platform=system.tsunami @@ -841,3 +895,7 @@ system=system terminal=system.terminal pio=system.iobus.master[23] +[system.voltage_domain] +type=VoltageDomain +voltage=1.000000 + diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout index 229260842..cabc90a11 100755 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout @@ -3,12 +3,12 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/t gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 23 2013 13:29:14 -gem5 started Jan 23 2013 14:32:52 -gem5 executing on ribera.cs.wisc.edu +gem5 compiled Sep 24 2013 03:08:53 +gem5 started Sep 28 2013 03:05:50 +gem5 executing on zizzer command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-timing -re tests/run.py build/ALPHA/tests/opt/quick/fs/10.linux-boot/alpha/linux/tsunami-simple-timing Global frequency set at 1000000000000 ticks per second -info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux +info: kernel located at: /dist/m5/system/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 info: Entering event queue @ 0. Starting simulation... -Exiting @ tick 1910582068000 because m5_exit instruction encountered +Exiting @ tick 1918473094000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal index ff644ed3f..0d89ac053 100644 --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/system.terminal @@ -24,7 +24,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
memcluster 1, usage 0, start 392, end 16384
freeing pages 1069:16384
reserving pages 1069:1070 -
4096K Bcache detected; load hit latency 40 cycles, load miss latency 124 cycles +
4096K Bcache detected; load hit latency 38 cycles, load miss latency 142 cycles
SMP: 1 CPUs probed -- cpu_present_mask = 1
Built 1 zonelists
Kernel command line: root=/dev/hda1 console=ttyS0 |