summaryrefslogtreecommitdiff
path: root/tests/quick/60.rubytest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/60.rubytest')
-rw-r--r--tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini81
-rw-r--r--tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats42
-rwxr-xr-xtests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout10
-rw-r--r--tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt6
4 files changed, 72 insertions, 67 deletions
diff --git a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
index 2e46bddba..247e64cce 100644
--- a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
+++ b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
@@ -1,13 +1,22 @@
[root]
type=Root
children=system
-dummy=0
+time_sync_enable=false
+time_sync_period=100000000
+time_sync_spin_threshold=100000
[system]
type=System
-children=dir_cntrl0 l1_cntrl0 physmem ruby
+children=dir_cntrl0 l1_cntrl0 physmem ruby tester
mem_mode=timing
physmem=system.physmem
+work_begin_ckpt_count=0
+work_begin_cpu_id_exit=-1
+work_begin_exit_count=0
+work_cpus_ckpt_count=0
+work_end_ckpt_count=0
+work_end_exit_count=0
+work_item_id=-1
[system.dir_cntrl0]
type=Directory_Controller
@@ -52,38 +61,16 @@ version=0
[system.l1_cntrl0]
type=L1Cache_Controller
-children=sequencer
buffer_size=0
-cacheMemory=system.l1_cntrl0.sequencer.icache
+cacheMemory=system.ruby.cpu_ruby_ports.dcache
cache_response_latency=12
issue_latency=2
number_of_TBEs=256
recycle_latency=10
-sequencer=system.l1_cntrl0.sequencer
+sequencer=system.ruby.cpu_ruby_ports
transitions_per_cycle=32
version=0
-[system.l1_cntrl0.sequencer]
-type=RubySequencer
-children=icache
-dcache=system.l1_cntrl0.sequencer.icache
-deadlock_threshold=500000
-icache=system.l1_cntrl0.sequencer.icache
-max_outstanding_requests=16
-physmem=system.physmem
-using_ruby_tester=true
-version=0
-physMemPort=system.physmem.port[0]
-port=root.cpuPort[0]
-
-[system.l1_cntrl0.sequencer.icache]
-type=RubyCache
-assoc=2
-latency=3
-replacement_policy=PSEUDO_LRU
-size=256
-start_index_bit=6
-
[system.physmem]
type=PhysicalMemory
file=
@@ -92,14 +79,13 @@ latency_var=0
null=false
range=0:134217727
zero=false
-port=system.l1_cntrl0.sequencer.physMemPort
+port=system.ruby.cpu_ruby_ports.physMemPort
[system.ruby]
type=RubySystem
-children=debug network profiler tracer
+children=cpu_ruby_ports network profiler tracer
block_size_bytes=64
clock=1
-debug=system.ruby.debug
mem_size=134217728
network=system.ruby.network
no_mem_vec=false
@@ -109,13 +95,27 @@ randomization=true
stats_filename=ruby.stats
tracer=system.ruby.tracer
-[system.ruby.debug]
-type=RubyDebug
-filter_string=none
-output_filename=none
-protocol_trace=false
-start_time=1
-verbosity_string=none
+[system.ruby.cpu_ruby_ports]
+type=RubySequencer
+children=dcache
+access_phys_mem=true
+dcache=system.ruby.cpu_ruby_ports.dcache
+deadlock_threshold=500000
+icache=system.ruby.cpu_ruby_ports.dcache
+max_outstanding_requests=16
+physmem=system.physmem
+using_ruby_tester=true
+version=0
+physMemPort=system.physmem.port[0]
+port=system.tester.cpuPort[0]
+
+[system.ruby.cpu_ruby_ports.dcache]
+type=RubyCache
+assoc=2
+latency=3
+replacement_policy=PSEUDO_LRU
+size=256
+start_index_bit=6
[system.ruby.network]
type=SimpleNetwork
@@ -131,9 +131,9 @@ topology=system.ruby.network.topology
[system.ruby.network.topology]
type=Topology
children=ext_links0 ext_links1 int_links0 int_links1
+description=Crossbar
ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
-name=Crossbar
num_int_nodes=3
print_config=false
@@ -179,3 +179,10 @@ num_of_sequencers=1
type=RubyTracer
warmup_length=100000
+[system.tester]
+type=RubyTester
+checks_to_complete=100
+deadlock_threshold=50000
+wakeup_frequency=10
+cpuPort=system.ruby.cpu_ruby_ports.port[0]
+
diff --git a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
index 4b8c316dc..ce11e4002 100644
--- a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
+++ b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
@@ -13,7 +13,7 @@ RubySystem config:
Network Configuration
---------------------
network: SIMPLE_NETWORK
-topology: Crossbar
+topology:
virtual_net_0: active, ordered
virtual_net_1: active, ordered
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
================ End RubySystem Configuration Print ================
-Real time: Aug/05/2010 10:10:57
+Real time: Feb/07/2011 01:47:37
Profiler Stats
--------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
Elapsed_time_in_hours: 0
Elapsed_time_in_days: 0
-Virtual_time_in_seconds: 0.29
-Virtual_time_in_minutes: 0.00483333
-Virtual_time_in_hours: 8.05556e-05
-Virtual_time_in_days: 3.35648e-06
+Virtual_time_in_seconds: 0.3
+Virtual_time_in_minutes: 0.005
+Virtual_time_in_hours: 8.33333e-05
+Virtual_time_in_days: 3.47222e-06
Ruby_current_time: 281031
Ruby_start_time: 0
Ruby_cycles: 281031
-mbytes_resident: 30.9531
-mbytes_total: 203.703
-resident_ratio: 0.15199
+mbytes_resident: 34.3867
+mbytes_total: 225.355
+resident_ratio: 0.152606
ruby_cycles_executed: [ 281032 ]
@@ -122,11 +122,11 @@ Resource Usage
page_size: 4096
user_time: 0
system_time: 0
-page_reclaims: 9003
+page_reclaims: 9878
page_faults: 0
swaps: 0
block_inputs: 0
-block_outputs: 0
+block_outputs: 48
Network Stats
-------------
@@ -170,18 +170,18 @@ links_utilized_percent_switch_2: 0.169999
outgoing_messages_switch_2_link_1_Control: 957 7656 [ 0 0 957 0 0 0 0 0 0 0 ] base_latency: 1
outgoing_messages_switch_2_link_1_Data: 954 68688 [ 0 0 954 0 0 0 0 0 0 0 ] base_latency: 1
-Cache Stats: system.l1_cntrl0.sequencer.icache
- system.l1_cntrl0.sequencer.icache_total_misses: 957
- system.l1_cntrl0.sequencer.icache_total_demand_misses: 957
- system.l1_cntrl0.sequencer.icache_total_prefetches: 0
- system.l1_cntrl0.sequencer.icache_total_sw_prefetches: 0
- system.l1_cntrl0.sequencer.icache_total_hw_prefetches: 0
+Cache Stats: system.ruby.cpu_ruby_ports.dcache
+ system.ruby.cpu_ruby_ports.dcache_total_misses: 957
+ system.ruby.cpu_ruby_ports.dcache_total_demand_misses: 957
+ system.ruby.cpu_ruby_ports.dcache_total_prefetches: 0
+ system.ruby.cpu_ruby_ports.dcache_total_sw_prefetches: 0
+ system.ruby.cpu_ruby_ports.dcache_total_hw_prefetches: 0
- system.l1_cntrl0.sequencer.icache_request_type_LD: 4.91118%
- system.l1_cntrl0.sequencer.icache_request_type_ST: 89.7597%
- system.l1_cntrl0.sequencer.icache_request_type_IFETCH: 5.32915%
+ system.ruby.cpu_ruby_ports.dcache_request_type_LD: 4.91118%
+ system.ruby.cpu_ruby_ports.dcache_request_type_ST: 89.7597%
+ system.ruby.cpu_ruby_ports.dcache_request_type_IFETCH: 5.32915%
- system.l1_cntrl0.sequencer.icache_access_mode_type_SupervisorMode: 957 100%
+ system.ruby.cpu_ruby_ports.dcache_access_mode_type_SupervisorMode: 957 100%
--- L1Cache ---
- Event Counts -
diff --git a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
index 566ba5c1a..e67c01bd9 100755
--- a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
+++ b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
@@ -1,5 +1,3 @@
-Redirecting stdout to build/ALPHA_SE/tests/fast/quick/60.rubytest/alpha/linux/rubytest-ruby/simout
-Redirecting stderr to build/ALPHA_SE/tests/fast/quick/60.rubytest/alpha/linux/rubytest-ruby/simerr
M5 Simulator System
Copyright (c) 2001-2008
@@ -7,10 +5,10 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Aug 4 2010 17:29:21
-M5 revision 1cd2a169499f+ 7535+ default brad/hammer_merge_gets qtip tip
-M5 started Aug 5 2010 10:10:57
-M5 executing on SC2B0617
+M5 compiled Feb 7 2011 01:47:18
+M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
+M5 started Feb 7 2011 01:47:37
+M5 executing on burrito
command line: build/ALPHA_SE/m5.fast -d build/ALPHA_SE/tests/fast/quick/60.rubytest/alpha/linux/rubytest-ruby -re tests/run.py build/ALPHA_SE/tests/fast/quick/60.rubytest/alpha/linux/rubytest-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index 104ae3de6..e1f5ad3f1 100644
--- a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -1,8 +1,8 @@
---------- Begin Simulation Statistics ----------
-host_mem_usage 208596 # Number of bytes of host memory used
-host_seconds 0.09 # Real time elapsed on the host
-host_tick_rate 3195386 # Simulator tick rate (ticks/s)
+host_mem_usage 230768 # Number of bytes of host memory used
+host_seconds 0.30 # Real time elapsed on the host
+host_tick_rate 934733 # Simulator tick rate (ticks/s)
sim_freq 1000000000 # Frequency of simulated ticks
sim_seconds 0.000281 # Number of seconds simulated
sim_ticks 281031 # Number of ticks simulated