stats: update stats for previous changes.

1 files changed, 198 insertions, 116 deletions

diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index ab2a707ae..e13d309d9 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -1,17 +1,19 @@
 [drivesys]
 type=LinuxAlphaSystem
 children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami
-boot_cpu_frequency=1
+boot_cpu_frequency=250
 boot_osflags=root=/dev/hda1 console=ttyS0
-console=/dist/m5/system/binaries/console
+clock=1000
+console=/gem5/dist/binaries/console
 init_param=0
-kernel=/dist/m5/system/binaries/vmlinux
+kernel=/gem5/dist/binaries/vmlinux
 load_addr_mask=1099511627775
 mem_mode=atomic
+mem_ranges=0:134217727
 memories=drivesys.physmem
 num_work_ids=16
-pal=/dist/m5/system/binaries/ts_osfpal
-readfile=/tmp/gem5.ali/configs/boot/netperf-server.rcS
+pal=/gem5/dist/binaries/ts_osfpal
+readfile=/gem5/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -26,22 +28,20 @@ system_port=drivesys.membus.slave[0]
 
 [drivesys.bridge]
 type=Bridge
+clock=1000
 delay=50000
-nack_delay=4000
 ranges=8796093022208:18446744073709551615
 req_size=16
 resp_size=16
-write_ack=false
 master=drivesys.iobus.slave[0]
 slave=drivesys.membus.master[0]
 
 [drivesys.cpu]
 type=AtomicSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
-clock=1
+clock=250
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -50,17 +50,18 @@ fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=drivesys.cpu.interrupts
+isa=drivesys.cpu.isa
 itb=drivesys.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
 simulate_data_stalls=false
 simulate_inst_stalls=false
+switched_out=false
 system=drivesys
 tracer=drivesys.cpu.tracer
 width=1
@@ -75,6 +76,9 @@ size=64
 [drivesys.cpu.interrupts]
 type=AlphaInterrupts
 
+[drivesys.cpu.isa]
+type=AlphaISA
+
 [drivesys.cpu.itb]
 type=AlphaTLB
 size=48
