changeset 97cf7ba82f0c in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=97cf7ba82f0c
description:
        stats: Bump for MessageBuffer, cache latency changes

diffstat:

 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
      |   2167 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
          |      7 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
          |     11 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
       |    352 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
 |   2176 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
     |      7 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
     |     11 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
  |    349 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
     |   2235 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simerr
         |      7 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
         |     11 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
      |    794 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
        |   1361 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simerr 
           |      7 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout 
           |     11 +-
 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
         |    403 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini          
           |   1274 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simerr              
           |      7 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout              
           |     11 +-
 tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt           
           |    398 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
      |   2167 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
          |      7 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout
          |     11 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
       |    260 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
 |   2176 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr
     |      7 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
     |     11 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
  |    473 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
     |   2235 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr
         |      7 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
         |     11 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
      |    336 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
        |   1361 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr 
           |      7 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout 
           |     11 +-
 
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
         |    340 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini          
           |   1274 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr              
           |      7 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout              
           |     11 +-
 tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt           
           |    437 +-
 tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini           
           |   1274 +-
 tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simerr               
           |      8 +-
 tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout               
           |     11 +-
 tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt            
           |    431 +-
 tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini          
           |   1274 +-
 tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simerr              
           |      7 +-
 tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout              
           |     13 +-
 tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt           
           |    411 +-
 tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini            
           |   1274 +-
 tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr                
           |      7 +-
 tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout                
           |     13 +-
 tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt             
           |    454 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
          |  12973 +++++++++-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simerr   
           |    146 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/simout   
           |     13 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt 
          |   1941 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
     |  12905 +++++++++-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr
         |    159 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
         |     11 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
      |   2594 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
         |  13057 +++++++++-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr  
           |    159 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout  
           |     11 +-
 
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
          |   2778 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini 
           |  11133 ++++++++-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr     
           |    159 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout     
           |     11 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt  
           |   2696 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini              
           |  10738 ++++++++-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simerr                  
           |    159 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout                  
           |     11 +-
 tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt               
           |   1214 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
        |   2165 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr 
           |      7 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout 
           |     13 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
         |    975 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
   |   2174 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr
       |      7 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
       |     11 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
    |    972 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
       |   2233 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr 
          |      7 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout 
          |     11 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
        |   1105 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
          |   1359 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simerr   
           |      7 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout   
           |     11 +-
 
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt 
          |   1035 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini            
           |   1272 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simerr                
           |      7 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout                
           |     11 +-
 tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt             
           |    733 +-
 92 files changed, 102646 insertions(+), 12262 deletions(-)

diffs (truncated from 125714 to 300 lines):

diff -r e6e3b7097810 -r 97cf7ba82f0c 
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
--- 
a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
      Fri Aug 14 00:19:45 2015 -0500
+++ 
b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
      Fri Aug 14 01:19:34 2015 -0500
@@ -118,7 +118,7 @@
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
+executable=/home/joel/research/gem5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 kvmInSE=false
@@ -241,7 +241,7 @@
 
 [system.ruby.dir_cntrl0]
 type=Directory_Controller
-children=directory
+children=directory requestToDir responseFromDir responseFromMemory 
responseToDir
 buffer_size=0
 clk_domain=system.ruby.clk_domain
 cluster_id=0
@@ -250,15 +250,16 @@
 eventq_index=0
 number_of_TBEs=256
 recycle_latency=10
+requestToDir=system.ruby.dir_cntrl0.requestToDir
+responseFromDir=system.ruby.dir_cntrl0.responseFromDir
+responseFromMemory=system.ruby.dir_cntrl0.responseFromMemory
+responseToDir=system.ruby.dir_cntrl0.responseToDir
 ruby_system=system.ruby
 system=system
 to_mem_ctrl_latency=1
 transitions_per_cycle=4
 version=0
 memory=system.mem_ctrls.port
-requestToDir=system.ruby.network.master[5]
-responseFromDir=system.ruby.network.slave[6]
-responseToDir=system.ruby.network.master[6]
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
@@ -267,9 +268,44 @@
 size=268435456
 version=0
 
+[system.ruby.dir_cntrl0.requestToDir]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+slave=system.ruby.network.master[5]
+
+[system.ruby.dir_cntrl0.responseFromDir]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[6]
+
+[system.ruby.dir_cntrl0.responseFromMemory]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+
+[system.ruby.dir_cntrl0.responseToDir]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+slave=system.ruby.network.master[6]
+
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
-children=L1Dcache L1Icache prefetcher sequencer
+children=L1Dcache L1Icache mandatoryQueue optionalQueue prefetcher 
requestFromL1Cache requestToL1Cache responseFromL1Cache responseToL1Cache 
sequencer unblockFromL1Cache
 L1Dcache=system.ruby.l1_cntrl0.L1Dcache
 L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
@@ -280,52 +316,86 @@
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
+mandatoryQueue=system.ruby.l1_cntrl0.mandatoryQueue
 number_of_TBEs=256
