changeset 1c5102c0a7a9 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=1c5102c0a7a9
description:
        stats: Update to reflect changes to PCI handling

diffstat:

 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/config.ini           
           |    69 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/simout               
           |    13 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/stats.txt            
           |   398 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/system.terminal      
           |     2 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini         
           |    73 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout             
           |    14 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt          
           |   498 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/system.terminal    
           |     2 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/config.ini              
           |    69 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/simout                  
           |    12 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt               
           |   732 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/system.terminal         
           |     2 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/config.ini 
           |    73 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/simerr     
           |     8 -
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/simout     
           |    10 +-
 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/stats.txt  
           |    28 +-
 
tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-switcheroo-full/system.terminal
       |     2 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini       
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout           
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt        
           |  4533 +++---
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini            
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout                
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt             
           |  1779 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini       
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr           
           |     2 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout           
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt        
           |  2198 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini          
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout              
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt           
           |  5778 ++++----
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini               
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout                   
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt                
           |  2144 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini  
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout      
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt   
           |    32 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini    
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simerr        
           |     6 +
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout        
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt     
           |  3928 +++---
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini     
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout         
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt      
           |  5147 ++++----
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal 
          |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini          
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout              
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt           
           |  2110 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal     
           |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini     
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr         
           |   174 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout         
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt      
           |  2838 ++--
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal 
          |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini        
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr            
           |     1 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout            
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt         
           |  6409 ++++-----
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal   
           |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini             
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout                 
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt              
           |  2738 ++--
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal        
           |   Bin 
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
  |    55 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
 |   123 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
   |    18 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini
        |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout 
           |     8 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt
         |    18 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini  
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout      
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt   
           |    18 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini
        |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout 
           |    10 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt
         |  5191 ++++----
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal
   |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini  
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout      
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt   
           |  2126 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal
        |   Bin 
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini
         |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout  
           |     8 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt
          |    18 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini 
          |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr    
           |  1480 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout    
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt 
           |  5143 ++++----
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal
      |   Bin 
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini  
           |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr      
           |    80 +
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout      
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt   
           |  4372 +++---
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal
        |   Bin 
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini
         |    55 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr  
           |    48 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout  
           |     8 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt
          |  3137 ++--
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal
    |   Bin 
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini              
           |    84 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout                  
           |    10 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt               
           |  2567 +--
 
tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/system.pc.com_1.terminal 
          |     4 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini        
           |    84 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json       
           |   183 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simerr            
           |    68 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout            
           |     8 +-
 tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt         
           |  3218 ++--
 
tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/system.pc.com_1.terminal
     |     4 +-
 tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simerr     
           |    39 -
 tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout     
           |    17 +-
 tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt  
           |   251 -
 
tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
        |    50 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout 
           |    12 +-
 
tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt
         |    20 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini  
           |    50 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout      
           |    12 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt   
           |    20 +-
 
tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
        |    50 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout 
           |    14 +-
 
tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt
         |  2805 ++--
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini  
           |    50 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout      
           |    12 +-
 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt   
           |   370 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
   |    55 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
  |   123 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
    |    18 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
         |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout  
           |     8 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
          |    18 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini   
           |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout       
           |     8 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt    
           |    18 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
         |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout  
           |    10 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
          |  4596 +++---
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal
    |   Bin 
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini   
           |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout       
           |    10 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt    
           |  1444 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
          |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout   
           |     8 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt 
          |    18 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
          |    55 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr   
           |    16 +
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout   
           |     8 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt 
          |  2351 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini         
           |    61 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout             
           |    12 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt          
           |    16 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini         
           |    61 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout             
           |    14 +-
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt          
           |   648 +-
 
tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
  |   100 +-
 
tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
      |    14 +-
 
tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
   |   404 +-
 154 files changed, 42268 insertions(+), 43036 deletions(-)

diffs (truncated from 104779 to 300 lines):

diff -r a2af58a06c4e -r 1c5102c0a7a9 
tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/config.ini
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/config.ini      
Sat Dec 05 00:11:24 2015 +0000
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/config.ini      
Sat Dec 05 00:11:25 2015 +0000
@@ -15,10 +15,10 @@
 boot_osflags=root=/dev/hda1 console=ttyS0
 cache_line_size=64
 clk_domain=system.clk_domain
-console=/scratch/nilay/GEM5/system/binaries/console
+console=/work/gem5/dist/binaries/console
 eventq_index=0
 init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux
