summaryrefslogtreecommitdiff
path: root/tests/quick/se/50.memtest/ref/alpha
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-10-11 16:18:51 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-10-11 16:18:51 -0500
commit1efe42fa97ed03662666cafee1b9dec9dfe524e9 (patch)
treedd35dfa8f257445840ea3afe71ebdce4d8e4030e /tests/quick/se/50.memtest/ref/alpha
parent8e07b36d2b6c1db8c4196336acc66d16e63f8ff3 (diff)
downloadgem5-1efe42fa97ed03662666cafee1b9dec9dfe524e9.tar.xz
stats: updates due to changes to x86, stale configs.
Diffstat (limited to 'tests/quick/se/50.memtest/ref/alpha')
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini2
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr150
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini2
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr150
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini2
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr150
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini2
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr150
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini2
-rwxr-xr-xtests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr150
10 files changed, 390 insertions, 370 deletions
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
index 1c907dde7..58228c89a 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
@@ -220,7 +220,7 @@ sys_clk_domain=system.clk_domain
transition_latency=100000
[system.funcbus]
-type=NoncoherentBus
+type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
header_cycles=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr
index b779cf15d..215e9ea82 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr
@@ -6,76 +6,80 @@ warn: rounding error > tolerance
0.072760 rounded to 0
warn: rounding error > tolerance
0.072760 rounded to 0
-system.cpu7: completed 10000 read, 5432 write accesses @720734
-system.cpu0: completed 10000 read, 5512 write accesses @730548
-system.cpu1: completed 10000 read, 5469 write accesses @733316
-system.cpu3: completed 10000 read, 5348 write accesses @734089
-system.cpu5: completed 10000 read, 5304 write accesses @739554
-system.cpu4: completed 10000 read, 5523 write accesses @742146
-system.cpu2: completed 10000 read, 5353 write accesses @742448
-system.cpu6: completed 10000 read, 5456 write accesses @746526
-system.cpu0: completed 20000 read, 10918 write accesses @1452216
-system.cpu7: completed 20000 read, 10905 write accesses @1455831
-system.cpu2: completed 20000 read, 10616 write accesses @1456643
-system.cpu1: completed 20000 read, 10900 write accesses @1468694
-system.cpu3: completed 20000 read, 10595 write accesses @1471954
-system.cpu6: completed 20000 read, 10732 write accesses @1476612
-system.cpu5: completed 20000 read, 10777 write accesses @1484015
-system.cpu4: completed 20000 read, 10962 write accesses @1484193
-system.cpu7: completed 30000 read, 16301 write accesses @2190709
-system.cpu3: completed 30000 read, 15930 write accesses @2193108
-system.cpu0: completed 30000 read, 16492 write accesses @2204699
-system.cpu2: completed 30000 read, 16137 write accesses @2208852
-system.cpu1: completed 30000 read, 16294 write accesses @2211342
-system.cpu6: completed 30000 read, 16138 write accesses @2217558
-system.cpu5: completed 30000 read, 16017 write accesses @2217893
-system.cpu4: completed 30000 read, 16364 write accesses @2220770
-system.cpu7: completed 40000 read, 21683 write accesses @2923239
-system.cpu3: completed 40000 read, 21410 write accesses @2936019
-system.cpu2: completed 40000 read, 21422 write accesses @2936262
-system.cpu0: completed 40000 read, 21993 write accesses @2938221
-system.cpu5: completed 40000 read, 21407 write accesses @2949381
-system.cpu4: completed 40000 read, 21696 write accesses @2954856
-system.cpu6: completed 40000 read, 21664 write accesses @2955212
-system.cpu1: completed 40000 read, 21772 write accesses @2957373
-system.cpu7: completed 50000 read, 26880 write accesses @3637356
-system.cpu0: completed 50000 read, 27433 write accesses @3667809
-system.cpu2: completed 50000 read, 26841 write accesses @3676541
-system.cpu3: completed 50000 read, 26846 write accesses @3676934
-system.cpu1: completed 50000 read, 27155 write accesses @3679587
-system.cpu5: completed 50000 read, 26712 write accesses @3699925
-system.cpu4: completed 50000 read, 27199 write accesses @3700680
-system.cpu6: completed 50000 read, 27119 write accesses @3709288
-system.cpu7: completed 60000 read, 32133 write accesses @4356266
-system.cpu0: completed 60000 read, 32774 write accesses @4396377
-system.cpu3: completed 60000 read, 32241 write accesses @4405248
-system.cpu2: completed 60000 read, 32179 write accesses @4410455
-system.cpu1: completed 60000 read, 32548 write accesses @4418337
-system.cpu4: completed 60000 read, 32496 write accesses @4444142
-system.cpu6: completed 60000 read, 32520 write accesses @4446125
-system.cpu5: completed 60000 read, 32111 write accesses @4457785
-system.cpu7: completed 70000 read, 37528 write accesses @5092190
-system.cpu3: completed 70000 read, 37618 write accesses @5124227
-system.cpu0: completed 70000 read, 38140 write accesses @5138553
-system.cpu2: completed 70000 read, 37630 write accesses @5148204
-system.cpu4: completed 70000 read, 37860 write accesses @5162780
-system.cpu1: completed 70000 read, 37968 write accesses @5169201
-system.cpu6: completed 70000 read, 38023 write accesses @5190771
-system.cpu5: completed 70000 read, 37447 write accesses @5193894
-system.cpu7: completed 80000 read, 42859 write accesses @5808723
-system.cpu3: completed 80000 read, 43086 write accesses @5863853
-system.cpu2: completed 80000 read, 43034 write accesses @5892131
-system.cpu0: completed 80000 read, 43586 write accesses @5894007
-system.cpu4: completed 80000 read, 43221 write accesses @5909816
-system.cpu1: completed 80000 read, 43381 write accesses @5910301
-system.cpu6: completed 80000 read, 43445 write accesses @5922153
-system.cpu5: completed 80000 read, 42916 write accesses @5926434
-system.cpu7: completed 90000 read, 48423 write accesses @6537227
-system.cpu3: completed 90000 read, 48562 write accesses @6619736
-system.cpu0: completed 90000 read, 48962 write accesses @6625530
-system.cpu2: completed 90000 read, 48441 write accesses @6629626
-system.cpu1: completed 90000 read, 48846 write accesses @6644848
-system.cpu6: completed 90000 read, 48899 write accesses @6650109
-system.cpu4: completed 90000 read, 48617 write accesses @6655860
-system.cpu5: completed 90000 read, 48309 write accesses @6656682
-system.cpu7: completed 100000 read, 53646 write accesses @7259586
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+system.cpu2: completed 10000 read, 5361 write accesses @731568
+system.cpu5: completed 10000 read, 5557 write accesses @735340
+system.cpu3: completed 10000 read, 5535 write accesses @738863
+system.cpu6: completed 10000 read, 5476 write accesses @748316
+system.cpu0: completed 10000 read, 5560 write accesses @752250
+system.cpu4: completed 10000 read, 5465 write accesses @757289
+system.cpu7: completed 10000 read, 5564 write accesses @760144
+system.cpu1: completed 10000 read, 5530 write accesses @768416
+system.cpu5: completed 20000 read, 11151 write accesses @1477095
+system.cpu2: completed 20000 read, 10827 write accesses @1478088
+system.cpu3: completed 20000 read, 11078 write accesses @1481757
+system.cpu0: completed 20000 read, 11117 write accesses @1493889
+system.cpu6: completed 20000 read, 11080 write accesses @1512346
+system.cpu1: completed 20000 read, 11091 write accesses @1512763
+system.cpu4: completed 20000 read, 10986 write accesses @1520589
+system.cpu7: completed 20000 read, 11078 write accesses @1523748
+system.cpu5: completed 30000 read, 16568 write accesses @2200051
+system.cpu3: completed 30000 read, 16616 write accesses @2221845
+system.cpu2: completed 30000 read, 16217 write accesses @2232672
+system.cpu0: completed 30000 read, 16692 write accesses @2249618
+system.cpu1: completed 30000 read, 16648 write accesses @2263101
+system.cpu6: completed 30000 read, 16745 write accesses @2274150
+system.cpu4: completed 30000 read, 16620 write accesses @2276386
+system.cpu7: completed 30000 read, 16733 write accesses @2277359
+system.cpu5: completed 40000 read, 21987 write accesses @2947352
+system.cpu3: completed 40000 read, 22027 write accesses @2968674
+system.cpu1: completed 40000 read, 22148 write accesses @2995890
+system.cpu0: completed 40000 read, 22166 write accesses @2998152
+system.cpu2: completed 40000 read, 21828 write accesses @3001342
+system.cpu7: completed 40000 read, 22152 write accesses @3022463
+system.cpu6: completed 40000 read, 22388 write accesses @3028895
+system.cpu4: completed 40000 read, 22197 write accesses @3031091
+system.cpu5: completed 50000 read, 27444 write accesses @3696748
+system.cpu3: completed 50000 read, 27708 write accesses @3723471
+system.cpu1: completed 50000 read, 27649 write accesses @3746058
+system.cpu0: completed 50000 read, 27719 write accesses @3747410
+system.cpu2: completed 50000 read, 27424 write accesses @3760076
+system.cpu7: completed 50000 read, 27568 write accesses @3771426
+system.cpu6: completed 50000 read, 28012 write accesses @3777023
+system.cpu4: completed 50000 read, 27741 write accesses @3802071
+system.cpu5: completed 60000 read, 33062 write accesses @4446684
+system.cpu3: completed 60000 read, 33331 write accesses @4487796
+system.cpu2: completed 60000 read, 33035 write accesses @4498626
+system.cpu0: completed 60000 read, 33211 write accesses @4505229
+system.cpu1: completed 60000 read, 33219 write accesses @4525223
+system.cpu6: completed 60000 read, 33545 write accesses @4528416
+system.cpu7: completed 60000 read, 33210 write accesses @4528425
+system.cpu4: completed 60000 read, 33325 write accesses @4560641
+system.cpu5: completed 70000 read, 38698 write accesses @5188287
+system.cpu2: completed 70000 read, 38579 write accesses @5235379
+system.cpu7: completed 70000 read, 38633 write accesses @5255909
+system.cpu0: completed 70000 read, 38682 write accesses @5255973
+system.cpu6: completed 70000 read, 38964 write accesses @5261147
+system.cpu3: completed 70000 read, 38993 write accesses @5267174
+system.cpu1: completed 70000 read, 38888 write accesses @5283161
+system.cpu4: completed 70000 read, 38789 write accesses @5300670
+system.cpu5: completed 80000 read, 44039 write accesses @5937946
+system.cpu2: completed 80000 read, 43995 write accesses @5990383
+system.cpu7: completed 80000 read, 44179 write accesses @5992827
+system.cpu0: completed 80000 read, 44154 write accesses @6000956
+system.cpu6: completed 80000 read, 44514 write accesses @6013988
+system.cpu3: completed 80000 read, 44595 write accesses @6025710
+system.cpu1: completed 80000 read, 44663 write accesses @6042332
+system.cpu4: completed 80000 read, 44390 write accesses @6048987
+system.cpu5: completed 90000 read, 49553 write accesses @6694237
+system.cpu7: completed 90000 read, 49635 write accesses @6734659
+system.cpu2: completed 90000 read, 49508 write accesses @6735285
+system.cpu0: completed 90000 read, 49652 write accesses @6748849
+system.cpu6: completed 90000 read, 50083 write accesses @6767267
+system.cpu1: completed 90000 read, 50078 write accesses @6778899
+system.cpu3: completed 90000 read, 50108 write accesses @6783497
+system.cpu4: completed 90000 read, 50077 write accesses @6811616
+system.cpu5: completed 100000 read, 55112 write accesses @7430292
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index cce9b7e46..a6cce7aa1 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -220,7 +220,7 @@ sys_clk_domain=system.clk_domain
transition_latency=100000
[system.funcbus]
-type=NoncoherentBus
+type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
header_cycles=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr
index 96061ea38..327665b25 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr
@@ -6,76 +6,80 @@ warn: rounding error > tolerance
0.072760 rounded to 0
warn: rounding error > tolerance
0.072760 rounded to 0
-system.cpu6: completed 10000 read, 5376 write accesses @740514
-system.cpu0: completed 10000 read, 5364 write accesses @745186
-system.cpu3: completed 10000 read, 5423 write accesses @748707
-system.cpu4: completed 10000 read, 5537 write accesses @749784
-system.cpu7: completed 10000 read, 5400 write accesses @749868
-system.cpu1: completed 10000 read, 5530 write accesses @750998
-system.cpu5: completed 10000 read, 5459 write accesses @756529
-system.cpu2: completed 10000 read, 5543 write accesses @771097
-system.cpu6: completed 20000 read, 10651 write accesses @1479754
-system.cpu3: completed 20000 read, 10879 write accesses @1495041
-system.cpu7: completed 20000 read, 10760 write accesses @1499008
-system.cpu1: completed 20000 read, 10977 write accesses @1499104
-system.cpu5: completed 20000 read, 10867 write accesses @1505086
-system.cpu0: completed 20000 read, 10799 write accesses @1507389
-system.cpu4: completed 20000 read, 11068 write accesses @1508085
-system.cpu2: completed 20000 read, 10878 write accesses @1527233
-system.cpu6: completed 30000 read, 16119 write accesses @2225328
-system.cpu3: completed 30000 read, 16305 write accesses @2244855
-system.cpu5: completed 30000 read, 16187 write accesses @2247278
-system.cpu7: completed 30000 read, 16155 write accesses @2249487
-system.cpu1: completed 30000 read, 16466 write accesses @2250992
-system.cpu0: completed 30000 read, 16273 write accesses @2255206
-system.cpu4: completed 30000 read, 16428 write accesses @2263136
-system.cpu2: completed 30000 read, 16197 write accesses @2278056
-system.cpu6: completed 40000 read, 21573 write accesses @2978557
-system.cpu7: completed 40000 read, 21410 write accesses @2982935
-system.cpu4: completed 40000 read, 21729 write accesses @2999959
-system.cpu3: completed 40000 read, 21781 write accesses @3000904
-system.cpu1: completed 40000 read, 21951 write accesses @3003109
-system.cpu5: completed 40000 read, 21639 write accesses @3013039
-system.cpu0: completed 40000 read, 21607 write accesses @3015250
-system.cpu2: completed 40000 read, 21696 write accesses @3037769
-system.cpu6: completed 50000 read, 26913 write accesses @3719593
-system.cpu7: completed 50000 read, 26968 write accesses @3753645
-system.cpu4: completed 50000 read, 27060 write accesses @3754051
-system.cpu1: completed 50000 read, 27365 write accesses @3755861
-system.cpu0: completed 50000 read, 27035 write accesses @3755945
-system.cpu3: completed 50000 read, 27265 write accesses @3757400
-system.cpu5: completed 50000 read, 27001 write accesses @3763589
-system.cpu2: completed 50000 read, 27364 write accesses @3806785
-system.cpu6: completed 60000 read, 32204 write accesses @4458868
-system.cpu1: completed 60000 read, 32673 write accesses @4480776
-system.cpu0: completed 60000 read, 32481 write accesses @4498229
-system.cpu7: completed 60000 read, 32335 write accesses @4506920
-system.cpu3: completed 60000 read, 32750 write accesses @4507998
-system.cpu4: completed 60000 read, 32435 write accesses @4514030
-system.cpu5: completed 60000 read, 32505 write accesses @4516999
-system.cpu2: completed 60000 read, 32812 write accesses @4572908
-system.cpu6: completed 70000 read, 37702 write accesses @5219683
-system.cpu0: completed 70000 read, 38094 write accesses @5237731
-system.cpu1: completed 70000 read, 38271 write accesses @5247271
-system.cpu5: completed 70000 read, 37826 write accesses @5260789
-system.cpu3: completed 70000 read, 38167 write accesses @5262755
-system.cpu4: completed 70000 read, 37927 write accesses @5268995
-system.cpu7: completed 70000 read, 37729 write accesses @5271169
-system.cpu2: completed 70000 read, 38312 write accesses @5320578
-system.cpu6: completed 80000 read, 43265 write accesses @5963960
-system.cpu0: completed 80000 read, 43558 write accesses @5996302
-system.cpu5: completed 80000 read, 43163 write accesses @6000784
-system.cpu3: completed 80000 read, 43563 write accesses @6009019
-system.cpu1: completed 80000 read, 43846 write accesses @6010830
-system.cpu4: completed 80000 read, 43375 write accesses @6021719
-system.cpu7: completed 80000 read, 43151 write accesses @6032005
-system.cpu2: completed 80000 read, 43642 write accesses @6070842
-system.cpu6: completed 90000 read, 48756 write accesses @6719511
-system.cpu5: completed 90000 read, 48675 write accesses @6752879
-system.cpu0: completed 90000 read, 49075 write accesses @6759943
-system.cpu4: completed 90000 read, 48792 write accesses @6772472
-system.cpu1: completed 90000 read, 49329 write accesses @6774290
-system.cpu3: completed 90000 read, 49090 write accesses @6783540
-system.cpu7: completed 90000 read, 48766 write accesses @6785808
-system.cpu2: completed 90000 read, 49113 write accesses @6821790
-system.cpu6: completed 100000 read, 54332 write accesses @7481441
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+system.cpu6: completed 10000 read, 5503 write accesses @757269
+system.cpu4: completed 10000 read, 5478 write accesses @761080
+system.cpu2: completed 10000 read, 5550 write accesses @763319
+system.cpu1: completed 10000 read, 5614 write accesses @768345
+system.cpu0: completed 10000 read, 5587 write accesses @769447
+system.cpu7: completed 10000 read, 5757 write accesses @772728
+system.cpu5: completed 10000 read, 5702 write accesses @774176
+system.cpu3: completed 10000 read, 5518 write accesses @779096
+system.cpu7: completed 20000 read, 10973 write accesses @1520367
+system.cpu4: completed 20000 read, 10979 write accesses @1526709
+system.cpu6: completed 20000 read, 11106 write accesses @1529725
+system.cpu2: completed 20000 read, 10993 write accesses @1531224
+system.cpu1: completed 20000 read, 11181 write accesses @1533339
+system.cpu5: completed 20000 read, 11353 write accesses @1534479
+system.cpu0: completed 20000 read, 11156 write accesses @1538403
+system.cpu3: completed 20000 read, 11059 write accesses @1546200
+system.cpu7: completed 30000 read, 16565 write accesses @2285511
+system.cpu5: completed 30000 read, 16777 write accesses @2288641
+system.cpu2: completed 30000 read, 16597 write accesses @2294136
+system.cpu4: completed 30000 read, 16631 write accesses @2299512
+system.cpu0: completed 30000 read, 16690 write accesses @2299577
+system.cpu1: completed 30000 read, 16784 write accesses @2300367
+system.cpu3: completed 30000 read, 16611 write accesses @2300731
+system.cpu6: completed 30000 read, 16728 write accesses @2302250
+system.cpu4: completed 40000 read, 22149 write accesses @3049466
+system.cpu6: completed 40000 read, 22257 write accesses @3061175
+system.cpu7: completed 40000 read, 22207 write accesses @3063273
+system.cpu5: completed 40000 read, 22390 write accesses @3065947
+system.cpu2: completed 40000 read, 22266 write accesses @3066692
+system.cpu3: completed 40000 read, 22073 write accesses @3067947
+system.cpu0: completed 40000 read, 22351 write accesses @3070634
+system.cpu1: completed 40000 read, 22419 write accesses @3080538
+system.cpu4: completed 50000 read, 27758 write accesses @3814226
+system.cpu5: completed 50000 read, 27788 write accesses @3821800
+system.cpu2: completed 50000 read, 27879 write accesses @3832783
+system.cpu6: completed 50000 read, 27794 write accesses @3833668
+system.cpu7: completed 50000 read, 27831 write accesses @3833943
+system.cpu3: completed 50000 read, 27630 write accesses @3836295
+system.cpu1: completed 50000 read, 28014 write accesses @3838264
+system.cpu0: completed 50000 read, 27900 write accesses @3845606
+system.cpu4: completed 60000 read, 33195 write accesses @4581871
+system.cpu6: completed 60000 read, 33436 write accesses @4591130
+system.cpu5: completed 60000 read, 33441 write accesses @4592195
+system.cpu2: completed 60000 read, 33425 write accesses @4596449
+system.cpu7: completed 60000 read, 33475 write accesses @4602310
+system.cpu1: completed 60000 read, 33528 write accesses @4604165
+system.cpu3: completed 60000 read, 33269 write accesses @4608944
+system.cpu0: completed 60000 read, 33561 write accesses @4617814
+system.cpu4: completed 70000 read, 38745 write accesses @5357021
+system.cpu1: completed 70000 read, 39092 write accesses @5358188
+system.cpu7: completed 70000 read, 39078 write accesses @5359639
+system.cpu6: completed 70000 read, 39017 write accesses @5360015
+system.cpu5: completed 70000 read, 39077 write accesses @5360709
+system.cpu2: completed 70000 read, 39142 write accesses @5362206
+system.cpu3: completed 70000 read, 38953 write accesses @5383557
+system.cpu0: completed 70000 read, 39148 write accesses @5384346
+system.cpu1: completed 80000 read, 44697 write accesses @6109229
+system.cpu4: completed 80000 read, 44391 write accesses @6113222
+system.cpu6: completed 80000 read, 44634 write accesses @6116932
+system.cpu2: completed 80000 read, 44686 write accesses @6124384
+system.cpu7: completed 80000 read, 44658 write accesses @6130030
+system.cpu5: completed 80000 read, 44817 write accesses @6133468
+system.cpu0: completed 80000 read, 44666 write accesses @6150195
+system.cpu3: completed 80000 read, 44619 write accesses @6165694
+system.cpu1: completed 90000 read, 50286 write accesses @6886139
+system.cpu5: completed 90000 read, 50291 write accesses @6887562
+system.cpu6: completed 90000 read, 50249 write accesses @6888221
+system.cpu4: completed 90000 read, 50068 write accesses @6890175
+system.cpu2: completed 90000 read, 50264 write accesses @6897909
+system.cpu7: completed 90000 read, 50336 write accesses @6907186
+system.cpu3: completed 90000 read, 50220 write accesses @6927421
+system.cpu0: completed 90000 read, 50337 write accesses @6930851
+system.cpu5: completed 100000 read, 55860 write accesses @7645897
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 c165a6832..319711992 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
@@ -220,7 +220,7 @@ sys_clk_domain=system.clk_domain
transition_latency=100000
[system.funcbus]
-type=NoncoherentBus
+type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
header_cycles=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr
index 78259ab68..1e742ef57 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr
@@ -6,76 +6,80 @@ warn: rounding error > tolerance
0.072760 rounded to 0
warn: rounding error > tolerance
0.072760 rounded to 0
-system.cpu3: completed 10000 read, 5373 write accesses @610961
-system.cpu5: completed 10000 read, 5365 write accesses @611018
-system.cpu4: completed 10000 read, 5553 write accesses @613027
-system.cpu2: completed 10000 read, 5350 write accesses @617677
-system.cpu1: completed 10000 read, 5430 write accesses @618344
-system.cpu0: completed 10000 read, 5583 write accesses @619157
-system.cpu7: completed 10000 read, 5389 write accesses @620153
-system.cpu6: completed 10000 read, 5612 write accesses @620650
-system.cpu5: completed 20000 read, 10789 write accesses @1225454
-system.cpu1: completed 20000 read, 10846 write accesses @1236230
-system.cpu4: completed 20000 read, 10993 write accesses @1237289
-system.cpu0: completed 20000 read, 11135 write accesses @1237437
-system.cpu7: completed 20000 read, 10790 write accesses @1238914
-system.cpu3: completed 20000 read, 10722 write accesses @1239177
-system.cpu6: completed 20000 read, 11153 write accesses @1244507
-system.cpu2: completed 20000 read, 10728 write accesses @1245295
-system.cpu5: completed 30000 read, 16089 write accesses @1837067
-system.cpu1: completed 30000 read, 16220 write accesses @1844516
-system.cpu3: completed 30000 read, 16042 write accesses @1846213
-system.cpu6: completed 30000 read, 16442 write accesses @1852618
-system.cpu0: completed 30000 read, 16510 write accesses @1857227
-system.cpu7: completed 30000 read, 16238 write accesses @1862399
-system.cpu2: completed 30000 read, 16227 write accesses @1874504
-system.cpu4: completed 30000 read, 16481 write accesses @1879909
-system.cpu5: completed 40000 read, 21666 write accesses @2447180
-system.cpu1: completed 40000 read, 21716 write accesses @2464865
-system.cpu0: completed 40000 read, 21907 write accesses @2473366
-system.cpu7: completed 40000 read, 21535 write accesses @2473664
-system.cpu3: completed 40000 read, 21446 write accesses @2475585
-system.cpu6: completed 40000 read, 21928 write accesses @2479522
-system.cpu4: completed 40000 read, 21651 write accesses @2491724
-system.cpu2: completed 40000 read, 21571 write accesses @2492947
-system.cpu5: completed 50000 read, 27225 write accesses @3067865
-system.cpu7: completed 50000 read, 26823 write accesses @3086290
-system.cpu3: completed 50000 read, 26661 write accesses @3087077
-system.cpu1: completed 50000 read, 27045 write accesses @3088502
-system.cpu6: completed 50000 read, 27350 write accesses @3091373
-system.cpu0: completed 50000 read, 27240 write accesses @3099902
-system.cpu4: completed 50000 read, 27063 write accesses @3101501
-system.cpu2: completed 50000 read, 27064 write accesses @3114914
-system.cpu5: completed 60000 read, 32586 write accesses @3679414
-system.cpu1: completed 60000 read, 32546 write accesses @3694760
-system.cpu3: completed 60000 read, 32032 write accesses @3702088
-system.cpu7: completed 60000 read, 32061 write accesses @3707072
-system.cpu0: completed 60000 read, 32607 write accesses @3710014
-system.cpu2: completed 60000 read, 32411 write accesses @3717514
-system.cpu6: completed 60000 read, 32905 write accesses @3719411
-system.cpu4: completed 60000 read, 32455 write accesses @3724218
-system.cpu1: completed 70000 read, 37971 write accesses @4303479
-system.cpu3: completed 70000 read, 37478 write accesses @4307612
-system.cpu5: completed 70000 read, 38121 write accesses @4312096
-system.cpu0: completed 70000 read, 38044 write accesses @4316156
-system.cpu7: completed 70000 read, 37345 write accesses @4323040
-system.cpu2: completed 70000 read, 37853 write accesses @4334714
-system.cpu6: completed 70000 read, 38341 write accesses @4338265
-system.cpu4: completed 70000 read, 37883 write accesses @4348139
-system.cpu3: completed 80000 read, 42790 write accesses @4909950
-system.cpu0: completed 80000 read, 43447 write accesses @4922258
-system.cpu1: completed 80000 read, 43458 write accesses @4929896
-system.cpu5: completed 80000 read, 43556 write accesses @4929946
-system.cpu7: completed 80000 read, 42733 write accesses @4945136
-system.cpu2: completed 80000 read, 43278 write accesses @4954988
-system.cpu6: completed 80000 read, 43794 write accesses @4962728
-system.cpu4: completed 80000 read, 43313 write accesses @4970893
-system.cpu3: completed 90000 read, 48235 write accesses @5529277
-system.cpu1: completed 90000 read, 48908 write accesses @5532854
-system.cpu0: completed 90000 read, 48795 write accesses @5538200
-system.cpu5: completed 90000 read, 49134 write accesses @5544337
-system.cpu2: completed 90000 read, 48427 write accesses @5551687
-system.cpu7: completed 90000 read, 48273 write accesses @5561660
-system.cpu4: completed 90000 read, 48720 write accesses @5589754
-system.cpu6: completed 90000 read, 49134 write accesses @5592253
-system.cpu0: completed 100000 read, 54250 write accesses @6151475
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+system.cpu5: completed 10000 read, 5530 write accesses @619922
+system.cpu6: completed 10000 read, 5474 write accesses @621650
+system.cpu7: completed 10000 read, 5669 write accesses @623678
+system.cpu2: completed 10000 read, 5566 write accesses @627878
+system.cpu4: completed 10000 read, 5488 write accesses @628250
+system.cpu1: completed 10000 read, 5485 write accesses @629308
+system.cpu3: completed 10000 read, 5616 write accesses @630755
+system.cpu0: completed 10000 read, 5556 write accesses @631832
+system.cpu0: completed 20000 read, 11113 write accesses @1242739
+system.cpu2: completed 20000 read, 11184 write accesses @1249193
+system.cpu5: completed 20000 read, 11055 write accesses @1252676
+system.cpu1: completed 20000 read, 11025 write accesses @1255481
+system.cpu6: completed 20000 read, 10958 write accesses @1259795
+system.cpu3: completed 20000 read, 11192 write accesses @1262410
+system.cpu4: completed 20000 read, 11069 write accesses @1265165
+system.cpu7: completed 20000 read, 11154 write accesses @1271872
+system.cpu2: completed 30000 read, 16789 write accesses @1882328
+system.cpu5: completed 30000 read, 16628 write accesses @1882366
+system.cpu4: completed 30000 read, 16634 write accesses @1884079
+system.cpu0: completed 30000 read, 16724 write accesses @1885096
+system.cpu1: completed 30000 read, 16623 write accesses @1888139
+system.cpu3: completed 30000 read, 16738 write accesses @1892924
+system.cpu6: completed 30000 read, 16532 write accesses @1894586
+system.cpu7: completed 30000 read, 16931 write accesses @1919912
+system.cpu0: completed 40000 read, 22182 write accesses @2505116
+system.cpu4: completed 40000 read, 22117 write accesses @2510993
+system.cpu1: completed 40000 read, 22260 write accesses @2513447
+system.cpu5: completed 40000 read, 22212 write accesses @2514125
+system.cpu3: completed 40000 read, 22396 write accesses @2516765
+system.cpu2: completed 40000 read, 22468 write accesses @2519189
+system.cpu6: completed 40000 read, 22230 write accesses @2538281
+system.cpu7: completed 40000 read, 22488 write accesses @2557526
+system.cpu0: completed 50000 read, 27789 write accesses @3133555
+system.cpu2: completed 50000 read, 28077 write accesses @3139915
+system.cpu4: completed 50000 read, 27742 write accesses @3146518
+system.cpu1: completed 50000 read, 27886 write accesses @3150027
+system.cpu5: completed 50000 read, 27798 write accesses @3154334
+system.cpu3: completed 50000 read, 28034 write accesses @3161717
+system.cpu6: completed 50000 read, 27710 write accesses @3168082
+system.cpu7: completed 50000 read, 28032 write accesses @3187555
+system.cpu0: completed 60000 read, 33311 write accesses @3767660
+system.cpu4: completed 60000 read, 33304 write accesses @3772541
+system.cpu1: completed 60000 read, 33446 write accesses @3773198
+system.cpu2: completed 60000 read, 33652 write accesses @3776350
+system.cpu5: completed 60000 read, 33271 write accesses @3781457
+system.cpu6: completed 60000 read, 33278 write accesses @3794854
+system.cpu3: completed 60000 read, 33612 write accesses @3795827
+system.cpu7: completed 60000 read, 33548 write accesses @3811016
+system.cpu0: completed 70000 read, 38763 write accesses @4391942
+system.cpu5: completed 70000 read, 38783 write accesses @4406065
+system.cpu4: completed 70000 read, 38931 write accesses @4406093
+system.cpu1: completed 70000 read, 39120 write accesses @4408424
+system.cpu2: completed 70000 read, 39282 write accesses @4411507
+system.cpu6: completed 70000 read, 38935 write accesses @4431425
+system.cpu3: completed 70000 read, 39112 write accesses @4436411
+system.cpu7: completed 70000 read, 39053 write accesses @4450257
+system.cpu4: completed 80000 read, 44397 write accesses @5015840
+system.cpu0: completed 80000 read, 44355 write accesses @5031328
+system.cpu1: completed 80000 read, 44681 write accesses @5033509
+system.cpu5: completed 80000 read, 44411 write accesses @5035544
+system.cpu2: completed 80000 read, 44867 write accesses @5051495
+system.cpu6: completed 80000 read, 44501 write accesses @5065596
+system.cpu3: completed 80000 read, 44674 write accesses @5067973
+system.cpu7: completed 80000 read, 44457 write accesses @5071578
+system.cpu5: completed 90000 read, 50018 write accesses @5653124
+system.cpu4: completed 90000 read, 50091 write accesses @5657891
+system.cpu0: completed 90000 read, 50057 write accesses @5659483
+system.cpu1: completed 90000 read, 50245 write accesses @5662169
+system.cpu2: completed 90000 read, 50468 write accesses @5689246
+system.cpu7: completed 90000 read, 50055 write accesses @5700359
+system.cpu6: completed 90000 read, 50091 write accesses @5701022
+system.cpu3: completed 90000 read, 50159 write accesses @5709281
+system.cpu0: completed 100000 read, 55570 write accesses @6284915
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index 77392538d..c8c135618 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -220,7 +220,7 @@ sys_clk_domain=system.clk_domain
transition_latency=100000
[system.funcbus]
-type=NoncoherentBus
+type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
header_cycles=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr
index f2f8ae71c..80cafee63 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr
@@ -6,76 +6,80 @@ warn: rounding error > tolerance
0.072760 rounded to 0
warn: rounding error > tolerance
0.072760 rounded to 0
-system.cpu5: completed 10000 read, 5516 write accesses @570851
-system.cpu3: completed 10000 read, 5324 write accesses @572812
-system.cpu1: completed 10000 read, 5481 write accesses @576530
-system.cpu2: completed 10000 read, 5411 write accesses @581924
-system.cpu6: completed 10000 read, 5498 write accesses @589277
-system.cpu4: completed 10000 read, 5455 write accesses @592697
-system.cpu7: completed 10000 read, 5509 write accesses @593396
-system.cpu0: completed 10000 read, 5411 write accesses @595334
-system.cpu5: completed 20000 read, 10869 write accesses @1154450
-system.cpu3: completed 20000 read, 10943 write accesses @1161279
-system.cpu1: completed 20000 read, 10969 write accesses @1165235
-system.cpu2: completed 20000 read, 10883 write accesses @1170873
-system.cpu4: completed 20000 read, 10908 write accesses @1171882
-system.cpu0: completed 20000 read, 10807 write accesses @1172431
-system.cpu6: completed 20000 read, 10859 write accesses @1174037
-system.cpu7: completed 20000 read, 11017 write accesses @1183706
-system.cpu5: completed 30000 read, 16441 write accesses @1743020
-system.cpu3: completed 30000 read, 16218 write accesses @1743361
-system.cpu0: completed 30000 read, 16106 write accesses @1749355
-system.cpu6: completed 30000 read, 16285 write accesses @1751262
-system.cpu2: completed 30000 read, 16334 write accesses @1752944
-system.cpu1: completed 30000 read, 16624 write accesses @1754412
-system.cpu4: completed 30000 read, 16300 write accesses @1756493
-system.cpu7: completed 30000 read, 16545 write accesses @1761662
-system.cpu5: completed 40000 read, 21903 write accesses @2321871
-system.cpu2: completed 40000 read, 21777 write accesses @2328122
-system.cpu6: completed 40000 read, 21684 write accesses @2328788
-system.cpu0: completed 40000 read, 21584 write accesses @2333159
-system.cpu4: completed 40000 read, 21691 write accesses @2333509
-system.cpu3: completed 40000 read, 21802 write accesses @2335052
-system.cpu1: completed 40000 read, 21911 write accesses @2336699
-system.cpu7: completed 40000 read, 21984 write accesses @2354153
-system.cpu3: completed 50000 read, 27199 write accesses @2900098
-system.cpu6: completed 50000 read, 26980 write accesses @2908928
-system.cpu2: completed 50000 read, 27238 write accesses @2909195
-system.cpu5: completed 50000 read, 27250 write accesses @2913605
-system.cpu4: completed 50000 read, 26997 write accesses @2920489
-system.cpu0: completed 50000 read, 27072 write accesses @2924735
-system.cpu1: completed 50000 read, 27407 write accesses @2925503
-system.cpu7: completed 50000 read, 27387 write accesses @2927681
-system.cpu2: completed 60000 read, 32632 write accesses @3474793
-system.cpu6: completed 60000 read, 32472 write accesses @3482759
-system.cpu3: completed 60000 read, 32504 write accesses @3487367
-system.cpu0: completed 60000 read, 32401 write accesses @3493294
-system.cpu4: completed 60000 read, 32171 write accesses @3498890
-system.cpu5: completed 60000 read, 32778 write accesses @3503066
-system.cpu1: completed 60000 read, 32891 write accesses @3509381
-system.cpu7: completed 60000 read, 32765 write accesses @3516772
-system.cpu2: completed 70000 read, 38066 write accesses @4058828
-system.cpu3: completed 70000 read, 37916 write accesses @4058910
-system.cpu6: completed 70000 read, 37885 write accesses @4063852
-system.cpu4: completed 70000 read, 37622 write accesses @4080369
-system.cpu0: completed 70000 read, 37925 write accesses @4085861
-system.cpu5: completed 70000 read, 38249 write accesses @4094801
-system.cpu1: completed 70000 read, 38488 write accesses @4095495
-system.cpu7: completed 70000 read, 38117 write accesses @4097708
-system.cpu2: completed 80000 read, 43433 write accesses @4639406
-system.cpu3: completed 80000 read, 43416 write accesses @4647614
-system.cpu6: completed 80000 read, 43333 write accesses @4648301
-system.cpu5: completed 80000 read, 43562 write accesses @4662354
-system.cpu0: completed 80000 read, 43227 write accesses @4664558
-system.cpu4: completed 80000 read, 43117 write accesses @4665549
-system.cpu1: completed 80000 read, 43838 write accesses @4675271
-system.cpu7: completed 80000 read, 43557 write accesses @4676998
-system.cpu2: completed 90000 read, 48793 write accesses @5208478
-system.cpu3: completed 90000 read, 48771 write accesses @5220479
-system.cpu6: completed 90000 read, 48900 write accesses @5227295
-system.cpu5: completed 90000 read, 48930 write accesses @5242795
-system.cpu1: completed 90000 read, 49220 write accesses @5246394
-system.cpu0: completed 90000 read, 48602 write accesses @5246963
-system.cpu4: completed 90000 read, 48456 write accesses @5248509
-system.cpu7: completed 90000 read, 48936 write accesses @5260982
-system.cpu2: completed 100000 read, 54294 write accesses @5795833
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+system.cpu4: completed 10000 read, 5516 write accesses @584228
+system.cpu5: completed 10000 read, 5515 write accesses @587183
+system.cpu1: completed 10000 read, 5491 write accesses @591446
+system.cpu7: completed 10000 read, 5626 write accesses @595409
+system.cpu2: completed 10000 read, 5637 write accesses @596437
+system.cpu6: completed 10000 read, 5437 write accesses @597608
+system.cpu3: completed 10000 read, 5738 write accesses @597986
+system.cpu0: completed 10000 read, 5730 write accesses @601184
+system.cpu4: completed 20000 read, 11120 write accesses @1170250
+system.cpu6: completed 20000 read, 10900 write accesses @1171579
+system.cpu3: completed 20000 read, 11193 write accesses @1184267
+system.cpu1: completed 20000 read, 11047 write accesses @1190135
+system.cpu5: completed 20000 read, 11070 write accesses @1191953
+system.cpu7: completed 20000 read, 11317 write accesses @1192073
+system.cpu2: completed 20000 read, 11059 write accesses @1192934
+system.cpu0: completed 20000 read, 11218 write accesses @1196582
+system.cpu6: completed 30000 read, 16404 write accesses @1756097
+system.cpu4: completed 30000 read, 16698 write accesses @1768219
+system.cpu7: completed 30000 read, 16835 write accesses @1769427
+system.cpu3: completed 30000 read, 16672 write accesses @1773026
+system.cpu1: completed 30000 read, 16602 write accesses @1773962
+system.cpu0: completed 30000 read, 16781 write accesses @1777262
+system.cpu5: completed 30000 read, 16565 write accesses @1782900
+system.cpu2: completed 30000 read, 16614 write accesses @1785263
+system.cpu6: completed 40000 read, 22003 write accesses @2340507
+system.cpu1: completed 40000 read, 22145 write accesses @2358116
+system.cpu0: completed 40000 read, 22355 write accesses @2364775
+system.cpu7: completed 40000 read, 22565 write accesses @2374538
+system.cpu2: completed 40000 read, 22222 write accesses @2375711
+system.cpu4: completed 40000 read, 22294 write accesses @2376781
+system.cpu3: completed 40000 read, 22360 write accesses @2377205
+system.cpu5: completed 40000 read, 22099 write accesses @2379118
+system.cpu6: completed 50000 read, 27600 write accesses @2941333
+system.cpu1: completed 50000 read, 27821 write accesses @2946145
+system.cpu0: completed 50000 read, 27935 write accesses @2959151
+system.cpu2: completed 50000 read, 27794 write accesses @2968804
+system.cpu3: completed 50000 read, 27849 write accesses @2971166
+system.cpu5: completed 50000 read, 27657 write accesses @2977357
+system.cpu4: completed 50000 read, 27828 write accesses @2978259
+system.cpu7: completed 50000 read, 28284 write accesses @2978857
+system.cpu6: completed 60000 read, 33178 write accesses @3536924
+system.cpu1: completed 60000 read, 33394 write accesses @3543961
+system.cpu2: completed 60000 read, 33230 write accesses @3549333
+system.cpu0: completed 60000 read, 33564 write accesses @3564287
+system.cpu3: completed 60000 read, 33336 write accesses @3569137
+system.cpu4: completed 60000 read, 33587 write accesses @3570593
+system.cpu5: completed 60000 read, 33166 write accesses @3576647
+system.cpu7: completed 60000 read, 33832 write accesses @3577075
+system.cpu6: completed 70000 read, 38652 write accesses @4137461
+system.cpu2: completed 70000 read, 38824 write accesses @4141010
+system.cpu1: completed 70000 read, 39043 write accesses @4142171
+system.cpu4: completed 70000 read, 39136 write accesses @4148986
+system.cpu5: completed 70000 read, 38716 write accesses @4161730
+system.cpu0: completed 70000 read, 39119 write accesses @4165271
+system.cpu3: completed 70000 read, 38875 write accesses @4169555
+system.cpu7: completed 70000 read, 39501 write accesses @4176068
+system.cpu6: completed 80000 read, 44287 write accesses @4740297
+system.cpu2: completed 80000 read, 44433 write accesses @4742323
+system.cpu4: completed 80000 read, 44799 write accesses @4743294
+system.cpu0: completed 80000 read, 44555 write accesses @4750388
+system.cpu1: completed 80000 read, 44835 write accesses @4751884
+system.cpu5: completed 80000 read, 44235 write accesses @4755731
+system.cpu3: completed 80000 read, 44536 write accesses @4756531
+system.cpu7: completed 80000 read, 45051 write accesses @4789789
+system.cpu2: completed 90000 read, 50085 write accesses @5331779
+system.cpu1: completed 90000 read, 50520 write accesses @5335067
+system.cpu6: completed 90000 read, 50077 write accesses @5343428
+system.cpu4: completed 90000 read, 50348 write accesses @5344112
+system.cpu5: completed 90000 read, 49814 write accesses @5348125
+system.cpu3: completed 90000 read, 50170 write accesses @5349617
+system.cpu0: completed 90000 read, 50102 write accesses @5350612
+system.cpu7: completed 90000 read, 50733 write accesses @5394074
+system.cpu1: completed 100000 read, 56034 write accesses @5920895
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 12c7c969e..0a7886e85 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
@@ -220,7 +220,7 @@ sys_clk_domain=system.clk_domain
transition_latency=100000
[system.funcbus]
-type=NoncoherentBus
+type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
header_cycles=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr
index 5a7e36bf9..b3b846e79 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr
@@ -6,76 +6,80 @@ warn: rounding error > tolerance
0.072760 rounded to 0
warn: rounding error > tolerance
0.072760 rounded to 0
-system.cpu4: completed 10000 read, 5267 write accesses @855219
-system.cpu7: completed 10000 read, 5381 write accesses @861031
-system.cpu1: completed 10000 read, 5262 write accesses @863126
-system.cpu2: completed 10000 read, 5381 write accesses @864460
-system.cpu0: completed 10000 read, 5401 write accesses @867419
-system.cpu3: completed 10000 read, 5382 write accesses @869141
-system.cpu5: completed 10000 read, 5455 write accesses @872828
-system.cpu6: completed 10000 read, 5482 write accesses @879392
-system.cpu7: completed 20000 read, 10628 write accesses @1724117
-system.cpu2: completed 20000 read, 10953 write accesses @1730360
-system.cpu1: completed 20000 read, 10550 write accesses @1730621
-system.cpu3: completed 20000 read, 10808 write accesses @1733195
-system.cpu4: completed 20000 read, 10816 write accesses @1737229
-system.cpu0: completed 20000 read, 10790 write accesses @1746955
-system.cpu6: completed 20000 read, 11016 write accesses @1749077
-system.cpu5: completed 20000 read, 10800 write accesses @1759742
-system.cpu3: completed 30000 read, 16255 write accesses @2586824
-system.cpu7: completed 30000 read, 15936 write accesses @2587214
-system.cpu0: completed 30000 read, 16091 write accesses @2589409
-system.cpu2: completed 30000 read, 16288 write accesses @2595682
-system.cpu4: completed 30000 read, 16193 write accesses @2610317
-system.cpu6: completed 30000 read, 16368 write accesses @2614352
-system.cpu5: completed 30000 read, 16095 write accesses @2624564
-system.cpu1: completed 30000 read, 16153 write accesses @2637701
-system.cpu7: completed 40000 read, 21310 write accesses @3438977
-system.cpu0: completed 40000 read, 21543 write accesses @3451234
-system.cpu2: completed 40000 read, 21712 write accesses @3460847
-system.cpu3: completed 40000 read, 21652 write accesses @3468818
-system.cpu6: completed 40000 read, 21709 write accesses @3479513
-system.cpu4: completed 40000 read, 21724 write accesses @3497567
-system.cpu5: completed 40000 read, 21477 write accesses @3498797
-system.cpu1: completed 40000 read, 21640 write accesses @3521390
-system.cpu7: completed 50000 read, 26683 write accesses @4309027
-system.cpu2: completed 50000 read, 27008 write accesses @4319999
-system.cpu0: completed 50000 read, 26993 write accesses @4330940
-system.cpu6: completed 50000 read, 27072 write accesses @4336165
-system.cpu3: completed 50000 read, 27085 write accesses @4352827
-system.cpu5: completed 50000 read, 26964 write accesses @4357459
-system.cpu4: completed 50000 read, 27198 write accesses @4384075
-system.cpu1: completed 50000 read, 27029 write accesses @4398757
-system.cpu7: completed 60000 read, 32063 write accesses @5160248
-system.cpu0: completed 60000 read, 32443 write accesses @5203475
-system.cpu2: completed 60000 read, 32367 write accesses @5205683
-system.cpu6: completed 60000 read, 32517 write accesses @5225171
-system.cpu3: completed 60000 read, 32534 write accesses @5227022
-system.cpu5: completed 60000 read, 32552 write accesses @5229640
-system.cpu1: completed 60000 read, 32592 write accesses @5258417
-system.cpu4: completed 60000 read, 32682 write accesses @5263781
-system.cpu7: completed 70000 read, 37467 write accesses @6033043
-system.cpu0: completed 70000 read, 37995 write accesses @6081225
-system.cpu6: completed 70000 read, 37873 write accesses @6089309
-system.cpu3: completed 70000 read, 38002 write accesses @6091981
-system.cpu2: completed 70000 read, 37862 write accesses @6093259
-system.cpu5: completed 70000 read, 38035 write accesses @6114916
-system.cpu1: completed 70000 read, 38024 write accesses @6119174
-system.cpu4: completed 70000 read, 38117 write accesses @6129370
-system.cpu7: completed 80000 read, 42779 write accesses @6903893
-system.cpu0: completed 80000 read, 43420 write accesses @6927865
-system.cpu6: completed 80000 read, 43280 write accesses @6952004
-system.cpu3: completed 80000 read, 43445 write accesses @6966407
-system.cpu5: completed 80000 read, 43493 write accesses @6966458
-system.cpu2: completed 80000 read, 43456 write accesses @6967571
-system.cpu1: completed 80000 read, 43311 write accesses @6981707
-system.cpu4: completed 80000 read, 43712 write accesses @7010960
-system.cpu7: completed 90000 read, 48212 write accesses @7781504
-system.cpu0: completed 90000 read, 49018 write accesses @7809551
-system.cpu6: completed 90000 read, 48768 write accesses @7821401
-system.cpu2: completed 90000 read, 48919 write accesses @7841558
-system.cpu1: completed 90000 read, 48631 write accesses @7843811
-system.cpu3: completed 90000 read, 49017 write accesses @7850422
-system.cpu5: completed 90000 read, 49075 write accesses @7851926
-system.cpu4: completed 90000 read, 49432 write accesses @7874435
-system.cpu7: completed 100000 read, 53796 write accesses @8664886
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+warn: rounding error > tolerance
+ 0.072760 rounded to 0
+system.cpu0: completed 10000 read, 5556 write accesses @879323
+system.cpu7: completed 10000 read, 5668 write accesses @879866
+system.cpu4: completed 10000 read, 5446 write accesses @880130
+system.cpu2: completed 10000 read, 5618 write accesses @882610
+system.cpu3: completed 10000 read, 5567 write accesses @889766
+system.cpu5: completed 10000 read, 5601 write accesses @889804
+system.cpu6: completed 10000 read, 5691 write accesses @907393
+system.cpu1: completed 10000 read, 5703 write accesses @911150
+system.cpu0: completed 20000 read, 11066 write accesses @1759277
+system.cpu7: completed 20000 read, 11260 write accesses @1770595
+system.cpu4: completed 20000 read, 11011 write accesses @1777119
+system.cpu2: completed 20000 read, 11410 write accesses @1779287
+system.cpu3: completed 20000 read, 11162 write accesses @1783007
+system.cpu5: completed 20000 read, 11166 write accesses @1789252
+system.cpu6: completed 20000 read, 11205 write accesses @1795677
+system.cpu1: completed 20000 read, 11246 write accesses @1799288
+system.cpu0: completed 30000 read, 16538 write accesses @2628765
+system.cpu4: completed 30000 read, 16331 write accesses @2649038
+system.cpu3: completed 30000 read, 16729 write accesses @2656841
+system.cpu7: completed 30000 read, 16821 write accesses @2657779
+system.cpu2: completed 30000 read, 16942 write accesses @2665738
+system.cpu6: completed 30000 read, 16767 write accesses @2683028
+system.cpu5: completed 30000 read, 16740 write accesses @2683223
+system.cpu1: completed 30000 read, 16843 write accesses @2687354
+system.cpu0: completed 40000 read, 21978 write accesses @3518323
+system.cpu4: completed 40000 read, 21923 write accesses @3532643
+system.cpu2: completed 40000 read, 22312 write accesses @3539629
+system.cpu7: completed 40000 read, 22397 write accesses @3540563
+system.cpu3: completed 40000 read, 22394 write accesses @3545743
+system.cpu1: completed 40000 read, 22522 write accesses @3569491
+system.cpu6: completed 40000 read, 22217 write accesses @3571115
+system.cpu5: completed 40000 read, 22361 write accesses @3575245
+system.cpu0: completed 50000 read, 27412 write accesses @4395937
+system.cpu4: completed 50000 read, 27504 write accesses @4402816
+system.cpu2: completed 50000 read, 27861 write accesses @4421377
+system.cpu7: completed 50000 read, 28050 write accesses @4432946
+system.cpu3: completed 50000 read, 28057 write accesses @4453484
+system.cpu5: completed 50000 read, 28091 write accesses @4459262
+system.cpu6: completed 50000 read, 27767 write accesses @4466993
+system.cpu1: completed 50000 read, 28057 write accesses @4473556
+system.cpu0: completed 60000 read, 33045 write accesses @5302811
+system.cpu2: completed 60000 read, 33521 write accesses @5307713
+system.cpu4: completed 60000 read, 33106 write accesses @5309735
+system.cpu3: completed 60000 read, 33613 write accesses @5326889
+system.cpu7: completed 60000 read, 33738 write accesses @5327419
+system.cpu1: completed 60000 read, 33648 write accesses @5345018
+system.cpu6: completed 60000 read, 33262 write accesses @5350442
+system.cpu5: completed 60000 read, 33765 write accesses @5365882
+system.cpu4: completed 70000 read, 38688 write accesses @6177299
+system.cpu0: completed 70000 read, 38751 write accesses @6203477
+system.cpu2: completed 70000 read, 39098 write accesses @6206063
+system.cpu3: completed 70000 read, 39126 write accesses @6219412
+system.cpu1: completed 70000 read, 39169 write accesses @6222370
+system.cpu6: completed 70000 read, 38802 write accesses @6223076
+system.cpu7: completed 70000 read, 39595 write accesses @6226670
+system.cpu5: completed 70000 read, 39326 write accesses @6257626
+system.cpu4: completed 80000 read, 44383 write accesses @7068978
+system.cpu2: completed 80000 read, 44769 write accesses @7095466
+system.cpu3: completed 80000 read, 44569 write accesses @7095782
+system.cpu0: completed 80000 read, 44509 write accesses @7100023
+system.cpu6: completed 80000 read, 44542 write accesses @7108504
+system.cpu1: completed 80000 read, 44592 write accesses @7113439
+system.cpu7: completed 80000 read, 45281 write accesses @7113500
+system.cpu5: completed 80000 read, 44911 write accesses @7150684
+system.cpu4: completed 90000 read, 50048 write accesses @7961758
+system.cpu0: completed 90000 read, 49958 write accesses @7968130
+system.cpu2: completed 90000 read, 50371 write accesses @7973060
+system.cpu3: completed 90000 read, 50104 write accesses @7976843
+system.cpu7: completed 90000 read, 50805 write accesses @7986452
+system.cpu6: completed 90000 read, 50102 write accesses @7998542
+system.cpu1: completed 90000 read, 50241 write accesses @7999593
+system.cpu5: completed 90000 read, 50481 write accesses @8039612
+system.cpu7: completed 100000 read, 56250 write accesses @8851106