summaryrefslogtreecommitdiff
path: root/tests/quick/se/00.hello/ref/x86
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:52 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:52 -0500
commitfa1fbcf020ee9aacdd4a7a09e81a633e09bad97a (patch)
treeec6cf719a27b279e250d9201c6af5143df649003 /tests/quick/se/00.hello/ref/x86
parent2cbe7c705be1cce44c5581fa58569cd95cc0f62d (diff)
downloadgem5-fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a.tar.xz
stats: updates due to recent ruby and x86 changes
Also updates many out of date config files.
Diffstat (limited to 'tests/quick/se/00.hello/ref/x86')
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini17
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini20
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini49
-rw-r--r--tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini18
4 files changed, 81 insertions, 23 deletions
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 016cd0c8d..2be4f154a 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
@@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain
+children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
eventq_index=0
init_param=0
kernel=
+kernel_addr_check=true
load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
@@ -37,7 +38,9 @@ system_port=system.membus.slave[0]
[system.clk_domain]
type=SrcClockDomain
clock=1000
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.cpu]
@@ -634,7 +637,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=/home/stever/hg/m5sim.org/gem5/tests/test-progs/hello/bin/x86/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -648,9 +651,19 @@ uid=100
[system.cpu_clk_domain]
type=SrcClockDomain
clock=500
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000000
+
[system.membus]
type=CoherentBus
clk_domain=system.clk_domain
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 eb1883caa..db49faad7 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
@@ -10,14 +10,16 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain
+children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
eventq_index=0
init_param=0
kernel=
+kernel_addr_check=true
load_addr_mask=1099511627775
+load_offset=0
mem_mode=atomic
mem_ranges=
memories=system.physmem
@@ -36,12 +38,15 @@ system_port=system.membus.slave[0]
[system.clk_domain]
type=SrcClockDomain
clock=1000
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.cpu]
type=AtomicSimpleCPU
children=apic_clk_domain dtb interrupts isa itb tracer workload
+branchPred=Null
checker=Null
clk_domain=system.cpu_clk_domain
cpu_id=0
@@ -69,6 +74,7 @@ simpoint_profile_file=simpoint.bb.gz
simpoint_start_insts=
simulate_data_stalls=false
simulate_inst_stalls=false
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -142,7 +148,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=/dist/test-progs/hello/bin/x86/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -156,9 +162,19 @@ uid=100
[system.cpu_clk_domain]
type=SrcClockDomain
clock=500
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000000
+
[system.membus]
type=CoherentBus
clk_domain=system.clk_domain
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 b7b166102..93964b6e7 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
@@ -10,13 +10,14 @@ time_sync_spin_threshold=100000
[system]
type=System
-children=clk_domain cpu physmem piobus ruby sys_port_proxy voltage_domain
+children=clk_domain cpu dvfs_handler physmem ruby sys_port_proxy voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
eventq_index=0
init_param=0
kernel=
+kernel_addr_check=true
load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
@@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0]
[system.clk_domain]
type=SrcClockDomain
clock=1
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.cpu]
@@ -65,6 +68,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -81,7 +85,9 @@ eventq_index=0
[system.cpu.clk_domain]
type=SrcClockDomain
clock=1
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.cpu.dtb]
@@ -143,7 +149,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/x86/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -154,6 +160,14 @@ simpoint=0
system=system
uid=100
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000
+
[system.physmem]
type=SimpleMemory
bandwidth=0.000000
@@ -166,16 +180,6 @@ latency_var=0
null=true
range=0:134217727
-[system.piobus]
-type=NoncoherentBus
-clk_domain=system.clk_domain
-eventq_index=0
-header_cycles=1
-use_default_range=false
-width=8
-master=system.ruby.l1_cntrl0.sequencer.pio_slave_port
-slave=system.ruby.l1_cntrl0.sequencer.pio_master_port system.ruby.l1_cntrl0.sequencer.mem_master_port
-
[system.ruby]
type=RubySystem
children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network
@@ -193,7 +197,9 @@ randomization=false
[system.ruby.clk_domain]
type=SrcClockDomain
clock=1
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.ruby.dir_cntrl0]
@@ -212,6 +218,11 @@ recycle_latency=10
ruby_system=system.ruby
transitions_per_cycle=4
version=0
+dmaRequestToDir=system.ruby.network.master[3]
+dmaResponseFromDir=system.ruby.network.slave[3]
+forwardFromDir=system.ruby.network.slave[4]
+requestToDir=system.ruby.network.master[2]
+responseFromDir=system.ruby.network.slave[2]
[system.ruby.dir_cntrl0.directory]
type=RubyDirectoryMemory
@@ -251,7 +262,7 @@ children=cacheMemory sequencer
buffer_size=0
cacheMemory=system.ruby.l1_cntrl0.cacheMemory
cache_response_latency=12
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu.clk_domain
cluster_id=0
eventq_index=0
issue_latency=2
@@ -263,6 +274,10 @@ send_evictions=false
sequencer=system.ruby.l1_cntrl0.sequencer
transitions_per_cycle=4
version=0
+forwardToCache=system.ruby.network.master[0]
+requestFromCache=system.ruby.network.slave[0]
+responseFromCache=system.ruby.network.slave[1]
+responseToCache=system.ruby.network.master[1]
[system.ruby.l1_cntrl0.cacheMemory]
type=RubyCache
@@ -282,7 +297,7 @@ tagArrayBanks=1
[system.ruby.l1_cntrl0.sequencer]
type=RubySequencer
access_phys_mem=false
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu.clk_domain
dcache=system.ruby.l1_cntrl0.cacheMemory
deadlock_threshold=500000
eventq_index=0
@@ -296,9 +311,6 @@ using_network_tester=false
using_ruby_tester=false
version=0
master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
-mem_master_port=system.piobus.slave[1]
-pio_master_port=system.piobus.slave[0]
-pio_slave_port=system.piobus.master[0]
slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
[system.ruby.memctrl_clk_domain]
@@ -318,10 +330,13 @@ endpoint_bandwidth=1000
eventq_index=0
ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
+netifs=
number_of_virtual_networks=10
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
topology=Crossbar
+master=system.ruby.l1_cntrl0.forwardToCache system.ruby.l1_cntrl0.responseToCache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.dmaRequestToDir
+slave=system.ruby.l1_cntrl0.requestFromCache system.ruby.l1_cntrl0.responseFromCache system.ruby.dir_cntrl0.responseFromDir system.ruby.dir_cntrl0.dmaResponseFromDir system.ruby.dir_cntrl0.forwardFromDir
[system.ruby.network.ext_links0]
type=SimpleExtLink
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 25de1cc29..a819aa859 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
@@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000
[system]
type=System
-children=clk_domain cpu cpu_clk_domain membus physmem voltage_domain
+children=clk_domain cpu cpu_clk_domain dvfs_handler membus physmem voltage_domain
boot_osflags=a
cache_line_size=64
clk_domain=system.clk_domain
eventq_index=0
init_param=0
kernel=
+kernel_addr_check=true
load_addr_mask=1099511627775
load_offset=0
mem_mode=timing
@@ -37,7 +38,9 @@ system_port=system.membus.slave[0]
[system.clk_domain]
type=SrcClockDomain
clock=1000
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
[system.cpu]
@@ -65,6 +68,7 @@ numThreads=1
profile=0
progress_interval=0
simpoint_start_insts=
+socket_id=0
switched_out=false
system=system
tracer=system.cpu.tracer
@@ -253,7 +257,7 @@ env=
errout=cerr
euid=100
eventq_index=0
-executable=tests/test-progs/hello/bin/x86/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/x86/linux/hello
gid=100
input=cin
max_stack_size=67108864
@@ -267,9 +271,19 @@ uid=100
[system.cpu_clk_domain]
type=SrcClockDomain
clock=500
+domain_id=-1
eventq_index=0
+init_perf_level=0
voltage_domain=system.voltage_domain
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000000
+
[system.membus]
type=CoherentBus
clk_domain=system.clk_domain