summaryrefslogtreecommitdiff
path: root/tests/quick/se
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2015-03-09 09:39:09 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2015-03-09 09:39:09 -0500
commit99fb8f81407efa54008ddf443718e492f583b142 (patch)
tree48e79a13dc012864045058f6ca3aadc3b9a767a8 /tests/quick/se
parent0c8e025c3bd208e516f1c4247fdf3af7aebb2300 (diff)
downloadgem5-99fb8f81407efa54008ddf443718e492f583b142.tar.xz
stats: changes to due to recent set of patches
Diffstat (limited to 'tests/quick/se')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini15
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini15
-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-atomic/config.ini10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini13
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini15
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini15
-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-atomic/config.ini10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini18
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini21
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini37
-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/config.ini52
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini20
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini17
-rw-r--r--tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini25
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini21
-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-atomic/config.ini10
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini18
-rw-r--r--tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini21
-rw-r--r--tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini10
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini10
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini18
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini15
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini8
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini6
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini13
-rw-r--r--tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini23
-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/config.ini21
-rw-r--r--tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/stats.txt1
-rw-r--r--tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini10
-rw-r--r--tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini18
-rw-r--r--tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini17
-rw-r--r--tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/stats.txt4
-rw-r--r--tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini26
-rw-r--r--tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini26
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini168
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini168
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini168
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini168
-rw-r--r--tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini168
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini181
-rw-r--r--tests/quick/se/50.memtest/ref/null/none/memtest/config.ini177
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini6
-rw-r--r--tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini9
-rw-r--r--tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini16
68 files changed, 943 insertions, 995 deletions
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini
index 0f651c9f7..8776aa226 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -638,8 +639,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -693,11 +697,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -728,7 +735,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
index 9165579c2..2212e87d6 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -587,8 +588,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -642,11 +646,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -677,7 +684,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
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 edf4ba710..d3a56e05c 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.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 6389 # Class of committed instruction
system.cpu.commit.bw_lim_events 190 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 25491 # The number of ROB reads
system.cpu.rob.rob_writes 27316 # The number of ROB writes
system.cpu.timesIdled 260 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
index 50fa51df7..f5748224b 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -107,6 +108,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -115,6 +117,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -144,11 +147,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
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 8f9379027..566450d05 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -336,7 +340,6 @@ unit_filter=8
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -506,7 +509,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
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 f8cc14345..c453da7e6 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -321,7 +325,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -490,7 +493,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 e68e0eb6b..c97f7f381 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -338,7 +342,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -510,7 +513,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 8473e2239..df9dcb459 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -360,7 +364,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -464,7 +467,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 791e6db74..a0fdb76c4 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -305,7 +309,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -409,7 +412,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
index 8332a7a3a..4f89807d5 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -207,8 +208,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -262,11 +266,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
index 66098146a..b89f21c49 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -638,8 +639,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -693,11 +697,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -728,7 +735,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
index 19ac3530d..78a45bd07 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -587,8 +588,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -642,11 +646,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -677,7 +684,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
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 165a7d5f5..9e6af9059 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
@@ -569,7 +569,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 2576 # Class of committed instruction
system.cpu.commit.bw_lim_events 69 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 11659 # The number of ROB reads
system.cpu.rob.rob_writes 10686 # The number of ROB writes
system.cpu.timesIdled 151 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
index f69c898cb..b1961bd8d 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -107,6 +108,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -115,6 +117,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -144,11 +147,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
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 cfffbc558..58df6e402 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -336,7 +340,6 @@ unit_filter=8
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -506,7 +509,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
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 0dadccb22..7737f4b73 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -321,7 +325,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -490,7 +493,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 e1272a9ad..5ec342cb1 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -338,7 +342,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -510,7 +513,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 aaffdb113..8f4fa29a5 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -360,7 +364,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -464,7 +467,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
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 7b61f2363..a20d94574 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -111,6 +112,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -119,6 +121,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -163,7 +166,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -216,6 +219,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -305,7 +309,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -409,7 +412,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
index 402442761..ea66af4ee 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -82,6 +83,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -122,6 +124,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -171,6 +174,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -204,8 +208,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -220,6 +227,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -228,6 +236,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/tru64/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -257,11 +266,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini
index c7a245793..3d022001c 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -167,6 +168,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -184,7 +186,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[5]
[system.cpu.dtb]
type=ArmTLB
@@ -661,6 +662,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -678,7 +680,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[4]
[system.cpu.itb]
type=ArmTLB
@@ -737,13 +738,16 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
master=system.cpu.l2cache.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
[system.cpu.tracer]
type=ExeTracer
@@ -792,11 +796,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -827,7 +834,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini
index 78a71faf3..c26f32538 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -191,6 +192,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.checker.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.checker.dtb
[system.cpu.checker.dstage2_mmu.stage2_tlb]
@@ -208,7 +210,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[9]
[system.cpu.checker.dtb]
type=ArmTLB
@@ -225,7 +226,7 @@ eventq_index=0
is_stage2=false
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[7]
+port=system.cpu.toL2Bus.slave[5]
[system.cpu.checker.isa]
type=ArmISA
@@ -254,6 +255,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.checker.istage2_mmu]
@@ -261,6 +263,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.checker.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.checker.itb
[system.cpu.checker.istage2_mmu.stage2_tlb]
@@ -278,7 +281,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[8]
[system.cpu.checker.itb]
type=ArmTLB
@@ -295,7 +297,7 @@ eventq_index=0
is_stage2=false
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[6]
+port=system.cpu.toL2Bus.slave[4]
[system.cpu.checker.tracer]
type=ExeTracer
@@ -307,6 +309,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -341,6 +344,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -358,7 +362,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[5]
[system.cpu.dtb]
type=ArmTLB
@@ -690,6 +693,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -750,6 +754,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.istage2_mmu]
@@ -757,6 +762,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -774,7 +780,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[4]
[system.cpu.itb]
type=ArmTLB
@@ -799,6 +804,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -832,13 +838,16 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
master=system.cpu.l2cache.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port system.cpu.checker.itb.walker.port system.cpu.checker.dtb.walker.port system.cpu.checker.istage2_mmu.stage2_tlb.walker.port system.cpu.checker.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.checker.itb.walker.port system.cpu.checker.dtb.walker.port
[system.cpu.tracer]
type=ExeTracer
@@ -848,6 +857,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -856,6 +866,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -885,11 +896,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -920,7 +934,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -929,6 +943,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 eb7b98cb0..086544e33 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
@@ -773,7 +773,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 5377 # Class of committed instruction
system.cpu.commit.bw_lim_events 113 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 22770 # The number of ROB reads
system.cpu.rob.rob_writes 21679 # The number of ROB writes
system.cpu.timesIdled 199 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
index a1b6a8304..8f050d759 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -157,6 +158,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -191,6 +193,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -208,7 +211,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[5]
[system.cpu.dtb]
type=ArmTLB
@@ -498,6 +500,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=1
@@ -558,6 +561,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.istage2_mmu]
@@ -565,6 +569,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -582,7 +587,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[4]
[system.cpu.itb]
type=ArmTLB
@@ -607,6 +611,7 @@ children=prefetcher tags
addr_ranges=0:18446744073709551615
assoc=16
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=12
@@ -628,19 +633,27 @@ mem_side=system.membus.slave[1]
[system.cpu.l2cache.prefetcher]
type=StridePrefetcher
+cache_snoop=false
clk_domain=system.cpu_clk_domain
-cross_pages=false
-data_accesses_only=false
degree=8
eventq_index=0
-inst_tagged=true
latency=1
-on_miss_only=false
-on_prefetch=true
-on_read_only=false
-serial_squash=false
-size=100
+max_conf=7
+min_conf=0
+on_data=true
+on_inst=true
+on_miss=false
+on_read=true
+on_write=true
+queue_filter=true
+queue_size=32
+queue_squash=true
+start_conf=4
sys=system
+table_assoc=4
+table_sets=16
+tag_prefetch=true
+thresh_conf=4
use_master_id=true
[system.cpu.l2cache.tags]
@@ -657,13 +670,16 @@ size=1048576
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
master=system.cpu.l2cache.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
[system.cpu.tracer]
type=ExeTracer
@@ -673,6 +689,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -681,6 +698,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -710,11 +728,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -745,7 +766,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -754,6 +775,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 9add0d45b..1162c6d13 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
@@ -655,7 +655,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 5377 # Class of committed instruction
system.cpu.commit.bw_lim_events 44 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 22696 # The number of ROB reads
system.cpu.rob.rob_writes 16433 # The number of ROB writes
system.cpu.timesIdled 211 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
index 91da4c557..af3e16c1f 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -122,6 +123,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.checker.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.checker.dtb
[system.cpu.checker.dstage2_mmu.stage2_tlb]
@@ -183,6 +185,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.checker.istage2_mmu]
@@ -190,6 +193,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.checker.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.checker.itb
[system.cpu.checker.istage2_mmu.stage2_tlb]
@@ -233,6 +237,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -250,7 +255,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.membus.slave[6]
[system.cpu.dtb]
type=ArmTLB
@@ -300,6 +304,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.istage2_mmu]
@@ -307,6 +312,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -324,7 +330,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.membus.slave[5]
[system.cpu.itb]
type=ArmTLB
@@ -351,6 +356,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -359,6 +365,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -388,13 +395,16 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
-slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port
[system.physmem]
type=SimpleMemory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
index 2e24c6545..8f14d69f7 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -87,6 +88,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -104,7 +106,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.membus.slave[6]
[system.cpu.dtb]
type=ArmTLB
@@ -154,6 +155,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.istage2_mmu]
@@ -161,6 +163,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -178,7 +181,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.membus.slave[5]
[system.cpu.itb]
type=ArmTLB
@@ -205,6 +207,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -213,6 +216,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -242,13 +246,16 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
-slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port
[system.physmem]
type=SimpleMemory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
index 54668155a..5fb17fcaa 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -84,6 +85,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -118,6 +120,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.dtb
[system.cpu.dstage2_mmu.stage2_tlb]
@@ -135,7 +138,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[5]
[system.cpu.dtb]
type=ArmTLB
@@ -160,6 +162,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -220,6 +223,7 @@ id_mmfr3=34611729
id_pfr0=49
id_pfr1=4113
midr=1091551472
+pmu=Null
system=system
[system.cpu.istage2_mmu]
@@ -227,6 +231,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu.itb
[system.cpu.istage2_mmu.stage2_tlb]
@@ -244,7 +249,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.cpu.toL2Bus.slave[4]
[system.cpu.itb]
type=ArmTLB
@@ -269,6 +273,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -302,13 +307,16 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
master=system.cpu.l2cache.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
[system.cpu.tracer]
type=ExeTracer
@@ -318,6 +326,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -326,6 +335,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/arm/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -355,11 +365,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini
index 946ab8388..e8f178a23 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -155,6 +156,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -502,6 +504,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -553,6 +556,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -586,8 +590,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -602,6 +609,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -610,6 +618,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -639,11 +648,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -674,7 +686,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -683,6 +695,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 f65d4ed09..74a03945e 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
@@ -555,7 +555,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 5623 # Class of committed instruction
system.cpu.commit.bw_lim_events 103 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 23990 # The number of ROB reads
system.cpu.rob.rob_writes 21831 # The number of ROB writes
system.cpu.timesIdled 267 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini
index 4e242dacc..3d063a0b8 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -109,6 +110,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -117,6 +119,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -146,11 +149,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
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 8604f5de4..68740c2e9 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -113,6 +114,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -121,6 +123,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -165,7 +168,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -218,6 +221,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -307,7 +311,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -411,7 +414,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini
index e0e01d26c..01cbbe08b 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -82,6 +83,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -122,6 +124,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -173,6 +176,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -206,8 +210,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -222,6 +229,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -230,6 +238,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/mips/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -259,11 +268,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini
index 709f4f73b..e1985510b 100644
--- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -156,6 +157,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -503,6 +505,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -551,6 +554,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -584,8 +588,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -600,6 +607,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -608,6 +616,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/power/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -637,11 +646,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -672,7 +684,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -681,6 +693,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 c9ca56107..5e6b95b13 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
@@ -556,7 +556,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 5792 # Class of committed instruction
system.cpu.commit.bw_lim_events 110 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 22278 # The number of ROB reads
system.cpu.rob.rob_writes 21482 # The number of ROB writes
system.cpu.timesIdled 230 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini
index 00428c3e1..3bfe108d2 100644
--- a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -107,6 +108,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -115,6 +117,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/power/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -144,11 +147,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini
index 10cf57bb4..4603bc218 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -106,6 +107,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -114,6 +116,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -143,11 +146,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
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 8d6cf097f..2cde94243 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -110,6 +111,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -118,6 +120,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -162,7 +165,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -215,6 +218,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -304,7 +308,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -408,7 +411,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini
index e38847653..60f2b3295 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -82,6 +83,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -122,6 +124,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -170,6 +173,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -203,8 +207,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -219,6 +226,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -227,6 +235,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/sparc/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -256,11 +265,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
index 64e1a1f99..3a8953fb2 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -620,8 +621,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -675,11 +679,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port system.cpu.interrupts.pio system.cpu.interrupts.int_slave
slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_master
@@ -710,7 +717,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
index 8ea066b3b..7e789d2c1 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
@@ -536,7 +536,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 9747 # Class of committed instruction
system.cpu.commit.bw_lim_events 259 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 43058 # The number of ROB reads
system.cpu.rob.rob_writes 44876 # The number of ROB writes
system.cpu.timesIdled 157 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini
index 9ee52b54f..938ee4ed9 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -179,11 +180,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port system.cpu.interrupts.pio system.cpu.interrupts.int_slave
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 9bc617783..5d12ba5c2 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -198,7 +199,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -251,6 +252,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -340,7 +342,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -445,7 +446,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini
index 916d9b36b..001f21930 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -240,8 +241,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -295,11 +299,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port system.cpu.interrupts.pio system.cpu.interrupts.int_slave
slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_master
diff --git a/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini b/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini
index d358e4bd4..febd22775 100644
--- a/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini
+++ b/tests/quick/se/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -155,6 +156,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -502,6 +504,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -556,6 +559,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -589,8 +593,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -605,6 +612,7 @@ eventq_index=0
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -613,6 +621,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -626,6 +635,7 @@ useArchPT=false
type=LiveProcess
cmd=hello
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -634,6 +644,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -663,11 +674,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -698,7 +712,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -707,6 +721,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 3794759d9..1a4bdd660 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,6 @@ system.cpu.commit.op_class_1::InstPrefetch 0 0.00% 100.00% #
system.cpu.commit.op_class_1::total 6389 # Class of committed instruction
system.cpu.commit.op_class::total 12778 0.00% 0.00% # Class of committed instruction
system.cpu.commit.bw_lim_events 325 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited::0 0 # number of insts not committed due to BW limits
-system.cpu.commit.bw_limited::1 0 # number of insts not committed due to BW limits
-system.cpu.commit.bw_limited::total 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 130940 # The number of ROB reads
system.cpu.rob.rob_writes 58397 # The number of ROB writes
system.cpu.timesIdled 389 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini
index 144f058d7..3156d1d19 100644
--- a/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini
+++ b/tests/quick/se/02.insttest/ref/sparc/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -155,6 +156,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -502,6 +504,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -550,6 +553,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -583,8 +587,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -599,6 +606,7 @@ eventq_index=0
type=LiveProcess
cmd=insttest
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -607,6 +615,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/insttest/bin/sparc/linux/insttest
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -636,11 +645,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
@@ -671,7 +683,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -680,6 +692,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
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 fe03e9faf..6c1b2fdec 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
@@ -533,7 +533,6 @@ system.cpu.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu.commit.op_class_0::total 15162 # Class of committed instruction
system.cpu.commit.bw_lim_events 272 # number cycles where commit BW limit reached
-system.cpu.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu.rob.rob_reads 54715 # The number of ROB reads
system.cpu.rob.rob_writes 52974 # The number of ROB writes
system.cpu.timesIdled 200 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini
index fc4381d3d..03bf761da 100644
--- a/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/quick/se/02.insttest/ref/sparc/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -106,6 +107,7 @@ eventq_index=0
type=LiveProcess
cmd=insttest
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -114,6 +116,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/insttest/bin/sparc/linux/insttest
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -143,11 +146,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.icache_port system.cpu.dcache_port
diff --git a/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini
index 727287e35..5a5031a15 100644
--- a/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/quick/se/02.insttest/ref/sparc/linux/simple-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -82,6 +83,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -122,6 +124,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -170,6 +173,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -203,8 +207,11 @@ size=2097152
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
width=32
@@ -219,6 +226,7 @@ eventq_index=0
type=LiveProcess
cmd=insttest
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -227,6 +235,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/insttest/bin/sparc/linux/insttest
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -256,11 +265,14 @@ transition_latency=100000000
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.cpu.l2cache.mem_side
diff --git a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini
index 8f525a009..4a4cc509f 100644
--- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini
+++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/o3-timing-mp/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -2150,11 +2151,14 @@ size=4194304
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.l2c.mem_side
@@ -2185,7 +2189,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -2239,11 +2243,14 @@ port=system.membus.master[0]
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
-width=8
+width=32
master=system.l2c.cpu_side
slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu2.icache.mem_side system.cpu2.dcache.mem_side system.cpu3.icache.mem_side system.cpu3.dcache.mem_side
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 948908ba0..97adbdaa9 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
@@ -563,7 +563,6 @@ system.cpu0.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu0.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu0.commit.op_class_0::total 450384 # Class of committed instruction
system.cpu0.commit.bw_lim_events 494 # number cycles where commit BW limit reached
-system.cpu0.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu0.rob.rob_reads 649458 # The number of ROB reads
system.cpu0.rob.rob_writes 931043 # The number of ROB writes
system.cpu0.timesIdled 314 # Number of times that the entire CPU went into an idle state and unscheduled itself
@@ -1087,7 +1086,6 @@ system.cpu1.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu1.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu1.commit.op_class_0::total 251602 # Class of committed instruction
system.cpu1.commit.bw_lim_events 1312 # number cycles where commit BW limit reached
-system.cpu1.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu1.rob.rob_reads 417798 # The number of ROB reads
system.cpu1.rob.rob_writes 534614 # The number of ROB writes
system.cpu1.timesIdled 216 # Number of times that the entire CPU went into an idle state and unscheduled itself
@@ -1607,7 +1605,6 @@ system.cpu2.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu2.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu2.commit.op_class_0::total 246921 # Class of committed instruction
system.cpu2.commit.bw_lim_events 1310 # number cycles where commit BW limit reached
-system.cpu2.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu2.rob.rob_reads 416888 # The number of ROB reads
system.cpu2.rob.rob_writes 525783 # The number of ROB writes
system.cpu2.timesIdled 205 # Number of times that the entire CPU went into an idle state and unscheduled itself
@@ -2128,7 +2125,6 @@ system.cpu3.commit.op_class_0::IprAccess 0 0.00% 100.00% # Cl
system.cpu3.commit.op_class_0::InstPrefetch 0 0.00% 100.00% # Class of committed instruction
system.cpu3.commit.op_class_0::total 238347 # Class of committed instruction
system.cpu3.commit.bw_lim_events 1300 # number cycles where commit BW limit reached
-system.cpu3.commit.bw_limited 0 # number of insts not committed due to BW limits
system.cpu3.rob.rob_reads 408052 # The number of ROB reads
system.cpu3.rob.rob_writes 507784 # The number of ROB writes
system.cpu3.timesIdled 206 # Number of times that the entire CPU went into an idle state and unscheduled itself
diff --git a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini
index dc830ef72..0b278b17c 100644
--- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini
+++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -86,6 +87,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -126,6 +128,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -176,6 +179,7 @@ eventq_index=0
type=LiveProcess
cmd=test_atomic 4
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -184,6 +188,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/m5threads/bin/sparc/linux/test_atomic
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -236,6 +241,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -276,6 +282,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -365,6 +372,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -405,6 +413,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -494,6 +503,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -534,6 +544,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -602,6 +613,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -635,11 +647,14 @@ size=4194304
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.l2c.mem_side
@@ -660,11 +675,14 @@ port=system.membus.master[0]
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
-width=8
+width=32
master=system.l2c.cpu_side
slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu2.icache.mem_side system.cpu2.dcache.mem_side system.cpu3.icache.mem_side system.cpu3.dcache.mem_side
diff --git a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini
index 2ad22e920..68e115348 100644
--- a/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini
+++ b/tests/quick/se/40.m5threads-test-atomic/ref/sparc/linux/simple-timing-mp/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -82,6 +83,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -122,6 +124,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -172,6 +175,7 @@ eventq_index=0
type=LiveProcess
cmd=test_atomic 4
cwd=
+drivers=
egid=100
env=
errout=cerr
@@ -180,6 +184,7 @@ eventq_index=0
executable=/scratch/nilay/GEM5/gem5/tests/test-progs/m5threads/bin/sparc/linux/test_atomic
gid=100
input=cin
+kvmInSE=false
max_stack_size=67108864
output=cout
pid=100
@@ -228,6 +233,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -268,6 +274,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -353,6 +360,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -393,6 +401,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -478,6 +487,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -518,6 +528,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -586,6 +597,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -619,11 +631,14 @@ size=4194304
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
master=system.physmem.port
slave=system.system_port system.l2c.mem_side
@@ -644,11 +659,14 @@ port=system.membus.master[0]
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
-width=8
+width=32
master=system.l2c.cpu_side
slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu2.icache.mem_side system.cpu2.dcache.mem_side system.cpu3.icache.mem_side system.cpu3.dcache.mem_side
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 2056212e7..5b3edc5fa 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
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
[system.cpu_clk_domain]
type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.mem_ctrls]
type=DRAMCtrl
IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -442,7 +389,6 @@ unit_filter=8
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=1000000
@@ -456,7 +402,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -531,7 +477,6 @@ unit_filter=8
[system.ruby.l1_cntrl1.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl1.L1Dcache
deadlock_threshold=1000000
@@ -545,7 +490,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
[system.ruby.l1_cntrl2]
type=L1Cache_Controller
@@ -620,7 +565,6 @@ unit_filter=8
[system.ruby.l1_cntrl2.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl2.L1Dcache
deadlock_threshold=1000000
@@ -634,7 +578,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
[system.ruby.l1_cntrl3]
type=L1Cache_Controller
@@ -709,7 +653,6 @@ unit_filter=8
[system.ruby.l1_cntrl3.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl3.L1Dcache
deadlock_threshold=1000000
@@ -723,7 +666,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
[system.ruby.l1_cntrl4]
type=L1Cache_Controller
@@ -798,7 +741,6 @@ unit_filter=8
[system.ruby.l1_cntrl4.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl4.L1Dcache
deadlock_threshold=1000000
@@ -812,7 +754,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
[system.ruby.l1_cntrl5]
type=L1Cache_Controller
@@ -887,7 +829,6 @@ unit_filter=8
[system.ruby.l1_cntrl5.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl5.L1Dcache
deadlock_threshold=1000000
@@ -901,7 +842,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
[system.ruby.l1_cntrl6]
type=L1Cache_Controller
@@ -976,7 +917,6 @@ unit_filter=8
[system.ruby.l1_cntrl6.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl6.L1Dcache
deadlock_threshold=1000000
@@ -990,7 +930,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
[system.ruby.l1_cntrl7]
type=L1Cache_Controller
@@ -1065,7 +1005,6 @@ unit_filter=8
[system.ruby.l1_cntrl7.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl7.L1Dcache
deadlock_threshold=1000000
@@ -1079,7 +1018,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -1424,7 +1363,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index 0c7adcd05..f3306cd28 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
[system.cpu_clk_domain]
type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.mem_ctrls]
type=DRAMCtrl
IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -427,7 +374,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=1000000
@@ -441,7 +387,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -500,7 +446,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl1.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl1.L1Dcache
deadlock_threshold=1000000
@@ -514,7 +459,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
[system.ruby.l1_cntrl2]
type=L1Cache_Controller
@@ -573,7 +518,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl2.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl2.L1Dcache
deadlock_threshold=1000000
@@ -587,7 +531,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
[system.ruby.l1_cntrl3]
type=L1Cache_Controller
@@ -646,7 +590,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl3.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl3.L1Dcache
deadlock_threshold=1000000
@@ -660,7 +603,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
[system.ruby.l1_cntrl4]
type=L1Cache_Controller
@@ -719,7 +662,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl4.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl4.L1Dcache
deadlock_threshold=1000000
@@ -733,7 +675,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
[system.ruby.l1_cntrl5]
type=L1Cache_Controller
@@ -792,7 +734,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl5.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl5.L1Dcache
deadlock_threshold=1000000
@@ -806,7 +747,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
[system.ruby.l1_cntrl6]
type=L1Cache_Controller
@@ -865,7 +806,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl6.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl6.L1Dcache
deadlock_threshold=1000000
@@ -879,7 +819,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
[system.ruby.l1_cntrl7]
type=L1Cache_Controller
@@ -938,7 +878,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl7.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl7.L1Dcache
deadlock_threshold=1000000
@@ -952,7 +891,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -1296,7 +1235,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index f99cf2ff6..149e26f4e 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
[system.cpu_clk_domain]
type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.mem_ctrls]
type=DRAMCtrl
IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -444,7 +391,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=1000000
@@ -458,7 +404,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -526,7 +472,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl1.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl1.L1Dcache
deadlock_threshold=1000000
@@ -540,7 +485,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
[system.ruby.l1_cntrl2]
type=L1Cache_Controller
@@ -608,7 +553,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl2.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl2.L1Dcache
deadlock_threshold=1000000
@@ -622,7 +566,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
[system.ruby.l1_cntrl3]
type=L1Cache_Controller
@@ -690,7 +634,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl3.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl3.L1Dcache
deadlock_threshold=1000000
@@ -704,7 +647,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
[system.ruby.l1_cntrl4]
type=L1Cache_Controller
@@ -772,7 +715,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl4.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl4.L1Dcache
deadlock_threshold=1000000
@@ -786,7 +728,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
[system.ruby.l1_cntrl5]
type=L1Cache_Controller
@@ -854,7 +796,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl5.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl5.L1Dcache
deadlock_threshold=1000000
@@ -868,7 +809,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
[system.ruby.l1_cntrl6]
type=L1Cache_Controller
@@ -936,7 +877,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl6.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl6.L1Dcache
deadlock_threshold=1000000
@@ -950,7 +890,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
[system.ruby.l1_cntrl7]
type=L1Cache_Controller
@@ -1018,7 +958,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl7.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl7.L1Dcache
deadlock_threshold=1000000
@@ -1032,7 +971,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -1379,7 +1318,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index 1c9a952a1..38c85fff5 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.mem_ctrls system.funcmem
+memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
[system.cpu_clk_domain]
type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.mem_ctrls]
type=DRAMCtrl
IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -466,7 +413,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=1000000
@@ -480,7 +426,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -557,7 +503,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl1.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl1.L1Dcache
deadlock_threshold=1000000
@@ -571,7 +516,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
[system.ruby.l1_cntrl2]
type=L1Cache_Controller
@@ -648,7 +593,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl2.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl2.L1Dcache
deadlock_threshold=1000000
@@ -662,7 +606,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
[system.ruby.l1_cntrl3]
type=L1Cache_Controller
@@ -739,7 +683,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl3.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl3.L1Dcache
deadlock_threshold=1000000
@@ -753,7 +696,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
[system.ruby.l1_cntrl4]
type=L1Cache_Controller
@@ -830,7 +773,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl4.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl4.L1Dcache
deadlock_threshold=1000000
@@ -844,7 +786,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
[system.ruby.l1_cntrl5]
type=L1Cache_Controller
@@ -921,7 +863,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl5.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl5.L1Dcache
deadlock_threshold=1000000
@@ -935,7 +876,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
[system.ruby.l1_cntrl6]
type=L1Cache_Controller
@@ -1012,7 +953,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl6.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl6.L1Dcache
deadlock_threshold=1000000
@@ -1026,7 +966,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
[system.ruby.l1_cntrl7]
type=L1Cache_Controller
@@ -1103,7 +1043,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl7.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl7.L1Dcache
deadlock_threshold=1000000
@@ -1117,7 +1056,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
[system.ruby.memctrl_clk_domain]
type=DerivedClockDomain
@@ -1396,7 +1335,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
index 15c73e8ec..75224c394 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=0:268435455
-memories=system.mem_ctrls system.funcmem
+memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu1]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu2]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
[system.cpu3]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
[system.cpu4]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
[system.cpu5]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
[system.cpu6]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
[system.cpu7]
type=MemTest
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=0
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
[system.cpu_clk_domain]
type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.mem_ctrls]
type=DRAMCtrl
IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -411,7 +358,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=1000000
@@ -425,7 +371,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -467,7 +413,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl1.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl1.cacheMemory
deadlock_threshold=1000000
@@ -481,7 +426,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
[system.ruby.l1_cntrl2]
type=L1Cache_Controller
@@ -523,7 +468,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl2.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl2.cacheMemory
deadlock_threshold=1000000
@@ -537,7 +481,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
[system.ruby.l1_cntrl3]
type=L1Cache_Controller
@@ -579,7 +523,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl3.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl3.cacheMemory
deadlock_threshold=1000000
@@ -593,7 +536,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
[system.ruby.l1_cntrl4]
type=L1Cache_Controller
@@ -635,7 +578,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl4.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl4.cacheMemory
deadlock_threshold=1000000
@@ -649,7 +591,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
[system.ruby.l1_cntrl5]
type=L1Cache_Controller
@@ -691,7 +633,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl5.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl5.cacheMemory
deadlock_threshold=1000000
@@ -705,7 +646,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
[system.ruby.l1_cntrl6]
type=L1Cache_Controller
@@ -747,7 +688,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl6.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl6.cacheMemory
deadlock_threshold=1000000
@@ -761,7 +701,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
[system.ruby.l1_cntrl7]
type=L1Cache_Controller
@@ -803,7 +743,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl7.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.cpu_clk_domain
dcache=system.ruby.l1_cntrl7.cacheMemory
deadlock_threshold=1000000
@@ -817,7 +756,7 @@ system=system
using_network_tester=false
using_ruby_tester=false
version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
[system.ruby.memctrl_clk_domain]
type=DerivedClockDomain
@@ -1096,7 +1035,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
index 6605d530a..27d9847c3 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem l2c membus physmem toL2Bus voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -46,23 +47,19 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.cpu0.l1c.cpu_side
+system=system
+port=system.cpu0.l1c.cpu_side
[system.cpu0.l1c]
type=BaseCache
@@ -70,6 +67,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -86,7 +84,7 @@ tags=system.cpu0.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu0.test
+cpu_side=system.cpu0.port
mem_side=system.toL2Bus.slave[0]
[system.cpu0.l1c.tags]
@@ -102,23 +100,19 @@ size=32768
[system.cpu1]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.cpu1.l1c.cpu_side
+system=system
+port=system.cpu1.l1c.cpu_side
[system.cpu1.l1c]
type=BaseCache
@@ -126,6 +120,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -142,7 +137,7 @@ tags=system.cpu1.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu1.test
+cpu_side=system.cpu1.port
mem_side=system.toL2Bus.slave[1]
[system.cpu1.l1c.tags]
@@ -158,23 +153,19 @@ size=32768
[system.cpu2]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.cpu2.l1c.cpu_side
+system=system
+port=system.cpu2.l1c.cpu_side
[system.cpu2.l1c]
type=BaseCache
@@ -182,6 +173,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -198,7 +190,7 @@ tags=system.cpu2.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu2.test
+cpu_side=system.cpu2.port
mem_side=system.toL2Bus.slave[2]
[system.cpu2.l1c.tags]
@@ -214,23 +206,19 @@ size=32768
[system.cpu3]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.cpu3.l1c.cpu_side
+system=system
+port=system.cpu3.l1c.cpu_side
[system.cpu3.l1c]
type=BaseCache
@@ -238,6 +226,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -254,7 +243,7 @@ tags=system.cpu3.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu3.test
+cpu_side=system.cpu3.port
mem_side=system.toL2Bus.slave[3]
[system.cpu3.l1c.tags]
@@ -270,23 +259,19 @@ size=32768
[system.cpu4]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.cpu4.l1c.cpu_side
+system=system
+port=system.cpu4.l1c.cpu_side
[system.cpu4.l1c]
type=BaseCache
@@ -294,6 +279,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -310,7 +296,7 @@ tags=system.cpu4.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu4.test
+cpu_side=system.cpu4.port
mem_side=system.toL2Bus.slave[4]
[system.cpu4.l1c.tags]
@@ -326,23 +312,19 @@ size=32768
[system.cpu5]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.cpu5.l1c.cpu_side
+system=system
+port=system.cpu5.l1c.cpu_side
[system.cpu5.l1c]
type=BaseCache
@@ -350,6 +332,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -366,7 +349,7 @@ tags=system.cpu5.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu5.test
+cpu_side=system.cpu5.port
mem_side=system.toL2Bus.slave[5]
[system.cpu5.l1c.tags]
@@ -382,23 +365,19 @@ size=32768
[system.cpu6]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.cpu6.l1c.cpu_side
+system=system
+port=system.cpu6.l1c.cpu_side
[system.cpu6.l1c]
type=BaseCache
@@ -406,6 +385,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -422,7 +402,7 @@ tags=system.cpu6.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu6.test
+cpu_side=system.cpu6.port
mem_side=system.toL2Bus.slave[6]
[system.cpu6.l1c.tags]
@@ -438,23 +418,19 @@ size=32768
[system.cpu7]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.cpu7.l1c.cpu_side
+system=system
+port=system.cpu7.l1c.cpu_side
[system.cpu7.l1c]
type=BaseCache
@@ -462,6 +438,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -478,7 +455,7 @@ tags=system.cpu7.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu7.test
+cpu_side=system.cpu7.port
mem_side=system.toL2Bus.slave[7]
[system.cpu7.l1c.tags]
@@ -507,35 +484,13 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=73.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30000
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.l2c]
type=BaseCache
children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -570,8 +525,11 @@ type=CoherentXBar
children=snoop_filter
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=system.membus.snoop_filter
+snoop_response_latency=4
system=system
use_default_range=false
width=16
@@ -581,7 +539,7 @@ slave=system.l2c.mem_side system.system_port
[system.membus.snoop_filter]
type=SnoopFilter
eventq_index=0
-lookup_latency=3
+lookup_latency=1
system=system
[system.physmem]
@@ -602,18 +560,21 @@ type=CoherentXBar
children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=system.toL2Bus.snoop_filter
+snoop_response_latency=1
system=system
use_default_range=false
-width=16
+width=32
master=system.l2c.cpu_side
slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side
[system.toL2Bus.snoop_filter]
type=SnoopFilter
eventq_index=0
-lookup_latency=3
+lookup_latency=1
system=system
[system.voltage_domain]
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
index 06da0f372..a476e7586 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem l2c membus physmem toL2Bus voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -46,23 +47,19 @@ voltage_domain=system.voltage_domain
[system.cpu0]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.cpu0.l1c.cpu_side
+system=system
+port=system.cpu0.l1c.cpu_side
[system.cpu0.l1c]
type=BaseCache
@@ -70,6 +67,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -86,7 +84,7 @@ tags=system.cpu0.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu0.test
+cpu_side=system.cpu0.port
mem_side=system.toL2Bus.slave[0]
[system.cpu0.l1c.tags]
@@ -102,23 +100,19 @@ size=32768
[system.cpu1]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.cpu1.l1c.cpu_side
+system=system
+port=system.cpu1.l1c.cpu_side
[system.cpu1.l1c]
type=BaseCache
@@ -126,6 +120,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -142,7 +137,7 @@ tags=system.cpu1.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu1.test
+cpu_side=system.cpu1.port
mem_side=system.toL2Bus.slave[1]
[system.cpu1.l1c.tags]
@@ -158,23 +153,19 @@ size=32768
[system.cpu2]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.cpu2.l1c.cpu_side
+system=system
+port=system.cpu2.l1c.cpu_side
[system.cpu2.l1c]
type=BaseCache
@@ -182,6 +173,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -198,7 +190,7 @@ tags=system.cpu2.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu2.test
+cpu_side=system.cpu2.port
mem_side=system.toL2Bus.slave[2]
[system.cpu2.l1c.tags]
@@ -214,23 +206,19 @@ size=32768
[system.cpu3]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.cpu3.l1c.cpu_side
+system=system
+port=system.cpu3.l1c.cpu_side
[system.cpu3.l1c]
type=BaseCache
@@ -238,6 +226,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -254,7 +243,7 @@ tags=system.cpu3.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu3.test
+cpu_side=system.cpu3.port
mem_side=system.toL2Bus.slave[3]
[system.cpu3.l1c.tags]
@@ -270,23 +259,19 @@ size=32768
[system.cpu4]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.cpu4.l1c.cpu_side
+system=system
+port=system.cpu4.l1c.cpu_side
[system.cpu4.l1c]
type=BaseCache
@@ -294,6 +279,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -310,7 +296,7 @@ tags=system.cpu4.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu4.test
+cpu_side=system.cpu4.port
mem_side=system.toL2Bus.slave[4]
[system.cpu4.l1c.tags]
@@ -326,23 +312,19 @@ size=32768
[system.cpu5]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.cpu5.l1c.cpu_side
+system=system
+port=system.cpu5.l1c.cpu_side
[system.cpu5.l1c]
type=BaseCache
@@ -350,6 +332,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -366,7 +349,7 @@ tags=system.cpu5.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu5.test
+cpu_side=system.cpu5.port
mem_side=system.toL2Bus.slave[5]
[system.cpu5.l1c.tags]
@@ -382,23 +365,19 @@ size=32768
[system.cpu6]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.cpu6.l1c.cpu_side
+system=system
+port=system.cpu6.l1c.cpu_side
[system.cpu6.l1c]
type=BaseCache
@@ -406,6 +385,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -422,7 +402,7 @@ tags=system.cpu6.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu6.test
+cpu_side=system.cpu6.port
mem_side=system.toL2Bus.slave[6]
[system.cpu6.l1c.tags]
@@ -438,23 +418,19 @@ size=32768
[system.cpu7]
type=MemTest
children=l1c
-atomic=false
clk_domain=system.cpu_clk_domain
eventq_index=0
-issue_dmas=false
+interval=1
max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
percent_functional=50
percent_reads=65
-percent_source_unaligned=50
percent_uncacheable=10
+progress_check=5000000
progress_interval=10000
+size=65536
suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.cpu7.l1c.cpu_side
+system=system
+port=system.cpu7.l1c.cpu_side
[system.cpu7.l1c]
type=BaseCache
@@ -462,6 +438,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
@@ -478,7 +455,7 @@ tags=system.cpu7.l1c.tags
tgts_per_mshr=20
two_queue=false
write_buffers=8
-cpu_side=system.cpu7.test
+cpu_side=system.cpu7.port
mem_side=system.toL2Bus.slave[7]
[system.cpu7.l1c.tags]
@@ -507,35 +484,13 @@ eventq_index=0
sys_clk_domain=system.clk_domain
transition_latency=100000000
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.funcmem.port
-slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
-
-[system.funcmem]
-type=SimpleMemory
-bandwidth=73.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30000
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
[system.l2c]
type=BaseCache
children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
@@ -569,8 +524,11 @@ size=65536
type=CoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
width=16
@@ -594,11 +552,14 @@ port=system.membus.master[0]
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
-width=16
+width=32
master=system.l2c.cpu_side
slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side
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 578c80a62..27433c589 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -91,7 +92,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -144,6 +145,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -264,7 +266,6 @@ unit_filter=8
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.ruby.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -434,7 +435,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
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 e824f18b8..e6a208fbe 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
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -91,7 +92,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -144,6 +145,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -249,7 +251,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.ruby.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -418,7 +419,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index 449426c95..6402fc4de 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -91,7 +92,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -144,6 +145,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -266,7 +268,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.ruby.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -438,7 +439,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
index f04aef1cf..c5c0c425f 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -91,7 +92,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -144,6 +145,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -288,7 +290,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.ruby.clk_domain
dcache=system.ruby.l1_cntrl0.L1Dcache
deadlock_threshold=500000
@@ -392,7 +393,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
index 7a41a41a1..0d98bbb99 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -91,7 +92,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -144,6 +145,7 @@ port=system.ruby.dir_cntrl0.memory
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
+access_backing_store=false
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
@@ -233,7 +235,6 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
-access_backing_store=false
clk_domain=system.ruby.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
@@ -337,7 +338,6 @@ virt_nets=10
[system.sys_port_proxy]
type=RubyPortProxy
-access_backing_store=false
clk_domain=system.clk_domain
eventq_index=0
ruby_system=system.ruby
diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini
index b1d661d27..82326fb62 100644
--- a/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini
+++ b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -70,7 +71,9 @@ transition_latency=100000000
type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=1
+frontend_latency=2
+response_latency=2
use_default_range=false
width=16
master=system.physmem.port
@@ -95,6 +98,7 @@ latency_bins=20
outstanding_bins=20
read_addr_mask=18446744073709551615
sample_period=1000000000
+stack_dist_calc=Null
system=system
trace_compress=true
trace_enable=false
@@ -131,7 +135,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -140,6 +144,7 @@ clk_domain=system.clk_domain
conf_table_reported=true
device_bus_width=8
device_rowbuffer_size=1024
+device_size=536870912
devices_per_rank=8
dll=true
eventq_index=0
diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini
index c210da503..91ff0eb51 100644
--- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini
+++ b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/config.ini
@@ -23,6 +23,7 @@ load_offset=0
mem_mode=timing
mem_ranges=
memories=system.physmem
+mmap_using_noreserve=false
num_work_ids=16
readfile=
symbolfile=
@@ -70,7 +71,9 @@ transition_latency=100000000
type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=1
+frontend_latency=2
+response_latency=2
use_default_range=false
width=16
master=system.physmem.port
@@ -78,6 +81,7 @@ slave=system.monitor.master system.system_port
[system.monitor]
type=CommMonitor
+children=stack_dist_calc
bandwidth_bins=20
burst_length_bins=20
clk_domain=system.clk_domain
@@ -95,6 +99,7 @@ latency_bins=20
outstanding_bins=20
read_addr_mask=18446744073709551615
sample_period=1000000000
+stack_dist_calc=system.monitor.stack_dist_calc
system=system
trace_compress=true
trace_enable=true
@@ -104,6 +109,15 @@ write_addr_mask=18446744073709551615
master=system.membus.slave[0]
slave=system.cpu.port
+[system.monitor.stack_dist_calc]
+type=StackDistCalc
+disable_linear_hists=false
+disable_log_hists=false
+eventq_index=0
+linear_hist_bins=16
+log_hist_bins=32
+verify=true
+
[system.physmem]
type=SimpleMemory
bandwidth=73.000000