summaryrefslogtreecommitdiff
path: root/tests/quick/se/50.memtest
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@gmail.com>2013-09-28 15:25:17 -0400
committerSteve Reinhardt <stever@gmail.com>2013-09-28 15:25:17 -0400
commitfbc1feb39ac19379983ca714f4c7fadcd9fdabf6 (patch)
tree59e49142d5930eb044e9fc09d94c5060a810d545 /tests/quick/se/50.memtest
parente5c319db43751f45b2bcca1d018fc39d4561ef9c (diff)
downloadgem5-fbc1feb39ac19379983ca714f4c7fadcd9fdabf6.tar.xz
tests: update reference outputs
Apparently only stats.txt was updated the last time, so this changeset updates other reference output files (config.ini, simout, simerr, ruby.stats) so that test output diffs should not be cluttered with irrelevant changes. There are a few stats.txt updates too, but they are in the minority.
Diffstat (limited to 'tests/quick/se/50.memtest')
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats24
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt30
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats24
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt46
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini2
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats24
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt42
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats24
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt34
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini2
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats24
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout6
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt22
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest/config.ini173
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest/simerr146
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest/simout14
20 files changed, 376 insertions, 285 deletions
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index 5908a1a40..051ef25fb 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Aug/29/2013 10:05:26
+Real time: Sep/22/2013 05:28:42
Profiler Stats
--------------
-Elapsed_time_in_seconds: 101
-Elapsed_time_in_minutes: 1.68333
-Elapsed_time_in_hours: 0.0280556
-Elapsed_time_in_days: 0.00116898
+Elapsed_time_in_seconds: 79
+Elapsed_time_in_minutes: 1.31667
+Elapsed_time_in_hours: 0.0219444
+Elapsed_time_in_days: 0.000914352
-Virtual_time_in_seconds: 100.98
-Virtual_time_in_minutes: 1.683
-Virtual_time_in_hours: 0.02805
-Virtual_time_in_days: 0.00116875
+Virtual_time_in_seconds: 79.09
+Virtual_time_in_minutes: 1.31817
+Virtual_time_in_hours: 0.0219694
+Virtual_time_in_days: 0.000915394
Ruby_current_time: 7257449
Ruby_start_time: 0
Ruby_cycles: 7257449
-mbytes_resident: 79.3281
-mbytes_total: 297.352
-resident_ratio: 0.266795
+mbytes_resident: 69.1055
+mbytes_total: 251.578
+resident_ratio: 0.275713
Busy Controller Counts:
L1Cache-0:0 L1Cache-1:0 L1Cache-2:0 L1Cache-3:0 L1Cache-4:0 L1Cache-5:0 L1Cache-6:0 L1Cache-7:0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
index 82781df07..53312cb70 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memte
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 9 2013 02:02:21
-gem5 started Apr 9 2013 02:03:11
-gem5 executing on vein
+gem5 compiled Sep 22 2013 05:27:02
+gem5 started Sep 22 2013 05:27:23
+gem5 executing on zizzer
command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index d27642359..e71048b46 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.007257 # Nu
sim_ticks 7257449 # Number of ticks simulated
final_tick 7257449 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 71632 # Simulator tick rate (ticks/s)
-host_mem_usage 305516 # Number of bytes of host memory used
-host_seconds 101.32 # Real time elapsed on the host
+host_tick_rate 91873 # Simulator tick rate (ticks/s)
+host_mem_usage 257620 # Number of bytes of host memory used
+host_seconds 78.99 # Real time elapsed on the host
system.ruby.l1_cntrl4.L1Dcache.demand_hits 2 # Number of cache demand hits
system.ruby.l1_cntrl4.L1Dcache.demand_misses 76641 # Number of cache demand misses
system.ruby.l1_cntrl4.L1Dcache.demand_accesses 76643 # Number of cache demand accesses
@@ -325,6 +325,18 @@ system.ruby.network.routers10.msg_bytes.Response_Control::2 4842768
system.ruby.network.routers10.msg_bytes.Writeback_Data::0 8120304
system.ruby.network.routers10.msg_bytes.Writeback_Data::1 28664064
system.ruby.network.routers10.msg_bytes.Writeback_Control::0 1656240
+system.ruby.network.msg_count.Control 3646183
+system.ruby.network.msg_count.Request_Control 1770458
+system.ruby.network.msg_count.Response_Data 4285974
+system.ruby.network.msg_count.Response_Control 6337828
+system.ruby.network.msg_count.Writeback_Data 1532683
+system.ruby.network.msg_count.Writeback_Control 621092
+system.ruby.network.msg_byte.Control 29169464
+system.ruby.network.msg_byte.Request_Control 14163664
+system.ruby.network.msg_byte.Response_Data 308590128
+system.ruby.network.msg_byte.Response_Control 50702624
+system.ruby.network.msg_byte.Writeback_Data 110353176
+system.ruby.network.msg_byte.Writeback_Control 4968736
system.funcbus.throughput 0 # Throughput (bytes/s)
system.funcbus.data_through_bus 0 # Total data (bytes)
system.cpu0.num_reads 99060 # number of read accesses completed
@@ -883,18 +895,6 @@ system.ruby.l2_cntrl0.MT_IB.WB_Data_clean 29 0.00% 0.00%
system.ruby.l2_cntrl0.MT_SB.L1_PUTX 2 0.00% 0.00%
system.ruby.l2_cntrl0.MT_SB.L2_Replacement 199 0.00% 0.00%
system.ruby.l2_cntrl0.MT_SB.Unblock 780 0.00% 0.00%
-system.ruby.network.msg_count.Control 3646183
-system.ruby.network.msg_count.Request_Control 1770458
-system.ruby.network.msg_count.Response_Data 4285974
-system.ruby.network.msg_count.Response_Control 6337828
-system.ruby.network.msg_count.Writeback_Data 1532683
-system.ruby.network.msg_count.Writeback_Control 621092
-system.ruby.network.msg_byte.Control 29169464
-system.ruby.network.msg_byte.Request_Control 14163664
-system.ruby.network.msg_byte.Response_Data 308590128
-system.ruby.network.msg_byte.Response_Control 50702624
-system.ruby.network.msg_byte.Writeback_Data 110353176
-system.ruby.network.msg_byte.Writeback_Control 4968736
system.ruby.dir_cntrl0.Fetch 604998 0.00% 0.00%
system.ruby.dir_cntrl0.Data 212955 0.00% 0.00%
system.ruby.dir_cntrl0.Memory_Data 604995 0.00% 0.00%
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
index cb8083e15..d118d8b60 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Aug/29/2013 10:07:55
+Real time: Sep/22/2013 05:38:45
Profiler Stats
--------------
-Elapsed_time_in_seconds: 182
-Elapsed_time_in_minutes: 3.03333
-Elapsed_time_in_hours: 0.0505556
-Elapsed_time_in_days: 0.00210648
+Elapsed_time_in_seconds: 142
+Elapsed_time_in_minutes: 2.36667
+Elapsed_time_in_hours: 0.0394444
+Elapsed_time_in_days: 0.00164352
-Virtual_time_in_seconds: 181.59
-Virtual_time_in_minutes: 3.0265
-Virtual_time_in_hours: 0.0504417
-Virtual_time_in_days: 0.00210174
+Virtual_time_in_seconds: 142.1
+Virtual_time_in_minutes: 2.36833
+Virtual_time_in_hours: 0.0394722
+Virtual_time_in_days: 0.00164468
Ruby_current_time: 7481441
Ruby_start_time: 0
Ruby_cycles: 7481441
-mbytes_resident: 80.625
-mbytes_total: 299.508
-resident_ratio: 0.269205
+mbytes_resident: 70.6289
+mbytes_total: 253.738
+resident_ratio: 0.278353
Busy Controller Counts:
L1Cache-0:0 L1Cache-1:0 L1Cache-2:0 L1Cache-3:0 L1Cache-4:0 L1Cache-5:0 L1Cache-6:0 L1Cache-7:0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
index 30ecc5910..802dd1a62 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memt
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 9 2013 02:05:20
-gem5 started Apr 9 2013 02:06:11
-gem5 executing on vein
+gem5 compiled Sep 22 2013 05:36:12
+gem5 started Sep 22 2013 05:36:22
+gem5 executing on zizzer
command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
index 7344fcbda..95538d9b6 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.007481 # Nu
sim_ticks 7481441 # Number of ticks simulated
final_tick 7481441 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 41233 # Simulator tick rate (ticks/s)
-host_mem_usage 306700 # Number of bytes of host memory used
-host_seconds 181.44 # Real time elapsed on the host
+host_tick_rate 52727 # Simulator tick rate (ticks/s)
+host_mem_usage 259832 # Number of bytes of host memory used
+host_seconds 141.89 # Real time elapsed on the host
system.ruby.l1_cntrl4.L1Dcache.demand_hits 21 # Number of cache demand hits
system.ruby.l1_cntrl4.L1Dcache.demand_misses 77428 # Number of cache demand misses
system.ruby.l1_cntrl4.L1Dcache.demand_accesses 77449 # Number of cache demand accesses
@@ -307,6 +307,26 @@ system.ruby.network.routers10.msg_bytes.Writeback_Control::2 3115216
system.ruby.network.routers10.msg_bytes.Forwarded_Control::0 67368
system.ruby.network.routers10.msg_bytes.Invalidate_Control::0 152
system.ruby.network.routers10.msg_bytes.Unblock_Control::2 9858144
+system.ruby.network.msg_count.Request_Control 3673936
+system.ruby.network.msg_count.Response_Data 3630768
+system.ruby.network.msg_count.ResponseL2hit_Data 17766
+system.ruby.network.msg_count.ResponseLocal_Data 25260
+system.ruby.network.msg_count.Response_Control 9012
+system.ruby.network.msg_count.Writeback_Data 2479504
+system.ruby.network.msg_count.Writeback_Control 8511972
+system.ruby.network.msg_count.Forwarded_Control 25263
+system.ruby.network.msg_count.Invalidate_Control 57
+system.ruby.network.msg_count.Unblock_Control 3696804
+system.ruby.network.msg_byte.Request_Control 29391488
+system.ruby.network.msg_byte.Response_Data 261415296
+system.ruby.network.msg_byte.ResponseL2hit_Data 1279152
+system.ruby.network.msg_byte.ResponseLocal_Data 1818720
+system.ruby.network.msg_byte.Response_Control 72096
+system.ruby.network.msg_byte.Writeback_Data 178524288
+system.ruby.network.msg_byte.Writeback_Control 68095776
+system.ruby.network.msg_byte.Forwarded_Control 202104
+system.ruby.network.msg_byte.Invalidate_Control 456
+system.ruby.network.msg_byte.Unblock_Control 29574432
system.funcbus.throughput 0 # Throughput (bytes/s)
system.funcbus.data_through_bus 0 # Total data (bytes)
system.cpu0.num_reads 99553 # number of read accesses completed
@@ -1105,26 +1125,6 @@ system.ruby.l2_cntrl0.MI.Writeback_Ack 604406 0.00% 0.00%
system.ruby.l2_cntrl0.OLSI.L1_PUTS_only 1011 0.00% 0.00%
system.ruby.l2_cntrl0.OLSI.L1_PUTS 108 0.00% 0.00%
system.ruby.l2_cntrl0.OLSI.Writeback_Ack 239 0.00% 0.00%
-system.ruby.network.msg_count.Request_Control 3673936
-system.ruby.network.msg_count.Response_Data 3630768
-system.ruby.network.msg_count.ResponseL2hit_Data 17766
-system.ruby.network.msg_count.ResponseLocal_Data 25260
-system.ruby.network.msg_count.Response_Control 9012
-system.ruby.network.msg_count.Writeback_Data 2479504
-system.ruby.network.msg_count.Writeback_Control 8511972
-system.ruby.network.msg_count.Forwarded_Control 25263
-system.ruby.network.msg_count.Invalidate_Control 57
-system.ruby.network.msg_count.Unblock_Control 3696804
-system.ruby.network.msg_byte.Request_Control 29391488
-system.ruby.network.msg_byte.Response_Data 261415296
-system.ruby.network.msg_byte.ResponseL2hit_Data 1279152
-system.ruby.network.msg_byte.ResponseLocal_Data 1818720
-system.ruby.network.msg_byte.Response_Control 72096
-system.ruby.network.msg_byte.Writeback_Data 178524288
-system.ruby.network.msg_byte.Writeback_Control 68095776
-system.ruby.network.msg_byte.Forwarded_Control 202104
-system.ruby.network.msg_byte.Invalidate_Control 456
-system.ruby.network.msg_byte.Unblock_Control 29574432
system.ruby.dir_cntrl0.GETX 211949 0.00% 0.00%
system.ruby.dir_cntrl0.GETS 393220 0.00% 0.00%
system.ruby.dir_cntrl0.PUTX 604433 0.00% 0.00%
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index 11200a202..a202baa14 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -17,7 +17,7 @@ kernel=
load_addr_mask=1099511627775
mem_mode=timing
mem_ranges=0:268435455
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
num_work_ids=16
readfile=
symbolfile=
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
index 87304c1a3..e0121fbf8 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Aug/29/2013 10:06:47
+Real time: Sep/22/2013 05:46:37
Profiler Stats
--------------
-Elapsed_time_in_seconds: 124
-Elapsed_time_in_minutes: 2.06667
-Elapsed_time_in_hours: 0.0344444
-Elapsed_time_in_days: 0.00143519
+Elapsed_time_in_seconds: 97
+Elapsed_time_in_minutes: 1.61667
+Elapsed_time_in_hours: 0.0269444
+Elapsed_time_in_days: 0.00112269
-Virtual_time_in_seconds: 123.4
-Virtual_time_in_minutes: 2.05667
-Virtual_time_in_hours: 0.0342778
-Virtual_time_in_days: 0.00142824
+Virtual_time_in_seconds: 97.69
+Virtual_time_in_minutes: 1.62817
+Virtual_time_in_hours: 0.0271361
+Virtual_time_in_days: 0.00113067
Ruby_current_time: 6151475
Ruby_start_time: 0
Ruby_cycles: 6151475
-mbytes_resident: 79.2969
-mbytes_total: 297.457
-resident_ratio: 0.266596
+mbytes_resident: 68.8125
+mbytes_total: 251.641
+resident_ratio: 0.273455
Busy Controller Counts:
L1Cache-0:0 L1Cache-1:0 L1Cache-2:0 L1Cache-3:0 L1Cache-4:0 L1Cache-5:0 L1Cache-6:0 L1Cache-7:0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
index e78fa46c2..9d06307c2 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 9 2013 02:08:32
-gem5 started Apr 9 2013 02:09:19
-gem5 executing on vein
+gem5 compiled Sep 22 2013 05:44:48
+gem5 started Sep 22 2013 05:44:59
+gem5 executing on zizzer
command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
index 17d7f958c..30f4ed177 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.006151 # Nu
sim_ticks 6151475 # Number of ticks simulated
final_tick 6151475 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 49950 # Simulator tick rate (ticks/s)
-host_mem_usage 304600 # Number of bytes of host memory used
-host_seconds 123.15 # Real time elapsed on the host
+host_tick_rate 63154 # Simulator tick rate (ticks/s)
+host_mem_usage 257684 # Number of bytes of host memory used
+host_seconds 97.40 # Real time elapsed on the host
system.ruby.l1_cntrl4.L1Dcache.demand_hits 20 # Number of cache demand hits
system.ruby.l1_cntrl4.L1Dcache.demand_misses 76947 # Number of cache demand misses
system.ruby.l1_cntrl4.L1Dcache.demand_accesses 76967 # Number of cache demand accesses
@@ -265,6 +265,24 @@ system.ruby.network.routers10.msg_bytes.Writeback_Data::4 63441936
system.ruby.network.routers10.msg_bytes.Writeback_Control::4 3020648
system.ruby.network.routers10.msg_bytes.Broadcast_Control::1 34542088
system.ruby.network.routers10.msg_bytes.Persistent_Control::3 18697824
+system.ruby.network.msg_count.Request_Control 3695895
+system.ruby.network.msg_count.Response_Data 1838719
+system.ruby.network.msg_count.ResponseL2hit_Data 5073
+system.ruby.network.msg_count.ResponseLocal_Data 4698
+system.ruby.network.msg_count.Response_Control 4248
+system.ruby.network.msg_count.Writeback_Data 2643414
+system.ruby.network.msg_count.Writeback_Control 1132743
+system.ruby.network.msg_count.Broadcast_Control 9252345
+system.ruby.network.msg_count.Persistent_Control 5193840
+system.ruby.network.msg_byte.Request_Control 29567160
+system.ruby.network.msg_byte.Response_Data 132387768
+system.ruby.network.msg_byte.ResponseL2hit_Data 365256
+system.ruby.network.msg_byte.ResponseLocal_Data 338256
+system.ruby.network.msg_byte.Response_Control 33984
+system.ruby.network.msg_byte.Writeback_Data 190325808
+system.ruby.network.msg_byte.Writeback_Control 9061944
+system.ruby.network.msg_byte.Broadcast_Control 74018760
+system.ruby.network.msg_byte.Persistent_Control 41550720
system.funcbus.throughput 0 # Throughput (bytes/s)
system.funcbus.data_through_bus 0 # Total data (bytes)
system.cpu0.num_reads 100000 # number of read accesses completed
@@ -1217,24 +1235,6 @@ system.ruby.l2_cntrl0.I_L.Persistent_GETS 83699 0.00% 0.00%
system.ruby.l2_cntrl0.I_L.Own_Lock_or_Unlock 330 0.00% 0.00%
system.ruby.l2_cntrl0.S_L.L2_Replacement 1 0.00% 0.00%
system.ruby.l2_cntrl0.S_L.Own_Lock_or_Unlock 5 0.00% 0.00%
-system.ruby.network.msg_count.Request_Control 3695895
-system.ruby.network.msg_count.Response_Data 1838719
-system.ruby.network.msg_count.ResponseL2hit_Data 5073
-system.ruby.network.msg_count.ResponseLocal_Data 4698
-system.ruby.network.msg_count.Response_Control 4248
-system.ruby.network.msg_count.Writeback_Data 2643414
-system.ruby.network.msg_count.Writeback_Control 1132743
-system.ruby.network.msg_count.Broadcast_Control 9252345
-system.ruby.network.msg_count.Persistent_Control 5193840
-system.ruby.network.msg_byte.Request_Control 29567160
-system.ruby.network.msg_byte.Response_Data 132387768
-system.ruby.network.msg_byte.ResponseL2hit_Data 365256
-system.ruby.network.msg_byte.ResponseLocal_Data 338256
-system.ruby.network.msg_byte.Response_Control 33984
-system.ruby.network.msg_byte.Writeback_Data 190325808
-system.ruby.network.msg_byte.Writeback_Control 9061944
-system.ruby.network.msg_byte.Broadcast_Control 74018760
-system.ruby.network.msg_byte.Persistent_Control 41550720
system.ruby.dir_cntrl0.GETX 255487 0.00% 0.00%
system.ruby.dir_cntrl0.GETS 476933 0.00% 0.00%
system.ruby.dir_cntrl0.Lockdown 130603 0.00% 0.00%
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
index 50647016f..3e6cf4aa4 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Aug/29/2013 10:05:07
+Real time: Sep/22/2013 05:19:16
Profiler Stats
--------------
-Elapsed_time_in_seconds: 131
-Elapsed_time_in_minutes: 2.18333
-Elapsed_time_in_hours: 0.0363889
-Elapsed_time_in_days: 0.0015162
+Elapsed_time_in_seconds: 98
+Elapsed_time_in_minutes: 1.63333
+Elapsed_time_in_hours: 0.0272222
+Elapsed_time_in_days: 0.00113426
-Virtual_time_in_seconds: 131.88
-Virtual_time_in_minutes: 2.198
-Virtual_time_in_hours: 0.0366333
-Virtual_time_in_days: 0.00152639
+Virtual_time_in_seconds: 98.86
+Virtual_time_in_minutes: 1.64767
+Virtual_time_in_hours: 0.0274611
+Virtual_time_in_days: 0.00114421
Ruby_current_time: 5795833
Ruby_start_time: 0
Ruby_cycles: 5795833
-mbytes_resident: 75.793
-mbytes_total: 298.383
-resident_ratio: 0.254026
+mbytes_resident: 69.3711
+mbytes_total: 252.59
+resident_ratio: 0.274639
Busy Controller Counts:
L1Cache-0:0 L1Cache-1:0 L1Cache-2:0 L1Cache-3:0 L1Cache-4:0 L1Cache-5:0 L1Cache-6:0 L1Cache-7:0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
index 899bc58f8..5f6410683 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alp
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 9 2013 01:58:20
-gem5 started Apr 9 2013 01:59:05
-gem5 executing on vein
+gem5 compiled Sep 22 2013 05:17:28
+gem5 started Sep 22 2013 05:17:37
+gem5 executing on zizzer
command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
index 98f43c561..2c76706ec 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.005796 # Nu
sim_ticks 5795833 # Number of ticks simulated
final_tick 5795833 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 44085 # Simulator tick rate (ticks/s)
-host_mem_usage 305548 # Number of bytes of host memory used
-host_seconds 131.47 # Real time elapsed on the host
+host_tick_rate 58777 # Simulator tick rate (ticks/s)
+host_mem_usage 258656 # Number of bytes of host memory used
+host_seconds 98.61 # Real time elapsed on the host
system.ruby.l1_cntrl4.L1Dcache.demand_hits 14 # Number of cache demand hits
system.ruby.l1_cntrl4.L1Dcache.demand_misses 77212 # Number of cache demand misses
system.ruby.l1_cntrl4.L1Dcache.demand_accesses 77226 # Number of cache demand accesses
@@ -308,6 +308,20 @@ system.ruby.network.routers9.msg_bytes.Writeback_Control::3 4658336
system.ruby.network.routers9.msg_bytes.Writeback_Control::5 2944376
system.ruby.network.routers9.msg_bytes.Broadcast_Control::3 34549816
system.ruby.network.routers9.msg_bytes.Unblock_Control::5 4940768
+system.ruby.network.msg_count.Request_Control 1853520
+system.ruby.network.msg_count.Response_Data 1852131
+system.ruby.network.msg_count.Response_Control 12897795
+system.ruby.network.msg_count.Writeback_Data 642069
+system.ruby.network.msg_count.Writeback_Control 4597894
+system.ruby.network.msg_count.Broadcast_Control 9254415
+system.ruby.network.msg_count.Unblock_Control 1852789
+system.ruby.network.msg_byte.Request_Control 14828160
+system.ruby.network.msg_byte.Response_Data 133353432
+system.ruby.network.msg_byte.Response_Control 103182360
+system.ruby.network.msg_byte.Writeback_Data 46228968
+system.ruby.network.msg_byte.Writeback_Control 36783152
+system.ruby.network.msg_byte.Broadcast_Control 74035320
+system.ruby.network.msg_byte.Unblock_Control 14822312
system.funcbus.throughput 0 # Throughput (bytes/s)
system.funcbus.data_through_bus 0 # Total data (bytes)
system.cpu0.num_reads 99395 # number of read accesses completed
@@ -1054,20 +1068,6 @@ system.ruby.l1_cntrl0.MMT.L1_to_L2::total 758
system.ruby.l1_cntrl0.MMT.Complete_L2_to_L1 | 21 10.29% 10.29% | 25 12.25% 22.55% | 34 16.67% 39.22% | 24 11.76% 50.98% | 25 12.25% 63.24% | 27 13.24% 76.47% | 27 13.24% 89.71% | 21 10.29% 100.00%
system.ruby.l1_cntrl0.MMT.Complete_L2_to_L1::total 204
-system.ruby.network.msg_count.Request_Control 1853520
-system.ruby.network.msg_count.Response_Data 1852131
-system.ruby.network.msg_count.Response_Control 12897795
-system.ruby.network.msg_count.Writeback_Data 642069
-system.ruby.network.msg_count.Writeback_Control 4597894
-system.ruby.network.msg_count.Broadcast_Control 9254415
-system.ruby.network.msg_count.Unblock_Control 1852789
-system.ruby.network.msg_byte.Request_Control 14828160
-system.ruby.network.msg_byte.Response_Data 133353432
-system.ruby.network.msg_byte.Response_Control 103182360
-system.ruby.network.msg_byte.Writeback_Data 46228968
-system.ruby.network.msg_byte.Writeback_Control 36783152
-system.ruby.network.msg_byte.Broadcast_Control 74035320
-system.ruby.network.msg_byte.Unblock_Control 14822312
system.ruby.dir_cntrl0.GETX 220023 0.00% 0.00%
system.ruby.dir_cntrl0.GETS 406995 0.00% 0.00%
system.ruby.dir_cntrl0.PUT 585083 0.00% 0.00%
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
index f52cdf318..cd6eb6e26 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
@@ -17,7 +17,7 @@ kernel=
load_addr_mask=1099511627775
mem_mode=timing
mem_ranges=0:268435455
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
num_work_ids=16
readfile=
symbolfile=
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
index 9ecd89c86..5e18bea6c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Aug/29/2013 10:05:30
+Real time: Sep/28/2013 03:06:25
Profiler Stats
--------------
-Elapsed_time_in_seconds: 48
-Elapsed_time_in_minutes: 0.8
-Elapsed_time_in_hours: 0.0133333
-Elapsed_time_in_days: 0.000555556
+Elapsed_time_in_seconds: 36
+Elapsed_time_in_minutes: 0.6
+Elapsed_time_in_hours: 0.01
+Elapsed_time_in_days: 0.000416667
-Virtual_time_in_seconds: 47.63
-Virtual_time_in_minutes: 0.793833
-Virtual_time_in_hours: 0.0132306
-Virtual_time_in_days: 0.000551273
+Virtual_time_in_seconds: 36.54
+Virtual_time_in_minutes: 0.609
+Virtual_time_in_hours: 0.01015
+Virtual_time_in_days: 0.000422917
Ruby_current_time: 8664886
Ruby_start_time: 0
Ruby_cycles: 8664886
-mbytes_resident: 75.6094
-mbytes_total: 295.949
-resident_ratio: 0.255494
+mbytes_resident: 67.1875
+mbytes_total: 250.145
+resident_ratio: 0.269579
Busy Controller Counts:
L1Cache-0:0 L1Cache-1:0 L1Cache-2:0 L1Cache-3:0 L1Cache-4:0 L1Cache-5:0 L1Cache-6:0 L1Cache-7:0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
index 3495746a7..1c746b09a 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memt
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 9 2013 01:51:40
-gem5 started Apr 9 2013 01:54:58
-gem5 executing on vein
+gem5 compiled Sep 24 2013 03:08:53
+gem5 started Sep 28 2013 03:05:49
+gem5 executing on zizzer
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
index 10a35fe3c..74bfa5d0c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.008665 # Nu
sim_ticks 8664886 # Number of ticks simulated
final_tick 8664886 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 183404 # Simulator tick rate (ticks/s)
-host_mem_usage 303056 # Number of bytes of host memory used
-host_seconds 47.25 # Real time elapsed on the host
+host_tick_rate 239244 # Simulator tick rate (ticks/s)
+host_mem_usage 256152 # Number of bytes of host memory used
+host_seconds 36.22 # Real time elapsed on the host
system.ruby.l1_cntrl4.cacheMemory.demand_hits 0 # Number of cache demand hits
system.ruby.l1_cntrl4.cacheMemory.demand_misses 77331 # Number of cache demand misses
system.ruby.l1_cntrl4.cacheMemory.demand_accesses 77331 # Number of cache demand accesses
@@ -139,6 +139,14 @@ system.ruby.network.routers9.msg_bytes.Control::2 4940496
system.ruby.network.routers9.msg_bytes.Data::2 44060256
system.ruby.network.routers9.msg_bytes.Response_Data::4 44463816
system.ruby.network.routers9.msg_bytes.Writeback_Control::3 4961080
+system.ruby.network.msg_count.Control 1852692
+system.ruby.network.msg_count.Data 1835849
+system.ruby.network.msg_count.Response_Data 1852658
+system.ruby.network.msg_count.Writeback_Control 1860405
+system.ruby.network.msg_byte.Control 14821536
+system.ruby.network.msg_byte.Data 132181128
+system.ruby.network.msg_byte.Response_Data 133391376
+system.ruby.network.msg_byte.Writeback_Control 14883240
system.funcbus.throughput 0 # Throughput (bytes/s)
system.funcbus.data_through_bus 0 # Total data (bytes)
system.cpu0.num_reads 99885 # number of read accesses completed
@@ -367,14 +375,6 @@ system.ruby.l1_cntrl0.IS.Data::total 401489
system.ruby.l1_cntrl0.IM.Data | 27005 12.50% 12.50% | 26934 12.47% 24.96% | 26786 12.40% 37.36% | 27152 12.57% 49.93% | 27327 12.65% 62.58% | 27084 12.54% 75.11% | 27074 12.53% 87.64% | 26701 12.36% 100.00%
system.ruby.l1_cntrl0.IM.Data::total 216063
-system.ruby.network.msg_count.Control 1852692
-system.ruby.network.msg_count.Data 1835849
-system.ruby.network.msg_count.Response_Data 1852658
-system.ruby.network.msg_count.Writeback_Control 1860405
-system.ruby.network.msg_byte.Control 14821536
-system.ruby.network.msg_byte.Data 132181128
-system.ruby.network.msg_byte.Response_Data 133391376
-system.ruby.network.msg_byte.Writeback_Control 14883240
system.ruby.dir_cntrl0.GETX 791175 0.00% 0.00%
system.ruby.dir_cntrl0.PUTX 609324 0.00% 0.00%
system.ruby.dir_cntrl0.PUTX_NotOwner 2623 0.00% 0.00%
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
index 1f567a1b9..0b50bed4c 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
@@ -8,15 +8,16 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem l2c membus physmem toL2Bus
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcbus funcmem l2c membus physmem toL2Bus voltage_domain
boot_osflags=a
-clock=1000
+cache_line_size=64
+clk_domain=system.clk_domain
init_param=0
kernel=
load_addr_mask=1099511627775
mem_mode=timing
mem_ranges=
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
num_work_ids=16
readfile=
symbolfile=
@@ -29,11 +30,16 @@ work_end_exit_count=0
work_item_id=-1
system_port=system.membus.slave[1]
+[system.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=system.voltage_domain
+
[system.cpu0]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -51,10 +57,10 @@ test=system.cpu0.l1c.cpu_side
[system.cpu0.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -65,17 +71,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu0.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu0.test
mem_side=system.toL2Bus.slave[0]
+[system.cpu0.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu1]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -93,10 +108,10 @@ test=system.cpu1.l1c.cpu_side
[system.cpu1.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -107,17 +122,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu1.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu1.test
mem_side=system.toL2Bus.slave[1]
+[system.cpu1.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu2]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -135,10 +159,10 @@ test=system.cpu2.l1c.cpu_side
[system.cpu2.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -149,17 +173,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu2.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu2.test
mem_side=system.toL2Bus.slave[2]
+[system.cpu2.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu3]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -177,10 +210,10 @@ test=system.cpu3.l1c.cpu_side
[system.cpu3.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -191,17 +224,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu3.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu3.test
mem_side=system.toL2Bus.slave[3]
+[system.cpu3.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu4]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -219,10 +261,10 @@ test=system.cpu4.l1c.cpu_side
[system.cpu4.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -233,17 +275,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu4.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu4.test
mem_side=system.toL2Bus.slave[4]
+[system.cpu4.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu5]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -261,10 +312,10 @@ test=system.cpu5.l1c.cpu_side
[system.cpu5.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -275,17 +326,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu5.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu5.test
mem_side=system.toL2Bus.slave[5]
+[system.cpu5.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu6]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -303,10 +363,10 @@ test=system.cpu6.l1c.cpu_side
[system.cpu6.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -317,17 +377,26 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu6.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu6.test
mem_side=system.toL2Bus.slave[6]
+[system.cpu6.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
[system.cpu7]
type=MemTest
children=l1c
atomic=false
-clock=500
+clk_domain=system.cpu_clk_domain
issue_dmas=false
max_loads=100000
memory_size=65536
@@ -345,10 +414,10 @@ test=system.cpu7.l1c.cpu_side
[system.cpu7.l1c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=2
is_top_level=true
@@ -359,16 +428,29 @@ prefetcher=Null
response_latency=2
size=32768
system=system
+tags=system.cpu7.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
cpu_side=system.cpu7.test
mem_side=system.toL2Bus.slave[7]
+[system.cpu7.l1c.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
+[system.cpu_clk_domain]
+type=SrcClockDomain
+clock=500
+voltage_domain=system.voltage_domain
+
[system.funcbus]
type=NoncoherentBus
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
header_cycles=1
use_default_range=false
width=8
@@ -378,22 +460,21 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
[system.funcmem]
type=SimpleMemory
bandwidth=73.000000
-clock=1000
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
in_addr_map=false
latency=30000
latency_var=0
null=false
range=0:134217727
-zero=false
port=system.funcbus.master[0]
[system.l2c]
type=BaseCache
+children=tags
addr_ranges=0:18446744073709551615
assoc=8
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
forward_snoops=true
hit_latency=20
is_top_level=false
@@ -404,16 +485,24 @@ prefetcher=Null
response_latency=20
size=65536
system=system
+tags=system.l2c.tags
tgts_per_mshr=12
two_queue=false
write_buffers=8
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[0]
+[system.l2c.tags]
+type=LRU
+assoc=8
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=20
+size=65536
+
[system.membus]
type=CoherentBus
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
header_cycles=1
system=system
use_default_range=false
@@ -424,20 +513,18 @@ slave=system.l2c.mem_side system.system_port
[system.physmem]
type=SimpleMemory
bandwidth=73.000000
-clock=1000
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
in_addr_map=true
latency=30000
latency_var=0
null=false
range=0:134217727
-zero=false
port=system.membus.master[0]
[system.toL2Bus]
type=CoherentBus
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
header_cycles=1
system=system
use_default_range=false
@@ -445,3 +532,7 @@ width=16
master=system.l2c.cpu_side
slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
index 014cde607..ad8539d90 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
@@ -1,74 +1,74 @@
-system.cpu6: completed 10000 read, 5435 write accesses @79021500
-system.cpu0: completed 10000 read, 5363 write accesses @79194500
-system.cpu7: completed 10000 read, 5392 write accesses @79770500
-system.cpu2: completed 10000 read, 5375 write accesses @80689500
-system.cpu1: completed 10000 read, 5373 write accesses @81623500
-system.cpu4: completed 10000 read, 5458 write accesses @81916000
-system.cpu5: completed 10000 read, 5507 write accesses @81975000
-system.cpu3: completed 10000 read, 5421 write accesses @82381000
-system.cpu2: completed 20000 read, 10678 write accesses @153864500
-system.cpu0: completed 20000 read, 10854 write accesses @154789000
-system.cpu7: completed 20000 read, 10817 write accesses @154953500
-system.cpu1: completed 20000 read, 10781 write accesses @155855500
-system.cpu3: completed 20000 read, 10799 write accesses @157033000
-system.cpu4: completed 20000 read, 10854 write accesses @157158000
-system.cpu6: completed 20000 read, 10878 write accesses @157795000
-system.cpu5: completed 20000 read, 10963 write accesses @159866500
-system.cpu0: completed 30000 read, 16180 write accesses @228385000
-system.cpu2: completed 30000 read, 15995 write accesses @229109500
-system.cpu7: completed 30000 read, 16232 write accesses @231170000
-system.cpu1: completed 30000 read, 16165 write accesses @231658500
-system.cpu4: completed 30000 read, 16252 write accesses @232783000
-system.cpu6: completed 30000 read, 16228 write accesses @233712000
-system.cpu3: completed 30000 read, 16226 write accesses @236523000
-system.cpu5: completed 30000 read, 16456 write accesses @239602000
-system.cpu0: completed 40000 read, 21598 write accesses @305262000
-system.cpu2: completed 40000 read, 21332 write accesses @306571000
-system.cpu1: completed 40000 read, 21599 write accesses @307778500
-system.cpu4: completed 40000 read, 21599 write accesses @307971000
-system.cpu7: completed 40000 read, 21551 write accesses @308441000
-system.cpu6: completed 40000 read, 21597 write accesses @310397000
-system.cpu3: completed 40000 read, 21704 write accesses @312891000
-system.cpu5: completed 40000 read, 21914 write accesses @315565000
-system.cpu4: completed 50000 read, 26891 write accesses @381925000
-system.cpu0: completed 50000 read, 26990 write accesses @382095500
-system.cpu2: completed 50000 read, 26686 write accesses @382917500
-system.cpu1: completed 50000 read, 26983 write accesses @384289000
-system.cpu6: completed 50000 read, 27066 write accesses @384539000
-system.cpu7: completed 50000 read, 26943 write accesses @385136500
-system.cpu3: completed 50000 read, 27037 write accesses @389922000
-system.cpu5: completed 50000 read, 27423 write accesses @393691500
-system.cpu6: completed 60000 read, 32353 write accesses @457634500
-system.cpu4: completed 60000 read, 32228 write accesses @457992000
-system.cpu1: completed 60000 read, 32457 write accesses @460714000
-system.cpu2: completed 60000 read, 32178 write accesses @461196500
-system.cpu0: completed 60000 read, 32542 write accesses @461690000
-system.cpu7: completed 60000 read, 32302 write accesses @462388500
-system.cpu3: completed 60000 read, 32488 write accesses @466103000
-system.cpu5: completed 60000 read, 32744 write accesses @469778000
-system.cpu6: completed 70000 read, 37747 write accesses @533745000
-system.cpu2: completed 70000 read, 37532 write accesses @535320500
-system.cpu4: completed 70000 read, 37773 write accesses @535591500
-system.cpu7: completed 70000 read, 37639 write accesses @538124500
-system.cpu0: completed 70000 read, 37909 write accesses @538334500
-system.cpu1: completed 70000 read, 37921 write accesses @541231500
-system.cpu3: completed 70000 read, 37871 write accesses @542226500
-system.cpu5: completed 70000 read, 38229 write accesses @548322500
-system.cpu4: completed 80000 read, 42983 write accesses @610769500
-system.cpu6: completed 80000 read, 43020 write accesses @610776000
-system.cpu2: completed 80000 read, 42982 write accesses @611661000
-system.cpu0: completed 80000 read, 43374 write accesses @615085500
-system.cpu1: completed 80000 read, 43250 write accesses @615627500
-system.cpu7: completed 80000 read, 43033 write accesses @615746000
-system.cpu3: completed 80000 read, 43154 write accesses @619760000
-system.cpu5: completed 80000 read, 43738 write accesses @625688001
-system.cpu6: completed 90000 read, 48339 write accesses @685422000
-system.cpu2: completed 90000 read, 48272 write accesses @687608500
-system.cpu4: completed 90000 read, 48507 write accesses @688615500
-system.cpu7: completed 90000 read, 48310 write accesses @688789000
-system.cpu0: completed 90000 read, 48650 write accesses @689991000
-system.cpu1: completed 90000 read, 48621 write accesses @693117500
-system.cpu3: completed 90000 read, 48493 write accesses @697608000
-system.cpu5: completed 90000 read, 49008 write accesses @701381500
-system.cpu6: completed 100000 read, 53851 write accesses @761435500
+system.cpu6: completed 10000 read, 5217 write accesses @68085999
+system.cpu4: completed 10000 read, 5435 write accesses @69661000
+system.cpu2: completed 10000 read, 5368 write accesses @70121500
+system.cpu3: completed 10000 read, 5457 write accesses @70317500
+system.cpu1: completed 10000 read, 5387 write accesses @70875500
+system.cpu7: completed 10000 read, 5470 write accesses @70949000
+system.cpu0: completed 10000 read, 5435 write accesses @71227500
+system.cpu5: completed 10000 read, 5514 write accesses @71894000
+system.cpu6: completed 20000 read, 10518 write accesses @132327500
+system.cpu4: completed 20000 read, 10839 write accesses @133525000
+system.cpu1: completed 20000 read, 10784 write accesses @134714500
+system.cpu7: completed 20000 read, 10701 write accesses @135318500
+system.cpu0: completed 20000 read, 10821 write accesses @135563500
+system.cpu2: completed 20000 read, 10843 write accesses @135684500
+system.cpu3: completed 20000 read, 10685 write accesses @135938500
+system.cpu5: completed 20000 read, 11031 write accesses @136425000
+system.cpu6: completed 30000 read, 16001 write accesses @197849500
+system.cpu4: completed 30000 read, 16254 write accesses @198725500
+system.cpu0: completed 30000 read, 16109 write accesses @199579499
+system.cpu1: completed 30000 read, 16209 write accesses @200016500
+system.cpu5: completed 30000 read, 16414 write accesses @200525000
+system.cpu3: completed 30000 read, 15978 write accesses @200724000
+system.cpu7: completed 30000 read, 16153 write accesses @201563500
+system.cpu2: completed 30000 read, 16316 write accesses @202401999
+system.cpu4: completed 40000 read, 21506 write accesses @263053500
+system.cpu6: completed 40000 read, 21338 write accesses @263431500
+system.cpu5: completed 40000 read, 21670 write accesses @263987000
+system.cpu3: completed 40000 read, 21219 write accesses @264608000
+system.cpu1: completed 40000 read, 21536 write accesses @265348500
+system.cpu0: completed 40000 read, 21604 write accesses @265426500
+system.cpu7: completed 40000 read, 21465 write accesses @265674000
+system.cpu2: completed 40000 read, 21690 write accesses @268754000
+system.cpu6: completed 50000 read, 26563 write accesses @327819000
+system.cpu4: completed 50000 read, 27066 write accesses @328101000
+system.cpu5: completed 50000 read, 26900 write accesses @328372000
+system.cpu3: completed 50000 read, 26596 write accesses @328811500
+system.cpu1: completed 50000 read, 26845 write accesses @328908500
+system.cpu7: completed 50000 read, 26873 write accesses @331316999
+system.cpu0: completed 50000 read, 26988 write accesses @331358000
+system.cpu2: completed 50000 read, 27102 write accesses @333876000
+system.cpu1: completed 60000 read, 32156 write accesses @392077000
+system.cpu6: completed 60000 read, 31998 write accesses @392784000
+system.cpu5: completed 60000 read, 32223 write accesses @393227500
+system.cpu4: completed 60000 read, 32446 write accesses @394175000
+system.cpu3: completed 60000 read, 32090 write accesses @394842000
+system.cpu0: completed 60000 read, 32282 write accesses @395716500
+system.cpu7: completed 60000 read, 32292 write accesses @397180000
+system.cpu2: completed 60000 read, 32266 write accesses @397288500
+system.cpu6: completed 70000 read, 37440 write accesses @457780500
+system.cpu1: completed 70000 read, 37577 write accesses @458242500
+system.cpu5: completed 70000 read, 37616 write accesses @458643500
+system.cpu4: completed 70000 read, 37952 write accesses @459569500
+system.cpu3: completed 70000 read, 37486 write accesses @460007500
+system.cpu0: completed 70000 read, 37804 write accesses @461418499
+system.cpu2: completed 70000 read, 37588 write accesses @461790000
+system.cpu7: completed 70000 read, 37743 write accesses @462130500
+system.cpu1: completed 80000 read, 42976 write accesses @523192500
+system.cpu5: completed 80000 read, 43028 write accesses @523895500
+system.cpu6: completed 80000 read, 42870 write accesses @524155000
+system.cpu4: completed 80000 read, 43341 write accesses @524226000
+system.cpu3: completed 80000 read, 42885 write accesses @524383000
+system.cpu2: completed 80000 read, 43005 write accesses @527239000
+system.cpu7: completed 80000 read, 43156 write accesses @528371000
+system.cpu0: completed 80000 read, 43239 write accesses @528519000
+system.cpu3: completed 90000 read, 48037 write accesses @586595000
+system.cpu1: completed 90000 read, 48299 write accesses @588010000
+system.cpu4: completed 90000 read, 48806 write accesses @589147500
+system.cpu6: completed 90000 read, 48454 write accesses @589844000
+system.cpu5: completed 90000 read, 48341 write accesses @590185000
+system.cpu2: completed 90000 read, 48395 write accesses @591584000
+system.cpu7: completed 90000 read, 48496 write accesses @592485000
+system.cpu0: completed 90000 read, 48680 write accesses @594831500
+system.cpu3: completed 100000 read, 53536 write accesses @652606500
hack: be nice to actually delete the event here
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simout b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
index 077a1416b..de32ac2d8 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simout
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
@@ -1,12 +1,12 @@
-Redirecting stdout to build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest/simout
-Redirecting stderr to build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest/simerr
+Redirecting stdout to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simout
+Redirecting stderr to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 26 2013 14:38:52
-gem5 started Mar 26 2013 14:39:12
-gem5 executing on ribera.cs.wisc.edu
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest -re tests/run.py build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest
+gem5 compiled Sep 22 2013 05:53:51
+gem5 started Sep 22 2013 05:53:54
+gem5 executing on zizzer
+command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest -re tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 761435500 because maximum number of loads reached
+Exiting @ tick 652606500 because maximum number of loads reached