+kernel=/work/gem5/dist/binaries/vmlinux
 kernel_addr_check=true
 load_addr_mask=1099511627775
 load_offset=0
@@ -26,9 +26,10 @@
 mem_ranges=0:134217727
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
-pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+pal=/work/gem5/dist/binaries/ts_osfpal
+readfile=/work/gem5/outgoing/gem5_2/tests/halt.sh
 symbolfile=
 system_rev=1024
 system_type=34
@@ -146,6 +147,7 @@
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -162,6 +164,7 @@
 tags=system.cpu.dcache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -569,6 +572,7 @@
 addr_ranges=0:18446744073709551615
 assoc=1
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -585,6 +589,7 @@
 tags=system.cpu.icache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -618,6 +623,7 @@
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -634,6 +640,7 @@
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -649,12 +656,13 @@
 
 [system.cpu.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.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -662,6 +670,13 @@
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -694,7 +709,7 @@
 [system.disk0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
+image_file=/work/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [system.disk2]
@@ -717,7 +732,7 @@
 [system.disk2.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
+image_file=/work/gem5/dist/disks/linux-bigswap2.img
 read_only=true
 
 [system.dvfs_handler]
@@ -740,10 +755,9 @@
 forward_latency=1
 frontend_latency=2
 response_latency=2
-use_default_range=true
+use_default_range=false
 width=16
-default=system.tsunami.pciconfig.pio
-master=system.tsunami.cchip.pio system.tsunami.pchip.pio 
system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio 
system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio 
system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio 
system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio 
system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio 
system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio 
system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio 
system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio 
system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio 
system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio 
system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio 
system.tsunami.ide.config system.tsunami.ethernet.pio 
system.tsunami.ethernet.config system.iocache.cpu_side
+master=system.tsunami.cchip.pio system.tsunami.pchip.pio 
system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio 
system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio 
system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio 
system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio 
system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio 
system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio 
system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio 
system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio 
system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio 
system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio 
system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio 
system.tsunami.ethernet.pio system.iocache.cpu_side
 slave=system.bridge.master system.tsunami.ide.dma system.tsunami.ethernet.dma
 
 [system.iocache]
@@ -752,6 +766,7 @@
 addr_ranges=0:134217727
 assoc=8
 clk_domain=system.clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
@@ -768,7 +783,8 @@
 tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
-cpu_side=system.iobus.master[29]
+writeback_clean=false
+cpu_side=system.iobus.master[27]
 mem_side=system.membus.slave[2]
 
 [system.iocache.tags]
@@ -903,7 +919,7 @@
 [system.simple_disk.disk]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
+image_file=/work/gem5/dist/disks/linux-latest.img
 read_only=true
 
 [system.terminal]
@@ -916,7 +932,7 @@
 
 [system.tsunami]
 type=Tsunami
-children=backdoor cchip ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr 
fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 
fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc 
fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip 
pciconfig uart
+children=backdoor cchip ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr 
fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 
fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc 
fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip uart
 eventq_index=0
 intrctrl=system.intrctrl
 system=system
@@ -1029,12 +1045,12 @@
 dma_write_factor=0
 eventq_index=0
 hardware_address=00:90:00:00:00:01
+host=system.tsunami.pchip
 intr_delay=10000000
 pci_bus=0
 pci_dev=1
 pci_func=0
 pio_latency=30000
-platform=system.tsunami
 rss=false
 rx_delay=1000000
 rx_fifo_size=524288
@@ -1044,9 +1060,8 @@
 tx_delay=1000000
 tx_fifo_size=524288
 tx_thread=false
-config=system.iobus.master[28]
 dma=system.iobus.slave[2]
-pio=system.iobus.master[27]
+pio=system.iobus.master[26]
 
 [system.tsunami.fake_OROM]
 type=IsaFake
@@ -1479,14 +1494,13 @@
 ctrl_offset=0
 disks=system.disk0 system.disk2
 eventq_index=0
+host=system.tsunami.pchip
 io_shift=0
 pci_bus=0
 pci_dev=0
 pci_func=0
 pio_latency=30000
-platform=system.tsunami
 system=system
-config=system.iobus.master[26]
 dma=system.iobus.slave[1]
 pio=system.iobus.master[25]
 
@@ -1506,25 +1520,20 @@
 [system.tsunami.pchip]
 type=TsunamiPChip
 clk_domain=system.clk_domain
+conf_base=8804649402368
+conf_device_bits=8
+conf_size=16777216
 eventq_index=0
+pci_dma_base=0
+pci_mem_base=8796093022208
+pci_pio_base=8804615847936
 pio_addr=8802535473152
 pio_latency=100000
+platform=system.tsunami
 system=system
 tsunami=system.tsunami
 pio=system.iobus.master[1]
 
-[system.tsunami.pciconfig]
-type=PciConfigAll
-bus=0
-clk_domain=system.clk_domain
-eventq_index=0
-pio_addr=0
-pio_latency=30000
-platform=system.tsunami
-size=16777216
-system=system
-pio=system.iobus.default
-
 [system.tsunami.uart]
 type=Uart8250
 clk_domain=system.clk_domain
diff -r a2af58a06c4e -r 1c5102c0a7a9 
tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/simout
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/simout  Sat Dec 
05 00:11:24 2015 +0000
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/simout  Sat Dec 
05 00:11:25 2015 +0000
@@ -1,12 +1,13 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Oct 29 2014 09:12:51
-gem5 started Oct 29 2014 09:20:31
-gem5 executing on u200540-lin
-command line: build/ALPHA/gem5.opt -d 
build/ALPHA/tests/opt/long/fs/10.linux-boot/alpha/linux/tsunami-minor -re 
/work/gem5.latest/tests/run.py 
build/ALPHA/tests/opt/long/fs/10.linux-boot/alpha/linux/tsunami-minor
+gem5 compiled Dec  4 2015 10:28:58
+gem5 started Dec  4 2015 10:29:11
+gem5 executing on e104799-lin, pid 21295
+command line: build/ALPHA/gem5.opt -d 
build/ALPHA/tests/opt/long/fs/10.linux-boot/alpha/linux/tsunami-minor -re 
/work/gem5/outgoing/gem5_2/tests/run.py 
build/ALPHA/tests/opt/long/fs/10.linux-boot/alpha/linux/tsunami-minor
+
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/binaries/vmlinux
+info: kernel located at: /work/gem5/dist/binaries/vmlinux
       0: system.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 1883224346500 because m5_exit instruction encountered
+Exiting @ tick 1906048606500 because m5_exit instruction encountered
diff -r a2af58a06c4e -r 1c5102c0a7a9 
tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/stats.txt
--- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/stats.txt       
Sat Dec 05 00:11:24 2015 +0000
+++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-minor/stats.txt       
Sat Dec 05 00:11:25 2015 +0000
@@ -4,11 +4,11 @@
 sim_ticks                                1906048606500                       # 
Number of ticks simulated
 final_tick                               1906048606500                       # 
Number of ticks from beginning of simulation (restored from checkpoints and 
never reset)
 sim_freq                                 1000000000000                       # 
Frequency of simulated ticks
-host_inst_rate                                 269376                       # 
Simulator instruction rate (inst/s)
-host_op_rate                                   269376                       # 
Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             9144869235                       # 
Simulator tick rate (ticks/s)
-host_mem_usage                                 376080                       # 
Number of bytes of host memory used
-host_seconds                                   208.43                       # 
Real time elapsed on the host
+host_inst_rate                                 268534                       # 
Simulator instruction rate (inst/s)
+host_op_rate                                   268534                       # 
Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             9116285517                       # 
Simulator tick rate (ticks/s)
+host_mem_usage                                 332204                       # 
Number of bytes of host memory used
+host_seconds                                   209.08                       # 
Real time elapsed on the host
 sim_insts                                    56145568                       # 
Number of instructions simulated
 sim_ops                                      56145568                       # 
Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # 
Voltage in Volts
@@ -150,10 +150,10 @@
 system.physmem.wrQLenPdf::14                        1                       # 
What write queue length does an incoming req see
 system.physmem.wrQLenPdf::15                     1565                       # 
What write queue length does an incoming req see
 system.physmem.wrQLenPdf::16                     1858                       # 
What write queue length does an incoming req see
-system.physmem.wrQLenPdf::17                     5601                       # 
What write queue length does an incoming req see
+system.physmem.wrQLenPdf::17                     5600                       # 
What write queue length does an incoming req see
 system.physmem.wrQLenPdf::18                     5604                       # 
What write queue length does an incoming req see
 system.physmem.wrQLenPdf::19                     6269                       # 
What write queue length does an incoming req see
-system.physmem.wrQLenPdf::20                     6564                       # 
What write queue length does an incoming req see
+system.physmem.wrQLenPdf::20                     6565                       # 
What write queue length does an incoming req see
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to