summaryrefslogtreecommitdiff
path: root/tests/quick/10.linux-boot
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/10.linux-boot')
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini22
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out90
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt8
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr10
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout6
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini21
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out89
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt8
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr4
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout6
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini22
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out90
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console2
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt397
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr6
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout8
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini21
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out89
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt136
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr8
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stdout8
21 files changed, 600 insertions, 451 deletions
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
index c45637b94..409b641a2 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
@@ -85,7 +85,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
simulate_stalls=false
@@ -116,7 +115,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
simulate_stalls=false
@@ -177,19 +175,39 @@ cpu=system.cpu0
[system.iobus]
type=Bus
+children=responder
bus_id=0
clock=2
+responder_set=true
width=64
default=system.tsunami.pciconfig.pio
port=system.bridge.side_a 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.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+
[system.membus]
type=Bus
+children=responder
bus_id=1
clock=2
+responder_set=false
width=64
+default=system.membus.responder.pio
port=system.bridge.side_b system.physmem.port system.cpu0.icache_port system.cpu0.dcache_port system.cpu1.icache_port system.cpu1.dcache_port
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+pio=system.membus.default
+
[system.physmem]
type=PhysicalMemory
file=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
index 45cbbec9b..d4ec3e5b3 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
@@ -31,6 +31,50 @@ type=Bus
bus_id=1
clock=2
width=64
+responder_set=false
+
+[system.cpu0.itb]
+type=AlphaITB
+size=48
+
+[system.cpu0.dtb]
+type=AlphaDTB
+size=64
+
+[system.cpu0]
+type=AtomicSimpleCPU
+max_insts_any_thread=0
+max_insts_all_threads=0
+max_loads_any_thread=0
+max_loads_all_threads=0
+progress_interval=0
+system=system
+cpu_id=0
+itb=system.cpu0.itb
+dtb=system.cpu0.dtb
+profile=0
+clock=1
+defer_registration=false
+width=1
+function_trace=false
+function_trace_start=0
+simulate_stalls=false
+
+[system.intrctrl]
+type=IntrControl
+cpu=system.cpu0
+
+[system.tsunami]
+type=Tsunami
+system=system
+intrctrl=system.intrctrl
+
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[system.bridge]
type=Bridge
@@ -75,34 +119,6 @@ image=system.disk2.image
driveID=master
delay=2000
-[system.cpu0.itb]
-type=AlphaITB
-size=48
-
-[system.cpu0.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu0]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-mem=system.physmem
-system=system
-cpu_id=0
-itb=system.cpu0.itb
-dtb=system.cpu0.dtb
-profile=0
-clock=1
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
[system.cpu1.itb]
type=AlphaITB
size=48
@@ -118,7 +134,6 @@ max_insts_all_threads=0
max_loads_any_thread=0
max_loads_all_threads=0
progress_interval=0
-mem=system.physmem
system=system
cpu_id=1
itb=system.cpu1.itb
@@ -131,10 +146,6 @@ function_trace=false
function_trace_start=0
simulate_stalls=false
-[system.intrctrl]
-type=IntrControl
-cpu=system.cpu0
-
[system.simple_disk.disk]
type=RawDiskImage
image_file=/dist/m5/system/disks/linux-latest.img
@@ -145,11 +156,6 @@ type=SimpleDisk
system=system
disk=system.simple_disk.disk
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
[system.tsunami.fake_uart1]
type=IsaFake
pio_addr=8804615848696
@@ -495,6 +501,14 @@ type=Bus
bus_id=0
clock=2
width=64
+responder_set=true
+
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[trace]
flags=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
index e76c1d683..4639640fe 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/m5stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1270607 # Simulator instruction rate (inst/s)
-host_mem_usage 197696 # Number of bytes of host memory used
-host_seconds 51.09 # Real time elapsed on the host
-host_tick_rate 72782461 # Simulator tick rate (ticks/s)
+host_inst_rate 1289947 # Simulator instruction rate (inst/s)
+host_mem_usage 199348 # Number of bytes of host memory used
+host_seconds 50.32 # Real time elapsed on the host
+host_tick_rate 73890229 # Simulator tick rate (ticks/s)
sim_freq 2000000000 # Frequency of simulated ticks
sim_insts 64909600 # Number of instructions simulated
sim_seconds 1.859078 # Number of seconds simulated
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
index 14aa2c9ff..9d74574e7 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stderr
@@ -1,6 +1,10 @@
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
0: system.tsunami.io.rtc: Real-time clock set to Sun Jan 1 00:00:00 2006
-Listening for console connection on port 3456
-0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
-0: system.remote_gdb.listener: listening for remote gdb #1 on port 7001
+Listening for console connection on port 3457
+0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
+0: system.remote_gdb.listener: listening for remote gdb #1 on port 7002
warn: Entering event queue @ 0. Starting simulation...
warn: 195723: Trying to launch CPU number 1!
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
index 18365db1c..8bfefbb7c 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 8 2006 21:57:24
-M5 started Sun Oct 8 21:58:13 2006
-M5 executing on zed.eecs.umich.edu
+M5 compiled Nov 5 2006 19:41:29
+M5 started Sun Nov 5 20:03:49 2006
+M5 executing on zizzer.eecs.umich.edu
command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual
Exiting @ tick 3718155709 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
index 11b108837..a862353cb 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
@@ -85,7 +85,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
simulate_stalls=false
@@ -146,19 +145,39 @@ cpu=system.cpu
[system.iobus]
type=Bus
+children=responder
bus_id=0
clock=2
+responder_set=true
width=64
default=system.tsunami.pciconfig.pio
port=system.bridge.side_a 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.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+
[system.membus]
type=Bus
+children=responder
bus_id=1
clock=2
+responder_set=false
width=64
+default=system.membus.responder.pio
port=system.bridge.side_b system.physmem.port system.cpu.icache_port system.cpu.dcache_port
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+pio=system.membus.default
+
[system.physmem]
type=PhysicalMemory
file=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
index e5c6e96f8..739a4860a 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
@@ -31,6 +31,50 @@ type=Bus
bus_id=1
clock=2
width=64
+responder_set=false
+
+[system.cpu.itb]
+type=AlphaITB
+size=48
+
+[system.cpu.dtb]
+type=AlphaDTB
+size=64
+
+[system.cpu]
+type=AtomicSimpleCPU
+max_insts_any_thread=0
+max_insts_all_threads=0
+max_loads_any_thread=0
+max_loads_all_threads=0
+progress_interval=0
+system=system
+cpu_id=0
+itb=system.cpu.itb
+dtb=system.cpu.dtb
+profile=0
+clock=1
+defer_registration=false
+width=1
+function_trace=false
+function_trace_start=0
+simulate_stalls=false
+
+[system.intrctrl]
+type=IntrControl
+cpu=system.cpu
+
+[system.tsunami]
+type=Tsunami
+system=system
+intrctrl=system.intrctrl
+
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[system.bridge]
type=Bridge
@@ -75,38 +119,6 @@ image=system.disk2.image
driveID=master
delay=2000
-[system.cpu.itb]
-type=AlphaITB
-size=48
-
-[system.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-mem=system.physmem
-system=system
-cpu_id=0
-itb=system.cpu.itb
-dtb=system.cpu.dtb
-profile=0
-clock=1
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[system.intrctrl]
-type=IntrControl
-cpu=system.cpu
-
[system.simple_disk.disk]
type=RawDiskImage
image_file=/dist/m5/system/disks/linux-latest.img
@@ -117,11 +129,6 @@ type=SimpleDisk
system=system
disk=system.simple_disk.disk
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
[system.tsunami.fake_uart1]
type=IsaFake
pio_addr=8804615848696
@@ -467,6 +474,14 @@ type=Bus
bus_id=0
clock=2
width=64
+responder_set=true
+
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[trace]
flags=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
index e276e91a7..d68921f1e 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/m5stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1389289 # Simulator instruction rate (inst/s)
-host_mem_usage 197652 # Number of bytes of host memory used
-host_seconds 44.48 # Real time elapsed on the host
-host_tick_rate 81712411 # Simulator tick rate (ticks/s)
+host_inst_rate 1313531 # Simulator instruction rate (inst/s)
+host_mem_usage 199136 # Number of bytes of host memory used
+host_seconds 47.04 # Real time elapsed on the host
+host_tick_rate 77256650 # Simulator tick rate (ticks/s)
sim_freq 2000000000 # Frequency of simulated ticks
sim_insts 61788439 # Number of instructions simulated
sim_seconds 1.817090 # Number of seconds simulated
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
index 6204251a5..dbafd6309 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stderr
@@ -1,3 +1,7 @@
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
0: system.tsunami.io.rtc: Real-time clock set to Sun Jan 1 00:00:00 2006
Listening for console connection on port 3456
0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
index bb7f4ca1e..3929194fc 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 8 2006 21:57:24
-M5 started Sun Oct 8 21:57:28 2006
-M5 executing on zed.eecs.umich.edu
+M5 compiled Nov 5 2006 19:41:29
+M5 started Sun Nov 5 20:03:49 2006
+M5 executing on zizzer.eecs.umich.edu
command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-atomic
Exiting @ tick 3634179176 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
index 9976e053a..f9a926d79 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
@@ -85,7 +85,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
system=system
@@ -114,7 +113,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
system=system
@@ -173,19 +171,39 @@ cpu=system.cpu0
[system.iobus]
type=Bus
+children=responder
bus_id=0
clock=2
+responder_set=true
width=64
default=system.tsunami.pciconfig.pio
port=system.bridge.side_a 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.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+
[system.membus]
type=Bus
+children=responder
bus_id=1
clock=2
+responder_set=false
width=64
+default=system.membus.responder.pio
port=system.bridge.side_b system.physmem.port system.cpu0.icache_port system.cpu0.dcache_port system.cpu1.icache_port system.cpu1.dcache_port
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+pio=system.membus.default
+
[system.physmem]
type=PhysicalMemory
file=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
index 9e4bfb566..5391d8e88 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
@@ -31,6 +31,50 @@ type=Bus
bus_id=1
clock=2
width=64
+responder_set=false
+
+[system.cpu0.itb]
+type=AlphaITB
+size=48
+
+[system.cpu0.dtb]
+type=AlphaDTB
+size=64
+
+[system.cpu0]
+type=TimingSimpleCPU
+max_insts_any_thread=0
+max_insts_all_threads=0
+max_loads_any_thread=0
+max_loads_all_threads=0
+progress_interval=0
+system=system
+cpu_id=0
+itb=system.cpu0.itb
+dtb=system.cpu0.dtb
+profile=0
+clock=1
+defer_registration=false
+// width not specified
+function_trace=false
+function_trace_start=0
+// simulate_stalls not specified
+
+[system.intrctrl]
+type=IntrControl
+cpu=system.cpu0
+
+[system.tsunami]
+type=Tsunami
+system=system
+intrctrl=system.intrctrl
+
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[system.bridge]
type=Bridge
@@ -75,34 +119,6 @@ image=system.disk2.image
driveID=master
delay=2000
-[system.cpu0.itb]
-type=AlphaITB
-size=48
-
-[system.cpu0.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu0]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-mem=system.physmem
-system=system
-cpu_id=0
-itb=system.cpu0.itb
-dtb=system.cpu0.dtb
-profile=0
-clock=1
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
[system.cpu1.itb]
type=AlphaITB
size=48
@@ -118,7 +134,6 @@ max_insts_all_threads=0
max_loads_any_thread=0
max_loads_all_threads=0
progress_interval=0
-mem=system.physmem
system=system
cpu_id=1
itb=system.cpu1.itb
@@ -131,10 +146,6 @@ function_trace=false
function_trace_start=0
// simulate_stalls not specified
-[system.intrctrl]
-type=IntrControl
-cpu=system.cpu0
-
[system.simple_disk.disk]
type=RawDiskImage
image_file=/dist/m5/system/disks/linux-latest.img
@@ -145,11 +156,6 @@ type=SimpleDisk
system=system
disk=system.simple_disk.disk
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
[system.tsunami.fake_uart1]
type=IsaFake
pio_addr=8804615848696
@@ -495,6 +501,14 @@ type=Bus
bus_id=0
clock=2
width=64
+responder_set=true
+
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[trace]
flags=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
index 27adebb82..ceae1faaf 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/console.system.sim_console
@@ -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)
- CallbackFixup 0 18000, t7=FFFFFC000070C000
Entering slaveloop for cpu 1 my_rpb=FFFFFC0000018400
+ CallbackFixup 0 18000, t7=FFFFFC000070C000
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
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
index 3f540d0ea..64a8cd99b 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/m5stats.txt
@@ -1,225 +1,226 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 255147 # Simulator instruction rate (inst/s)
-host_mem_usage 198260 # Number of bytes of host memory used
-host_seconds 260.00 # Real time elapsed on the host
-host_tick_rate 14365182 # Simulator tick rate (ticks/s)
+host_inst_rate 341883 # Simulator instruction rate (inst/s)
+host_mem_usage 198856 # Number of bytes of host memory used
+host_seconds 195.81 # Real time elapsed on the host
+host_tick_rate 20274403 # Simulator tick rate (ticks/s)
sim_freq 2000000000 # Frequency of simulated ticks
-sim_insts 66337257 # Number of instructions simulated
-sim_seconds 1.867449 # Number of seconds simulated
-sim_ticks 3734898877 # Number of ticks simulated
-system.cpu0.dtb.accesses 828318 # DTB accesses
-system.cpu0.dtb.acv 315 # DTB access violations
-system.cpu0.dtb.hits 13264910 # DTB hits
-system.cpu0.dtb.misses 7094 # DTB misses
-system.cpu0.dtb.read_accesses 572336 # DTB read accesses
-system.cpu0.dtb.read_acv 200 # DTB read access violations
-system.cpu0.dtb.read_hits 8201218 # DTB read hits
-system.cpu0.dtb.read_misses 6394 # DTB read misses
-system.cpu0.dtb.write_accesses 255982 # DTB write accesses
+sim_insts 66945470 # Number of instructions simulated
+sim_seconds 1.985009 # Number of seconds simulated
+sim_ticks 3970017178 # Number of ticks simulated
+system.cpu0.dtb.accesses 1003481 # DTB accesses
+system.cpu0.dtb.acv 289 # DTB access violations
+system.cpu0.dtb.hits 13332675 # DTB hits
+system.cpu0.dtb.misses 8437 # DTB misses
+system.cpu0.dtb.read_accesses 695694 # DTB read accesses
+system.cpu0.dtb.read_acv 174 # DTB read access violations
+system.cpu0.dtb.read_hits 8285791 # DTB read hits
+system.cpu0.dtb.read_misses 7640 # DTB read misses
+system.cpu0.dtb.write_accesses 307787 # DTB write accesses
system.cpu0.dtb.write_acv 115 # DTB write access violations
-system.cpu0.dtb.write_hits 5063692 # DTB write hits
-system.cpu0.dtb.write_misses 700 # DTB write misses
-system.cpu0.idle_fraction 0.982517 # Percentage of idle cycles
-system.cpu0.itb.accesses 1888651 # ITB accesses
-system.cpu0.itb.acv 166 # ITB acv
-system.cpu0.itb.hits 1885318 # ITB hits
-system.cpu0.itb.misses 3333 # ITB misses
-system.cpu0.kern.callpal 146863 # number of callpals executed
+system.cpu0.dtb.write_hits 5046884 # DTB write hits
+system.cpu0.dtb.write_misses 797 # DTB write misses
+system.cpu0.idle_fraction 0.928150 # Percentage of idle cycles
+system.cpu0.itb.accesses 2398201 # ITB accesses
+system.cpu0.itb.acv 143 # ITB acv
+system.cpu0.itb.hits 2394377 # ITB hits
+system.cpu0.itb.misses 3824 # ITB misses
+system.cpu0.kern.callpal 144637 # number of callpals executed
system.cpu0.kern.callpal_cserve 1 0.00% 0.00% # number of callpals executed
-system.cpu0.kern.callpal_wripir 506 0.34% 0.35% # number of callpals executed
-system.cpu0.kern.callpal_wrmces 1 0.00% 0.35% # number of callpals executed
-system.cpu0.kern.callpal_wrfen 1 0.00% 0.35% # number of callpals executed
-system.cpu0.kern.callpal_wrvptptr 1 0.00% 0.35% # number of callpals executed
-system.cpu0.kern.callpal_swpctx 2962 2.02% 2.36% # number of callpals executed
-system.cpu0.kern.callpal_tbi 47 0.03% 2.40% # number of callpals executed
-system.cpu0.kern.callpal_wrent 7 0.00% 2.40% # number of callpals executed
-system.cpu0.kern.callpal_swpipl 132443 90.18% 92.58% # number of callpals executed
-system.cpu0.kern.callpal_rdps 6236 4.25% 96.83% # number of callpals executed
-system.cpu0.kern.callpal_wrkgp 1 0.00% 96.83% # number of callpals executed
-system.cpu0.kern.callpal_wrusp 2 0.00% 96.83% # number of callpals executed
-system.cpu0.kern.callpal_rdusp 8 0.01% 96.84% # number of callpals executed
-system.cpu0.kern.callpal_whami 2 0.00% 96.84% # number of callpals executed
-system.cpu0.kern.callpal_rti 4200 2.86% 99.70% # number of callpals executed
-system.cpu0.kern.callpal_callsys 317 0.22% 99.91% # number of callpals executed
-system.cpu0.kern.callpal_imb 128 0.09% 100.00% # number of callpals executed
+system.cpu0.kern.callpal_wripir 571 0.39% 0.40% # number of callpals executed
+system.cpu0.kern.callpal_wrmces 1 0.00% 0.40% # number of callpals executed
+system.cpu0.kern.callpal_wrfen 1 0.00% 0.40% # number of callpals executed
+system.cpu0.kern.callpal_wrvptptr 1 0.00% 0.40% # number of callpals executed
+system.cpu0.kern.callpal_swpctx 2907 2.01% 2.41% # number of callpals executed
+system.cpu0.kern.callpal_tbi 44 0.03% 2.44% # number of callpals executed
+system.cpu0.kern.callpal_wrent 7 0.00% 2.44% # number of callpals executed
+system.cpu0.kern.callpal_swpipl 129633 89.63% 92.07% # number of callpals executed
+system.cpu0.kern.callpal_rdps 6650 4.60% 96.67% # number of callpals executed
+system.cpu0.kern.callpal_wrkgp 1 0.00% 96.67% # number of callpals executed
+system.cpu0.kern.callpal_wrusp 4 0.00% 96.67% # number of callpals executed
+system.cpu0.kern.callpal_rdusp 7 0.00% 96.68% # number of callpals executed
+system.cpu0.kern.callpal_whami 2 0.00% 96.68% # number of callpals executed
+system.cpu0.kern.callpal_rti 4286 2.96% 99.64% # number of callpals executed
+system.cpu0.kern.callpal_callsys 372 0.26% 99.90% # number of callpals executed
+system.cpu0.kern.callpal_imb 149 0.10% 100.00% # number of callpals executed
system.cpu0.kern.inst.arm 0 # number of arm instructions executed
-system.cpu0.kern.inst.hwrei 160332 # number of hwrei instructions executed
+system.cpu0.kern.inst.hwrei 159963 # number of hwrei instructions executed
system.cpu0.kern.inst.ivlb 0 # number of ivlb instructions executed
system.cpu0.kern.inst.ivle 0 # number of ivle instructions executed
-system.cpu0.kern.inst.quiesce 6637 # number of quiesce instructions executed
-system.cpu0.kern.ipl_count 139203 # number of times we switched to this ipl
-system.cpu0.kern.ipl_count_0 55744 40.05% 40.05% # number of times we switched to this ipl
-system.cpu0.kern.ipl_count_21 245 0.18% 40.22% # number of times we switched to this ipl
-system.cpu0.kern.ipl_count_22 1904 1.37% 41.59% # number of times we switched to this ipl
-system.cpu0.kern.ipl_count_30 410 0.29% 41.88% # number of times we switched to this ipl
-system.cpu0.kern.ipl_count_31 80900 58.12% 100.00% # number of times we switched to this ipl
-system.cpu0.kern.ipl_good 112527 # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_good_0 55189 49.05% 49.05% # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_good_21 245 0.22% 49.26% # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_good_22 1904 1.69% 50.95% # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_good_30 410 0.36% 51.32% # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_good_31 54779 48.68% 100.00% # number of times we switched to this ipl from a different ipl
-system.cpu0.kern.ipl_ticks 3734378988 # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_ticks_0 3696326531 98.98% 98.98% # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_ticks_21 53683 0.00% 98.98% # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_ticks_22 224672 0.01% 98.99% # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_ticks_30 128286 0.00% 98.99% # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_ticks_31 37645816 1.01% 100.00% # number of cycles we spent at this ipl
-system.cpu0.kern.ipl_used 0.808366 # fraction of swpipl calls that actually changed the ipl
-system.cpu0.kern.ipl_used_0 0.990044 # fraction of swpipl calls that actually changed the ipl
+system.cpu0.kern.inst.quiesce 6648 # number of quiesce instructions executed
+system.cpu0.kern.ipl_count 136551 # number of times we switched to this ipl
+system.cpu0.kern.ipl_count_0 54497 39.91% 39.91% # number of times we switched to this ipl
+system.cpu0.kern.ipl_count_21 143 0.10% 40.01% # number of times we switched to this ipl
+system.cpu0.kern.ipl_count_22 2005 1.47% 41.48% # number of times we switched to this ipl
+system.cpu0.kern.ipl_count_30 483 0.35% 41.84% # number of times we switched to this ipl
+system.cpu0.kern.ipl_count_31 79423 58.16% 100.00% # number of times we switched to this ipl
+system.cpu0.kern.ipl_good 110306 # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_good_0 54079 49.03% 49.03% # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_good_21 143 0.13% 49.16% # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_good_22 2005 1.82% 50.97% # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_good_30 483 0.44% 51.41% # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_good_31 53596 48.59% 100.00% # number of times we switched to this ipl from a different ipl
+system.cpu0.kern.ipl_ticks 3970015394 # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_ticks_0 3836129328 96.63% 96.63% # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_ticks_21 133000 0.00% 96.63% # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_ticks_22 1870128 0.05% 96.68% # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_ticks_30 1206048 0.03% 96.71% # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_ticks_31 130676890 3.29% 100.00% # number of cycles we spent at this ipl
+system.cpu0.kern.ipl_used 0.807801 # fraction of swpipl calls that actually changed the ipl
+system.cpu0.kern.ipl_used_0 0.992330 # fraction of swpipl calls that actually changed the ipl
system.cpu0.kern.ipl_used_21 1 # fraction of swpipl calls that actually changed the ipl
system.cpu0.kern.ipl_used_22 1 # fraction of swpipl calls that actually changed the ipl
system.cpu0.kern.ipl_used_30 1 # fraction of swpipl calls that actually changed the ipl
-system.cpu0.kern.ipl_used_31 0.677120 # fraction of swpipl calls that actually changed the ipl
-system.cpu0.kern.mode_good_kernel 1095
-system.cpu0.kern.mode_good_user 1095
+system.cpu0.kern.ipl_used_31 0.674817 # fraction of swpipl calls that actually changed the ipl
+system.cpu0.kern.mode_good_kernel 1253
+system.cpu0.kern.mode_good_user 1254
system.cpu0.kern.mode_good_idle 0
-system.cpu0.kern.mode_switch_kernel 6628 # number of protection mode switches
-system.cpu0.kern.mode_switch_user 1095 # number of protection mode switches
+system.cpu0.kern.mode_switch_kernel 6799 # number of protection mode switches
+system.cpu0.kern.mode_switch_user 1254 # number of protection mode switches
system.cpu0.kern.mode_switch_idle 0 # number of protection mode switches
-system.cpu0.kern.mode_switch_good 0.283569 # fraction of useful protection mode switches
-system.cpu0.kern.mode_switch_good_kernel 0.165208 # fraction of useful protection mode switches
+system.cpu0.kern.mode_switch_good 0.311313 # fraction of useful protection mode switches
+system.cpu0.kern.mode_switch_good_kernel 0.184292 # fraction of useful protection mode switches
system.cpu0.kern.mode_switch_good_user 1 # fraction of useful protection mode switches
system.cpu0.kern.mode_switch_good_idle <err: div-0> # fraction of useful protection mode switches
-system.cpu0.kern.mode_ticks_kernel 3730042316 99.93% 99.93% # number of ticks spent at the given mode
-system.cpu0.kern.mode_ticks_user 2718822 0.07% 100.00% # number of ticks spent at the given mode
+system.cpu0.kern.mode_ticks_kernel 3956260432 99.65% 99.65% # number of ticks spent at the given mode
+system.cpu0.kern.mode_ticks_user 13754954 0.35% 100.00% # number of ticks spent at the given mode
system.cpu0.kern.mode_ticks_idle 0 0.00% 100.00% # number of ticks spent at the given mode
-system.cpu0.kern.swap_context 2963 # number of times the context was actually changed
-system.cpu0.kern.syscall 179 # number of syscalls executed
-system.cpu0.kern.syscall_fork 7 3.91% 3.91% # number of syscalls executed
-system.cpu0.kern.syscall_read 14 7.82% 11.73% # number of syscalls executed
-system.cpu0.kern.syscall_write 4 2.23% 13.97% # number of syscalls executed
-system.cpu0.kern.syscall_close 27 15.08% 29.05% # number of syscalls executed
-system.cpu0.kern.syscall_chdir 1 0.56% 29.61% # number of syscalls executed
-system.cpu0.kern.syscall_obreak 6 3.35% 32.96% # number of syscalls executed
-system.cpu0.kern.syscall_lseek 7 3.91% 36.87% # number of syscalls executed
-system.cpu0.kern.syscall_getpid 4 2.23% 39.11% # number of syscalls executed
-system.cpu0.kern.syscall_setuid 1 0.56% 39.66% # number of syscalls executed
-system.cpu0.kern.syscall_getuid 3 1.68% 41.34% # number of syscalls executed
-system.cpu0.kern.syscall_access 6 3.35% 44.69% # number of syscalls executed
-system.cpu0.kern.syscall_dup 2 1.12% 45.81% # number of syscalls executed
-system.cpu0.kern.syscall_open 30 16.76% 62.57% # number of syscalls executed
-system.cpu0.kern.syscall_getgid 3 1.68% 64.25% # number of syscalls executed
-system.cpu0.kern.syscall_sigprocmask 8 4.47% 68.72% # number of syscalls executed
-system.cpu0.kern.syscall_ioctl 8 4.47% 73.18% # number of syscalls executed
-system.cpu0.kern.syscall_execve 5 2.79% 75.98% # number of syscalls executed
-system.cpu0.kern.syscall_mmap 17 9.50% 85.47% # number of syscalls executed
-system.cpu0.kern.syscall_munmap 3 1.68% 87.15% # number of syscalls executed
-system.cpu0.kern.syscall_mprotect 4 2.23% 89.39% # number of syscalls executed
-system.cpu0.kern.syscall_gethostname 1 0.56% 89.94% # number of syscalls executed
-system.cpu0.kern.syscall_dup2 2 1.12% 91.06% # number of syscalls executed
-system.cpu0.kern.syscall_fcntl 8 4.47% 95.53% # number of syscalls executed
-system.cpu0.kern.syscall_socket 2 1.12% 96.65% # number of syscalls executed
-system.cpu0.kern.syscall_connect 2 1.12% 97.77% # number of syscalls executed
-system.cpu0.kern.syscall_setgid 1 0.56% 98.32% # number of syscalls executed
-system.cpu0.kern.syscall_getrlimit 1 0.56% 98.88% # number of syscalls executed
-system.cpu0.kern.syscall_setsid 2 1.12% 100.00% # number of syscalls executed
-system.cpu0.not_idle_fraction 0.017483 # Percentage of non-idle cycles
-system.cpu0.numCycles 3734379018 # number of cpu cycles simulated
-system.cpu0.num_insts 51973218 # Number of instructions executed
-system.cpu0.num_refs 13496062 # Number of memory references
-system.cpu1.dtb.accesses 477041 # DTB accesses
-system.cpu1.dtb.acv 52 # DTB access violations
-system.cpu1.dtb.hits 4561390 # DTB hits
-system.cpu1.dtb.misses 4359 # DTB misses
-system.cpu1.dtb.read_accesses 328551 # DTB read accesses
-system.cpu1.dtb.read_acv 10 # DTB read access violations
-system.cpu1.dtb.read_hits 2657400 # DTB read hits
-system.cpu1.dtb.read_misses 3911 # DTB read misses
-system.cpu1.dtb.write_accesses 148490 # DTB write accesses
-system.cpu1.dtb.write_acv 42 # DTB write access violations
-system.cpu1.dtb.write_hits 1903990 # DTB write hits
-system.cpu1.dtb.write_misses 448 # DTB write misses
-system.cpu1.idle_fraction 0.994927 # Percentage of idle cycles
-system.cpu1.itb.accesses 1392687 # ITB accesses
-system.cpu1.itb.acv 18 # ITB acv
-system.cpu1.itb.hits 1391015 # ITB hits
-system.cpu1.itb.misses 1672 # ITB misses
-system.cpu1.kern.callpal 74370 # number of callpals executed
+system.cpu0.kern.swap_context 2908 # number of times the context was actually changed
+system.cpu0.kern.syscall 227 # number of syscalls executed
+system.cpu0.kern.syscall_fork 6 2.64% 2.64% # number of syscalls executed
+system.cpu0.kern.syscall_read 19 8.37% 11.01% # number of syscalls executed
+system.cpu0.kern.syscall_write 3 1.32% 12.33% # number of syscalls executed
+system.cpu0.kern.syscall_close 31 13.66% 25.99% # number of syscalls executed
+system.cpu0.kern.syscall_chdir 1 0.44% 26.43% # number of syscalls executed
+system.cpu0.kern.syscall_chmod 1 0.44% 26.87% # number of syscalls executed
+system.cpu0.kern.syscall_obreak 10 4.41% 31.28% # number of syscalls executed
+system.cpu0.kern.syscall_lseek 6 2.64% 33.92% # number of syscalls executed
+system.cpu0.kern.syscall_getpid 4 1.76% 35.68% # number of syscalls executed
+system.cpu0.kern.syscall_setuid 2 0.88% 36.56% # number of syscalls executed
+system.cpu0.kern.syscall_getuid 4 1.76% 38.33% # number of syscalls executed
+system.cpu0.kern.syscall_access 8 3.52% 41.85% # number of syscalls executed
+system.cpu0.kern.syscall_dup 2 0.88% 42.73% # number of syscalls executed
+system.cpu0.kern.syscall_open 40 17.62% 60.35% # number of syscalls executed
+system.cpu0.kern.syscall_getgid 4 1.76% 62.11% # number of syscalls executed
+system.cpu0.kern.syscall_sigprocmask 7 3.08% 65.20% # number of syscalls executed
+system.cpu0.kern.syscall_ioctl 9 3.96% 69.16% # number of syscalls executed
+system.cpu0.kern.syscall_readlink 1 0.44% 69.60% # number of syscalls executed
+system.cpu0.kern.syscall_execve 5 2.20% 71.81% # number of syscalls executed
+system.cpu0.kern.syscall_mmap 32 14.10% 85.90% # number of syscalls executed
+system.cpu0.kern.syscall_munmap 3 1.32% 87.22% # number of syscalls executed
+system.cpu0.kern.syscall_mprotect 9 3.96% 91.19% # number of syscalls executed
+system.cpu0.kern.syscall_gethostname 1 0.44% 91.63% # number of syscalls executed
+system.cpu0.kern.syscall_dup2 2 0.88% 92.51% # number of syscalls executed
+system.cpu0.kern.syscall_fcntl 8 3.52% 96.04% # number of syscalls executed
+system.cpu0.kern.syscall_socket 2 0.88% 96.92% # number of syscalls executed
+system.cpu0.kern.syscall_connect 2 0.88% 97.80% # number of syscalls executed
+system.cpu0.kern.syscall_setgid 2 0.88% 98.68% # number of syscalls executed
+system.cpu0.kern.syscall_getrlimit 1 0.44% 99.12% # number of syscalls executed
+system.cpu0.kern.syscall_setsid 2 0.88% 100.00% # number of syscalls executed
+system.cpu0.not_idle_fraction 0.071850 # Percentage of non-idle cycles
+system.cpu0.numCycles 3970017178 # number of cpu cycles simulated
+system.cpu0.num_insts 52312134 # Number of instructions executed
+system.cpu0.num_refs 13564902 # Number of memory references
+system.cpu1.dtb.accesses 302962 # DTB accesses
+system.cpu1.dtb.acv 84 # DTB access violations
+system.cpu1.dtb.hits 4635665 # DTB hits
+system.cpu1.dtb.misses 3107 # DTB misses
+system.cpu1.dtb.read_accesses 205912 # DTB read accesses
+system.cpu1.dtb.read_acv 36 # DTB read access violations
+system.cpu1.dtb.read_hits 2664909 # DTB read hits
+system.cpu1.dtb.read_misses 2747 # DTB read misses
+system.cpu1.dtb.write_accesses 97050 # DTB write accesses
+system.cpu1.dtb.write_acv 48 # DTB write access violations
+system.cpu1.dtb.write_hits 1970756 # DTB write hits
+system.cpu1.dtb.write_misses 360 # DTB write misses
+system.cpu1.idle_fraction 0.974941 # Percentage of idle cycles
+system.cpu1.itb.accesses 885878 # ITB accesses
+system.cpu1.itb.acv 41 # ITB acv
+system.cpu1.itb.hits 884631 # ITB hits
+system.cpu1.itb.misses 1247 # ITB misses
+system.cpu1.kern.callpal 80664 # number of callpals executed
system.cpu1.kern.callpal_cserve 1 0.00% 0.00% # number of callpals executed
-system.cpu1.kern.callpal_wripir 410 0.55% 0.55% # number of callpals executed
-system.cpu1.kern.callpal_wrmces 1 0.00% 0.55% # number of callpals executed
-system.cpu1.kern.callpal_wrfen 1 0.00% 0.56% # number of callpals executed
-system.cpu1.kern.callpal_swpctx 2102 2.83% 3.38% # number of callpals executed
-system.cpu1.kern.callpal_tbi 6 0.01% 3.39% # number of callpals executed
-system.cpu1.kern.callpal_wrent 7 0.01% 3.40% # number of callpals executed
-system.cpu1.kern.callpal_swpipl 65072 87.50% 90.90% # number of callpals executed
-system.cpu1.kern.callpal_rdps 2603 3.50% 94.40% # number of callpals executed
-system.cpu1.kern.callpal_wrkgp 1 0.00% 94.40% # number of callpals executed
-system.cpu1.kern.callpal_wrusp 5 0.01% 94.41% # number of callpals executed
-system.cpu1.kern.callpal_rdusp 1 0.00% 94.41% # number of callpals executed
-system.cpu1.kern.callpal_whami 3 0.00% 94.41% # number of callpals executed
-system.cpu1.kern.callpal_rti 3890 5.23% 99.64% # number of callpals executed
-system.cpu1.kern.callpal_callsys 214 0.29% 99.93% # number of callpals executed
-system.cpu1.kern.callpal_imb 52 0.07% 100.00% # number of callpals executed
+system.cpu1.kern.callpal_wripir 483 0.60% 0.60% # number of callpals executed
+system.cpu1.kern.callpal_wrmces 1 0.00% 0.60% # number of callpals executed
+system.cpu1.kern.callpal_wrfen 1 0.00% 0.60% # number of callpals executed
+system.cpu1.kern.callpal_swpctx 2277 2.82% 3.43% # number of callpals executed
+system.cpu1.kern.callpal_tbi 10 0.01% 3.44% # number of callpals executed
+system.cpu1.kern.callpal_wrent 7 0.01% 3.45% # number of callpals executed
+system.cpu1.kern.callpal_swpipl 71260 88.34% 91.79% # number of callpals executed
+system.cpu1.kern.callpal_rdps 2378 2.95% 94.74% # number of callpals executed
+system.cpu1.kern.callpal_wrkgp 1 0.00% 94.74% # number of callpals executed
+system.cpu1.kern.callpal_wrusp 3 0.00% 94.74% # number of callpals executed
+system.cpu1.kern.callpal_rdusp 2 0.00% 94.74% # number of callpals executed
+system.cpu1.kern.callpal_whami 3 0.00% 94.75% # number of callpals executed
+system.cpu1.kern.callpal_rti 4044 5.01% 99.76% # number of callpals executed
+system.cpu1.kern.callpal_callsys 161 0.20% 99.96% # number of callpals executed
+system.cpu1.kern.callpal_imb 31 0.04% 100.00% # number of callpals executed
system.cpu1.kern.callpal_rdunique 1 0.00% 100.00% # number of callpals executed
system.cpu1.kern.inst.arm 0 # number of arm instructions executed
-system.cpu1.kern.inst.hwrei 82881 # number of hwrei instructions executed
+system.cpu1.kern.inst.hwrei 87713 # number of hwrei instructions executed
system.cpu1.kern.inst.ivlb 0 # number of ivlb instructions executed
system.cpu1.kern.inst.ivle 0 # number of ivle instructions executed
-system.cpu1.kern.inst.quiesce 2511 # number of quiesce instructions executed
-system.cpu1.kern.ipl_count 71371 # number of times we switched to this ipl
-system.cpu1.kern.ipl_count_0 27750 38.88% 38.88% # number of times we switched to this ipl
-system.cpu1.kern.ipl_count_22 1902 2.66% 41.55% # number of times we switched to this ipl
-system.cpu1.kern.ipl_count_30 506 0.71% 42.26% # number of times we switched to this ipl
-system.cpu1.kern.ipl_count_31 41213 57.74% 100.00% # number of times we switched to this ipl
-system.cpu1.kern.ipl_good 55758 # number of times we switched to this ipl from a different ipl
-system.cpu1.kern.ipl_good_0 26928 48.29% 48.29% # number of times we switched to this ipl from a different ipl
-system.cpu1.kern.ipl_good_22 1902 3.41% 51.71% # number of times we switched to this ipl from a different ipl
-system.cpu1.kern.ipl_good_30 506 0.91% 52.61% # number of times we switched to this ipl from a different ipl
-system.cpu1.kern.ipl_good_31 26422 47.39% 100.00% # number of times we switched to this ipl from a different ipl
-system.cpu1.kern.ipl_ticks 3734898431 # number of cycles we spent at this ipl
-system.cpu1.kern.ipl_ticks_0 3704872588 99.20% 99.20% # number of cycles we spent at this ipl
-system.cpu1.kern.ipl_ticks_22 224436 0.01% 99.20% # number of cycles we spent at this ipl
-system.cpu1.kern.ipl_ticks_30 162482 0.00% 99.21% # number of cycles we spent at this ipl
-system.cpu1.kern.ipl_ticks_31 29638925 0.79% 100.00% # number of cycles we spent at this ipl
-system.cpu1.kern.ipl_used 0.781242 # fraction of swpipl calls that actually changed the ipl
-system.cpu1.kern.ipl_used_0 0.970378 # fraction of swpipl calls that actually changed the ipl
+system.cpu1.kern.inst.quiesce 2740 # number of quiesce instructions executed
+system.cpu1.kern.ipl_count 77873 # number of times we switched to this ipl
+system.cpu1.kern.ipl_count_0 30259 38.86% 38.86% # number of times we switched to this ipl
+system.cpu1.kern.ipl_count_22 1997 2.56% 41.42% # number of times we switched to this ipl
+system.cpu1.kern.ipl_count_30 571 0.73% 42.15% # number of times we switched to this ipl
+system.cpu1.kern.ipl_count_31 45046 57.85% 100.00% # number of times we switched to this ipl
+system.cpu1.kern.ipl_good 60597 # number of times we switched to this ipl from a different ipl
+system.cpu1.kern.ipl_good_0 29300 48.35% 48.35% # number of times we switched to this ipl from a different ipl
+system.cpu1.kern.ipl_good_22 1997 3.30% 51.65% # number of times we switched to this ipl from a different ipl
+system.cpu1.kern.ipl_good_30 571 0.94% 52.59% # number of times we switched to this ipl from a different ipl
+system.cpu1.kern.ipl_good_31 28729 47.41% 100.00% # number of times we switched to this ipl from a different ipl
+system.cpu1.kern.ipl_ticks 3968771896 # number of cycles we spent at this ipl
+system.cpu1.kern.ipl_ticks_0 3847181696 96.94% 96.94% # number of cycles we spent at this ipl
+system.cpu1.kern.ipl_ticks_22 1867354 0.05% 96.98% # number of cycles we spent at this ipl
+system.cpu1.kern.ipl_ticks_30 1457952 0.04% 97.02% # number of cycles we spent at this ipl
+system.cpu1.kern.ipl_ticks_31 118264894 2.98% 100.00% # number of cycles we spent at this ipl
+system.cpu1.kern.ipl_used 0.778152 # fraction of swpipl calls that actually changed the ipl
+system.cpu1.kern.ipl_used_0 0.968307 # fraction of swpipl calls that actually changed the ipl
system.cpu1.kern.ipl_used_22 1 # fraction of swpipl calls that actually changed the ipl
system.cpu1.kern.ipl_used_30 1 # fraction of swpipl calls that actually changed the ipl
-system.cpu1.kern.ipl_used_31 0.641108 # fraction of swpipl calls that actually changed the ipl
-system.cpu1.kern.mode_good_kernel 1093
-system.cpu1.kern.mode_good_user 662
-system.cpu1.kern.mode_good_idle 431
-system.cpu1.kern.mode_switch_kernel 2354 # number of protection mode switches
-system.cpu1.kern.mode_switch_user 662 # number of protection mode switches
-system.cpu1.kern.mode_switch_idle 2830 # number of protection mode switches
-system.cpu1.kern.mode_switch_good 0.373931 # fraction of useful protection mode switches
-system.cpu1.kern.mode_switch_good_kernel 0.464316 # fraction of useful protection mode switches
+system.cpu1.kern.ipl_used_31 0.637770 # fraction of swpipl calls that actually changed the ipl
+system.cpu1.kern.mode_good_kernel 1013
+system.cpu1.kern.mode_good_user 518
+system.cpu1.kern.mode_good_idle 495
+system.cpu1.kern.mode_switch_kernel 2345 # number of protection mode switches
+system.cpu1.kern.mode_switch_user 518 # number of protection mode switches
+system.cpu1.kern.mode_switch_idle 3028 # number of protection mode switches
+system.cpu1.kern.mode_switch_good 0.343914 # fraction of useful protection mode switches
+system.cpu1.kern.mode_switch_good_kernel 0.431983 # fraction of useful protection mode switches
system.cpu1.kern.mode_switch_good_user 1 # fraction of useful protection mode switches
-system.cpu1.kern.mode_switch_good_idle 0.152297 # fraction of useful protection mode switches
-system.cpu1.kern.mode_ticks_kernel 13359666 0.36% 0.36% # number of ticks spent at the given mode
-system.cpu1.kern.mode_ticks_user 1967356 0.05% 0.41% # number of ticks spent at the given mode
-system.cpu1.kern.mode_ticks_idle 3719571407 99.59% 100.00% # number of ticks spent at the given mode
-system.cpu1.kern.swap_context 2103 # number of times the context was actually changed
-system.cpu1.kern.syscall 150 # number of syscalls executed
-system.cpu1.kern.syscall_fork 1 0.67% 0.67% # number of syscalls executed
-system.cpu1.kern.syscall_read 16 10.67% 11.33% # number of syscalls executed
-system.cpu1.kern.syscall_close 16 10.67% 22.00% # number of syscalls executed
-system.cpu1.kern.syscall_chmod 1 0.67% 22.67% # number of syscalls executed
-system.cpu1.kern.syscall_obreak 9 6.00% 28.67% # number of syscalls executed
-system.cpu1.kern.syscall_lseek 3 2.00% 30.67% # number of syscalls executed
-system.cpu1.kern.syscall_getpid 2 1.33% 32.00% # number of syscalls executed
-system.cpu1.kern.syscall_setuid 3 2.00% 34.00% # number of syscalls executed
-system.cpu1.kern.syscall_getuid 3 2.00% 36.00% # number of syscalls executed
-system.cpu1.kern.syscall_access 5 3.33% 39.33% # number of syscalls executed
-system.cpu1.kern.syscall_open 25 16.67% 56.00% # number of syscalls executed
-system.cpu1.kern.syscall_getgid 3 2.00% 58.00% # number of syscalls executed
-system.cpu1.kern.syscall_sigprocmask 2 1.33% 59.33% # number of syscalls executed
-system.cpu1.kern.syscall_ioctl 2 1.33% 60.67% # number of syscalls executed
-system.cpu1.kern.syscall_readlink 1 0.67% 61.33% # number of syscalls executed
-system.cpu1.kern.syscall_execve 2 1.33% 62.67% # number of syscalls executed
-system.cpu1.kern.syscall_mmap 37 24.67% 87.33% # number of syscalls executed
-system.cpu1.kern.syscall_mprotect 12 8.00% 95.33% # number of syscalls executed
-system.cpu1.kern.syscall_dup2 1 0.67% 96.00% # number of syscalls executed
-system.cpu1.kern.syscall_fcntl 2 1.33% 97.33% # number of syscalls executed
-system.cpu1.kern.syscall_setgid 3 2.00% 99.33% # number of syscalls executed
-system.cpu1.kern.syscall_getrlimit 1 0.67% 100.00% # number of syscalls executed
-system.cpu1.not_idle_fraction 0.005073 # Percentage of non-idle cycles
-system.cpu1.numCycles 3734898877 # number of cpu cycles simulated
-system.cpu1.num_insts 14364039 # Number of instructions executed
-system.cpu1.num_refs 4590544 # Number of memory references
+system.cpu1.kern.mode_switch_good_idle 0.163474 # fraction of useful protection mode switches
+system.cpu1.kern.mode_ticks_kernel 63013938 1.59% 1.59% # number of ticks spent at the given mode
+system.cpu1.kern.mode_ticks_user 5102326 0.13% 1.72% # number of ticks spent at the given mode
+system.cpu1.kern.mode_ticks_idle 3899442912 98.28% 100.00% # number of ticks spent at the given mode
+system.cpu1.kern.swap_context 2278 # number of times the context was actually changed
+system.cpu1.kern.syscall 102 # number of syscalls executed
+system.cpu1.kern.syscall_fork 2 1.96% 1.96% # number of syscalls executed
+system.cpu1.kern.syscall_read 11 10.78% 12.75% # number of syscalls executed
+system.cpu1.kern.syscall_write 1 0.98% 13.73% # number of syscalls executed
+system.cpu1.kern.syscall_close 12 11.76% 25.49% # number of syscalls executed
+system.cpu1.kern.syscall_obreak 5 4.90% 30.39% # number of syscalls executed
+system.cpu1.kern.syscall_lseek 4 3.92% 34.31% # number of syscalls executed
+system.cpu1.kern.syscall_getpid 2 1.96% 36.27% # number of syscalls executed
+system.cpu1.kern.syscall_setuid 2 1.96% 38.24% # number of syscalls executed
+system.cpu1.kern.syscall_getuid 2 1.96% 40.20% # number of syscalls executed
+system.cpu1.kern.syscall_access 3 2.94% 43.14% # number of syscalls executed
+system.cpu1.kern.syscall_open 15 14.71% 57.84% # number of syscalls executed
+system.cpu1.kern.syscall_getgid 2 1.96% 59.80% # number of syscalls executed
+system.cpu1.kern.syscall_sigprocmask 3 2.94% 62.75% # number of syscalls executed
+system.cpu1.kern.syscall_ioctl 1 0.98% 63.73% # number of syscalls executed
+system.cpu1.kern.syscall_execve 2 1.96% 65.69% # number of syscalls executed
+system.cpu1.kern.syscall_mmap 22 21.57% 87.25% # number of syscalls executed
+system.cpu1.kern.syscall_mprotect 7 6.86% 94.12% # number of syscalls executed
+system.cpu1.kern.syscall_dup2 1 0.98% 95.10% # number of syscalls executed
+system.cpu1.kern.syscall_fcntl 2 1.96% 97.06% # number of syscalls executed
+system.cpu1.kern.syscall_setgid 2 1.96% 99.02% # number of syscalls executed
+system.cpu1.kern.syscall_getrlimit 1 0.98% 100.00% # number of syscalls executed
+system.cpu1.not_idle_fraction 0.025059 # Percentage of non-idle cycles
+system.cpu1.numCycles 3968772136 # number of cpu cycles simulated
+system.cpu1.num_insts 14633336 # Number of instructions executed
+system.cpu1.num_refs 4665250 # Number of memory references
system.disk0.dma_read_bytes 1024 # Number of bytes transfered via DMA reads (not PRD).
system.disk0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD).
system.disk0.dma_read_txs 1 # Number of DMA read transactions (not PRD).
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
index 64d80c0d2..bfd64fb2b 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stderr
@@ -1,6 +1,10 @@
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
0: system.tsunami.io.rtc: Real-time clock set to Sun Jan 1 00:00:00 2006
Listening for console connection on port 3457
0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
0: system.remote_gdb.listener: listening for remote gdb #1 on port 7002
warn: Entering event queue @ 0. Starting simulation...
-warn: 271343: Trying to launch CPU number 1!
+warn: 1082476: Trying to launch CPU number 1!
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
index 0e22ad636..c97d4fc44 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 10 2006 01:59:16
-M5 started Tue Oct 10 02:09:13 2006
-M5 executing on zamp.eecs.umich.edu
+M5 compiled Nov 5 2006 19:41:29
+M5 started Sun Nov 5 20:04:42 2006
+M5 executing on zizzer.eecs.umich.edu
command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual
-Exiting @ tick 3734898877 because m5_exit instruction encountered
+Exiting @ tick 3970017178 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
index 6514a6af7..17b05cd2b 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
@@ -85,7 +85,6 @@ max_insts_all_threads=0
max_insts_any_thread=0
max_loads_all_threads=0
max_loads_any_thread=0
-mem=system.physmem
profile=0
progress_interval=0
system=system
@@ -144,19 +143,39 @@ cpu=system.cpu
[system.iobus]
type=Bus
+children=responder
bus_id=0
clock=2
+responder_set=true
width=64
default=system.tsunami.pciconfig.pio
port=system.bridge.side_a 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.console.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+
[system.membus]
type=Bus
+children=responder
bus_id=1
clock=2
+responder_set=false
width=64
+default=system.membus.responder.pio
port=system.bridge.side_b system.physmem.port system.cpu.icache_port system.cpu.dcache_port
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
+pio=system.membus.default
+
[system.physmem]
type=PhysicalMemory
file=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
index 173819299..6f0210a4c 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
@@ -31,6 +31,50 @@ type=Bus
bus_id=1
clock=2
width=64
+responder_set=false
+
+[system.cpu.itb]
+type=AlphaITB
+size=48
+
+[system.cpu.dtb]
+type=AlphaDTB
+size=64
+
+[system.cpu]
+type=TimingSimpleCPU
+max_insts_any_thread=0
+max_insts_all_threads=0
+max_loads_any_thread=0
+max_loads_all_threads=0
+progress_interval=0
+system=system
+cpu_id=0
+itb=system.cpu.itb
+dtb=system.cpu.dtb
+profile=0
+clock=1
+defer_registration=false
+// width not specified
+function_trace=false
+function_trace_start=0
+// simulate_stalls not specified
+
+[system.intrctrl]
+type=IntrControl
+cpu=system.cpu
+
+[system.tsunami]
+type=Tsunami
+system=system
+intrctrl=system.intrctrl
+
+[system.membus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[system.bridge]
type=Bridge
@@ -75,38 +119,6 @@ image=system.disk2.image
driveID=master
delay=2000
-[system.cpu.itb]
-type=AlphaITB
-size=48
-
-[system.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-mem=system.physmem
-system=system
-cpu_id=0
-itb=system.cpu.itb
-dtb=system.cpu.dtb
-profile=0
-clock=1
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.intrctrl]
-type=IntrControl
-cpu=system.cpu
-
[system.simple_disk.disk]
type=RawDiskImage
image_file=/dist/m5/system/disks/linux-latest.img
@@ -117,11 +129,6 @@ type=SimpleDisk
system=system
disk=system.simple_disk.disk
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
[system.tsunami.fake_uart1]
type=IsaFake
pio_addr=8804615848696
@@ -467,6 +474,14 @@ type=Bus
bus_id=0
clock=2
width=64
+responder_set=true
+
+[system.iobus.responder]
+type=BadAddr
+pio_addr=0
+pio_latency=0
+platform=system.tsunami
+system=system
[trace]
flags=
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt
index c126b03a3..6c7f8faed 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/m5stats.txt
@@ -1,86 +1,86 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 244619 # Simulator instruction rate (inst/s)
-host_mem_usage 197804 # Number of bytes of host memory used
-host_seconds 252.48 # Real time elapsed on the host
-host_tick_rate 14464234 # Simulator tick rate (ticks/s)
+host_inst_rate 351787 # Simulator instruction rate (inst/s)
+host_mem_usage 198432 # Number of bytes of host memory used
+host_seconds 175.87 # Real time elapsed on the host
+host_tick_rate 22032614 # Simulator tick rate (ticks/s)
sim_freq 2000000000 # Frequency of simulated ticks
-sim_insts 61760478 # Number of instructions simulated
-sim_seconds 1.825937 # Number of seconds simulated
-sim_ticks 3651873858 # Number of ticks simulated
-system.cpu.dtb.accesses 1304494 # DTB accesses
+sim_insts 61868161 # Number of instructions simulated
+sim_seconds 1.937422 # Number of seconds simulated
+sim_ticks 3874844018 # Number of ticks simulated
+system.cpu.dtb.accesses 1304554 # DTB accesses
system.cpu.dtb.acv 367 # DTB access violations
-system.cpu.dtb.hits 16545335 # DTB hits
-system.cpu.dtb.misses 11425 # DTB misses
-system.cpu.dtb.read_accesses 900425 # DTB read accesses
+system.cpu.dtb.hits 16566194 # DTB hits
+system.cpu.dtb.misses 11447 # DTB misses
+system.cpu.dtb.read_accesses 900486 # DTB read accesses
system.cpu.dtb.read_acv 210 # DTB read access violations
-system.cpu.dtb.read_hits 10034117 # DTB read hits
-system.cpu.dtb.read_misses 10280 # DTB read misses
-system.cpu.dtb.write_accesses 404069 # DTB write accesses
+system.cpu.dtb.read_hits 10048141 # DTB read hits
+system.cpu.dtb.read_misses 10303 # DTB read misses
+system.cpu.dtb.write_accesses 404068 # DTB write accesses
system.cpu.dtb.write_acv 157 # DTB write access violations
-system.cpu.dtb.write_hits 6511218 # DTB write hits
-system.cpu.dtb.write_misses 1145 # DTB write misses
-system.cpu.idle_fraction 0.978539 # Percentage of idle cycles
-system.cpu.itb.accesses 3281311 # ITB accesses
+system.cpu.dtb.write_hits 6518053 # DTB write hits
+system.cpu.dtb.write_misses 1144 # DTB write misses
+system.cpu.idle_fraction 0.918945 # Percentage of idle cycles
+system.cpu.itb.accesses 3281349 # ITB accesses
system.cpu.itb.acv 184 # ITB acv
-system.cpu.itb.hits 3276321 # ITB hits
-system.cpu.itb.misses 4990 # ITB misses
-system.cpu.kern.callpal 193987 # number of callpals executed
+system.cpu.itb.hits 3276346 # ITB hits
+system.cpu.itb.misses 5003 # ITB misses
+system.cpu.kern.callpal 195242 # number of callpals executed
system.cpu.kern.callpal_cserve 1 0.00% 0.00% # number of callpals executed
system.cpu.kern.callpal_wrmces 1 0.00% 0.00% # number of callpals executed
system.cpu.kern.callpal_wrfen 1 0.00% 0.00% # number of callpals executed
system.cpu.kern.callpal_wrvptptr 1 0.00% 0.00% # number of callpals executed
-system.cpu.kern.callpal_swpctx 4203 2.17% 2.17% # number of callpals executed
-system.cpu.kern.callpal_tbi 54 0.03% 2.20% # number of callpals executed
-system.cpu.kern.callpal_wrent 7 0.00% 2.20% # number of callpals executed
-system.cpu.kern.callpal_swpipl 176881 91.18% 93.38% # number of callpals executed
-system.cpu.kern.callpal_rdps 6888 3.55% 96.93% # number of callpals executed
-system.cpu.kern.callpal_wrkgp 1 0.00% 96.93% # number of callpals executed
-system.cpu.kern.callpal_wrusp 7 0.00% 96.94% # number of callpals executed
-system.cpu.kern.callpal_rdusp 9 0.00% 96.94% # number of callpals executed
-system.cpu.kern.callpal_whami 2 0.00% 96.94% # number of callpals executed
-system.cpu.kern.callpal_rti 5219 2.69% 99.63% # number of callpals executed
+system.cpu.kern.callpal_swpctx 4161 2.13% 2.13% # number of callpals executed
+system.cpu.kern.callpal_tbi 54 0.03% 2.16% # number of callpals executed
+system.cpu.kern.callpal_wrent 7 0.00% 2.16% # number of callpals executed
+system.cpu.kern.callpal_swpipl 178096 91.22% 93.38% # number of callpals executed
+system.cpu.kern.callpal_rdps 6977 3.57% 96.96% # number of callpals executed
+system.cpu.kern.callpal_wrkgp 1 0.00% 96.96% # number of callpals executed
+system.cpu.kern.callpal_wrusp 7 0.00% 96.96% # number of callpals executed
+system.cpu.kern.callpal_rdusp 9 0.00% 96.96% # number of callpals executed
+system.cpu.kern.callpal_whami 2 0.00% 96.97% # number of callpals executed
+system.cpu.kern.callpal_rti 5212 2.67% 99.64% # number of callpals executed
system.cpu.kern.callpal_callsys 531 0.27% 99.91% # number of callpals executed
system.cpu.kern.callpal_imb 181 0.09% 100.00% # number of callpals executed
system.cpu.kern.inst.arm 0 # number of arm instructions executed
-system.cpu.kern.inst.hwrei 213061 # number of hwrei instructions executed
+system.cpu.kern.inst.hwrei 214344 # number of hwrei instructions executed
system.cpu.kern.inst.ivlb 0 # number of ivlb instructions executed
system.cpu.kern.inst.ivle 0 # number of ivle instructions executed
-system.cpu.kern.inst.quiesce 6207 # number of quiesce instructions executed
-system.cpu.kern.ipl_count 184207 # number of times we switched to this ipl
-system.cpu.kern.ipl_count_0 75390 40.93% 40.93% # number of times we switched to this ipl
-system.cpu.kern.ipl_count_21 245 0.13% 41.06% # number of times we switched to this ipl
-system.cpu.kern.ipl_count_22 1861 1.01% 42.07% # number of times we switched to this ipl
-system.cpu.kern.ipl_count_31 106711 57.93% 100.00% # number of times we switched to this ipl
-system.cpu.kern.ipl_good 150152 # number of times we switched to this ipl from a different ipl
-system.cpu.kern.ipl_good_0 74023 49.30% 49.30% # number of times we switched to this ipl from a different ipl
-system.cpu.kern.ipl_good_21 245 0.16% 49.46% # number of times we switched to this ipl from a different ipl
-system.cpu.kern.ipl_good_22 1861 1.24% 50.70% # number of times we switched to this ipl from a different ipl
-system.cpu.kern.ipl_good_31 74023 49.30% 100.00% # number of times we switched to this ipl from a different ipl
-system.cpu.kern.ipl_ticks 3651873412 # number of cycles we spent at this ipl
-system.cpu.kern.ipl_ticks_0 3611240657 98.89% 98.89% # number of cycles we spent at this ipl
-system.cpu.kern.ipl_ticks_21 53683 0.00% 98.89% # number of cycles we spent at this ipl
-system.cpu.kern.ipl_ticks_22 219598 0.01% 98.89% # number of cycles we spent at this ipl
-system.cpu.kern.ipl_ticks_31 40359474 1.11% 100.00% # number of cycles we spent at this ipl
-system.cpu.kern.ipl_used 0.815126 # fraction of swpipl calls that actually changed the ipl
-system.cpu.kern.ipl_used_0 0.981868 # fraction of swpipl calls that actually changed the ipl
+system.cpu.kern.inst.quiesce 6112 # number of quiesce instructions executed
+system.cpu.kern.ipl_count 185408 # number of times we switched to this ipl
+system.cpu.kern.ipl_count_0 75624 40.79% 40.79% # number of times we switched to this ipl
+system.cpu.kern.ipl_count_21 143 0.08% 40.87% # number of times we switched to this ipl
+system.cpu.kern.ipl_count_22 1956 1.05% 41.92% # number of times we switched to this ipl
+system.cpu.kern.ipl_count_31 107685 58.08% 100.00% # number of times we switched to this ipl
+system.cpu.kern.ipl_good 150613 # number of times we switched to this ipl from a different ipl
+system.cpu.kern.ipl_good_0 74257 49.30% 49.30% # number of times we switched to this ipl from a different ipl
+system.cpu.kern.ipl_good_21 143 0.09% 49.40% # number of times we switched to this ipl from a different ipl
+system.cpu.kern.ipl_good_22 1956 1.30% 50.70% # number of times we switched to this ipl from a different ipl
+system.cpu.kern.ipl_good_31 74257 49.30% 100.00% # number of times we switched to this ipl from a different ipl
+system.cpu.kern.ipl_ticks 3874842234 # number of cycles we spent at this ipl
+system.cpu.kern.ipl_ticks_0 3747190106 96.71% 96.71% # number of cycles we spent at this ipl
+system.cpu.kern.ipl_ticks_21 122728 0.00% 96.71% # number of cycles we spent at this ipl
+system.cpu.kern.ipl_ticks_22 915408 0.02% 96.73% # number of cycles we spent at this ipl
+system.cpu.kern.ipl_ticks_31 126613992 3.27% 100.00% # number of cycles we spent at this ipl
+system.cpu.kern.ipl_used 0.812333 # fraction of swpipl calls that actually changed the ipl
+system.cpu.kern.ipl_used_0 0.981924 # fraction of swpipl calls that actually changed the ipl
system.cpu.kern.ipl_used_21 1 # fraction of swpipl calls that actually changed the ipl
system.cpu.kern.ipl_used_22 1 # fraction of swpipl calls that actually changed the ipl
-system.cpu.kern.ipl_used_31 0.693677 # fraction of swpipl calls that actually changed the ipl
-system.cpu.kern.mode_good_kernel 1934
-system.cpu.kern.mode_good_user 1754
-system.cpu.kern.mode_good_idle 180
-system.cpu.kern.mode_switch_kernel 5984 # number of protection mode switches
-system.cpu.kern.mode_switch_user 1754 # number of protection mode switches
-system.cpu.kern.mode_switch_idle 2104 # number of protection mode switches
-system.cpu.kern.mode_switch_good 0.393010 # fraction of useful protection mode switches
-system.cpu.kern.mode_switch_good_kernel 0.323195 # fraction of useful protection mode switches
+system.cpu.kern.ipl_used_31 0.689576 # fraction of swpipl calls that actually changed the ipl
+system.cpu.kern.mode_good_kernel 1923
+system.cpu.kern.mode_good_user 1762
+system.cpu.kern.mode_good_idle 161
+system.cpu.kern.mode_switch_kernel 5967 # number of protection mode switches
+system.cpu.kern.mode_switch_user 1762 # number of protection mode switches
+system.cpu.kern.mode_switch_idle 2072 # number of protection mode switches
+system.cpu.kern.mode_switch_good 0.392409 # fraction of useful protection mode switches
+system.cpu.kern.mode_switch_good_kernel 0.322272 # fraction of useful protection mode switches
system.cpu.kern.mode_switch_good_user 1 # fraction of useful protection mode switches
-system.cpu.kern.mode_switch_good_idle 0.085551 # fraction of useful protection mode switches
-system.cpu.kern.mode_ticks_kernel 58926919 1.61% 1.61% # number of ticks spent at the given mode
-system.cpu.kern.mode_ticks_user 4685602 0.13% 1.74% # number of ticks spent at the given mode
-system.cpu.kern.mode_ticks_idle 3588260889 98.26% 100.00% # number of ticks spent at the given mode
-system.cpu.kern.swap_context 4204 # number of times the context was actually changed
+system.cpu.kern.mode_switch_good_idle 0.077703 # fraction of useful protection mode switches
+system.cpu.kern.mode_ticks_kernel 118227580 3.05% 3.05% # number of ticks spent at the given mode
+system.cpu.kern.mode_ticks_user 18744852 0.48% 3.53% # number of ticks spent at the given mode
+system.cpu.kern.mode_ticks_idle 3737869794 96.47% 100.00% # number of ticks spent at the given mode
+system.cpu.kern.swap_context 4162 # number of times the context was actually changed
system.cpu.kern.syscall 329 # number of syscalls executed
system.cpu.kern.syscall_fork 8 2.43% 2.43% # number of syscalls executed
system.cpu.kern.syscall_read 30 9.12% 11.55% # number of syscalls executed
@@ -112,10 +112,10 @@ system.cpu.kern.syscall_connect 2 0.61% 97.57% # nu
system.cpu.kern.syscall_setgid 4 1.22% 98.78% # number of syscalls executed
system.cpu.kern.syscall_getrlimit 2 0.61% 99.39% # number of syscalls executed
system.cpu.kern.syscall_setsid 2 0.61% 100.00% # number of syscalls executed
-system.cpu.not_idle_fraction 0.021461 # Percentage of non-idle cycles
-system.cpu.numCycles 3651873858 # number of cpu cycles simulated
-system.cpu.num_insts 61760478 # Number of instructions executed
-system.cpu.num_refs 16793874 # Number of memory references
+system.cpu.not_idle_fraction 0.081055 # Percentage of non-idle cycles
+system.cpu.numCycles 3874844018 # number of cpu cycles simulated
+system.cpu.num_insts 61868161 # Number of instructions executed
+system.cpu.num_refs 16814275 # Number of memory references
system.disk0.dma_read_bytes 1024 # Number of bytes transfered via DMA reads (not PRD).
system.disk0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD).
system.disk0.dma_read_txs 1 # Number of DMA read transactions (not PRD).
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
index 4741dd710..dbafd6309 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stderr
@@ -1,4 +1,8 @@
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
+Warning: rounding error > tolerance
+ 0.002000 rounded to 0
0: system.tsunami.io.rtc: Real-time clock set to Sun Jan 1 00:00:00 2006
-Listening for console connection on port 3457
-0: system.remote_gdb.listener: listening for remote gdb #0 on port 7001
+Listening for console connection on port 3456
+0: system.remote_gdb.listener: listening for remote gdb #0 on port 7000
warn: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stdout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stdout
index 2ffd4c8b9..9ae43c290 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stdout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stdout
@@ -5,8 +5,8 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Oct 10 2006 01:59:16
-M5 started Tue Oct 10 02:04:59 2006
-M5 executing on zamp.eecs.umich.edu
+M5 compiled Nov 5 2006 19:41:29
+M5 started Sun Nov 5 20:04:39 2006
+M5 executing on zizzer.eecs.umich.edu
command line: build/ALPHA_FS/m5.opt -d build/ALPHA_FS/tests/opt/quick/10.linux-boot/alpha/linux/tsunami-simple-timing tests/run.py quick/10.linux-boot/alpha/linux/tsunami-simple-timing
-Exiting @ tick 3651873858 because m5_exit instruction encountered
+Exiting @ tick 3874844018 because m5_exit instruction encountered