From 257e09d62622676b84b5166854850024a5f72bcc Mon Sep 17 00:00:00 2001 From: Kevin Lim Date: Sun, 5 Nov 2006 20:42:05 -0500 Subject: Update refs. --HG-- extra : convert_revision : 61d298fb0d9a66a76209a6bfcdb7c14f2efca947 --- .../linux/tsunami-simple-atomic-dual/config.ini | 22 +++++- .../linux/tsunami-simple-atomic-dual/config.out | 90 +++++++++++++--------- .../linux/tsunami-simple-atomic-dual/m5stats.txt | 8 +- .../alpha/linux/tsunami-simple-atomic-dual/stderr | 10 ++- .../alpha/linux/tsunami-simple-atomic-dual/stdout | 6 +- 5 files changed, 86 insertions(+), 50 deletions(-) (limited to 'tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual') 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 -- cgit v1.2.3