summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt2
-rw-r--r--tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt1
-rw-r--r--tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt1
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt1
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt2
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt1
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt1
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt2
-rw-r--r--tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt36
-rw-r--r--tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/long/se/30.eon/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/long/se/40.perlbmk/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/long/se/50.vortex/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/long/se/60.bzip2/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/long/se/70.twolf/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini17
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt12
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini17
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt12
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini19
-rw-r--r--tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini19
-rw-r--r--tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats.txt3
-rw-r--r--tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt4
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini5
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt42
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt24
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini3
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt42
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini3
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt30
50 files changed, 154 insertions, 315 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
index 9c4d04cdf..5cabf17a2 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt
@@ -1084,7 +1084,6 @@ system.cpu0.idleCycles 39960467 # To
system.cpu0.quiesceCycles 3695221845 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu0.committedInsts 48300626 # Number of Instructions Simulated
system.cpu0.committedOps 48300626 # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total 48300626 # Number of Instructions Simulated
system.cpu0.cpi 2.403165 # CPI: Cycles Per Instruction
system.cpu0.cpi_total 2.403165 # CPI: Total CPI of All Threads
system.cpu0.ipc 0.416118 # IPC: Instructions Per Cycle
@@ -1819,7 +1818,6 @@ system.cpu1.idleCycles 861019 # To
system.cpu1.quiesceCycles 3795679739 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu1.committedInsts 8410372 # Number of Instructions Simulated
system.cpu1.committedOps 8410372 # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total 8410372 # Number of Instructions Simulated
system.cpu1.cpi 1.779309 # CPI: Cycles Per Instruction
system.cpu1.cpi_total 1.779309 # CPI: Total CPI of All Threads
system.cpu1.ipc 0.562016 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
index 272c07d73..eda12d3cf 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt
@@ -765,7 +765,6 @@ system.cpu.idleCycles 40774499 # To
system.cpu.quiesceCycles 3598399845 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu.committedInsts 52979638 # Number of Instructions Simulated
system.cpu.committedOps 52979638 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 52979638 # Number of Instructions Simulated
system.cpu.cpi 2.302193 # CPI: Cycles Per Instruction
system.cpu.cpi_total 2.302193 # CPI: Total CPI of All Threads
system.cpu.ipc 0.434368 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
index 14b9e6b0f..d0b0c157e 100644
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt
@@ -1854,7 +1854,6 @@ system.cpu2.idleCycles 3893863 # To
system.cpu2.quiesceCycles 1748379581 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu2.committedInsts 31517609 # Number of Instructions Simulated
system.cpu2.committedOps 31517609 # Number of Ops (including micro ops) Simulated
-system.cpu2.committedInsts_total 31517609 # Number of Instructions Simulated
system.cpu2.cpi 0.994228 # CPI: Cycles Per Instruction
system.cpu2.cpi_total 0.994228 # CPI: Total CPI of All Threads
system.cpu2.ipc 1.005806 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
index 2c9e78fdf..7fa449dce 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
@@ -918,7 +918,6 @@ system.cpu.idleCycles 322801694 # To
system.cpu.quiesceCycles 4575172520 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu.committedInsts 60309034 # Number of Instructions Simulated
system.cpu.committedOps 77600502 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 60309034 # Number of Instructions Simulated
system.cpu.cpi 7.911400 # CPI: Cycles Per Instruction
system.cpu.cpi_total 7.911400 # CPI: Total CPI of All Threads
system.cpu.ipc 0.126400 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
index 97a804211..3626d40ac 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
@@ -1338,7 +1338,6 @@ system.cpu0.idleCycles 27854788 # To
system.cpu0.quiesceCycles 5140997105 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu0.committedInsts 23990835 # Number of Instructions Simulated
system.cpu0.committedOps 31708821 # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total 23990835 # Number of Instructions Simulated
system.cpu0.cpi 2.928128 # CPI: Cycles Per Instruction
system.cpu0.cpi_total 2.928128 # CPI: Total CPI of All Threads
system.cpu0.ipc 0.341515 # IPC: Instructions Per Cycle
@@ -2005,7 +2004,6 @@ system.cpu1.idleCycles 296058429 # To
system.cpu1.quiesceCycles 4796946974 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu1.committedInsts 38803971 # Number of Instructions Simulated
system.cpu1.committedOps 49144375 # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total 38803971 # Number of Instructions Simulated
system.cpu1.cpi 10.661121 # CPI: Cycles Per Instruction
system.cpu1.cpi_total 10.661121 # CPI: Total CPI of All Threads
system.cpu1.ipc 0.093799 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
index d345e80f2..4ddd9308a 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
@@ -831,7 +831,6 @@ system.cpu.idleCycles 322801694 # To
system.cpu.quiesceCycles 4575172520 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu.committedInsts 60309034 # Number of Instructions Simulated
system.cpu.committedOps 77600502 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 60309034 # Number of Instructions Simulated
system.cpu.cpi 7.911400 # CPI: Cycles Per Instruction
system.cpu.cpi_total 7.911400 # CPI: Total CPI of All Threads
system.cpu.ipc 0.126400 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
index 8f1b31c18..60f6414c0 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
@@ -2007,7 +2007,6 @@ system.cpu2.idleCycles 50897008 # To
system.cpu2.quiesceCycles 3546076715 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu2.committedInsts 20499567 # Number of Instructions Simulated
system.cpu2.committedOps 25336997 # Number of Ops (including micro ops) Simulated
-system.cpu2.committedInsts_total 20499567 # Number of Instructions Simulated
system.cpu2.cpi 4.308205 # CPI: Cycles Per Instruction
system.cpu2.cpi_total 4.308205 # CPI: Total CPI of All Threads
system.cpu2.ipc 0.232115 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
index 2ae3638d8..bff238873 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
@@ -1307,7 +1307,6 @@ system.cpu0.idleCycles 162972938 # To
system.cpu0.quiesceCycles 2247980405 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu0.committedInsts 30002566 # Number of Instructions Simulated
system.cpu0.committedOps 39142879 # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total 30002566 # Number of Instructions Simulated
system.cpu0.cpi 8.074798 # CPI: Cycles Per Instruction
system.cpu0.cpi_total 8.074798 # CPI: Total CPI of All Threads
system.cpu0.ipc 0.123842 # IPC: Instructions Per Cycle
@@ -2078,7 +2077,6 @@ system.cpu1.idleCycles 160084473 # To
system.cpu1.quiesceCycles 2317121408 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu1.committedInsts 30313431 # Number of Instructions Simulated
system.cpu1.committedOps 38467115 # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total 30313431 # Number of Instructions Simulated
system.cpu1.cpi 7.813189 # CPI: Cycles Per Instruction
system.cpu1.cpi_total 7.813189 # CPI: Total CPI of All Threads
system.cpu1.ipc 0.127989 # IPC: Instructions Per Cycle
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
index 69bdeab1f..e979c11e3 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -259,12 +259,12 @@ system.physmem.memoryStateTime::PRE_PDN 0 # Ti
system.physmem.memoryStateTime::ACT 0 # Time in different power states
system.physmem.memoryStateTime::ACT_PDN 0 # Time in different power states
system.ruby.clk_domain.clock 500 # Clock period in ticks
-system.ruby.delayHist::bucket_size 2 # delay histogram for all message
-system.ruby.delayHist::max_bucket 19 # delay histogram for all message
+system.ruby.delayHist::bucket_size 4 # delay histogram for all message
+system.ruby.delayHist::max_bucket 39 # delay histogram for all message
system.ruby.delayHist::samples 10864248 # delay histogram for all message
-system.ruby.delayHist::mean 0.221600 # delay histogram for all message
-system.ruby.delayHist::stdev 0.915697 # delay histogram for all message
-system.ruby.delayHist | 10262737 94.46% 94.46% | 1567 0.01% 94.48% | 599477 5.52% 100.00% | 172 0.00% 100.00% | 242 0.00% 100.00% | 9 0.00% 100.00% | 44 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 0.443134 # delay histogram for all message
+system.ruby.delayHist::stdev 1.831153 # delay histogram for all message
+system.ruby.delayHist | 10262857 94.46% 94.46% | 1509 0.01% 94.48% | 599467 5.52% 100.00% | 131 0.00% 100.00% | 231 0.00% 100.00% | 9 0.00% 100.00% | 44 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 10864248 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 1
system.ruby.outstanding_req_hist::max_bucket 9
@@ -854,25 +854,25 @@ system.ruby.network.routers5.throttle4.msg_count.Response_Data::1 811
system.ruby.network.routers5.throttle4.msg_count.Writeback_Control::1 46736
system.ruby.network.routers5.throttle4.msg_bytes.Response_Data::1 58392
system.ruby.network.routers5.throttle4.msg_bytes.Writeback_Control::1 373888
-system.ruby.delayVCHist.vnet_0::bucket_size 2 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::max_bucket 19 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::bucket_size 4 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::max_bucket 39 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::samples 6099117 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean 0.377316 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev 1.170385 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0 | 5524398 90.58% 90.58% | 438 0.01% 90.58% | 573820 9.41% 99.99% | 170 0.00% 100.00% | 238 0.00% 100.00% | 9 0.00% 100.00% | 44 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean 0.754514 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev 2.340449 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0 | 5524518 90.58% 90.58% | 380 0.01% 90.59% | 573810 9.41% 99.99% | 129 0.00% 100.00% | 227 0.00% 100.00% | 9 0.00% 100.00% | 44 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::total 6099117 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::bucket_size 2 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::max_bucket 19 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::samples 4683733 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean 0.022443 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev 0.297350 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean 0.044886 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev 0.594700 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1 | 4656826 99.43% 99.43% | 417 0.01% 99.43% | 407 0.01% 99.44% | 552 0.01% 99.45% | 25430 0.54% 100.00% | 99 0.00% 100.00% | 0 0.00% 100.00% | 1 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::total 4683733 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_2::bucket_size 1 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::max_bucket 9 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::bucket_size 2 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::max_bucket 19 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::samples 81398 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean 0.013600 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev 0.216236 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean 0.027200 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev 0.432471 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2 | 80998 99.51% 99.51% | 98 0.12% 99.63% | 74 0.09% 99.72% | 96 0.12% 99.84% | 98 0.12% 99.96% | 30 0.04% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 2 0.00% 100.00% | 1 0.00% 100.00% # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::total 81398 # delay histogram for vnet_2
system.ruby.LD.latency_hist::bucket_size 16
diff --git a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
index 0e2c469d2..a24a01894 100644
--- a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
@@ -625,7 +625,6 @@ system.cpu.timesIdled 46113 # Nu
system.cpu.idleCycles 391152 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 90589798 # Number of Instructions Simulated
system.cpu.committedOps 91240351 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 90589798 # Number of Instructions Simulated
system.cpu.cpi 0.594090 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.594090 # CPI: Total CPI of All Threads
system.cpu.ipc 1.683247 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/30.eon/ref/alpha/tru64/o3-timing/stats.txt b/tests/long/se/30.eon/ref/alpha/tru64/o3-timing/stats.txt
index 1b726b2c6..3dc3e1150 100644
--- a/tests/long/se/30.eon/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/alpha/tru64/o3-timing/stats.txt
@@ -570,7 +570,6 @@ system.cpu.timesIdled 3592 # Nu
system.cpu.idleCycles 298582 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 375574808 # Number of Instructions Simulated
system.cpu.committedOps 375574808 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 375574808 # Number of Instructions Simulated
system.cpu.cpi 0.413010 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.413010 # CPI: Total CPI of All Threads
system.cpu.ipc 2.421251 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
index 9ff03dde6..c61e70c3d 100644
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
@@ -625,7 +625,6 @@ system.cpu.timesIdled 6746 # Nu
system.cpu.idleCycles 353987 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 273036725 # Number of Instructions Simulated
system.cpu.committedOps 349064449 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 273036725 # Number of Instructions Simulated
system.cpu.cpi 0.502059 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.502059 # CPI: Total CPI of All Threads
system.cpu.ipc 1.991799 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/40.perlbmk/ref/alpha/tru64/o3-timing/stats.txt b/tests/long/se/40.perlbmk/ref/alpha/tru64/o3-timing/stats.txt
index 139fd1f12..2a5fe76f4 100644
--- a/tests/long/se/40.perlbmk/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/long/se/40.perlbmk/ref/alpha/tru64/o3-timing/stats.txt
@@ -596,7 +596,6 @@ system.cpu.timesIdled 347595 # Nu
system.cpu.idleCycles 15020639 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 1823043370 # Number of Instructions Simulated
system.cpu.committedOps 1823043370 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 1823043370 # Number of Instructions Simulated
system.cpu.cpi 0.690121 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.690121 # CPI: Total CPI of All Threads
system.cpu.ipc 1.449021 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
index 23a63d881..e51d34500 100644
--- a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
@@ -651,7 +651,6 @@ system.cpu.timesIdled 352856 # Nu
system.cpu.idleCycles 41281940 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 1384370590 # Number of Instructions Simulated
system.cpu.committedOps 1885325342 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 1384370590 # Number of Instructions Simulated
system.cpu.cpi 0.908415 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.908415 # CPI: Total CPI of All Threads
system.cpu.ipc 1.100818 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/50.vortex/ref/alpha/tru64/o3-timing/stats.txt b/tests/long/se/50.vortex/ref/alpha/tru64/o3-timing/stats.txt
index 1536d4b0d..118121be3 100644
--- a/tests/long/se/50.vortex/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/long/se/50.vortex/ref/alpha/tru64/o3-timing/stats.txt
@@ -599,7 +599,6 @@ system.cpu.timesIdled 83887 # Nu
system.cpu.idleCycles 4610712 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 79591756 # Number of Instructions Simulated
system.cpu.committedOps 79591756 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 79591756 # Number of Instructions Simulated
system.cpu.cpi 0.619064 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.619064 # CPI: Total CPI of All Threads
system.cpu.ipc 1.615341 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
index 5913e1c51..ee5d7b3a8 100644
--- a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
@@ -656,7 +656,6 @@ system.cpu.timesIdled 79510 # Nu
system.cpu.idleCycles 6993412 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 70907629 # Number of Instructions Simulated
system.cpu.committedOps 100626876 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 70907629 # Number of Instructions Simulated
system.cpu.cpi 0.751825 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.751825 # CPI: Total CPI of All Threads
system.cpu.ipc 1.330098 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/60.bzip2/ref/alpha/tru64/o3-timing/stats.txt b/tests/long/se/60.bzip2/ref/alpha/tru64/o3-timing/stats.txt
index c3541208a..aae431db6 100644
--- a/tests/long/se/60.bzip2/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/long/se/60.bzip2/ref/alpha/tru64/o3-timing/stats.txt
@@ -614,7 +614,6 @@ system.cpu.timesIdled 949757 # Nu
system.cpu.idleCycles 80170517 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 1736043781 # Number of Instructions Simulated
system.cpu.committedOps 1736043781 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 1736043781 # Number of Instructions Simulated
system.cpu.cpi 0.783631 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.783631 # CPI: Total CPI of All Threads
system.cpu.ipc 1.276110 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
index 980e25610..8a3d4d605 100644
--- a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
@@ -667,7 +667,6 @@ system.cpu.timesIdled 1153872 # Nu
system.cpu.idleCycles 90540825 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 1544563023 # Number of Instructions Simulated
system.cpu.committedOps 1723073835 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 1544563023 # Number of Instructions Simulated
system.cpu.cpi 0.684188 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.684188 # CPI: Total CPI of All Threads
system.cpu.ipc 1.461586 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/70.twolf/ref/alpha/tru64/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/alpha/tru64/o3-timing/stats.txt
index c2ef654cc..a6580fdc8 100644
--- a/tests/long/se/70.twolf/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/alpha/tru64/o3-timing/stats.txt
@@ -570,7 +570,6 @@ system.cpu.timesIdled 5418 # Nu
system.cpu.idleCycles 255072 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 84179709 # Number of Instructions Simulated
system.cpu.committedOps 84179709 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 84179709 # Number of Instructions Simulated
system.cpu.cpi 0.558231 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.558231 # CPI: Total CPI of All Threads
system.cpu.ipc 1.791373 # IPC: Instructions Per Cycle
diff --git a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
index d4466739f..59645b4d8 100644
--- a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
@@ -624,7 +624,6 @@ system.cpu.timesIdled 2789 # Nu
system.cpu.idleCycles 194714 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 172303021 # Number of Instructions Simulated
system.cpu.committedOps 188656503 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 172303021 # Number of Instructions Simulated
system.cpu.cpi 0.861373 # CPI: Cycles Per Instruction
system.cpu.cpi_total 0.861373 # CPI: Total CPI of All Threads
system.cpu.ipc 1.160937 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
index 33f9c5fe9..489f9221e 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
@@ -569,7 +569,6 @@ system.cpu.timesIdled 272 # Nu
system.cpu.idleCycles 27051 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 6372 # Number of Instructions Simulated
system.cpu.committedOps 6372 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 6372 # Number of Instructions Simulated
system.cpu.cpi 6.599341 # CPI: Cycles Per Instruction
system.cpu.cpi_total 6.599341 # CPI: Total CPI of All Threads
system.cpu.ipc 0.151530 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
index 3f8bf1cf2..27b1ed20b 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -294,9 +285,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -349,6 +337,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
index 351b1338b..088293227 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -17,9 +17,9 @@ system.ruby.clk_domain.clock 1 # Cl
system.ruby.delayHist::bucket_size 1 # delay histogram for all message
system.ruby.delayHist::max_bucket 9 # delay histogram for all message
system.ruby.delayHist::samples 9645 # delay histogram for all message
-system.ruby.delayHist::mean 0.060135 # delay histogram for all message
-system.ruby.delayHist::stdev 0.486773 # delay histogram for all message
-system.ruby.delayHist | 9500 98.50% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 145 1.50% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 0.120270 # delay histogram for all message
+system.ruby.delayHist::stdev 0.973545 # delay histogram for all message
+system.ruby.delayHist | 9500 98.50% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 0 0.00% 98.50% | 145 1.50% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 9645 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 1
system.ruby.outstanding_req_hist::max_bucket 9
@@ -333,9 +333,9 @@ system.ruby.network.routers3.throttle2.msg_bytes.Response_Control::1 940
system.ruby.delayVCHist.vnet_0::bucket_size 1 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::max_bucket 9 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::samples 2725 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean 0.212844 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev 0.897981 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0 | 2580 94.68% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 145 5.32% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean 0.425688 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev 1.795962 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0 | 2580 94.68% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 0 0.00% 94.68% | 145 5.32% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::total 2725 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 6929a8fb6..2cd590f14 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -279,9 +270,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -333,6 +321,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 815cf3090..e94a21fc3 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -290,9 +281,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -346,6 +334,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index 539f8d093..39febcadf 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -314,9 +305,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -336,6 +324,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
index 13126b600..a2d0a5bf8 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -262,9 +253,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -284,6 +272,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
index 5be5fa9ed..8c004be4e 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
@@ -570,7 +570,6 @@ system.cpu.timesIdled 157 # Nu
system.cpu.idleCycles 16247 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 2387 # Number of Instructions Simulated
system.cpu.committedOps 2387 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 2387 # Number of Instructions Simulated
system.cpu.cpi 10.034353 # CPI: Cycles Per Instruction
system.cpu.cpi_total 10.034353 # CPI: Total CPI of All Threads
system.cpu.ipc 0.099658 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
index 96554f51d..1f5f9ed94 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -294,9 +285,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -349,6 +337,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
index d01144a54..a58d5939b 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -17,9 +17,9 @@ system.ruby.clk_domain.clock 1 # Cl
system.ruby.delayHist::bucket_size 1 # delay histogram for all message
system.ruby.delayHist::max_bucket 9 # delay histogram for all message
system.ruby.delayHist::samples 3612 # delay histogram for all message
-system.ruby.delayHist::mean 0.049834 # delay histogram for all message
-system.ruby.delayHist::stdev 0.443742 # delay histogram for all message
-system.ruby.delayHist | 3567 98.75% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 45 1.25% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 0.099668 # delay histogram for all message
+system.ruby.delayHist::stdev 0.887483 # delay histogram for all message
+system.ruby.delayHist | 3567 98.75% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 0 0.00% 98.75% | 45 1.25% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 3612 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 1
system.ruby.outstanding_req_hist::max_bucket 9
@@ -332,9 +332,9 @@ system.ruby.network.routers3.throttle2.msg_bytes.Response_Control::1 348
system.ruby.delayVCHist.vnet_0::bucket_size 1 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::max_bucket 9 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::samples 968 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean 0.185950 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev 0.842590 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0 | 923 95.35% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 45 4.65% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean 0.371901 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev 1.685180 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0 | 923 95.35% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 0 0.00% 95.35% | 45 4.65% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::total 968 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 5bf00383f..b2a981b16 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -279,9 +270,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -333,6 +321,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
index 215d8c7dd..40b91a3e0 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
@@ -290,9 +281,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.l2_cntrl0]
@@ -346,6 +334,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
index 80f383f10..861278961 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -314,9 +305,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -336,6 +324,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
index 06b17a491..46419073b 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -110,7 +111,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
max_stack_size=67108864
@@ -133,16 +134,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -262,9 +253,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -284,6 +272,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
index 06219c218..52eced7fc 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
@@ -706,7 +706,6 @@ system.cpu.timesIdled 221 # Nu
system.cpu.idleCycles 20659 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 4591 # Number of Instructions Simulated
system.cpu.committedOps 5729 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 4591 # Number of Instructions Simulated
system.cpu.cpi 7.386408 # CPI: Cycles Per Instruction
system.cpu.cpi_total 7.386408 # CPI: Total CPI of All Threads
system.cpu.ipc 0.135384 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
index 41f6b039e..f55ae4f77 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
@@ -619,7 +619,6 @@ system.cpu.timesIdled 221 # Nu
system.cpu.idleCycles 20659 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 4591 # Number of Instructions Simulated
system.cpu.committedOps 5729 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 4591 # Number of Instructions Simulated
system.cpu.cpi 7.386408 # CPI: Cycles Per Instruction
system.cpu.cpi_total 7.386408 # CPI: Total CPI of All Threads
system.cpu.ipc 0.135384 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
index 6e934b1b9..dc9e77234 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
@@ -554,7 +554,6 @@ system.cpu.timesIdled 287 # Nu
system.cpu.idleCycles 29189 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 5156 # Number of Instructions Simulated
system.cpu.committedOps 5156 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 5156 # Number of Instructions Simulated
system.cpu.cpi 8.473235 # CPI: Cycles Per Instruction
system.cpu.cpi_total 8.473235 # CPI: Total CPI of All Threads
system.cpu.ipc 0.118019 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
index bb822211b..a69535826 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -112,7 +113,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/mips/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -135,16 +136,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -264,9 +255,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -286,6 +274,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
index 810e47329..47a5a4172 100644
--- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
@@ -551,7 +551,6 @@ system.cpu.timesIdled 247 # Nu
system.cpu.idleCycles 26190 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 5792 # Number of Instructions Simulated
system.cpu.committedOps 5792 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 5792 # Number of Instructions Simulated
system.cpu.cpi 6.571478 # CPI: Cycles Per Instruction
system.cpu.cpi_total 6.571478 # CPI: Total CPI of All Threads
system.cpu.ipc 0.152173 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index ff0dc56e6..d718c5982 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -65,6 +65,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -109,7 +110,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/sparc/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -132,16 +133,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -261,9 +252,6 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port
[system.ruby.memctrl_clk_domain]
@@ -283,6 +271,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
diff --git a/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats.txt b/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats.txt
index 343b8a125..46bc957fd 100644
--- a/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats.txt
+++ b/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/stats.txt
@@ -708,9 +708,10 @@ system.cpu.timesIdled 384 # Nu
system.cpu.idleCycles 19567 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts::0 6372 # Number of Instructions Simulated
system.cpu.committedInsts::1 6373 # Number of Instructions Simulated
+system.cpu.committedInsts::total 12745 # Number of Instructions Simulated
system.cpu.committedOps::0 6372 # Number of Ops (including micro ops) Simulated
system.cpu.committedOps::1 6373 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 12745 # Number of Instructions Simulated
+system.cpu.committedOps::total 12745 # Number of Ops (including micro ops) Simulated
system.cpu.cpi::0 7.696485 # CPI: Cycles Per Instruction
system.cpu.cpi::1 7.695277 # CPI: Cycles Per Instruction
system.cpu.cpi_total 3.847940 # CPI: Total CPI of All Threads
diff --git a/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt b/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt
index a29a98d10..68fda33e0 100644
--- a/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt
+++ b/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt
@@ -532,7 +532,6 @@ system.cpu.timesIdled 211 # Nu
system.cpu.idleCycles 19883 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu.committedInsts 14436 # Number of Instructions Simulated
system.cpu.committedOps 14436 # Number of Ops (including micro ops) Simulated
-system.cpu.committedInsts_total 14436 # Number of Instructions Simulated
system.cpu.cpi 3.700055 # CPI: Cycles Per Instruction
system.cpu.cpi_total 3.700055 # CPI: Total CPI of All Threads
system.cpu.ipc 0.270266 # IPC: Instructions Per Cycle
diff --git a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt
index 8ec8c1281..e8e12eadf 100644
--- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt
+++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt
@@ -1021,7 +1021,6 @@ system.cpu0.timesIdled 327 # Nu
system.cpu0.idleCycles 25026 # Total number of cycles that the CPU has spent unscheduled due to idling
system.cpu0.committedInsts 396236 # Number of Instructions Simulated
system.cpu0.committedOps 396236 # Number of Ops (including micro ops) Simulated
-system.cpu0.committedInsts_total 396236 # Number of Instructions Simulated
system.cpu0.cpi 0.559631 # CPI: Cycles Per Instruction
system.cpu0.cpi_total 0.559631 # CPI: Total CPI of All Threads
system.cpu0.ipc 1.786891 # IPC: Instructions Per Cycle
@@ -1547,7 +1546,6 @@ system.cpu1.idleCycles 2209 # To
system.cpu1.quiesceCycles 44103 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu1.committedInsts 208040 # Number of Instructions Simulated
system.cpu1.committedOps 208040 # Number of Ops (including micro ops) Simulated
-system.cpu1.committedInsts_total 208040 # Number of Instructions Simulated
system.cpu1.cpi 0.853879 # CPI: Cycles Per Instruction
system.cpu1.cpi_total 0.853879 # CPI: Total CPI of All Threads
system.cpu1.ipc 1.171126 # IPC: Instructions Per Cycle
@@ -2067,7 +2065,6 @@ system.cpu2.idleCycles 5482 # To
system.cpu2.quiesceCycles 44468 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu2.committedInsts 201372 # Number of Instructions Simulated
system.cpu2.committedOps 201372 # Number of Ops (including micro ops) Simulated
-system.cpu2.committedInsts_total 201372 # Number of Instructions Simulated
system.cpu2.cpi 0.880341 # CPI: Cycles Per Instruction
system.cpu2.cpi_total 0.880341 # CPI: Total CPI of All Threads
system.cpu2.ipc 1.135924 # IPC: Instructions Per Cycle
@@ -2589,7 +2586,6 @@ system.cpu3.idleCycles 1387 # To
system.cpu3.quiesceCycles 44814 # Total number of cycles that CPU has spent quiesced or waiting for an interrupt
system.cpu3.committedInsts 236440 # Number of Instructions Simulated
system.cpu3.committedOps 236440 # Number of Ops (including micro ops) Simulated
-system.cpu3.committedInsts_total 236440 # Number of Instructions Simulated
system.cpu3.cpi 0.748308 # CPI: Cycles Per Instruction
system.cpu3.cpi_total 0.748308 # CPI: Total CPI of All Threads
system.cpu3.ipc 1.336348 # IPC: Instructions Per Cycle
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 a7931ea6d..e9a6efb57 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
@@ -18,9 +18,10 @@ eventq_index=0
init_param=0
kernel=
load_addr_mask=1099511627775
+load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
num_work_ids=16
readfile=
symbolfile=
@@ -1024,6 +1025,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 system.ruby.network.ext_links9
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 system.ruby.network.int_links9
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers00 system.ruby.network.routers01 system.ruby.network.routers02 system.ruby.network.routers03 system.ruby.network.routers04 system.ruby.network.routers05 system.ruby.network.routers06 system.ruby.network.routers07 system.ruby.network.routers08 system.ruby.network.routers09 system.ruby.network.routers10
ruby_system=system.ruby
@@ -1315,7 +1317,6 @@ ruby_system=system.ruby
support_data_reqs=true
support_inst_reqs=true
system=system
-using_network_tester=false
using_ruby_tester=false
version=0
slave=system.system_port
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt
index 6ebaf5618..1999d7a63 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt
@@ -4,18 +4,18 @@ 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 104409 # Simulator tick rate (ticks/s)
-host_mem_usage 258924 # Number of bytes of host memory used
-host_seconds 69.51 # Real time elapsed on the host
+host_tick_rate 65093 # Simulator tick rate (ticks/s)
+host_mem_usage 307624 # Number of bytes of host memory used
+host_seconds 111.49 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1 # Clock period in ticks
system.ruby.clk_domain.clock 1 # Clock period in ticks
-system.ruby.delayHist::bucket_size 128 # delay histogram for all message
-system.ruby.delayHist::max_bucket 1279 # delay histogram for all message
+system.ruby.delayHist::bucket_size 2048 # delay histogram for all message
+system.ruby.delayHist::max_bucket 20479 # delay histogram for all message
system.ruby.delayHist::samples 4856797 # delay histogram for all message
-system.ruby.delayHist::mean 43.408236 # delay histogram for all message
-system.ruby.delayHist::stdev 104.143628 # delay histogram for all message
-system.ruby.delayHist | 4186631 86.20% 86.20% | 269978 5.56% 91.76% | 294293 6.06% 97.82% | 99069 2.04% 99.86% | 6676 0.14% 100.00% | 136 0.00% 100.00% | 10 0.00% 100.00% | 4 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 140.290599 # delay histogram for all message
+system.ruby.delayHist::stdev 396.072179 # delay histogram for all message
+system.ruby.delayHist | 4821310 99.27% 99.27% | 35358 0.73% 100.00% | 117 0.00% 100.00% | 10 0.00% 100.00% | 1 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 4856797 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 2
system.ruby.outstanding_req_hist::max_bucket 19
@@ -696,25 +696,25 @@ system.ruby.network.routers10.throttle9.msg_count.Response_Control::1 3920
system.ruby.network.routers10.throttle9.msg_bytes.Control::0 4839984
system.ruby.network.routers10.throttle9.msg_bytes.Response_Data::1 15332760
system.ruby.network.routers10.throttle9.msg_bytes.Response_Control::1 3136272
-system.ruby.delayVCHist.vnet_0::bucket_size 128 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::max_bucket 1279 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::bucket_size 2048 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::max_bucket 20479 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::samples 1535534 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean 133.923584 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev 149.364101 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0 | 865368 56.36% 56.36% | 269978 17.58% 73.94% | 294293 19.17% 93.10% | 99069 6.45% 99.56% | 6676 0.43% 99.99% | 136 0.01% 100.00% | 10 0.00% 100.00% | 4 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean 436.982452 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev 606.134727 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0 | 1500047 97.69% 97.69% | 35358 2.30% 99.99% | 117 0.01% 100.00% | 10 0.00% 100.00% | 1 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::total 1535534 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_1::bucket_size 4 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::max_bucket 39 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::bucket_size 8 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::max_bucket 79 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::samples 2729880 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean 1.399630 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev 2.333392 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean 2.799261 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev 4.666784 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1 | 2250926 82.46% 82.46% | 389307 14.26% 96.72% | 78202 2.86% 99.58% | 10480 0.38% 99.96% | 901 0.03% 100.00% | 62 0.00% 100.00% | 2 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::total 2729880 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_2::bucket_size 4 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::max_bucket 39 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::bucket_size 8 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::max_bucket 79 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::samples 591383 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean 2.299610 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev 3.368994 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean 4.599219 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev 6.737987 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2 | 425660 71.98% 71.98% | 117728 19.91% 91.88% | 32866 5.56% 97.44% | 10210 1.73% 99.17% | 3255 0.55% 99.72% | 1210 0.20% 99.92% | 371 0.06% 99.99% | 72 0.01% 100.00% | 9 0.00% 100.00% | 2 0.00% 100.00% # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::total 591383 # delay histogram for vnet_2
system.ruby.LD.latency_hist::bucket_size 512
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 ab5af9666..ef37353bc 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,18 +4,18 @@ 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 261960 # Simulator tick rate (ticks/s)
-host_mem_usage 257512 # Number of bytes of host memory used
-host_seconds 33.08 # Real time elapsed on the host
+host_tick_rate 160889 # Simulator tick rate (ticks/s)
+host_mem_usage 306216 # Number of bytes of host memory used
+host_seconds 53.86 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1 # Clock period in ticks
system.ruby.clk_domain.clock 1 # Clock period in ticks
system.ruby.delayHist::bucket_size 4 # delay histogram for all message
system.ruby.delayHist::max_bucket 39 # delay histogram for all message
system.ruby.delayHist::samples 1237687 # delay histogram for all message
-system.ruby.delayHist::mean 0.007239 # delay histogram for all message
-system.ruby.delayHist::stdev 0.160082 # delay histogram for all message
-system.ruby.delayHist | 1236765 99.93% 99.93% | 900 0.07% 100.00% | 1 0.00% 100.00% | 5 0.00% 100.00% | 15 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 0.014190 # delay histogram for all message
+system.ruby.delayHist::stdev 0.298328 # delay histogram for all message
+system.ruby.delayHist | 1235151 99.80% 99.80% | 1617 0.13% 99.93% | 897 0.07% 100.00% | 6 0.00% 100.00% | 12 0.00% 100.00% | 3 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 1237687 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 2
system.ruby.outstanding_req_hist::max_bucket 19
@@ -364,16 +364,16 @@ system.ruby.network.routers9.throttle8.msg_bytes.Data::2 44060256
system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::samples 617552 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean 0.001010 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev 0.051774 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1 | 617290 99.96% 99.96% | 38 0.01% 99.96% | 102 0.02% 99.98% | 106 0.02% 100.00% | 16 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean 0.002021 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev 0.103548 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1 | 617290 99.96% 99.96% | 0 0.00% 99.96% | 38 0.01% 99.96% | 0 0.00% 99.96% | 102 0.02% 99.98% | 0 0.00% 99.98% | 106 0.02% 100.00% | 0 0.00% 100.00% | 16 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::total 617552 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_2::bucket_size 4 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::max_bucket 39 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::samples 620135 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean 0.013442 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev 0.219998 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2 | 619229 99.85% 99.85% | 884 0.14% 100.00% | 1 0.00% 100.00% | 5 0.00% 100.00% | 15 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean 0.026309 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev 0.408237 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2 | 617823 99.63% 99.63% | 1409 0.23% 99.85% | 881 0.14% 100.00% | 6 0.00% 100.00% | 12 0.00% 100.00% | 3 0.00% 100.00% | 1 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::total 620135 # delay histogram for vnet_2
system.ruby.LD.latency_hist::bucket_size 512
system.ruby.LD.latency_hist::max_bucket 5119
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
index f288a7a31..9af8818a4 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
@@ -18,6 +18,7 @@ eventq_index=0
init_param=0
kernel=
load_addr_mask=1099511627775
+load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.physmem
@@ -254,6 +255,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
@@ -356,7 +358,6 @@ ruby_system=system.ruby
support_data_reqs=true
support_inst_reqs=true
system=system
-using_network_tester=false
using_ruby_tester=false
version=0
slave=system.system_port
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
index c90fc8b43..232cc5435 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
@@ -4,18 +4,18 @@ sim_seconds 0.000318 # Nu
sim_ticks 318321 # Number of ticks simulated
final_tick 318321 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 2101304 # Simulator tick rate (ticks/s)
-host_mem_usage 123592 # Number of bytes of host memory used
-host_seconds 0.15 # Real time elapsed on the host
+host_tick_rate 1460796 # Simulator tick rate (ticks/s)
+host_mem_usage 172332 # Number of bytes of host memory used
+host_seconds 0.22 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1 # Clock period in ticks
system.ruby.clk_domain.clock 1 # Clock period in ticks
-system.ruby.delayHist::bucket_size 256 # delay histogram for all message
-system.ruby.delayHist::max_bucket 2559 # delay histogram for all message
+system.ruby.delayHist::bucket_size 512 # delay histogram for all message
+system.ruby.delayHist::max_bucket 5119 # delay histogram for all message
system.ruby.delayHist::samples 7069 # delay histogram for all message
-system.ruby.delayHist::mean 39.915405 # delay histogram for all message
-system.ruby.delayHist::stdev 159.246921 # delay histogram for all message
-system.ruby.delayHist | 6692 94.67% 94.67% | 139 1.97% 96.63% | 139 1.97% 98.60% | 61 0.86% 99.46% | 23 0.33% 99.79% | 13 0.18% 99.97% | 2 0.03% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
+system.ruby.delayHist::mean 56.481964 # delay histogram for all message
+system.ruby.delayHist::stdev 265.833648 # delay histogram for all message
+system.ruby.delayHist | 6800 96.19% 96.19% | 151 2.14% 98.33% | 60 0.85% 99.18% | 30 0.42% 99.60% | 15 0.21% 99.82% | 7 0.10% 99.92% | 2 0.03% 99.94% | 2 0.03% 99.97% | 1 0.01% 99.99% | 1 0.01% 100.00% # delay histogram for all message
system.ruby.delayHist::total 7069 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 2
system.ruby.outstanding_req_hist::max_bucket 19
@@ -243,25 +243,25 @@ system.ruby.network.routers3.throttle2.msg_count.Response_Control::1 8
system.ruby.network.routers3.throttle2.msg_bytes.Control::0 6992
system.ruby.network.routers3.throttle2.msg_bytes.Response_Data::1 56592
system.ruby.network.routers3.throttle2.msg_bytes.Response_Control::1 672
-system.ruby.delayVCHist.vnet_0::bucket_size 256 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::max_bucket 2559 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::bucket_size 512 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::max_bucket 5119 # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::samples 2530 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::mean 110.950593 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0::stdev 251.019614 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_0 | 2153 85.10% 85.10% | 139 5.49% 90.59% | 139 5.49% 96.09% | 61 2.41% 98.50% | 23 0.91% 99.41% | 13 0.51% 99.92% | 2 0.08% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::mean 156.662846 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0::stdev 426.445861 # delay histogram for vnet_0
+system.ruby.delayVCHist.vnet_0 | 2261 89.37% 89.37% | 151 5.97% 95.34% | 60 2.37% 97.71% | 30 1.19% 98.89% | 15 0.59% 99.49% | 7 0.28% 99.76% | 2 0.08% 99.84% | 2 0.08% 99.92% | 1 0.04% 99.96% | 1 0.04% 100.00% # delay histogram for vnet_0
system.ruby.delayVCHist.vnet_0::total 2530 # delay histogram for vnet_0
-system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::bucket_size 2 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::max_bucket 19 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::samples 3976 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean 0.342807 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev 1.048959 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean 0.685614 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev 2.097919 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1 | 3455 86.90% 86.90% | 133 3.35% 90.24% | 152 3.82% 94.06% | 135 3.40% 97.46% | 45 1.13% 98.59% | 25 0.63% 99.22% | 14 0.35% 99.57% | 8 0.20% 99.77% | 5 0.13% 99.90% | 4 0.10% 100.00% # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::total 3976 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_2::bucket_size 2 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::max_bucket 19 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::bucket_size 4 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::max_bucket 39 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::samples 563 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean 0.166963 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev 0.906977 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean 0.333925 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev 1.813954 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2 | 541 96.09% 96.09% | 8 1.42% 97.51% | 11 1.95% 99.47% | 1 0.18% 99.64% | 1 0.18% 99.82% | 1 0.18% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::total 563 # delay histogram for vnet_2
system.ruby.LD.latency_hist::bucket_size 1024
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
index 683949732..3318715cf 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
@@ -18,6 +18,7 @@ eventq_index=0
init_param=0
kernel=
load_addr_mask=1099511627775
+load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.physmem
@@ -238,6 +239,7 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
@@ -340,7 +342,6 @@ ruby_system=system.ruby
support_data_reqs=true
support_inst_reqs=true
system=system
-using_network_tester=false
using_ruby_tester=false
version=0
slave=system.system_port
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index 67ca7d426..83714cb16 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -4,17 +4,17 @@ sim_seconds 0.000222 # Nu
sim_ticks 221941 # Number of ticks simulated
final_tick 221941 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 3307860 # Simulator tick rate (ticks/s)
-host_mem_usage 122180 # Number of bytes of host memory used
-host_seconds 0.07 # Real time elapsed on the host
+host_tick_rate 2110232 # Simulator tick rate (ticks/s)
+host_mem_usage 170916 # Number of bytes of host memory used
+host_seconds 0.11 # Real time elapsed on the host
system.voltage_domain.voltage 1 # Voltage in Volts
system.clk_domain.clock 1 # Clock period in ticks
system.ruby.clk_domain.clock 1 # Clock period in ticks
-system.ruby.delayHist::bucket_size 2 # delay histogram for all message
-system.ruby.delayHist::max_bucket 19 # delay histogram for all message
+system.ruby.delayHist::bucket_size 4 # delay histogram for all message
+system.ruby.delayHist::max_bucket 39 # delay histogram for all message
system.ruby.delayHist::samples 1828 # delay histogram for all message
-system.ruby.delayHist::mean 0.280088 # delay histogram for all message
-system.ruby.delayHist::stdev 1.032741 # delay histogram for all message
+system.ruby.delayHist::mean 0.560175 # delay histogram for all message
+system.ruby.delayHist::stdev 2.065483 # delay histogram for all message
system.ruby.delayHist | 1690 92.45% 92.45% | 89 4.87% 97.32% | 33 1.81% 99.12% | 11 0.60% 99.73% | 4 0.22% 99.95% | 0 0.00% 99.95% | 1 0.05% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for all message
system.ruby.delayHist::total 1828 # delay histogram for all message
system.ruby.outstanding_req_hist::bucket_size 2
@@ -139,18 +139,18 @@ system.ruby.network.routers2.throttle1.msg_count.Control::2 916
system.ruby.network.routers2.throttle1.msg_count.Data::2 914
system.ruby.network.routers2.throttle1.msg_bytes.Control::2 7328
system.ruby.network.routers2.throttle1.msg_bytes.Data::2 65808
-system.ruby.delayVCHist.vnet_1::bucket_size 1 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::max_bucket 9 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::bucket_size 2 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::max_bucket 19 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::samples 916 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::mean 0.265284 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_1::stdev 0.915284 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::mean 0.530568 # delay histogram for vnet_1
+system.ruby.delayVCHist.vnet_1::stdev 1.830567 # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1 | 824 89.96% 89.96% | 19 2.07% 92.03% | 30 3.28% 95.31% | 28 3.06% 98.36% | 3 0.33% 98.69% | 6 0.66% 99.34% | 4 0.44% 99.78% | 2 0.22% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_1
system.ruby.delayVCHist.vnet_1::total 916 # delay histogram for vnet_1
-system.ruby.delayVCHist.vnet_2::bucket_size 2 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::max_bucket 19 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::bucket_size 4 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::max_bucket 39 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::samples 912 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::mean 0.294956 # delay histogram for vnet_2
-system.ruby.delayVCHist.vnet_2::stdev 1.138902 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::mean 0.589912 # delay histogram for vnet_2
+system.ruby.delayVCHist.vnet_2::stdev 2.277805 # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2 | 847 92.87% 92.87% | 31 3.40% 96.27% | 24 2.63% 98.90% | 5 0.55% 99.45% | 4 0.44% 99.89% | 0 0.00% 99.89% | 1 0.11% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% | 0 0.00% 100.00% # delay histogram for vnet_2
system.ruby.delayVCHist.vnet_2::total 912 # delay histogram for vnet_2
system.ruby.LD.latency_hist::bucket_size 512