+optionalQueue=system.ruby.l1_cntrl0.optionalQueue
 prefetcher=system.ruby.l1_cntrl0.prefetcher
 recycle_latency=10
+requestFromL1Cache=system.ruby.l1_cntrl0.requestFromL1Cache
+requestToL1Cache=system.ruby.l1_cntrl0.requestToL1Cache
+responseFromL1Cache=system.ruby.l1_cntrl0.responseFromL1Cache
+responseToL1Cache=system.ruby.l1_cntrl0.responseToL1Cache
 ruby_system=system.ruby
 send_evictions=false
 sequencer=system.ruby.l1_cntrl0.sequencer
 system=system
 to_l2_latency=1
 transitions_per_cycle=4
+unblockFromL1Cache=system.ruby.l1_cntrl0.unblockFromL1Cache
 version=0
-requestFromL1Cache=system.ruby.network.slave[0]
-requestToL1Cache=system.ruby.network.master[0]
-responseFromL1Cache=system.ruby.network.slave[1]
-responseToL1Cache=system.ruby.network.master[1]
-unblockFromL1Cache=system.ruby.network.slave[2]
 
 [system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
+children=replacement_policy
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
 is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
+replacement_policy=system.ruby.l1_cntrl0.L1Dcache.replacement_policy
 resourceStalls=false
+ruby_system=system.ruby
 size=256
 start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
+[system.ruby.l1_cntrl0.L1Dcache.replacement_policy]
+type=PseudoLRUReplacementPolicy
+assoc=2
+block_size=64
+eventq_index=0
+size=256
+
 [system.ruby.l1_cntrl0.L1Icache]
 type=RubyCache
+children=replacement_policy
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
 is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
+replacement_policy=system.ruby.l1_cntrl0.L1Icache.replacement_policy
 resourceStalls=false
+ruby_system=system.ruby
 size=256
 start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
+[system.ruby.l1_cntrl0.L1Icache.replacement_policy]
+type=PseudoLRUReplacementPolicy
+assoc=2
+block_size=64
+eventq_index=0
+size=256
+
+[system.ruby.l1_cntrl0.mandatoryQueue]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+
+[system.ruby.l1_cntrl0.optionalQueue]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+
 [system.ruby.l1_cntrl0.prefetcher]
 type=Prefetcher
 cross_page=false
@@ -338,13 +408,51 @@
 train_misses=4
 unit_filter=8
 
+[system.ruby.l1_cntrl0.requestFromL1Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[0]
+
+[system.ruby.l1_cntrl0.requestToL1Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+slave=system.ruby.network.master[0]
+
+[system.ruby.l1_cntrl0.responseFromL1Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[1]
+
+[system.ruby.l1_cntrl0.responseToL1Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+slave=system.ruby.network.master[1]
+
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 clk_domain=system.cpu.clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
+dcache_hit_latency=1
 deadlock_threshold=500000
 eventq_index=0
 icache=system.ruby.l1_cntrl0.L1Icache
+icache_hit_latency=1
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -355,9 +463,21 @@
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
+[system.ruby.l1_cntrl0.unblockFromL1Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[2]
+
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
-children=L2cache
+children=DirRequestFromL2Cache L1RequestFromL2Cache L1RequestToL2Cache L2cache 
responseFromL2Cache responseToL2Cache unblockToL2Cache
+DirRequestFromL2Cache=system.ruby.l2_cntrl0.DirRequestFromL2Cache
+L1RequestFromL2Cache=system.ruby.l2_cntrl0.L1RequestFromL2Cache
+L1RequestToL2Cache=system.ruby.l2_cntrl0.L1RequestToL2Cache
 L2cache=system.ruby.l2_cntrl0.L2cache
 buffer_size=0
 clk_domain=system.ruby.clk_domain
@@ -367,33 +487,92 @@
 l2_response_latency=2
 number_of_TBEs=256
 recycle_latency=10
+responseFromL2Cache=system.ruby.l2_cntrl0.responseFromL2Cache
+responseToL2Cache=system.ruby.l2_cntrl0.responseToL2Cache
 ruby_system=system.ruby
 system=system
 to_l1_latency=1
 transitions_per_cycle=4
+unblockToL2Cache=system.ruby.l2_cntrl0.unblockToL2Cache
 version=0
-DirRequestFromL2Cache=system.ruby.network.slave[3]
-L1RequestFromL2Cache=system.ruby.network.slave[4]
-L1RequestToL2Cache=system.ruby.network.master[3]
-responseFromL2Cache=system.ruby.network.slave[5]
-responseToL2Cache=system.ruby.network.master[4]
-unblockToL2Cache=system.ruby.network.master[2]
+
+[system.ruby.l2_cntrl0.DirRequestFromL2Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[3]
+
+[system.ruby.l2_cntrl0.L1RequestFromL2Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
+randomization=false
+recycle_latency=10
+master=system.ruby.network.slave[4]
+
+[system.ruby.l2_cntrl0.L1RequestToL2Cache]
+type=MessageBuffer
+buffer_size=0
+eventq_index=0
+ordered=false
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to