From d2fae026a84c732ecd0dc898655f487f2e45bd35 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sun, 28 Sep 2008 14:16:26 -0700 Subject: tests: Update all tests for small outstanding changes. Little differences have accumulated over time and it's worth getting things back in sync for the stable release. --- .../20.eio-short/ref/alpha/eio/simple-atomic/config.ini | 4 +++- tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr | 1 + tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout | 12 ++++++------ .../20.eio-short/ref/alpha/eio/simple-timing/config.ini | 1 + .../20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt | 8 ++++---- tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr | 2 +- tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout | 12 ++++++------ 7 files changed, 22 insertions(+), 18 deletions(-) mode change 100644 => 100755 tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr mode change 100644 => 100755 tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout mode change 100644 => 100755 tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr mode change 100644 => 100755 tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout (limited to 'tests/quick/20.eio-short') diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini index a0555b3f3..836233457 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini @@ -23,6 +23,7 @@ max_insts_all_threads=0 max_insts_any_thread=500000 max_loads_all_threads=0 max_loads_any_thread=0 +numThreads=1 phase=0 progress_interval=0 simulate_data_stalls=false @@ -48,6 +49,7 @@ type=ExeTracer [system.cpu.workload] type=EioProcess chkpt= +errout=cerr file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 @@ -67,7 +69,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port [system.physmem] type=PhysicalMemory file= -latency=1 +latency=30000 latency_var=0 null=false range=0:134217727 diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr old mode 100644 new mode 100755 index 4e444fa6b..ea818e9b8 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr @@ -1,3 +1,4 @@ +warn: Sockets disabled, not accepting gdb connections warn: Entering event queue @ 0. Starting simulation... gzip: stdout: Broken pipe diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout old mode 100644 new mode 100755 index 54f73c06e..e002b4982 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout @@ -5,12 +5,12 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Jul 21 2008 20:12:56 -M5 started Mon Jul 21 20:16:25 2008 -M5 executing on zizzer -M5 revision 5508:992aeed1374332d0933a68d1f1fe749e2fec0881 -M5 commit date Tue Jul 15 14:38:51 2008 -0400 -command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/20.eio-short/alpha/eio/simple-atomic tests/run.py quick/20.eio-short/alpha/eio/simple-atomic +M5 compiled Sep 27 2008 21:08:21 +M5 revision 5571:7f81bb1690686883c5b93e8343068a001faf5083 +M5 commit date Sat Sep 27 21:03:50 2008 -0700 +M5 started Sep 27 2008 21:14:06 +M5 executing on piton +command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/20.eio-short/alpha/eio/simple-atomic -re --stdout-file stdout --stderr-file stderr tests/run.py quick/20.eio-short/alpha/eio/simple-atomic Global frequency set at 1000000000000 ticks per second main dictionary has 1245 entries 49508 bytes wasted diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini index 3d8212f3f..8c926f583 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini @@ -23,6 +23,7 @@ max_insts_all_threads=0 max_insts_any_thread=500000 max_loads_all_threads=0 max_loads_any_thread=0 +numThreads=1 phase=0 progress_interval=0 system=system diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt index e8282d216..fdebad7d8 100644 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt @@ -1,9 +1,9 @@ ---------- Begin Simulation Statistics ---------- -host_inst_rate 1672362 # Simulator instruction rate (inst/s) -host_mem_usage 196544 # Number of bytes of host memory used -host_seconds 0.30 # Real time elapsed on the host -host_tick_rate 2464131877 # Simulator tick rate (ticks/s) +host_inst_rate 1585966 # Simulator instruction rate (inst/s) +host_mem_usage 196712 # Number of bytes of host memory used +host_seconds 0.32 # Real time elapsed on the host +host_tick_rate 2336933545 # Simulator tick rate (ticks/s) sim_freq 1000000000000 # Frequency of simulated ticks sim_insts 500001 # Number of instructions simulated sim_seconds 0.000737 # Number of seconds simulated diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr old mode 100644 new mode 100755 index cc0a07c09..ea818e9b8 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr @@ -1,4 +1,4 @@ -0: system.remote_gdb.listener: listening for remote gdb on port 7006 +warn: Sockets disabled, not accepting gdb connections warn: Entering event queue @ 0. Starting simulation... gzip: stdout: Broken pipe diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout old mode 100644 new mode 100755 index 46fb8222f..fec2f14b8 --- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout @@ -5,12 +5,12 @@ The Regents of The University of Michigan All Rights Reserved -M5 compiled Aug 2 2008 17:07:15 -M5 started Sat Aug 2 17:10:34 2008 -M5 executing on zizzer -M5 revision 5517:3ad997252dd241f919fe7d9071a0a136e29ac424 -M5 commit date Thu Jul 31 08:01:38 2008 -0700 -command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/20.eio-short/alpha/eio/simple-timing tests/run.py quick/20.eio-short/alpha/eio/simple-timing +M5 compiled Sep 27 2008 21:08:21 +M5 revision 5571:7f81bb1690686883c5b93e8343068a001faf5083 +M5 commit date Sat Sep 27 21:03:50 2008 -0700 +M5 started Sep 27 2008 21:08:23 +M5 executing on piton +command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/20.eio-short/alpha/eio/simple-timing -re --stdout-file stdout --stderr-file stderr tests/run.py quick/20.eio-short/alpha/eio/simple-timing Global frequency set at 1000000000000 ticks per second main dictionary has 1245 entries 49508 bytes wasted -- cgit v1.2.3