summaryrefslogtreecommitdiff
path: root/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini')
-rw-r--r--tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini112
1 files changed, 58 insertions, 54 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini
index 62b96c7c4..048f742ca 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini
@@ -19,7 +19,6 @@ mem_mode=timing
memories=system.physmem
num_work_ids=16
pal=/dist/m5/system/binaries/ts_osfpal
-physmem=system.physmem
readfile=tests/halt.sh
symbolfile=
system_rev=1024
@@ -31,7 +30,7 @@ work_cpus_ckpt_count=0
work_end_ckpt_count=0
work_end_exit_count=0
work_item_id=-1
-system_port=system.membus.port[2]
+system_port=system.membus.slave[0]
[system.bridge]
type=Bridge
@@ -41,8 +40,8 @@ ranges=8796093022208:18446744073709551615
req_size=16
resp_size=16
write_ack=false
-master=system.iobus.port[0]
-slave=system.membus.port[0]
+master=system.iobus.slave[0]
+slave=system.membus.master[0]
[system.cpu0]
type=DerivO3CPU
@@ -143,7 +142,7 @@ icache_port=system.cpu0.icache.cpu_side
[system.cpu0.dcache]
type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
assoc=4
block_size=64
forward_snoops=true
@@ -164,7 +163,7 @@ trace_addr=0
two_queue=false
write_buffers=8
cpu_side=system.cpu0.dcache_port
-mem_side=system.toL2Bus.port[2]
+mem_side=system.toL2Bus.slave[1]
[system.cpu0.dtb]
type=AlphaTLB
@@ -435,7 +434,7 @@ opLat=3
[system.cpu0.icache]
type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
assoc=1
block_size=64
forward_snoops=true
@@ -456,7 +455,7 @@ trace_addr=0
two_queue=false
write_buffers=8
cpu_side=system.cpu0.icache_port
-mem_side=system.toL2Bus.port[1]
+mem_side=system.toL2Bus.slave[0]
[system.cpu0.interrupts]
type=AlphaInterrupts
@@ -567,7 +566,7 @@ icache_port=system.cpu1.icache.cpu_side
[system.cpu1.dcache]
type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
assoc=4
block_size=64
forward_snoops=true
@@ -588,7 +587,7 @@ trace_addr=0
two_queue=false
write_buffers=8
cpu_side=system.cpu1.dcache_port
-mem_side=system.toL2Bus.port[4]
+mem_side=system.toL2Bus.slave[3]
[system.cpu1.dtb]
type=AlphaTLB
@@ -859,7 +858,7 @@ opLat=3
[system.cpu1.icache]
type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
assoc=1
block_size=64
forward_snoops=true
@@ -880,7 +879,7 @@ trace_addr=0
two_queue=false
write_buffers=8
cpu_side=system.cpu1.icache_port
-mem_side=system.toL2Bus.port[3]
+mem_side=system.toL2Bus.slave[2]
[system.cpu1.interrupts]
type=AlphaInterrupts
@@ -945,11 +944,12 @@ header_cycles=1
use_default_range=true
width=64
default=system.tsunami.pciconfig.pio
-port=system.bridge.master system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ide.dma system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.iocache.cpu_side
+master=system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ethernet.pio system.tsunami.ethernet.config system.iocache.cpu_side
+slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma
[system.iocache]
type=BaseCache
-addr_range=0:8589934591
+addr_ranges=0:8589934591
assoc=8
block_size=64
forward_snoops=false
@@ -969,12 +969,12 @@ tgts_per_mshr=12
trace_addr=0
two_queue=false
write_buffers=8
-cpu_side=system.iobus.port[32]
-mem_side=system.membus.port[3]
+cpu_side=system.iobus.master[29]
+mem_side=system.membus.slave[1]
[system.l2c]
type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
assoc=8
block_size=64
forward_snoops=true
@@ -994,8 +994,8 @@ tgts_per_mshr=16
trace_addr=0
two_queue=false
write_buffers=8
-cpu_side=system.toL2Bus.port[0]
-mem_side=system.membus.port[4]
+cpu_side=system.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
[system.membus]
type=Bus
@@ -1007,7 +1007,8 @@ header_cycles=1
use_default_range=false
width=64
default=system.membus.badaddr_responder.pio
-port=system.bridge.slave system.physmem.port[0] system.system_port system.iocache.mem_side system.l2c.mem_side
+master=system.bridge.slave system.physmem.port[0]
+slave=system.system_port system.iocache.mem_side system.l2c.mem_side
[system.membus.badaddr_responder]
type=IsaFake
@@ -1026,14 +1027,16 @@ warn_access=
pio=system.membus.default
[system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
range=0:134217727
zero=false
-port=system.membus.port[1]
+port=system.membus.master[1]
[system.simple_disk]
type=SimpleDisk
@@ -1061,7 +1064,8 @@ clock=1000
header_cycles=1
use_default_range=false
width=64
-port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
+master=system.l2c.cpu_side
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side
[system.tsunami]
type=Tsunami
@@ -1078,7 +1082,7 @@ pio_latency=1000
platform=system.tsunami
system=system
terminal=system.terminal
-pio=system.iobus.port[25]
+pio=system.iobus.master[24]
[system.tsunami.cchip]
type=TsunamiCChip
@@ -1086,7 +1090,7 @@ pio_addr=8803072344064
pio_latency=1000
system=system
tsunami=system.tsunami
-pio=system.iobus.port[1]
+pio=system.iobus.master[0]
[system.tsunami.ethernet]
type=NSGigE
@@ -1155,9 +1159,9 @@ system=system
tx_delay=1000000
tx_fifo_size=524288
tx_thread=false
-config=system.iobus.port[30]
-dma=system.iobus.port[31]
-pio=system.iobus.port[29]
+config=system.iobus.master[28]
+dma=system.iobus.slave[2]
+pio=system.iobus.master[27]
[system.tsunami.fake_OROM]
type=IsaFake
@@ -1173,7 +1177,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[9]
+pio=system.iobus.master[8]
[system.tsunami.fake_ata0]
type=IsaFake
@@ -1189,7 +1193,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[20]
+pio=system.iobus.master[19]
[system.tsunami.fake_ata1]
type=IsaFake
@@ -1205,7 +1209,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[21]
+pio=system.iobus.master[20]
[system.tsunami.fake_pnp_addr]
type=IsaFake
@@ -1221,7 +1225,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[10]
+pio=system.iobus.master[9]
[system.tsunami.fake_pnp_read0]
type=IsaFake
@@ -1237,7 +1241,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[12]
+pio=system.iobus.master[11]
[system.tsunami.fake_pnp_read1]
type=IsaFake
@@ -1253,7 +1257,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[13]
+pio=system.iobus.master[12]
[system.tsunami.fake_pnp_read2]
type=IsaFake
@@ -1269,7 +1273,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[14]
+pio=system.iobus.master[13]
[system.tsunami.fake_pnp_read3]
type=IsaFake
@@ -1285,7 +1289,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[15]
+pio=system.iobus.master[14]
[system.tsunami.fake_pnp_read4]
type=IsaFake
@@ -1301,7 +1305,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[16]
+pio=system.iobus.master[15]
[system.tsunami.fake_pnp_read5]
type=IsaFake
@@ -1317,7 +1321,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[17]
+pio=system.iobus.master[16]
[system.tsunami.fake_pnp_read6]
type=IsaFake
@@ -1333,7 +1337,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[18]
+pio=system.iobus.master[17]
[system.tsunami.fake_pnp_read7]
type=IsaFake
@@ -1349,7 +1353,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[19]
+pio=system.iobus.master[18]
[system.tsunami.fake_pnp_write]
type=IsaFake
@@ -1365,7 +1369,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[11]
+pio=system.iobus.master[10]
[system.tsunami.fake_ppc]
type=IsaFake
@@ -1381,7 +1385,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[8]
+pio=system.iobus.master[7]
[system.tsunami.fake_sm_chip]
type=IsaFake
@@ -1397,7 +1401,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[3]
+pio=system.iobus.master[2]
[system.tsunami.fake_uart1]
type=IsaFake
@@ -1413,7 +1417,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[4]
+pio=system.iobus.master[3]
[system.tsunami.fake_uart2]
type=IsaFake
@@ -1429,7 +1433,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[5]
+pio=system.iobus.master[4]
[system.tsunami.fake_uart3]
type=IsaFake
@@ -1445,7 +1449,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[6]
+pio=system.iobus.master[5]
[system.tsunami.fake_uart4]
type=IsaFake
@@ -1461,7 +1465,7 @@ ret_data8=255
system=system
update_data=false
warn_access=
-pio=system.iobus.port[7]
+pio=system.iobus.master[6]
[system.tsunami.fb]
type=BadDevice
@@ -1469,7 +1473,7 @@ devicename=FrameBuffer
pio_addr=8804615848912
pio_latency=1000
system=system
-pio=system.iobus.port[22]
+pio=system.iobus.master[21]
[system.tsunami.ide]
type=IdeController
@@ -1523,9 +1527,9 @@ pci_func=0
pio_latency=1000
platform=system.tsunami
system=system
-config=system.iobus.port[27]
-dma=system.iobus.port[28]
-pio=system.iobus.port[26]
+config=system.iobus.master[26]
+dma=system.iobus.slave[1]
+pio=system.iobus.master[25]
[system.tsunami.io]
type=TsunamiIO
@@ -1536,7 +1540,7 @@ system=system
time=Thu Jan 1 00:00:00 2009
tsunami=system.tsunami
year_is_bcd=false
-pio=system.iobus.port[23]
+pio=system.iobus.master[22]
[system.tsunami.pchip]
type=TsunamiPChip
@@ -1544,7 +1548,7 @@ pio_addr=8802535473152
pio_latency=1000
system=system
tsunami=system.tsunami
-pio=system.iobus.port[2]
+pio=system.iobus.master[1]
[system.tsunami.pciconfig]
type=PciConfigAll
@@ -1562,5 +1566,5 @@ pio_latency=1000
platform=system.tsunami
system=system
terminal=system.terminal
-pio=system.iobus.port[24]
+pio=system.iobus.master[23]