From a75e27b4a64df780e9b8207e10f3a11f172d1db3 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 6 Nov 2014 05:42:21 -0600
Subject: stats: updates due to changes to ruby

---
 .../linux/rubytest-ruby-MOESI_hammer/config.ini    | 127 ++++++++++++++-------
 1 file changed, 84 insertions(+), 43 deletions(-)

(limited to 'tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini')

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 6cd2e4d83..f04aef1cf 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
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu dvfs_handler physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu 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,7 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.physmem
+memories=system.mem_ctrls
 num_work_ids=16
 readfile=
 symbolfile=
@@ -64,17 +64,82 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.physmem]
-type=SimpleMemory
-bandwidth=0.000000
+[system.mem_ctrls]
+type=DRAMCtrl
+IDD0=0.075000
+IDD02=0.000000
+IDD2N=0.050000
+IDD2N2=0.000000
+IDD2P0=0.000000
+IDD2P02=0.000000
+IDD2P1=0.000000
+IDD2P12=0.000000
+IDD3N=0.057000
+IDD3N2=0.000000
+IDD3P0=0.000000
+IDD3P02=0.000000
+IDD3P1=0.000000
+IDD3P12=0.000000
+IDD4R=0.187000
+IDD4R2=0.000000
+IDD4W=0.165000
+IDD4W2=0.000000
+IDD5=0.220000
+IDD52=0.000000
+IDD6=0.000000
+IDD62=0.000000
+VDD=1.500000
+VDD2=0.000000
+activation_limit=4
+addr_mapping=RoRaBaChCo
+bank_groups_per_rank=0
+banks_per_rank=8
+burst_length=8
+channels=1
 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
 in_addr_map=true
-latency=30
-latency_var=0
-null=true
-range=0:134217727
+max_accesses_per_row=16
+mem_sched_policy=frfcfs
+min_writes_per_switch=16
+null=false
+page_policy=open_adaptive
+range=0:268435455
+ranks_per_channel=2
+read_buffer_size=32
+static_backend_latency=10
+static_frontend_latency=10
+tBURST=5
+tCCD_L=0
+tCK=1
+tCL=14
+tCS=3
+tRAS=35
+tRCD=14
+tREFI=7800
+tRFC=260
+tRP=14
+tRRD=6
+tRRD_L=0
+tRTP=8
+tRTW=3
+tWR=15
+tWTR=8
+tXAW=30
+tXP=0
+tXPDLL=0
+tXS=0
+tXSDLL=0
+write_buffer_size=64
+write_high_thresh_perc=85
+write_low_thresh_perc=50
+port=system.ruby.dir_cntrl0.memory
 
 [system.ruby]
 type=RubySystem
@@ -84,9 +149,9 @@ block_size_bytes=64
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 hot_lines=false
-mem_size=268435456
-no_mem_vec=false
+memory_size_bits=48
 num_of_sequencers=1
+phys_mem=Null
 random_seed=1234
 randomization=true
 
@@ -100,26 +165,27 @@ voltage_domain=system.voltage_domain
 
 [system.ruby.dir_cntrl0]
 type=Directory_Controller
-children=directory memBuffer probeFilter
+children=directory probeFilter
 buffer_size=0
 clk_domain=system.ruby.clk_domain
 cluster_id=0
 directory=system.ruby.dir_cntrl0.directory
 eventq_index=0
+from_memory_controller_latency=2
 full_bit_dir_enabled=false
-memBuffer=system.ruby.dir_cntrl0.memBuffer
-memory_controller_latency=2
 number_of_TBEs=256
-peer=Null
 probeFilter=system.ruby.dir_cntrl0.probeFilter
 probe_filter_enabled=false
 recycle_latency=10
 ruby_system=system.ruby
+system=system
+to_memory_controller_latency=1
 transitions_per_cycle=32
 version=0
 dmaRequestToDir=system.ruby.network.master[5]
 dmaResponseFromDir=system.ruby.network.slave[5]
 forwardFromDir=system.ruby.network.slave[3]
+memory=system.mem_ctrls.port
 requestToDir=system.ruby.network.master[4]
 responseFromDir=system.ruby.network.slave[4]
 responseToDir=system.ruby.network.master[3]
@@ -128,33 +194,8 @@ unblockToDir=system.ruby.network.master[2]
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 eventq_index=0
-map_levels=4
 numa_high_bit=5
 size=268435456
-use_map=false
-version=0
-
-[system.ruby.dir_cntrl0.memBuffer]
-type=RubyMemoryControl
-bank_bit_0=8
-bank_busy_time=11
-bank_queue_size=12
-banks_per_rank=8
-basic_bus_busy_time=2
-clk_domain=system.ruby.memctrl_clk_domain
-dimm_bit_0=12
-dimms_per_channel=2
-eventq_index=0
-mem_ctl_latency=12
-mem_fixed_delay=0
-mem_random_arbitrate=0
-rank_bit_0=11
-rank_rank_delay=1
-ranks_per_dimm=2
-read_write_delay=2
-refresh_period=1560
-ruby_system=system.ruby
-tFaw=0
 version=0
 
 [system.ruby.dir_cntrl0.probeFilter]
@@ -187,11 +228,11 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
-peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
 sequencer=system.ruby.l1_cntrl0.sequencer
+system=system
 transitions_per_cycle=32
 version=0
 forwardToCache=system.ruby.network.master[0]
@@ -247,7 +288,7 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_phys_mem=false
+access_backing_store=false
 clk_domain=system.ruby.clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=500000
@@ -351,7 +392,7 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_phys_mem=true
+access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
-- 
cgit v1.2.3