summaryrefslogtreecommitdiff
path: root/tests/quick/se/30.eio-mp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se/30.eio-mp')
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini19
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json88
-rwxr-xr-xtests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr5
-rwxr-xr-xtests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout7
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt38
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini19
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json88
-rwxr-xr-xtests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr4
-rwxr-xr-xtests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout9
-rw-r--r--tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt38
10 files changed, 194 insertions, 121 deletions
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini
index 7a2702bb7..0f6c8e312 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini
@@ -24,6 +24,7 @@ mem_mode=atomic
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -179,7 +180,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -322,7 +323,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -465,7 +466,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -608,7 +609,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -697,12 +698,13 @@ port=system.membus.master[0]
[system.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -710,6 +712,13 @@ 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
+[system.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.voltage_domain]
type=VoltageDomain
eventq_index=0
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json
index 868366c46..a5175d735 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json
@@ -180,7 +180,16 @@
"role": "SLAVE"
},
"name": "toL2Bus",
- "snoop_filter": null,
+ "snoop_filter": {
+ "name": "snoop_filter",
+ "system": "system",
+ "max_capacity": 8388608,
+ "eventq_index": 0,
+ "cxx_class": "SnoopFilter",
+ "path": "system.toL2Bus.snoop_filter",
+ "type": "SnoopFilter",
+ "lookup_latency": 0
+ },
"forward_latency": 0,
"clk_domain": "system.cpu_clk_domain",
"system": "system",
@@ -287,13 +296,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu0.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu0.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu0.dcache.cpu_side",
"role": "MASTER"
@@ -313,7 +324,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu0.workload",
"max_stack_size": 67108864,
@@ -478,13 +489,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu1.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu1.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu1.dcache.cpu_side",
"role": "MASTER"
@@ -504,7 +517,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu1.workload",
"max_stack_size": 67108864,
@@ -669,13 +682,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu2.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu2.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu2.dcache.cpu_side",
"role": "MASTER"
@@ -695,7 +710,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu2.workload",
"max_stack_size": 67108864,
@@ -860,13 +875,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu3.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu3.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu3.dcache.cpu_side",
"role": "MASTER"
@@ -886,7 +903,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu3.workload",
"max_stack_size": 67108864,
@@ -974,9 +991,10 @@
}
}
],
- "num_work_ids": 16,
+ "multi_thread": false,
+ "work_begin_cpu_id_exit": -1,
"work_item_id": -1,
- "work_begin_cpu_id_exit": -1
+ "num_work_ids": 16
},
"time_sync_period": 100000000000,
"eventq_index": 0,
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr
index 8af5388f9..052b7de6e 100755
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr
@@ -3,3 +3,8 @@ warn: Prefetch instructions in Alpha do not do anything
warn: Prefetch instructions in Alpha do not do anything
gzip: stdout: Broken pipe
+stdout: Broken pipe
+
+gzip: stdout: Broken pipe
+
+gzip: stdout: Broken pipe
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout
index 90692ccf8..c513854ed 100755
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simout
@@ -1,10 +1,11 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 7 2015 13:46:57
-gem5 started Mar 7 2015 13:47:23
-gem5 executing on zizzer2
+gem5 compiled Oct 1 2015 18:05:22
+gem5 started Oct 1 2015 18:06:58
+gem5 executing on zizzer
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-atomic-mp -re /z/stever/hg/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-atomic-mp
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
main dictionary has 1245 entries
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt
index 8a18a4d03..bc68b43ab 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000250 # Nu
sim_ticks 250015500 # Number of ticks simulated
final_tick 250015500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 2352807 # Simulator instruction rate (inst/s)
-host_op_rate 2352743 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 294103962 # Simulator tick rate (ticks/s)
-host_mem_usage 298060 # Number of bytes of host memory used
-host_seconds 0.85 # Real time elapsed on the host
+host_inst_rate 1088528 # Simulator instruction rate (inst/s)
+host_op_rate 1088500 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 136068763 # Simulator tick rate (ticks/s)
+host_mem_usage 242992 # Number of bytes of host memory used
+host_seconds 1.84 # Real time elapsed on the host
sim_insts 2000004 # Number of instructions simulated
sim_ops 2000004 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1043,6 +1043,12 @@ system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Re
system.membus.snoop_fanout::min_value 0 # Request fanout histogram
system.membus.snoop_fanout::max_value 0 # Request fanout histogram
system.membus.snoop_fanout::total 3428 # Request fanout histogram
+system.toL2Bus.snoop_filter.tot_requests 4556 # Total number of requests made to the snoop filter.
+system.toL2Bus.snoop_filter.hit_single_requests 852 # Number of requests hitting in the snoop filter with a single holder of the requested data.
+system.toL2Bus.snoop_filter.hit_multi_requests 0 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.
+system.toL2Bus.snoop_filter.tot_snoops 0 # Total number of snoops made to the snoop filter.
+system.toL2Bus.snoop_filter.hit_single_snoops 0 # Number of snoops hitting in the snoop filter with a single holder of the requested data.
+system.toL2Bus.snoop_filter.hit_multi_snoops 0 # Number of snoops hitting in the snoop filter with multiple (>1) holders of the requested data.
system.toL2Bus.trans_dist::ReadResp 3148 # Transaction distribution
system.toL2Bus.trans_dist::Writeback 116 # Transaction distribution
system.toL2Bus.trans_dist::CleanEvict 736 # Transaction distribution
@@ -1070,21 +1076,21 @@ system.toL2Bus.pkt_size_system.cpu3.dcache.mem_side::system.l2c.cpu_side
system.toL2Bus.pkt_size::total 244480 # Cumulative packet size per connected master and slave (bytes)
system.toL2Bus.snoops 0 # Total snoops (count)
system.toL2Bus.snoop_fanout::samples 4556 # Request fanout histogram
-system.toL2Bus.snoop_fanout::mean 7 # Request fanout histogram
+system.toL2Bus.snoop_fanout::mean 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::stdev 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::0 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::1 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::2 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::3 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::4 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::5 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::6 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::7 4556 100.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::0 4556 100.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::1 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::2 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::3 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::4 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::5 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::6 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::7 0 0.00% 100.00% # Request fanout histogram
system.toL2Bus.snoop_fanout::8 0 0.00% 100.00% # Request fanout histogram
system.toL2Bus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::min_value 7 # Request fanout histogram
-system.toL2Bus.snoop_fanout::max_value 7 # Request fanout histogram
+system.toL2Bus.snoop_fanout::min_value 0 # Request fanout histogram
+system.toL2Bus.snoop_fanout::max_value 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::total 4556 # Request fanout histogram
---------- End Simulation Statistics ----------
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini
index 100c82beb..df493ed95 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -175,7 +176,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -314,7 +315,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -453,7 +454,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -592,7 +593,7 @@ type=EioProcess
chkpt=
errout=cerr
eventq_index=0
-file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
+file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
input=cin
kvmInSE=false
max_stack_size=67108864
@@ -681,12 +682,13 @@ port=system.membus.master[0]
[system.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -694,6 +696,13 @@ 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
+[system.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.voltage_domain]
type=VoltageDomain
eventq_index=0
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json
index e13778a7a..101f60454 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json
@@ -180,7 +180,16 @@
"role": "SLAVE"
},
"name": "toL2Bus",
- "snoop_filter": null,
+ "snoop_filter": {
+ "name": "snoop_filter",
+ "system": "system",
+ "max_capacity": 8388608,
+ "eventq_index": 0,
+ "cxx_class": "SnoopFilter",
+ "path": "system.toL2Bus.snoop_filter",
+ "type": "SnoopFilter",
+ "lookup_latency": 0
+ },
"forward_latency": 0,
"clk_domain": "system.cpu_clk_domain",
"system": "system",
@@ -284,13 +293,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu0.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu0.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu0.dcache.cpu_side",
"role": "MASTER"
@@ -310,7 +321,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu0.workload",
"max_stack_size": 67108864,
@@ -471,13 +482,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu1.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu1.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu1.dcache.cpu_side",
"role": "MASTER"
@@ -497,7 +510,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu1.workload",
"max_stack_size": 67108864,
@@ -658,13 +671,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu2.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu2.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu2.dcache.cpu_side",
"role": "MASTER"
@@ -684,7 +699,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu2.workload",
"max_stack_size": 67108864,
@@ -845,13 +860,15 @@
"sequential_access": false,
"assoc": 1
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu3.interrupts",
- "type": "AlphaInterrupts",
- "name": "interrupts",
- "cxx_class": "AlphaISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu3.interrupts",
+ "type": "AlphaInterrupts",
+ "name": "interrupts",
+ "cxx_class": "AlphaISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.cpu3.dcache.cpu_side",
"role": "MASTER"
@@ -871,7 +888,7 @@
"system": "system",
"useArchPT": false,
"eventq_index": 0,
- "file": "/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
+ "file": "/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz",
"cxx_class": "EioProcess",
"path": "system.cpu3.workload",
"max_stack_size": 67108864,
@@ -958,9 +975,10 @@
}
}
],
- "num_work_ids": 16,
+ "multi_thread": false,
+ "work_begin_cpu_id_exit": -1,
"work_item_id": -1,
- "work_begin_cpu_id_exit": -1
+ "num_work_ids": 16
},
"time_sync_period": 100000000000,
"eventq_index": 0,
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr
index 8be63e416..4cbd6189b 100755
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simerr
@@ -3,5 +3,5 @@ warn: Prefetch instructions in Alpha do not do anything
warn: Prefetch instructions in Alpha do not do anything
gzip: stdout: Broken pipe
-stdout: Broken pipe
-stdout: Broken pipe
+
+gzip: stdout: Broken pipe
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout
index aa09b6199..971177aae 100755
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/simout
@@ -1,10 +1,11 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 7 2015 13:46:57
-gem5 started Mar 7 2015 13:47:11
-gem5 executing on zizzer2
+gem5 compiled Oct 1 2015 18:05:22
+gem5 started Oct 1 2015 18:06:57
+gem5 executing on zizzer
command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-timing-mp -re /z/stever/hg/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/30.eio-mp/alpha/eio/simple-timing-mp
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
main dictionary has 1245 entries
@@ -15,4 +16,4 @@ main dictionary has 1245 entries
49508 bytes wasted
49508 bytes wasted
49508 bytes wasted
->>>>Exiting @ tick 727903500 because a thread reached the max instruction count
+>>>>Exiting @ tick 727902500 because a thread reached the max instruction count
diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt
index 640568869..76ab339df 100644
--- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt
+++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000728 # Nu
sim_ticks 727902500 # Number of ticks simulated
final_tick 727902500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 969116 # Simulator instruction rate (inst/s)
-host_op_rate 969107 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 352708611 # Simulator tick rate (ticks/s)
-host_mem_usage 298060 # Number of bytes of host memory used
-host_seconds 2.06 # Real time elapsed on the host
+host_inst_rate 608748 # Simulator instruction rate (inst/s)
+host_op_rate 608744 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 221554150 # Simulator tick rate (ticks/s)
+host_mem_usage 243036 # Number of bytes of host memory used
+host_seconds 3.29 # Real time elapsed on the host
sim_insts 1999978 # Number of instructions simulated
sim_ops 1999978 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1577,6 +1577,12 @@ system.membus.reqLayer0.occupancy 3438468 # La
system.membus.reqLayer0.utilization 0.5 # Layer utilization (%)
system.membus.respLayer1.occupancy 17142500 # Layer occupancy (ticks)
system.membus.respLayer1.utilization 2.4 # Layer utilization (%)
+system.toL2Bus.snoop_filter.tot_requests 4556 # Total number of requests made to the snoop filter.
+system.toL2Bus.snoop_filter.hit_single_requests 852 # Number of requests hitting in the snoop filter with a single holder of the requested data.
+system.toL2Bus.snoop_filter.hit_multi_requests 0 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.
+system.toL2Bus.snoop_filter.tot_snoops 0 # Total number of snoops made to the snoop filter.
+system.toL2Bus.snoop_filter.hit_single_snoops 0 # Number of snoops hitting in the snoop filter with a single holder of the requested data.
+system.toL2Bus.snoop_filter.hit_multi_snoops 0 # Number of snoops hitting in the snoop filter with multiple (>1) holders of the requested data.
system.toL2Bus.trans_dist::ReadResp 3148 # Transaction distribution
system.toL2Bus.trans_dist::Writeback 116 # Transaction distribution
system.toL2Bus.trans_dist::CleanEvict 736 # Transaction distribution
@@ -1604,21 +1610,21 @@ system.toL2Bus.pkt_size_system.cpu3.dcache.mem_side::system.l2c.cpu_side
system.toL2Bus.pkt_size::total 244480 # Cumulative packet size per connected master and slave (bytes)
system.toL2Bus.snoops 0 # Total snoops (count)
system.toL2Bus.snoop_fanout::samples 4556 # Request fanout histogram
-system.toL2Bus.snoop_fanout::mean 7 # Request fanout histogram
+system.toL2Bus.snoop_fanout::mean 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::stdev 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::underflows 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::0 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::1 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::2 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::3 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::4 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::5 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::6 0 0.00% 0.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::7 4556 100.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::0 4556 100.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::1 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::2 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::3 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::4 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::5 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::6 0 0.00% 100.00% # Request fanout histogram
+system.toL2Bus.snoop_fanout::7 0 0.00% 100.00% # Request fanout histogram
system.toL2Bus.snoop_fanout::8 0 0.00% 100.00% # Request fanout histogram
system.toL2Bus.snoop_fanout::overflows 0 0.00% 100.00% # Request fanout histogram
-system.toL2Bus.snoop_fanout::min_value 7 # Request fanout histogram
-system.toL2Bus.snoop_fanout::max_value 7 # Request fanout histogram
+system.toL2Bus.snoop_fanout::min_value 0 # Request fanout histogram
+system.toL2Bus.snoop_fanout::max_value 0 # Request fanout histogram
system.toL2Bus.snoop_fanout::total 4556 # Request fanout histogram
system.toL2Bus.reqLayer0.occupancy 2394000 # Layer occupancy (ticks)
system.toL2Bus.reqLayer0.utilization 0.3 # Layer utilization (%)