summaryrefslogtreecommitdiff
path: root/tests/quick/se/50.memtest/ref/null
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se/50.memtest/ref/null')
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini21
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr146
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest-filter/simout13
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt6
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest/config.ini29
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest/simerr146
-rwxr-xr-xtests/quick/se/50.memtest/ref/null/none/memtest/simout13
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt6
8 files changed, 217 insertions, 163 deletions
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
index 69f918228..4f3bc1d29 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -67,6 +68,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -83,6 +85,7 @@ system=system
tags=system.cpu0.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu0.port
mem_side=system.toL2Bus.slave[0]
@@ -119,6 +122,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -135,6 +139,7 @@ system=system
tags=system.cpu1.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu1.port
mem_side=system.toL2Bus.slave[1]
@@ -171,6 +176,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -187,6 +193,7 @@ system=system
tags=system.cpu2.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu2.port
mem_side=system.toL2Bus.slave[2]
@@ -223,6 +230,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -239,6 +247,7 @@ system=system
tags=system.cpu3.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu3.port
mem_side=system.toL2Bus.slave[3]
@@ -275,6 +284,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -291,6 +301,7 @@ system=system
tags=system.cpu4.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu4.port
mem_side=system.toL2Bus.slave[4]
@@ -327,6 +338,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -343,6 +355,7 @@ system=system
tags=system.cpu5.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu5.port
mem_side=system.toL2Bus.slave[5]
@@ -379,6 +392,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -395,6 +409,7 @@ system=system
tags=system.cpu6.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu6.port
mem_side=system.toL2Bus.slave[6]
@@ -431,6 +446,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -447,6 +463,7 @@ system=system
tags=system.cpu7.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu7.port
mem_side=system.toL2Bus.slave[7]
@@ -482,6 +499,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -498,6 +516,7 @@ system=system
tags=system.l2c.tags
tgts_per_mshr=12
write_buffers=8
+writeback_clean=false
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[0]
@@ -531,6 +550,7 @@ slave=system.l2c.mem_side system.system_port
type=SnoopFilter
eventq_index=0
lookup_latency=1
+max_capacity=8388608
system=system
[system.physmem]
@@ -566,6 +586,7 @@ slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side
type=SnoopFilter
eventq_index=0
lookup_latency=1
+max_capacity=8388608
system=system
[system.voltage_domain]
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
index 16ab1a5b8..4771f3483 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
@@ -1,73 +1,73 @@
-system.cpu4: completed 10000 read, 5317 write accesses @146612000
-system.cpu3: completed 10000 read, 5592 write accesses @148872500
-system.cpu7: completed 10000 read, 5446 write accesses @149754500
-system.cpu0: completed 10000 read, 5432 write accesses @150141500
-system.cpu1: completed 10000 read, 5693 write accesses @151929000
-system.cpu2: completed 10000 read, 5680 write accesses @152039000
-system.cpu6: completed 10000 read, 5624 write accesses @152462500
-system.cpu5: completed 10000 read, 5650 write accesses @153139000
-system.cpu4: completed 20000 read, 10841 write accesses @294897500
-system.cpu3: completed 20000 read, 11252 write accesses @295891500
-system.cpu0: completed 20000 read, 10771 write accesses @296321000
-system.cpu6: completed 20000 read, 11129 write accesses @300503000
-system.cpu1: completed 20000 read, 11154 write accesses @303003500
-system.cpu7: completed 20000 read, 11162 write accesses @303067000
-system.cpu5: completed 20000 read, 11275 write accesses @305007000
-system.cpu2: completed 20000 read, 11301 write accesses @305237000
-system.cpu4: completed 30000 read, 16293 write accesses @441647000
-system.cpu0: completed 30000 read, 16339 write accesses @446349998
-system.cpu6: completed 30000 read, 16630 write accesses @450155000
-system.cpu1: completed 30000 read, 16474 write accesses @451775000
-system.cpu3: completed 30000 read, 16954 write accesses @452288000
-system.cpu7: completed 30000 read, 16778 write accesses @453662000
-system.cpu5: completed 30000 read, 16839 write accesses @456398000
-system.cpu2: completed 30000 read, 16838 write accesses @457529500
-system.cpu4: completed 40000 read, 21515 write accesses @587133500
-system.cpu0: completed 40000 read, 21712 write accesses @594544000
-system.cpu6: completed 40000 read, 22199 write accesses @599911000
-system.cpu3: completed 40000 read, 22436 write accesses @600303500
-system.cpu1: completed 40000 read, 22001 write accesses @603916500
-system.cpu7: completed 40000 read, 22291 write accesses @604899500
-system.cpu5: completed 40000 read, 22433 write accesses @607477000
-system.cpu2: completed 40000 read, 22541 write accesses @610042000
-system.cpu4: completed 50000 read, 27094 write accesses @738435000
-system.cpu0: completed 50000 read, 27172 write accesses @744686500
-system.cpu3: completed 50000 read, 27887 write accesses @749000500
-system.cpu1: completed 50000 read, 27549 write accesses @751936500
-system.cpu6: completed 50000 read, 27775 write accesses @752183500
-system.cpu7: completed 50000 read, 27920 write accesses @756029000
-system.cpu5: completed 50000 read, 27984 write accesses @756496000
-system.cpu2: completed 50000 read, 27916 write accesses @758896000
-system.cpu4: completed 60000 read, 32601 write accesses @886900500
-system.cpu0: completed 60000 read, 32631 write accesses @892444000
-system.cpu1: completed 60000 read, 33102 write accesses @899938000
-system.cpu3: completed 60000 read, 33481 write accesses @900956500
-system.cpu6: completed 60000 read, 33392 write accesses @901773000
-system.cpu5: completed 60000 read, 33565 write accesses @904995500
-system.cpu2: completed 60000 read, 33466 write accesses @909744500
-system.cpu7: completed 60000 read, 33536 write accesses @910295999
-system.cpu4: completed 70000 read, 38175 write accesses @1036375499
-system.cpu0: completed 70000 read, 38106 write accesses @1040049000
-system.cpu6: completed 70000 read, 38841 write accesses @1048673000
-system.cpu1: completed 70000 read, 38668 write accesses @1049885000
-system.cpu3: completed 70000 read, 39114 write accesses @1053709500
-system.cpu5: completed 70000 read, 39200 write accesses @1055942500
-system.cpu2: completed 70000 read, 38856 write accesses @1057747499
-system.cpu7: completed 70000 read, 39064 write accesses @1059368500
-system.cpu4: completed 80000 read, 43619 write accesses @1185369000
-system.cpu0: completed 80000 read, 43549 write accesses @1189974500
-system.cpu6: completed 80000 read, 44374 write accesses @1198657499
-system.cpu1: completed 80000 read, 43973 write accesses @1199665500
-system.cpu3: completed 80000 read, 44602 write accesses @1199968000
-system.cpu5: completed 80000 read, 44843 write accesses @1207585500
-system.cpu2: completed 80000 read, 44389 write accesses @1209591000
-system.cpu7: completed 80000 read, 44629 write accesses @1211090500
-system.cpu4: completed 90000 read, 49142 write accesses @1333753500
-system.cpu0: completed 90000 read, 49249 write accesses @1339029000
-system.cpu1: completed 90000 read, 49469 write accesses @1348019000
-system.cpu6: completed 90000 read, 50013 write accesses @1351048500
-system.cpu3: completed 90000 read, 50231 write accesses @1351323000
-system.cpu5: completed 90000 read, 50311 write accesses @1355589000
-system.cpu7: completed 90000 read, 50146 write accesses @1357457500
-system.cpu2: completed 90000 read, 49997 write accesses @1360771999
-system.cpu4: completed 100000 read, 54692 write accesses @1486654500
+system.cpu5: completed 10000 read, 5633 write accesses @60486000
+system.cpu4: completed 10000 read, 5582 write accesses @61180000
+system.cpu6: completed 10000 read, 5560 write accesses @61307500
+system.cpu7: completed 10000 read, 5599 write accesses @61402000
+system.cpu2: completed 10000 read, 5643 write accesses @61472000
+system.cpu1: completed 10000 read, 5506 write accesses @61551000
+system.cpu3: completed 10000 read, 5658 write accesses @61700000
+system.cpu0: completed 10000 read, 5706 write accesses @62631500
+system.cpu5: completed 20000 read, 11103 write accesses @113616000
+system.cpu6: completed 20000 read, 10976 write accesses @113920500
+system.cpu2: completed 20000 read, 11039 write accesses @113933500
+system.cpu3: completed 20000 read, 11207 write accesses @114624500
+system.cpu4: completed 20000 read, 11084 write accesses @114955000
+system.cpu0: completed 20000 read, 11085 write accesses @115057000
+system.cpu7: completed 20000 read, 11095 write accesses @115187000
+system.cpu1: completed 20000 read, 11193 write accesses @116687500
+system.cpu5: completed 30000 read, 16705 write accesses @166840500
+system.cpu2: completed 30000 read, 16691 write accesses @167354000
+system.cpu6: completed 30000 read, 16468 write accesses @167416000
+system.cpu4: completed 30000 read, 16533 write accesses @168175000
+system.cpu3: completed 30000 read, 16715 write accesses @168594500
+system.cpu7: completed 30000 read, 16620 write accesses @168682000
+system.cpu0: completed 30000 read, 16560 write accesses @168778500
+system.cpu1: completed 30000 read, 16873 write accesses @170313500
+system.cpu2: completed 40000 read, 22285 write accesses @220155500
+system.cpu3: completed 40000 read, 22038 write accesses @220636000
+system.cpu5: completed 40000 read, 22211 write accesses @221161500
+system.cpu6: completed 40000 read, 22097 write accesses @221217500
+system.cpu7: completed 40000 read, 22095 write accesses @221239000
+system.cpu0: completed 40000 read, 22196 write accesses @221351000
+system.cpu4: completed 40000 read, 21983 write accesses @222184000
+system.cpu1: completed 40000 read, 22367 write accesses @223407000
+system.cpu2: completed 50000 read, 27562 write accesses @273475000
+system.cpu6: completed 50000 read, 27553 write accesses @273666500
+system.cpu0: completed 50000 read, 27658 write accesses @274179000
+system.cpu4: completed 50000 read, 27584 write accesses @274332000
+system.cpu3: completed 50000 read, 27495 write accesses @274461500
+system.cpu7: completed 50000 read, 27568 write accesses @274681000
+system.cpu5: completed 50000 read, 27850 write accesses @275614000
+system.cpu1: completed 50000 read, 28070 write accesses @277107000
+system.cpu2: completed 60000 read, 33123 write accesses @327185500
+system.cpu6: completed 60000 read, 33149 write accesses @327223000
+system.cpu3: completed 60000 read, 32991 write accesses @327854000
+system.cpu7: completed 60000 read, 32997 write accesses @328407000
+system.cpu0: completed 60000 read, 33282 write accesses @328452500
+system.cpu4: completed 60000 read, 33164 write accesses @329017000
+system.cpu5: completed 60000 read, 33383 write accesses @329401500
+system.cpu1: completed 60000 read, 33681 write accesses @330675000
+system.cpu2: completed 70000 read, 38702 write accesses @380801000
+system.cpu3: completed 70000 read, 38442 write accesses @381181000
+system.cpu6: completed 70000 read, 38695 write accesses @381583500
+system.cpu7: completed 70000 read, 38573 write accesses @382302000
+system.cpu0: completed 70000 read, 38773 write accesses @382499000
+system.cpu4: completed 70000 read, 38793 write accesses @383094500
+system.cpu5: completed 70000 read, 38945 write accesses @383290000
+system.cpu1: completed 70000 read, 39200 write accesses @385376000
+system.cpu2: completed 80000 read, 44175 write accesses @434108000
+system.cpu6: completed 80000 read, 44138 write accesses @434454000
+system.cpu3: completed 80000 read, 43905 write accesses @434859000
+system.cpu7: completed 80000 read, 43929 write accesses @435594500
+system.cpu0: completed 80000 read, 44322 write accesses @435767000
+system.cpu4: completed 80000 read, 44313 write accesses @436517500
+system.cpu5: completed 80000 read, 44613 write accesses @436622000
+system.cpu1: completed 80000 read, 44739 write accesses @439209000
+system.cpu6: completed 90000 read, 49689 write accesses @488185000
+system.cpu3: completed 90000 read, 49429 write accesses @488562500
+system.cpu7: completed 90000 read, 49434 write accesses @488577000
+system.cpu2: completed 90000 read, 49778 write accesses @488987500
+system.cpu0: completed 90000 read, 49893 write accesses @489736000
+system.cpu5: completed 90000 read, 50116 write accesses @489869500
+system.cpu4: completed 90000 read, 49769 write accesses @490914000
+system.cpu1: completed 90000 read, 50142 write accesses @491765500
+system.cpu6: completed 100000 read, 55059 write accesses @540820000
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
index c563af536..2db1b4a25 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
@@ -1,10 +1,13 @@
+Redirecting stdout to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter/simout
+Redirecting stderr to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Feb 28 2014 18:29:12
-gem5 started Feb 28 2014 18:30:27
-gem5 executing on cz310588hp
-command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter -re tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter
+gem5 compiled Nov 15 2015 14:58:33
+gem5 started Nov 15 2015 14:58:44
+gem5 executing on ribera.cs.wisc.edu, pid 5046
+command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter -re /scratch/nilay/GEM5/gem5/tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 1466014000 because maximum number of loads reached
+Exiting @ tick 540820000 because maximum number of loads reached
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
index 00706da1e..cf3befab9 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000541 # Nu
sim_ticks 540820000 # Number of ticks simulated
final_tick 540820000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_tick_rate 106172397 # Simulator tick rate (ticks/s)
-host_mem_usage 280772 # Number of bytes of host memory used
-host_seconds 5.09 # Real time elapsed on the host
+host_tick_rate 74356212 # Simulator tick rate (ticks/s)
+host_mem_usage 274932 # Number of bytes of host memory used
+host_seconds 7.27 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1000 # Clock period in ticks
system.physmem.bytes_read::cpu0 88157 # Number of bytes read from this memory
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 d53e388b9..66e654794 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
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -67,6 +68,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -83,6 +85,7 @@ system=system
tags=system.cpu0.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu0.port
mem_side=system.toL2Bus.slave[0]
@@ -119,6 +122,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -135,6 +139,7 @@ system=system
tags=system.cpu1.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu1.port
mem_side=system.toL2Bus.slave[1]
@@ -171,6 +176,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -187,6 +193,7 @@ system=system
tags=system.cpu2.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu2.port
mem_side=system.toL2Bus.slave[2]
@@ -223,6 +230,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -239,6 +247,7 @@ system=system
tags=system.cpu3.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu3.port
mem_side=system.toL2Bus.slave[3]
@@ -275,6 +284,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -291,6 +301,7 @@ system=system
tags=system.cpu4.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu4.port
mem_side=system.toL2Bus.slave[4]
@@ -327,6 +338,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -343,6 +355,7 @@ system=system
tags=system.cpu5.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu5.port
mem_side=system.toL2Bus.slave[5]
@@ -379,6 +392,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -395,6 +409,7 @@ system=system
tags=system.cpu6.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu6.port
mem_side=system.toL2Bus.slave[6]
@@ -431,6 +446,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -447,6 +463,7 @@ system=system
tags=system.cpu7.l1c.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu7.port
mem_side=system.toL2Bus.slave[7]
@@ -482,6 +499,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -498,6 +516,7 @@ system=system
tags=system.l2c.tags
tgts_per_mshr=12
write_buffers=8
+writeback_clean=false
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[0]
@@ -541,12 +560,13 @@ port=system.membus.master[0]
[system.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -554,6 +574,13 @@ width=32
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.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.voltage_domain]
type=VoltageDomain
eventq_index=0
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 b2fb4093d..6df4b75be 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
@@ -1,73 +1,73 @@
-system.cpu1: completed 10000 read, 5362 write accesses @70749500
-system.cpu6: completed 10000 read, 5537 write accesses @71195000
-system.cpu7: completed 10000 read, 5519 write accesses @71360000
-system.cpu4: completed 10000 read, 5569 write accesses @71442000
-system.cpu3: completed 10000 read, 5551 write accesses @71947000
-system.cpu5: completed 10000 read, 5610 write accesses @72351000
-system.cpu2: completed 10000 read, 5548 write accesses @72366000
-system.cpu0: completed 10000 read, 5597 write accesses @72604000
-system.cpu1: completed 20000 read, 10810 write accesses @136799000
-system.cpu6: completed 20000 read, 11150 write accesses @137085000
-system.cpu4: completed 20000 read, 11041 write accesses @137243000
-system.cpu5: completed 20000 read, 11255 write accesses @138165500
-system.cpu7: completed 20000 read, 11207 write accesses @138180500
-system.cpu3: completed 20000 read, 11018 write accesses @138711500
-system.cpu2: completed 20000 read, 11094 write accesses @139138500
-system.cpu0: completed 20000 read, 11219 write accesses @140219500
-system.cpu5: completed 30000 read, 16778 write accesses @203366500
-system.cpu6: completed 30000 read, 16566 write accesses @203972500
-system.cpu4: completed 30000 read, 16724 write accesses @204003000
-system.cpu1: completed 30000 read, 16364 write accesses @204656500
-system.cpu2: completed 30000 read, 16663 write accesses @204765000
-system.cpu7: completed 30000 read, 16867 write accesses @205681500
-system.cpu3: completed 30000 read, 16606 write accesses @205970500
-system.cpu0: completed 30000 read, 16763 write accesses @207333500
-system.cpu5: completed 40000 read, 22274 write accesses @268156500
-system.cpu6: completed 40000 read, 22009 write accesses @269534000
-system.cpu2: completed 40000 read, 22255 write accesses @271458500
-system.cpu4: completed 40000 read, 22360 write accesses @272143500
-system.cpu0: completed 40000 read, 22178 write accesses @272544500
-system.cpu1: completed 40000 read, 22131 write accesses @272652000
-system.cpu3: completed 40000 read, 22246 write accesses @273210500
-system.cpu7: completed 40000 read, 22431 write accesses @273722500
-system.cpu5: completed 50000 read, 27739 write accesses @335077500
-system.cpu6: completed 50000 read, 27540 write accesses @335500500
-system.cpu4: completed 50000 read, 27805 write accesses @337842000
-system.cpu7: completed 50000 read, 27755 write accesses @337879500
-system.cpu2: completed 50000 read, 27750 write accesses @338436000
-system.cpu0: completed 50000 read, 27692 write accesses @339374000
-system.cpu1: completed 50000 read, 27828 write accesses @340225500
-system.cpu3: completed 50000 read, 27884 write accesses @341199000
-system.cpu5: completed 60000 read, 33220 write accesses @401069000
-system.cpu6: completed 60000 read, 33064 write accesses @401171000
-system.cpu7: completed 60000 read, 33318 write accesses @402700500
-system.cpu4: completed 60000 read, 33407 write accesses @404241000
-system.cpu2: completed 60000 read, 33248 write accesses @404642000
-system.cpu0: completed 60000 read, 33222 write accesses @405992500
-system.cpu1: completed 60000 read, 33452 write accesses @407711000
-system.cpu3: completed 60000 read, 33293 write accesses @408190000
-system.cpu6: completed 70000 read, 38545 write accesses @467631000
-system.cpu5: completed 70000 read, 38773 write accesses @467786500
-system.cpu7: completed 70000 read, 38817 write accesses @468768499
-system.cpu2: completed 70000 read, 38804 write accesses @470615500
-system.cpu4: completed 70000 read, 38942 write accesses @471024500
-system.cpu1: completed 70000 read, 38924 write accesses @472741500
-system.cpu0: completed 70000 read, 38792 write accesses @473888500
-system.cpu3: completed 70000 read, 38873 write accesses @474437500
-system.cpu5: completed 80000 read, 44156 write accesses @533178500
-system.cpu6: completed 80000 read, 44068 write accesses @534028500
-system.cpu7: completed 80000 read, 44398 write accesses @535850500
-system.cpu2: completed 80000 read, 44302 write accesses @537573000
-system.cpu4: completed 80000 read, 44462 write accesses @538315000
-system.cpu0: completed 80000 read, 44312 write accesses @540158500
-system.cpu1: completed 80000 read, 44676 write accesses @540667000
-system.cpu3: completed 80000 read, 44446 write accesses @541285000
-system.cpu5: completed 90000 read, 49777 write accesses @600496000
-system.cpu6: completed 90000 read, 49628 write accesses @600631500
-system.cpu7: completed 90000 read, 49999 write accesses @603063500
-system.cpu4: completed 90000 read, 49890 write accesses @603847000
-system.cpu2: completed 90000 read, 50013 write accesses @605897999
-system.cpu1: completed 90000 read, 50188 write accesses @606811500
-system.cpu3: completed 90000 read, 49928 write accesses @606922500
-system.cpu0: completed 90000 read, 49837 write accesses @607047500
-system.cpu6: completed 100000 read, 55113 write accesses @666669000
+system.cpu6: completed 10000 read, 5487 write accesses @59571500
+system.cpu3: completed 10000 read, 5414 write accesses @59651500
+system.cpu7: completed 10000 read, 5388 write accesses @60317500
+system.cpu5: completed 10000 read, 5633 write accesses @60565500
+system.cpu0: completed 10000 read, 5554 write accesses @60812000
+system.cpu2: completed 10000 read, 5506 write accesses @60906000
+system.cpu4: completed 10000 read, 5667 write accesses @61020000
+system.cpu1: completed 10000 read, 5729 write accesses @61134500
+system.cpu6: completed 20000 read, 10937 write accesses @112006500
+system.cpu3: completed 20000 read, 10780 write accesses @112135000
+system.cpu7: completed 20000 read, 10967 write accesses @112826000
+system.cpu4: completed 20000 read, 11065 write accesses @113623000
+system.cpu5: completed 20000 read, 11211 write accesses @113744000
+system.cpu2: completed 20000 read, 11030 write accesses @114035000
+system.cpu0: completed 20000 read, 10992 write accesses @114045500
+system.cpu1: completed 20000 read, 11316 write accesses @114786000
+system.cpu7: completed 30000 read, 16437 write accesses @164923000
+system.cpu3: completed 30000 read, 16370 write accesses @165110500
+system.cpu6: completed 30000 read, 16452 write accesses @165210000
+system.cpu5: completed 30000 read, 16648 write accesses @166336000
+system.cpu2: completed 30000 read, 16509 write accesses @166732000
+system.cpu0: completed 30000 read, 16577 write accesses @167160500
+system.cpu4: completed 30000 read, 16715 write accesses @167466500
+system.cpu1: completed 30000 read, 16830 write accesses @168055000
+system.cpu6: completed 40000 read, 21969 write accesses @217981000
+system.cpu3: completed 40000 read, 21918 write accesses @218202000
+system.cpu7: completed 40000 read, 21990 write accesses @218219000
+system.cpu2: completed 40000 read, 21957 write accesses @218925500
+system.cpu5: completed 40000 read, 22088 write accesses @218962000
+system.cpu0: completed 40000 read, 22019 write accesses @220261500
+system.cpu4: completed 40000 read, 22141 write accesses @220429500
+system.cpu1: completed 40000 read, 22465 write accesses @221673500
+system.cpu6: completed 50000 read, 27340 write accesses @269928500
+system.cpu3: completed 50000 read, 27331 write accesses @269971000
+system.cpu7: completed 50000 read, 27530 write accesses @270791500
+system.cpu5: completed 50000 read, 27634 write accesses @271727500
+system.cpu2: completed 50000 read, 27623 write accesses @272554500
+system.cpu0: completed 50000 read, 27533 write accesses @273321500
+system.cpu4: completed 50000 read, 27756 write accesses @273793500
+system.cpu1: completed 50000 read, 28047 write accesses @275360000
+system.cpu6: completed 60000 read, 32844 write accesses @323017000
+system.cpu3: completed 60000 read, 32841 write accesses @324483500
+system.cpu5: completed 60000 read, 33251 write accesses @324526000
+system.cpu7: completed 60000 read, 33152 write accesses @324853000
+system.cpu0: completed 60000 read, 33006 write accesses @325804000
+system.cpu2: completed 60000 read, 33348 write accesses @325916500
+system.cpu4: completed 60000 read, 33317 write accesses @326721500
+system.cpu1: completed 60000 read, 33656 write accesses @328729000
+system.cpu6: completed 70000 read, 38487 write accesses @376493000
+system.cpu7: completed 70000 read, 38761 write accesses @377715000
+system.cpu3: completed 70000 read, 38353 write accesses @377922000
+system.cpu5: completed 70000 read, 38776 write accesses @378190500
+system.cpu2: completed 70000 read, 38794 write accesses @378444500
+system.cpu0: completed 70000 read, 38678 write accesses @379664500
+system.cpu4: completed 70000 read, 38900 write accesses @380595000
+system.cpu1: completed 70000 read, 39220 write accesses @382567000
+system.cpu6: completed 80000 read, 43956 write accesses @429072500
+system.cpu7: completed 80000 read, 44286 write accesses @430036500
+system.cpu5: completed 80000 read, 44299 write accesses @430673000
+system.cpu3: completed 80000 read, 43950 write accesses @431481500
+system.cpu2: completed 80000 read, 44367 write accesses @431856000
+system.cpu0: completed 80000 read, 44165 write accesses @433508500
+system.cpu4: completed 80000 read, 44456 write accesses @435070500
+system.cpu1: completed 80000 read, 44736 write accesses @436017000
+system.cpu6: completed 90000 read, 49535 write accesses @481570000
+system.cpu7: completed 90000 read, 49822 write accesses @483210500
+system.cpu5: completed 90000 read, 49824 write accesses @483444500
+system.cpu3: completed 90000 read, 49649 write accesses @484870500
+system.cpu2: completed 90000 read, 50045 write accesses @485829000
+system.cpu0: completed 90000 read, 49706 write accesses @486425000
+system.cpu4: completed 90000 read, 49831 write accesses @488248500
+system.cpu1: completed 90000 read, 50268 write accesses @489877001
+system.cpu6: completed 100000 read, 54955 write accesses @534039500
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 831211e6c..299b89caf 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simout
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
@@ -1,10 +1,13 @@
+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 Jan 22 2014 16:54:17
-gem5 started Jan 22 2014 17:28:45
-gem5 executing on u200540-lin
-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
+gem5 compiled Nov 15 2015 14:58:33
+gem5 started Nov 15 2015 14:58:45
+gem5 executing on ribera.cs.wisc.edu, pid 5047
+command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest -re /scratch/nilay/GEM5/gem5/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 652606500 because maximum number of loads reached
+Exiting @ tick 534039500 because maximum number of loads reached
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
index 366a5b776..9e91490cc 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000534 # Nu
sim_ticks 534039500 # Number of ticks simulated
final_tick 534039500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_tick_rate 107991246 # Simulator tick rate (ticks/s)
-host_mem_usage 280540 # Number of bytes of host memory used
-host_seconds 4.95 # Real time elapsed on the host
+host_tick_rate 75793857 # Simulator tick rate (ticks/s)
+host_mem_usage 274932 # Number of bytes of host memory used
+host_seconds 7.05 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1000 # Clock period in ticks
system.physmem.bytes_read::cpu0 80135 # Number of bytes read from this memory