This brings M5 closer to modernity - the kernel being advertised is newer so it won't die on binaries compiled with newer glibc's, and enables use of TLS-toolchain built binaries for ALPHA_SE by putting auxiliary vectors on the stack. There are some comments in the code to help. Finally, stats changes for ALPHA are from slight perturbations to the initial stack frame, all minimal diffs.

6 files changed, 22 insertions, 26 deletions

diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/m5stats.txt b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/m5stats.txt
index 5a19ce746..12655b8fd 100644
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/m5stats.txt
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/m5stats.txt
@@ -1,8 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                1660926                       # Simulator instruction rate (inst/s)
-host_seconds                                     1.20                       # Real time elapsed on the host
-host_tick_rate                              207598549                       # Simulator tick rate (ticks/s)
+host_inst_rate                                2958551                       # Simulator instruction rate (inst/s)
+host_mem_usage                                1121980                       # Number of bytes of host memory used
+host_seconds                                     0.68                       # Real time elapsed on the host
+host_tick_rate                              369689554                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                     2000004                       # Number of instructions simulated
 sim_seconds                                  0.000250                       # Number of seconds simulated
diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stderr b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stderr
index e0d5d4d73..496a7244f 100644..100755
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stderr
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stderr
@@ -1,7 +1,4 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7002
-0: system.remote_gdb.listener: listening for remote gdb on port 7003
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
-0: system.remote_gdb.listener: listening for remote gdb on port 7001
+warn: Sockets disabled, not accepting gdb connections
 warn: be nice to actually delete the event here
 
 gzip: stdout: Broken pipe
diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stdout b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stdout
index b79194a00..b1dd747a5 100644..100755
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stdout
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stdout
@@ -5,12 +5,12 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Nov  5 2008 17:12:56
-M5 revision 5719:c9056088f1516d097f7e73673f990175ad238d69
-M5 commit date Wed Nov 05 16:19:17 2008 -0500
-M5 started Nov  5 2008 17:19:26
-M5 executing on dhcp128036150089.central.yale.edu
-command line: build/ALPHA_SE/m5.fast -d simple-atomic wrapper.py
+M5 compiled Dec  4 2008 21:21:43
+M5 revision 5755:d6a5329ec79b40f273fe6dacb70354f281725652
+M5 commit date Thu Dec 04 18:04:32 2008 -0500
+M5 started Dec  4 2008 21:21:45
+M5 executing on zizzer
+command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/30.eio-mp/alpha/eio/simple-atomic-mp -re --stdout-file stdout --stderr-file stderr tests/run.py quick/30.eio-mp/alpha/eio/simple-atomic-mp
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 main dictionary has 1245 entries
diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/m5stats.txt b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/m5stats.txt
index d00f39e87..5dc3a25b6 100644
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/m5stats.txt
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/m5stats.txt
@@ -1,8 +1,9 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 803390                       # Simulator instruction rate (inst/s)
-host_seconds                                     2.49                       # Real time elapsed on the host
-host_tick_rate                              296594923                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1370296                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 204468                       # Number of bytes of host memory used
+host_seconds                                     1.46                       # Real time elapsed on the host
+host_tick_rate                              505820394                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                     1999941                       # Number of instructions simulated
 sim_seconds                                  0.000738                       # Number of seconds simulated
diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stderr b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stderr
index e0d5d4d73..496a7244f 100644..100755
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stderr
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stderr
@@ -1,7 +1,4 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7002
-0: system.remote_gdb.listener: listening for remote gdb on port 7003
-0: system.remote_gdb.listener: listening for remote gdb on port 7000
-0: system.remote_gdb.listener: listening for remote gdb on port 7001
+warn: Sockets disabled, not accepting gdb connections
 warn: be nice to actually delete the event here
 
 gzip: stdout: Broken pipe
diff --git a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stdout b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stdout
index 2976be712..edbace7b2 100644..100755
--- a/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stdout
+++ b/tests/quick/30.eio-mp/ref/alpha/eio/simple-timing-mp/stdout
@@ -5,12 +5,12 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Nov  5 2008 17:12:56
-M5 revision 5719:c9056088f1516d097f7e73673f990175ad238d69
-M5 commit date Wed Nov 05 16:19:17 2008 -0500
-M5 started Nov  5 2008 17:26:45
-M5 executing on dhcp128036150089.central.yale.edu
-command line: build/ALPHA_SE/m5.fast -d output wrapper.py
+M5 compiled Dec  4 2008 21:21:43
+M5 revision 5755:d6a5329ec79b40f273fe6dacb70354f281725652
+M5 commit date Thu Dec 04 18:04:32 2008 -0500
+M5 started Dec  4 2008 21:30:50
+M5 executing on zizzer
+command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/30.eio-mp/alpha/eio/simple-timing-mp -re --stdout-file stdout --stderr-file stderr tests/run.py quick/30.eio-mp/alpha/eio/simple-timing-mp
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 main dictionary has 1245 entries