summaryrefslogtreecommitdiff
path: root/tests/quick/fs/80.netperf-stream
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/fs/80.netperf-stream')
-rw-r--r--tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini288
-rw-r--r--tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal4
-rwxr-xr-xtests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout12
-rw-r--r--tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt20
-rw-r--r--tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal6
5 files changed, 175 insertions, 155 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 56a5a7d83..0062dcbb2 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,19 +1,20 @@
[drivesys]
type=LinuxAlphaSystem
-children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami
+children=bridge clk_domain cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami voltage_domain
boot_cpu_frequency=250
boot_osflags=root=/dev/hda1 console=ttyS0
-clock=1000
-console=/scratch/nilay/GEM5/system/binaries/console
+cache_line_size=64
+clk_domain=drivesys.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=drivesys.physmem
num_work_ids=16
-pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal
-readfile=/scratch/nilay/GEM5/gem5/configs/boot/netperf-server.rcS
+pal=/dist/m5/system/binaries/ts_osfpal
+readfile=/z/m5/regression/zizzer/gem5/configs/boot/netperf-server.rcS
symbolfile=
system_rev=1024
system_type=34
@@ -28,7 +29,7 @@ system_port=drivesys.membus.slave[0]
[drivesys.bridge]
type=Bridge
-clock=1000
+clk_domain=drivesys.clk_domain
delay=50000
ranges=8796093022208:18446744073709551615
req_size=16
@@ -36,12 +37,16 @@ resp_size=16
master=drivesys.iobus.slave[0]
slave=drivesys.membus.master[0]
+[drivesys.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=drivesys.voltage_domain
+
[drivesys.cpu]
type=AtomicSimpleCPU
-children=dtb interrupts isa itb tracer
-branchPred=Null
+children=clk_domain dtb interrupts isa itb tracer
checker=Null
-clock=250
+clk_domain=drivesys.cpu.clk_domain
cpu_id=0
do_checkpoint_insts=true
do_quiesce=true
@@ -60,6 +65,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
@@ -70,6 +79,11 @@ workload=
dcache_port=drivesys.membus.slave[2]
icache_port=drivesys.membus.slave[1]
+[drivesys.cpu.clk_domain]
+type=SrcClockDomain
+clock=250
+voltage_domain=drivesys.voltage_domain
+
[drivesys.cpu.dtb]
type=AlphaTLB
size=64
@@ -104,7 +118,7 @@ table_size=65536
[drivesys.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
[drivesys.disk2]
@@ -124,7 +138,7 @@ table_size=65536
[drivesys.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
[drivesys.intrctrl]
@@ -133,7 +147,7 @@ sys=drivesys
[drivesys.iobridge]
type=Bridge
-clock=1000
+clk_domain=drivesys.clk_domain
delay=50000
ranges=0:134217727
req_size=16
@@ -143,8 +157,7 @@ slave=drivesys.iobus.master[29]
[drivesys.iobus]
type=NoncoherentBus
-block_size=64
-clock=1000
+clk_domain=drivesys.clk_domain
header_cycles=1
use_default_range=true
width=8
@@ -155,9 +168,9 @@ slave=drivesys.bridge.master drivesys.tsunami.ide.dma drivesys.tsunami.ethernet.
[drivesys.membus]
type=CoherentBus
children=badaddr_responder
-block_size=64
-clock=1000
+clk_domain=drivesys.clk_domain
header_cycles=1
+system=drivesys
use_default_range=false
width=8
default=drivesys.membus.badaddr_responder.pio
@@ -166,7 +179,7 @@ slave=drivesys.system_port drivesys.cpu.icache_port drivesys.cpu.dcache_port dri
[drivesys.membus.badaddr_responder]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=0
pio_latency=100000
@@ -182,29 +195,15 @@ warn_access=
pio=drivesys.membus.default
[drivesys.physmem]
-type=SimpleDRAM
-addr_mapping=openmap
-banks_per_rank=8
-clock=1000
-conf_table_reported=false
+type=SimpleMemory
+bandwidth=73.000000
+clk_domain=drivesys.clk_domain
+conf_table_reported=true
in_addr_map=true
-lines_per_rowbuffer=64
-mem_sched_policy=fcfs
+latency=30000
+latency_var=0
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]
[drivesys.simple_disk]
@@ -215,7 +214,7 @@ system=drivesys
[drivesys.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
[drivesys.terminal]
@@ -233,7 +232,7 @@ system=drivesys
[drivesys.tsunami.backdoor]
type=AlphaBackdoor
-clock=1000
+clk_domain=drivesys.clk_domain
cpu=drivesys.cpu
disk=drivesys.simple_disk
pio_addr=8804682956800
@@ -245,7 +244,7 @@ pio=drivesys.iobus.master[24]
[drivesys.tsunami.cchip]
type=TsunamiCChip
-clock=1000
+clk_domain=drivesys.clk_domain
pio_addr=8803072344064
pio_latency=100000
system=drivesys
@@ -254,6 +253,7 @@ pio=drivesys.iobus.master[0]
[drivesys.tsunami.ethernet]
type=NSGigE
+children=clk_domain
BAR0=1
BAR0LegacyIO=false
BAR0Size=256
@@ -292,7 +292,7 @@ SubClassCode=0
SubsystemID=0
SubsystemVendorID=0
VendorID=4107
-clock=2000
+clk_domain=drivesys.tsunami.ethernet.clk_domain
config_latency=20000
dma_data_free=false
dma_desc_free=false
@@ -322,9 +322,14 @@ dma=drivesys.iobus.slave[2]
interface=etherlink.int1
pio=drivesys.iobus.master[27]
+[drivesys.tsunami.ethernet.clk_domain]
+type=SrcClockDomain
+clock=2000
+voltage_domain=drivesys.voltage_domain
+
[drivesys.tsunami.fake_OROM]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8796093677568
pio_latency=100000
@@ -341,7 +346,7 @@ pio=drivesys.iobus.master[8]
[drivesys.tsunami.fake_ata0]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848432
pio_latency=100000
@@ -358,7 +363,7 @@ pio=drivesys.iobus.master[19]
[drivesys.tsunami.fake_ata1]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848304
pio_latency=100000
@@ -375,7 +380,7 @@ pio=drivesys.iobus.master[20]
[drivesys.tsunami.fake_pnp_addr]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848569
pio_latency=100000
@@ -392,7 +397,7 @@ pio=drivesys.iobus.master[9]
[drivesys.tsunami.fake_pnp_read0]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848451
pio_latency=100000
@@ -409,7 +414,7 @@ pio=drivesys.iobus.master[11]
[drivesys.tsunami.fake_pnp_read1]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848515
pio_latency=100000
@@ -426,7 +431,7 @@ pio=drivesys.iobus.master[12]
[drivesys.tsunami.fake_pnp_read2]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848579
pio_latency=100000
@@ -443,7 +448,7 @@ pio=drivesys.iobus.master[13]
[drivesys.tsunami.fake_pnp_read3]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848643
pio_latency=100000
@@ -460,7 +465,7 @@ pio=drivesys.iobus.master[14]
[drivesys.tsunami.fake_pnp_read4]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848707
pio_latency=100000
@@ -477,7 +482,7 @@ pio=drivesys.iobus.master[15]
[drivesys.tsunami.fake_pnp_read5]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848771
pio_latency=100000
@@ -494,7 +499,7 @@ pio=drivesys.iobus.master[16]
[drivesys.tsunami.fake_pnp_read6]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848835
pio_latency=100000
@@ -511,7 +516,7 @@ pio=drivesys.iobus.master[17]
[drivesys.tsunami.fake_pnp_read7]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848899
pio_latency=100000
@@ -528,7 +533,7 @@ pio=drivesys.iobus.master[18]
[drivesys.tsunami.fake_pnp_write]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615850617
pio_latency=100000
@@ -545,7 +550,7 @@ pio=drivesys.iobus.master[10]
[drivesys.tsunami.fake_ppc]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848891
pio_latency=100000
@@ -562,7 +567,7 @@ pio=drivesys.iobus.master[7]
[drivesys.tsunami.fake_sm_chip]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848816
pio_latency=100000
@@ -579,7 +584,7 @@ pio=drivesys.iobus.master[2]
[drivesys.tsunami.fake_uart1]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848696
pio_latency=100000
@@ -596,7 +601,7 @@ pio=drivesys.iobus.master[3]
[drivesys.tsunami.fake_uart2]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848936
pio_latency=100000
@@ -613,7 +618,7 @@ pio=drivesys.iobus.master[4]
[drivesys.tsunami.fake_uart3]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848680
pio_latency=100000
@@ -630,7 +635,7 @@ pio=drivesys.iobus.master[5]
[drivesys.tsunami.fake_uart4]
type=IsaFake
-clock=1000
+clk_domain=drivesys.clk_domain
fake_mem=false
pio_addr=8804615848944
pio_latency=100000
@@ -647,7 +652,7 @@ pio=drivesys.iobus.master[6]
[drivesys.tsunami.fb]
type=BadDevice
-clock=1000
+clk_domain=drivesys.clk_domain
devicename=FrameBuffer
pio_addr=8804615848912
pio_latency=100000
@@ -694,7 +699,7 @@ SubClassCode=1
SubsystemID=0
SubsystemVendorID=0
VendorID=32902
-clock=1000
+clk_domain=drivesys.clk_domain
config_latency=20000
ctrl_offset=0
disks=drivesys.disk0 drivesys.disk2
@@ -711,7 +716,7 @@ pio=drivesys.iobus.master[25]
[drivesys.tsunami.io]
type=TsunamiIO
-clock=1000
+clk_domain=drivesys.clk_domain
frequency=976562500
pio_addr=8804615847936
pio_latency=100000
@@ -723,7 +728,7 @@ pio=drivesys.iobus.master[22]
[drivesys.tsunami.pchip]
type=TsunamiPChip
-clock=1000
+clk_domain=drivesys.clk_domain
pio_addr=8802535473152
pio_latency=100000
system=drivesys
@@ -733,7 +738,8 @@ pio=drivesys.iobus.master[1]
[drivesys.tsunami.pciconfig]
type=PciConfigAll
bus=0
-clock=1000
+clk_domain=drivesys.clk_domain
+pio_addr=0
pio_latency=30000
platform=drivesys.tsunami
size=16777216
@@ -742,7 +748,7 @@ pio=drivesys.iobus.default
[drivesys.tsunami.uart]
type=Uart8250
-clock=1000
+clk_domain=drivesys.clk_domain
pio_addr=8804615848952
pio_latency=100000
platform=drivesys.tsunami
@@ -750,6 +756,10 @@ system=drivesys
terminal=drivesys.terminal
pio=drivesys.iobus.master[23]
+[drivesys.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
[etherdump]
type=EtherDump
file=ethertrace
@@ -774,20 +784,21 @@ time_sync_spin_threshold=100000000
[testsys]
type=LinuxAlphaSystem
-children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami
+children=bridge clk_domain cpu disk0 disk2 intrctrl iobridge iobus 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=testsys.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=testsys.physmem
num_work_ids=16
-pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal
-readfile=/scratch/nilay/GEM5/gem5/configs/boot/netperf-stream-client.rcS
+pal=/dist/m5/system/binaries/ts_osfpal
+readfile=/z/m5/regression/zizzer/gem5/configs/boot/netperf-stream-client.rcS
symbolfile=
system_rev=1024
system_type=34
@@ -802,7 +813,7 @@ system_port=testsys.membus.slave[0]
[testsys.bridge]
type=Bridge
-clock=1000
+clk_domain=testsys.clk_domain
delay=50000
ranges=8796093022208:18446744073709551615
req_size=16
@@ -810,12 +821,16 @@ resp_size=16
master=testsys.iobus.slave[0]
slave=testsys.membus.master[0]
+[testsys.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=testsys.voltage_domain
+
[testsys.cpu]
type=AtomicSimpleCPU
-children=dtb interrupts isa itb tracer
-branchPred=Null
+children=clk_domain dtb interrupts isa itb tracer
checker=Null
-clock=500
+clk_domain=testsys.cpu.clk_domain
cpu_id=0
do_checkpoint_insts=true
do_quiesce=true
@@ -834,6 +849,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
@@ -844,6 +863,11 @@ workload=
dcache_port=testsys.membus.slave[2]
icache_port=testsys.membus.slave[1]
+[testsys.cpu.clk_domain]
+type=SrcClockDomain
+clock=500
+voltage_domain=testsys.voltage_domain
+
[testsys.cpu.dtb]
type=AlphaTLB
size=64
@@ -878,7 +902,7 @@ table_size=65536
[testsys.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
[testsys.disk2]
@@ -898,7 +922,7 @@ table_size=65536
[testsys.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
[testsys.intrctrl]
@@ -907,7 +931,7 @@ sys=testsys
[testsys.iobridge]
type=Bridge
-clock=1000
+clk_domain=testsys.clk_domain
delay=50000
ranges=0:134217727
req_size=16
@@ -917,8 +941,7 @@ slave=testsys.iobus.master[29]
[testsys.iobus]
type=NoncoherentBus
-block_size=64
-clock=1000
+clk_domain=testsys.clk_domain
header_cycles=1
use_default_range=true
width=8
@@ -929,9 +952,9 @@ slave=testsys.bridge.master testsys.tsunami.ide.dma testsys.tsunami.ethernet.dma
[testsys.membus]
type=CoherentBus
children=badaddr_responder
-block_size=64
-clock=1000
+clk_domain=testsys.clk_domain
header_cycles=1
+system=testsys
use_default_range=false
width=8
default=testsys.membus.badaddr_responder.pio
@@ -940,7 +963,7 @@ slave=testsys.system_port testsys.cpu.icache_port testsys.cpu.dcache_port testsy
[testsys.membus.badaddr_responder]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=0
pio_latency=100000
@@ -956,29 +979,15 @@ warn_access=
pio=testsys.membus.default
[testsys.physmem]
-type=SimpleDRAM
-addr_mapping=openmap
-banks_per_rank=8
-clock=1000
-conf_table_reported=false
+type=SimpleMemory
+bandwidth=73.000000
+clk_domain=testsys.clk_domain
+conf_table_reported=true
in_addr_map=true
-lines_per_rowbuffer=64
-mem_sched_policy=fcfs
+latency=30000
+latency_var=0
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]
[testsys.simple_disk]
@@ -989,7 +998,7 @@ system=testsys
[testsys.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
[testsys.terminal]
@@ -1007,7 +1016,7 @@ system=testsys
[testsys.tsunami.backdoor]
type=AlphaBackdoor
-clock=1000
+clk_domain=testsys.clk_domain
cpu=testsys.cpu
disk=testsys.simple_disk
pio_addr=8804682956800
@@ -1019,7 +1028,7 @@ pio=testsys.iobus.master[24]
[testsys.tsunami.cchip]
type=TsunamiCChip
-clock=1000
+clk_domain=testsys.clk_domain
pio_addr=8803072344064
pio_latency=100000
system=testsys
@@ -1028,6 +1037,7 @@ pio=testsys.iobus.master[0]
[testsys.tsunami.ethernet]
type=NSGigE
+children=clk_domain
BAR0=1
BAR0LegacyIO=false
BAR0Size=256
@@ -1066,7 +1076,7 @@ SubClassCode=0
SubsystemID=0
SubsystemVendorID=0
VendorID=4107
-clock=2000
+clk_domain=testsys.tsunami.ethernet.clk_domain
config_latency=20000
dma_data_free=false
dma_desc_free=false
@@ -1096,9 +1106,14 @@ dma=testsys.iobus.slave[2]
interface=etherlink.int0
pio=testsys.iobus.master[27]
+[testsys.tsunami.ethernet.clk_domain]
+type=SrcClockDomain
+clock=2000
+voltage_domain=testsys.voltage_domain
+
[testsys.tsunami.fake_OROM]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8796093677568
pio_latency=100000
@@ -1115,7 +1130,7 @@ pio=testsys.iobus.master[8]
[testsys.tsunami.fake_ata0]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848432
pio_latency=100000
@@ -1132,7 +1147,7 @@ pio=testsys.iobus.master[19]
[testsys.tsunami.fake_ata1]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848304
pio_latency=100000
@@ -1149,7 +1164,7 @@ pio=testsys.iobus.master[20]
[testsys.tsunami.fake_pnp_addr]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848569
pio_latency=100000
@@ -1166,7 +1181,7 @@ pio=testsys.iobus.master[9]
[testsys.tsunami.fake_pnp_read0]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848451
pio_latency=100000
@@ -1183,7 +1198,7 @@ pio=testsys.iobus.master[11]
[testsys.tsunami.fake_pnp_read1]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848515
pio_latency=100000
@@ -1200,7 +1215,7 @@ pio=testsys.iobus.master[12]
[testsys.tsunami.fake_pnp_read2]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848579
pio_latency=100000
@@ -1217,7 +1232,7 @@ pio=testsys.iobus.master[13]
[testsys.tsunami.fake_pnp_read3]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848643
pio_latency=100000
@@ -1234,7 +1249,7 @@ pio=testsys.iobus.master[14]
[testsys.tsunami.fake_pnp_read4]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848707
pio_latency=100000
@@ -1251,7 +1266,7 @@ pio=testsys.iobus.master[15]
[testsys.tsunami.fake_pnp_read5]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848771
pio_latency=100000
@@ -1268,7 +1283,7 @@ pio=testsys.iobus.master[16]
[testsys.tsunami.fake_pnp_read6]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848835
pio_latency=100000
@@ -1285,7 +1300,7 @@ pio=testsys.iobus.master[17]
[testsys.tsunami.fake_pnp_read7]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848899
pio_latency=100000
@@ -1302,7 +1317,7 @@ pio=testsys.iobus.master[18]
[testsys.tsunami.fake_pnp_write]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615850617
pio_latency=100000
@@ -1319,7 +1334,7 @@ pio=testsys.iobus.master[10]
[testsys.tsunami.fake_ppc]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848891
pio_latency=100000
@@ -1336,7 +1351,7 @@ pio=testsys.iobus.master[7]
[testsys.tsunami.fake_sm_chip]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848816
pio_latency=100000
@@ -1353,7 +1368,7 @@ pio=testsys.iobus.master[2]
[testsys.tsunami.fake_uart1]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848696
pio_latency=100000
@@ -1370,7 +1385,7 @@ pio=testsys.iobus.master[3]
[testsys.tsunami.fake_uart2]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848936
pio_latency=100000
@@ -1387,7 +1402,7 @@ pio=testsys.iobus.master[4]
[testsys.tsunami.fake_uart3]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848680
pio_latency=100000
@@ -1404,7 +1419,7 @@ pio=testsys.iobus.master[5]
[testsys.tsunami.fake_uart4]
type=IsaFake
-clock=1000
+clk_domain=testsys.clk_domain
fake_mem=false
pio_addr=8804615848944
pio_latency=100000
@@ -1421,7 +1436,7 @@ pio=testsys.iobus.master[6]
[testsys.tsunami.fb]
type=BadDevice
-clock=1000
+clk_domain=testsys.clk_domain
devicename=FrameBuffer
pio_addr=8804615848912
pio_latency=100000
@@ -1468,7 +1483,7 @@ SubClassCode=1
SubsystemID=0
SubsystemVendorID=0
VendorID=32902
-clock=1000
+clk_domain=testsys.clk_domain
config_latency=20000
ctrl_offset=0
disks=testsys.disk0 testsys.disk2
@@ -1485,7 +1500,7 @@ pio=testsys.iobus.master[25]
[testsys.tsunami.io]
type=TsunamiIO
-clock=1000
+clk_domain=testsys.clk_domain
frequency=976562500
pio_addr=8804615847936
pio_latency=100000
@@ -1497,7 +1512,7 @@ pio=testsys.iobus.master[22]
[testsys.tsunami.pchip]
type=TsunamiPChip
-clock=1000
+clk_domain=testsys.clk_domain
pio_addr=8802535473152
pio_latency=100000
system=testsys
@@ -1507,7 +1522,8 @@ pio=testsys.iobus.master[1]
[testsys.tsunami.pciconfig]
type=PciConfigAll
bus=0
-clock=1000
+clk_domain=testsys.clk_domain
+pio_addr=0
pio_latency=30000
platform=testsys.tsunami
size=16777216
@@ -1516,7 +1532,7 @@ pio=testsys.iobus.default
[testsys.tsunami.uart]
type=Uart8250
-clock=1000
+clk_domain=testsys.clk_domain
pio_addr=8804615848952
pio_latency=100000
platform=testsys.tsunami
@@ -1524,3 +1540,7 @@ system=testsys
terminal=testsys.terminal
pio=testsys.iobus.master[23]
+[testsys.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal
index d501adb38..8798f32cd 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/drivesys.terminal
@@ -4,7 +4,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
First free page after ROM 0xFFFFFC0000018000
HWRPB 0xFFFFFC0000018000 l1pt 0xFFFFFC0000040000 l2pt 0xFFFFFC0000042000 l3pt_rpb 0xFFFFFC0000044000 l3pt_kernel 0xFFFFFC0000048000 l2reserv 0xFFFFFC0000046000
kstart = 0xFFFFFC0000310000, kend = 0xFFFFFC0000855898, kentry = 0xFFFFFC0000310000, numCPUs = 0x1
- CPU Clock at 1000000 MHz IntrClockFrequency=1024
+ CPU Clock at 4000 MHz IntrClockFrequency=1024
Booting with 1 processor(s)
KSP: 0x20043FE8 PTBR 0x20
Console Callback at 0x0, fixup at 0x0, crb offset: 0x510
@@ -36,7 +36,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
Mount-cache hash table entries: 512
SMP mode deactivated.
Brought up 1 CPUs
- SMP: Total of 1 processors activated (1998756.81 BogoMIPS).
+ SMP: Total of 1 processors activated (8000.15 BogoMIPS).
NET: Registered protocol family 16
EISA bus registered
pci: enabling save/restore of SRM state
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
index 4fa3d404b..af627b8fa 100755
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
@@ -3,14 +3,14 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/lin
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:07:46
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Sep 24 2013 03:08:53
+gem5 started Sep 28 2013 03:05:52
+gem5 executing on zizzer
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-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: testsys.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009
-info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux
+info: kernel located at: /dist/m5/system/binaries/vmlinux
0: drivesys.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 4321612280500 because checkpoint
+Exiting @ tick 4321621592000 because checkpoint
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
index cf36dbc01..4ccc9d7bc 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.200409 # Nu
sim_ticks 200409284500 # Number of ticks simulated
final_tick 4321214250500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 10833540 # Simulator instruction rate (inst/s)
-host_op_rate 10833535 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 4145057481 # Simulator tick rate (ticks/s)
-host_mem_usage 475668 # Number of bytes of host memory used
-host_seconds 48.35 # Real time elapsed on the host
+host_inst_rate 21337245 # Simulator instruction rate (inst/s)
+host_op_rate 21337231 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 8163912733 # Simulator tick rate (ticks/s)
+host_mem_usage 473328 # Number of bytes of host memory used
+host_seconds 24.55 # Real time elapsed on the host
sim_insts 523790075 # Number of instructions simulated
sim_ops 523790075 # Number of ops (including micro ops) simulated
testsys.physmem.bytes_read::cpu.inst 81046720 # Number of bytes read from this memory
@@ -445,11 +445,11 @@ sim_seconds 0.000407 # Nu
sim_ticks 407341500 # Number of ticks simulated
final_tick 4321621592000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 5619093232 # Simulator instruction rate (inst/s)
-host_op_rate 5617709608 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 4367114686 # Simulator tick rate (ticks/s)
-host_mem_usage 475668 # Number of bytes of host memory used
-host_seconds 0.09 # Real time elapsed on the host
+host_inst_rate 10977168844 # Simulator instruction rate (inst/s)
+host_op_rate 10973505866 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 8529941400 # Simulator tick rate (ticks/s)
+host_mem_usage 473328 # Number of bytes of host memory used
+host_seconds 0.05 # Real time elapsed on the host
sim_insts 523862353 # Number of instructions simulated
sim_ops 523862353 # Number of ops (including micro ops) simulated
testsys.physmem.bytes_read::cpu.inst 144504 # Number of bytes read from this memory
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal
index 9468ea620..371f1a3fb 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/testsys.terminal
@@ -4,7 +4,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
First free page after ROM 0xFFFFFC0000018000
HWRPB 0xFFFFFC0000018000 l1pt 0xFFFFFC0000040000 l2pt 0xFFFFFC0000042000 l3pt_rpb 0xFFFFFC0000044000 l3pt_kernel 0xFFFFFC0000048000 l2reserv 0xFFFFFC0000046000
kstart = 0xFFFFFC0000310000, kend = 0xFFFFFC0000855898, kentry = 0xFFFFFC0000310000, numCPUs = 0x1
- CPU Clock at 1000000 MHz IntrClockFrequency=1024
+ CPU Clock at 2000 MHz IntrClockFrequency=1024
Booting with 1 processor(s)
KSP: 0x20043FE8 PTBR 0x20
Console Callback at 0x0, fixup at 0x0, crb offset: 0x510
@@ -36,7 +36,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
Mount-cache hash table entries: 512
SMP mode deactivated.
Brought up 1 CPUs
- SMP: Total of 1 processors activated (1998756.81 BogoMIPS).
+ SMP: Total of 1 processors activated (4002.20 BogoMIPS).
NET: Registered protocol family 16
EISA bus registered
pci: enabling save/restore of SRM state
@@ -117,7 +117,7 @@ Socket Socket Message Elapsed
Size Size Size Time Throughput
bytes bytes bytes secs. 10^6bits/sec
-5000000 5000000 5000000 1.29 30.91
+5000000 5000000 5000000 1.30 30.82
netperf benchmark
/benchmarks/netperf-bin/netperf -H 10.0.0.1 -t TCP_STREAM -k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144
TCP STREAM TEST to 10.0.0.1 : dirty data