@@ -99,7 +103,7 @@ table_size=65536
 
 [drivesys.disk0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
+image_file=/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [drivesys.disk2]
@@ -119,7 +123,7 @@ table_size=65536
 
 [drivesys.disk2.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
+image_file=/gem5/dist/disks/linux-bigswap2.img
 read_only=true
 
 [drivesys.intrctrl]
@@ -128,12 +132,11 @@ sys=drivesys
 
 [drivesys.iobridge]
 type=Bridge
+clock=1000
 delay=50000
-nack_delay=4000
-ranges=0:8589934592
+ranges=0:134217727
 req_size=16
 resp_size=16
-write_ack=false
 master=drivesys.membus.slave[3]
 slave=drivesys.iobus.master[29]
 
@@ -143,7 +146,7 @@ block_size=64
 clock=1000
 header_cycles=1
 use_default_range=true
-width=64
+width=8
 default=drivesys.tsunami.pciconfig.pio
 master=drivesys.tsunami.cchip.pio drivesys.tsunami.pchip.pio drivesys.tsunami.fake_sm_chip.pio drivesys.tsunami.fake_uart1.pio drivesys.tsunami.fake_uart2.pio drivesys.tsunami.fake_uart3.pio drivesys.tsunami.fake_uart4.pio drivesys.tsunami.fake_ppc.pio drivesys.tsunami.fake_OROM.pio drivesys.tsunami.fake_pnp_addr.pio drivesys.tsunami.fake_pnp_write.pio drivesys.tsunami.fake_pnp_read0.pio drivesys.tsunami.fake_pnp_read1.pio drivesys.tsunami.fake_pnp_read2.pio drivesys.tsunami.fake_pnp_read3.pio drivesys.tsunami.fake_pnp_read4.pio drivesys.tsunami.fake_pnp_read5.pio drivesys.tsunami.fake_pnp_read6.pio drivesys.tsunami.fake_pnp_read7.pio drivesys.tsunami.fake_ata0.pio drivesys.tsunami.fake_ata1.pio drivesys.tsunami.fb.pio drivesys.tsunami.io.pio drivesys.tsunami.uart.pio drivesys.tsunami.backdoor.pio drivesys.tsunami.ide.pio drivesys.tsunami.ide.config drivesys.tsunami.ethernet.pio drivesys.tsunami.ethernet.config drivesys.iobridge.slave
 slave=drivesys.bridge.master drivesys.tsunami.ide.dma drivesys.tsunami.ethernet.dma
@@ -155,16 +158,17 @@ block_size=64
 clock=1000
 header_cycles=1
 use_default_range=false
-width=64
+width=8
 default=drivesys.membus.badaddr_responder.pio
-master=drivesys.bridge.slave drivesys.physmem.port[0]
+master=drivesys.bridge.slave drivesys.physmem.port
 slave=drivesys.system_port drivesys.cpu.icache_port drivesys.cpu.dcache_port drivesys.iobridge.master
 
 [drivesys.membus.badaddr_responder]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=0
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=true
 ret_data16=65535
@@ -177,14 +181,28 @@ warn_access=
 pio=drivesys.membus.default
 
 [drivesys.physmem]
-type=SimpleMemory
+type=SimpleDRAM
+addr_mapping=openmap
+banks_per_rank=8
+clock=1000
 conf_table_reported=false
-file=
 in_addr_map=true
-latency=30000
-latency_var=0
+lines_per_rowbuffer=64
+mem_sched_policy=fcfs
 null=false
+page_policy=open
 range=0:134217727
+ranks_per_channel=2
+read_buffer_size=32
+tBURST=4000
+tCL=14000
+tRCD=14000
+tREFI=7800000
+tRFC=300000
+tRP=14000
+tWTR=1000
+write_buffer_size=32
+write_thresh_perc=70
 zero=false
 port=drivesys.membus.master[1]
 
@@ -196,7 +214,7 @@ system=drivesys
 
 [drivesys.simple_disk.disk]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
+image_file=/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [drivesys.terminal]
@@ -214,10 +232,11 @@ system=drivesys
 
 [drivesys.tsunami.backdoor]
 type=AlphaBackdoor
+clock=1000
 cpu=drivesys.cpu
 disk=drivesys.simple_disk
 pio_addr=8804682956800
-pio_latency=1000
+pio_latency=100000
 platform=drivesys.tsunami
 system=drivesys
 terminal=drivesys.terminal
@@ -225,8 +244,9 @@ pio=drivesys.iobus.master[24]
 
 [drivesys.tsunami.cchip]
 type=TsunamiCChip
+clock=1000
 pio_addr=8803072344064
-pio_latency=1000
+pio_latency=100000
 system=drivesys
 tsunami=drivesys.tsunami
 pio=drivesys.iobus.master[0]
@@ -271,7 +291,7 @@ SubClassCode=0
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=4107
-clock=0
+clock=2000
 config_latency=20000
 dma_data_free=false
 dma_desc_free=false
@@ -282,12 +302,10 @@ dma_write_delay=0
 dma_write_factor=0
 hardware_address=00:90:00:00:00:02
 intr_delay=10000000
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pci_bus=0
 pci_dev=1
 pci_func=0
-pio_latency=1000
+pio_latency=30000
 platform=drivesys.tsunami
 rss=false
 rx_delay=1000000
@@ -305,9 +323,10 @@ pio=drivesys.iobus.master[27]
 
 [drivesys.tsunami.fake_OROM]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8796093677568
-pio_latency=1000
+pio_latency=100000
 pio_size=393216
 ret_bad_addr=false
 ret_data16=65535
@@ -321,9 +340,10 @@ pio=drivesys.iobus.master[8]
 
 [drivesys.tsunami.fake_ata0]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848432
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -337,9 +357,10 @@ pio=drivesys.iobus.master[19]
 
 [drivesys.tsunami.fake_ata1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848304
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -353,9 +374,10 @@ pio=drivesys.iobus.master[20]
 
 [drivesys.tsunami.fake_pnp_addr]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848569
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -369,9 +391,10 @@ pio=drivesys.iobus.master[9]
 
 [drivesys.tsunami.fake_pnp_read0]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848451
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -385,9 +408,10 @@ pio=drivesys.iobus.master[11]
 
 [drivesys.tsunami.fake_pnp_read1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848515
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -401,9 +425,10 @@ pio=drivesys.iobus.master[12]
 
 [drivesys.tsunami.fake_pnp_read2]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848579
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -417,9 +442,10 @@ pio=drivesys.iobus.master[13]
 
 [drivesys.tsunami.fake_pnp_read3]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848643
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -433,9 +459,10 @@ pio=drivesys.iobus.master[14]
 
 [drivesys.tsunami.fake_pnp_read4]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848707
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -449,9 +476,10 @@ pio=drivesys.iobus.master[15]
 
 [drivesys.tsunami.fake_pnp_read5]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848771
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -465,9 +493,10 @@ pio=drivesys.iobus.master[16]
 
 [drivesys.tsunami.fake_pnp_read6]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848835
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -481,9 +510,10 @@ pio=drivesys.iobus.master[17]
 
 [drivesys.tsunami.fake_pnp_read7]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848899
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -497,9 +527,10 @@ pio=drivesys.iobus.master[18]
 
 [drivesys.tsunami.fake_pnp_write]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615850617
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -513,9 +544,10 @@ pio=drivesys.iobus.master[10]
 
 [drivesys.tsunami.fake_ppc]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848891
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -529,9 +561,10 @@ pio=drivesys.iobus.master[7]
 
 [drivesys.tsunami.fake_sm_chip]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848816
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -545,9 +578,10 @@ pio=drivesys.iobus.master[2]
 
 [drivesys.tsunami.fake_uart1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848696
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -561,9 +595,10 @@ pio=drivesys.iobus.master[3]
 
 [drivesys.tsunami.fake_uart2]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848936
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -577,9 +612,10 @@ pio=drivesys.iobus.master[4]
 
 [drivesys.tsunami.fake_uart3]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848680
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -593,9 +629,10 @@ pio=drivesys.iobus.master[5]
 
 [drivesys.tsunami.fake_uart4]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848944
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -609,9 +646,10 @@ pio=drivesys.iobus.master[6]
 
 [drivesys.tsunami.fb]
 type=BadDevice
+clock=1000
 devicename=FrameBuffer
 pio_addr=8804615848912
-pio_latency=1000
+pio_latency=100000
 system=drivesys
 pio=drivesys.iobus.master[21]
 
@@ -655,16 +693,15 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+clock=1000
 config_latency=20000
 ctrl_offset=0
 disks=drivesys.disk0 drivesys.disk2
 io_shift=0
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pci_bus=0
 pci_dev=0
 pci_func=0
-pio_latency=1000
+pio_latency=30000
 platform=drivesys.tsunami
 system=drivesys
 config=drivesys.iobus.master[26]
@@ -673,9 +710,10 @@ pio=drivesys.iobus.master[25]
 
 [drivesys.tsunami.io]
 type=TsunamiIO
+clock=1000
 frequency=976562500
 pio_addr=8804615847936
-pio_latency=1000
+pio_latency=100000
 system=drivesys
 time=Thu Jan  1 00:00:00 2009
 tsunami=drivesys.tsunami
@@ -684,8 +722,9 @@ pio=drivesys.iobus.master[22]
 
 [drivesys.tsunami.pchip]
 type=TsunamiPChip
+clock=1000
 pio_addr=8802535473152
-pio_latency=1000
+pio_latency=100000
 system=drivesys
 tsunami=drivesys.tsunami
 pio=drivesys.iobus.master[1]
@@ -693,7 +732,8 @@ pio=drivesys.iobus.master[1]
 [drivesys.tsunami.pciconfig]
 type=PciConfigAll
 bus=0
-pio_latency=1
+clock=1000
+pio_latency=30000
 platform=drivesys.tsunami
 size=16777216
 system=drivesys
@@ -701,8 +741,9 @@ pio=drivesys.iobus.default
 
 [drivesys.tsunami.uart]
 type=Uart8250
+clock=1000
 pio_addr=8804615848952
-pio_latency=1000
+pio_latency=100000
 platform=drivesys.tsunami
 system=drivesys
 terminal=drivesys.terminal
@@ -733,17 +774,19 @@ time_sync_spin_threshold=100000000
 [testsys]
 type=LinuxAlphaSystem
 children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami
-boot_cpu_frequency=1
+boot_cpu_frequency=500
 boot_osflags=root=/dev/hda1 console=ttyS0
-console=/dist/m5/system/binaries/console
+clock=1000
+console=/gem5/dist/binaries/console
 init_param=0
-kernel=/dist/m5/system/binaries/vmlinux
+kernel=/gem5/dist/binaries/vmlinux
 load_addr_mask=1099511627775
 mem_mode=atomic
+mem_ranges=0:134217727
 memories=testsys.physmem
 num_work_ids=16
-pal=/dist/m5/system/binaries/ts_osfpal
-readfile=/tmp/gem5.ali/configs/boot/netperf-stream-client.rcS
+pal=/gem5/dist/binaries/ts_osfpal
+readfile=/gem5/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -758,22 +801,20 @@ system_port=testsys.membus.slave[0]
 
 [testsys.bridge]
 type=Bridge
+clock=1000
 delay=50000
-nack_delay=4000
 ranges=8796093022208:18446744073709551615
 req_size=16
 resp_size=16
-write_ack=false
 master=testsys.iobus.slave[0]
 slave=testsys.membus.master[0]
 
 [testsys.cpu]
 type=AtomicSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
-clock=1
+clock=500
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -782,17 +823,18 @@ fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=testsys.cpu.interrupts
+isa=testsys.cpu.isa
 itb=testsys.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
 simulate_data_stalls=false
 simulate_inst_stalls=false
+switched_out=false
 system=testsys
 tracer=testsys.cpu.tracer
 width=1
@@ -807,6 +849,9 @@ size=64
 [testsys.cpu.interrupts]
 type=AlphaInterrupts
 
+[testsys.cpu.isa]
+type=AlphaISA
+
 [testsys.cpu.itb]
 type=AlphaTLB
 size=48
@@ -831,7 +876,7 @@ table_size=65536
 
 [testsys.disk0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
+image_file=/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [testsys.disk2]
@@ -851,7 +896,7 @@ table_size=65536
 
 [testsys.disk2.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
+image_file=/gem5/dist/disks/linux-bigswap2.img
 read_only=true
 
 [testsys.intrctrl]
@@ -860,12 +905,11 @@ sys=testsys
 
 [testsys.iobridge]
 type=Bridge
+clock=1000
 delay=50000
-nack_delay=4000
-ranges=0:8589934592
+ranges=0:134217727
 req_size=16
 resp_size=16
-write_ack=false
 master=testsys.membus.slave[3]
 slave=testsys.iobus.master[29]
 
@@ -875,7 +919,7 @@ block_size=64
 clock=1000
 header_cycles=1
 use_default_range=true
-width=64
+width=8
 default=testsys.tsunami.pciconfig.pio
 master=testsys.tsunami.cchip.pio testsys.tsunami.pchip.pio testsys.tsunami.fake_sm_chip.pio testsys.tsunami.fake_uart1.pio testsys.tsunami.fake_uart2.pio testsys.tsunami.fake_uart3.pio testsys.tsunami.fake_uart4.pio testsys.tsunami.fake_ppc.pio testsys.tsunami.fake_OROM.pio testsys.tsunami.fake_pnp_addr.pio testsys.tsunami.fake_pnp_write.pio testsys.tsunami.fake_pnp_read0.pio testsys.tsunami.fake_pnp_read1.pio testsys.tsunami.fake_pnp_read2.pio testsys.tsunami.fake_pnp_read3.pio testsys.tsunami.fake_pnp_read4.pio testsys.tsunami.fake_pnp_read5.pio testsys.tsunami.fake_pnp_read6.pio testsys.tsunami.fake_pnp_read7.pio testsys.tsunami.fake_ata0.pio testsys.tsunami.fake_ata1.pio testsys.tsunami.fb.pio testsys.tsunami.io.pio testsys.tsunami.uart.pio testsys.tsunami.backdoor.pio testsys.tsunami.ide.pio testsys.tsunami.ide.config testsys.tsunami.ethernet.pio testsys.tsunami.ethernet.config testsys.iobridge.slave
 slave=testsys.bridge.master testsys.tsunami.ide.dma testsys.tsunami.ethernet.dma
@@ -887,16 +931,17 @@ block_size=64
 clock=1000
 header_cycles=1
 use_default_range=false
-width=64
+width=8
 default=testsys.membus.badaddr_responder.pio
-master=testsys.bridge.slave testsys.physmem.port[0]
+master=testsys.bridge.slave testsys.physmem.port
 slave=testsys.system_port testsys.cpu.icache_port testsys.cpu.dcache_port testsys.iobridge.master
 
 [testsys.membus.badaddr_responder]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=0
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=true
 ret_data16=65535
@@ -909,14 +954,28 @@ warn_access=
 pio=testsys.membus.default
 
 [testsys.physmem]
-type=SimpleMemory
+type=SimpleDRAM
+addr_mapping=openmap
+banks_per_rank=8
+clock=1000
 conf_table_reported=false
-file=
 in_addr_map=true
-latency=30000
-latency_var=0
+lines_per_rowbuffer=64
+mem_sched_policy=fcfs
 null=false
+page_policy=open
 range=0:134217727
+ranks_per_channel=2
+read_buffer_size=32
+tBURST=4000
+tCL=14000
+tRCD=14000
+tREFI=7800000
+tRFC=300000
+tRP=14000
+tWTR=1000
+write_buffer_size=32
+write_thresh_perc=70
 zero=false
 port=testsys.membus.master[1]
 
@@ -928,7 +987,7 @@ system=testsys
 
 [testsys.simple_disk.disk]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
+image_file=/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [testsys.terminal]
@@ -946,10 +1005,11 @@ system=testsys
 
 [testsys.tsunami.backdoor]
 type=AlphaBackdoor
+clock=1000
 cpu=testsys.cpu
 disk=testsys.simple_disk
 pio_addr=8804682956800
-pio_latency=1000
+pio_latency=100000
 platform=testsys.tsunami
 system=testsys
 terminal=testsys.terminal
@@ -957,8 +1017,9 @@ pio=testsys.iobus.master[24]
 
 [testsys.tsunami.cchip]
 type=TsunamiCChip
+clock=1000
 pio_addr=8803072344064
-pio_latency=1000
+pio_latency=100000
 system=testsys
 tsunami=testsys.tsunami
 pio=testsys.iobus.master[0]
@@ -1003,7 +1064,7 @@ SubClassCode=0
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=4107
-clock=0
+clock=2000
 config_latency=20000
 dma_data_free=false
 dma_desc_free=false
@@ -1014,12 +1075,10 @@ dma_write_delay=0
 dma_write_factor=0
 hardware_address=00:90:00:00:00:01
 intr_delay=10000000
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pci_bus=0
 pci_dev=1
 pci_func=0
-pio_latency=1000
+pio_latency=30000
 platform=testsys.tsunami
 rss=false
 rx_delay=1000000
@@ -1037,9 +1096,10 @@ pio=testsys.iobus.master[27]
 
 [testsys.tsunami.fake_OROM]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8796093677568
-pio_latency=1000
+pio_latency=100000
 pio_size=393216
 ret_bad_addr=false
 ret_data16=65535
@@ -1053,9 +1113,10 @@ pio=testsys.iobus.master[8]
 
 [testsys.tsunami.fake_ata0]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848432
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1069,9 +1130,10 @@ pio=testsys.iobus.master[19]
 
 [testsys.tsunami.fake_ata1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848304
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1085,9 +1147,10 @@ pio=testsys.iobus.master[20]
 
 [testsys.tsunami.fake_pnp_addr]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848569
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1101,9 +1164,10 @@ pio=testsys.iobus.master[9]
 
 [testsys.tsunami.fake_pnp_read0]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848451
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1117,9 +1181,10 @@ pio=testsys.iobus.master[11]
 
 [testsys.tsunami.fake_pnp_read1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848515
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1133,9 +1198,10 @@ pio=testsys.iobus.master[12]
 
 [testsys.tsunami.fake_pnp_read2]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848579
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1149,9 +1215,10 @@ pio=testsys.iobus.master[13]
 
 [testsys.tsunami.fake_pnp_read3]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848643
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1165,9 +1232,10 @@ pio=testsys.iobus.master[14]
 
 [testsys.tsunami.fake_pnp_read4]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848707
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1181,9 +1249,10 @@ pio=testsys.iobus.master[15]
 
 [testsys.tsunami.fake_pnp_read5]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848771
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1197,9 +1266,10 @@ pio=testsys.iobus.master[16]
 
 [testsys.tsunami.fake_pnp_read6]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848835
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1213,9 +1283,10 @@ pio=testsys.iobus.master[17]
 
 [testsys.tsunami.fake_pnp_read7]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848899
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1229,9 +1300,10 @@ pio=testsys.iobus.master[18]
 
 [testsys.tsunami.fake_pnp_write]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615850617
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1245,9 +1317,10 @@ pio=testsys.iobus.master[10]
 
 [testsys.tsunami.fake_ppc]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848891
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1261,9 +1334,10 @@ pio=testsys.iobus.master[7]
 
 [testsys.tsunami.fake_sm_chip]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848816
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1277,9 +1351,10 @@ pio=testsys.iobus.master[2]
 
 [testsys.tsunami.fake_uart1]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848696
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1293,9 +1368,10 @@ pio=testsys.iobus.master[3]
 
 [testsys.tsunami.fake_uart2]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848936
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1309,9 +1385,10 @@ pio=testsys.iobus.master[4]
 
 [testsys.tsunami.fake_uart3]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848680
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1325,9 +1402,10 @@ pio=testsys.iobus.master[5]
 
 [testsys.tsunami.fake_uart4]
 type=IsaFake
+clock=1000
 fake_mem=false
 pio_addr=8804615848944
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -1341,9 +1419,10 @@ pio=testsys.iobus.master[6]
 
 [testsys.tsunami.fb]
 type=BadDevice
+clock=1000
 devicename=FrameBuffer
 pio_addr=8804615848912
-pio_latency=1000
+pio_latency=100000
 system=testsys
 pio=testsys.iobus.master[21]
 
@@ -1387,16 +1466,15 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+clock=1000
 config_latency=20000
 ctrl_offset=0
 disks=testsys.disk0 testsys.disk2
 io_shift=0
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pci_bus=0
 pci_dev=0
 pci_func=0
-pio_latency=1000
+pio_latency=30000
 platform=testsys.tsunami
 system=testsys
 config=testsys.iobus.master[26]
@@ -1405,9 +1483,10 @@ pio=testsys.iobus.master[25]
 
 [testsys.tsunami.io]
 type=TsunamiIO
+clock=1000
 frequency=976562500
 pio_addr=8804615847936
-pio_latency=1000
+pio_latency=100000
 system=testsys
 time=Thu Jan  1 00:00:00 2009
 tsunami=testsys.tsunami
@@ -1416,8 +1495,9 @@ pio=testsys.iobus.master[22]
 
 [testsys.tsunami.pchip]
 type=TsunamiPChip
+clock=1000
 pio_addr=8802535473152
-pio_latency=1000
+pio_latency=100000
 system=testsys
 tsunami=testsys.tsunami
 pio=testsys.iobus.master[1]
@@ -1425,7 +1505,8 @@ pio=testsys.iobus.master[1]
 [testsys.tsunami.pciconfig]
 type=PciConfigAll
 bus=0
-pio_latency=1
+clock=1000
+pio_latency=30000
 platform=testsys.tsunami
 size=16777216
 system=testsys
@@ -1433,8 +1514,9 @@ pio=testsys.iobus.default
 
 [testsys.tsunami.uart]
 type=Uart8250
+clock=1000
 pio_addr=8804615848952
-pio_latency=1000
+pio_latency=100000
 platform=testsys.tsunami
 system=testsys
 terminal=testsys.terminal