changeset 3be64e1f80ed in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=3be64e1f80ed
description:
        stats: Update to reflect changes to RealView platform code

diffstat:

 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini       
           |   294 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout           
           |    16 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt        
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini            
           |   265 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout                
           |    16 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt             
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini       
           |   268 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr           
           |     7 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout           
           |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt        
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini          
           |   261 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr              
           |     1 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout              
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt           
           |    34 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini               
           |   265 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simerr                   
           |     2 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout                   
           |    16 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt                
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini  
           |   274 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simerr      
           |    58 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout      
           |    10 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt   
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini    
           |   268 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simerr        
           |    26 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout        
           |     6 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt     
           |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini     
           |   263 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout         
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt      
           |    30 +-
 
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          
           |   254 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout              
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt           
           |    30 +-
 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     
           |   255 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr         
           |   172 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout         
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt      
           |    30 +-
 
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        
           |   263 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr            
           |     5 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout            
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt         
           |    30 +-
 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             
           |   254 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout                 
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt              
           |    30 +-
 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
  |   254 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
 |   353 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
   |    30 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini
        |   263 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout 
           |    12 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt
         |    30 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini  
           |   254 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout      
           |    12 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt   
           |    30 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini
        |   263 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout 
           |    14 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt
         |    30 +-
 
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  
           |   254 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout      
           |    14 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt   
           |    30 +-
 
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
         |   255 +-
 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
          |    30 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini 
          |   257 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr    
           |  1484 ++++-----
 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 
           |    30 +-
 
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  
           |   255 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr      
           |    16 +
 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   
           |    30 +-
 
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
         |   255 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr  
           |     4 -
 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
          |    30 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal
    |   Bin 
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
   |   245 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
  |   320 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
    |    30 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
         |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout  
           |    14 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
          |    30 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini   
           |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout       
           |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt    
           |    30 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
         |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout  
           |    14 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
          |    30 +-
 
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   
           |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout       
           |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt    
           |    30 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
          |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout   
           |    10 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt 
          |    30 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
          |   245 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout   
           |    10 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt 
          |    30 +-
 105 files changed, 5589 insertions(+), 5228 deletions(-)

diffs (truncated from 16687 to 300 lines):

diff -r 627dd43a5846 -r 3be64e1f80ed 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini  
Fri Dec 04 00:19:05 2015 +0000
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini  
Fri Dec 04 00:19:05 2015 +0000
@@ -12,11 +12,11 @@
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl 
iobus iocache l2c membus physmem realview terminal toL2Bus vncserver 
voltage_domain
 atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
 boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 
norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
 cache_line_size=64
 clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
@@ -28,7 +28,7 @@
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
@@ -38,11 +38,12 @@
 memories=system.physmem system.realview.nvmem system.realview.vram
 mmap_using_noreserve=false
 multi_proc=true
+multi_thread=false
 num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -85,7 +86,7 @@
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
 read_only=true
 
 [system.clk_domain]
@@ -184,6 +185,7 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -200,6 +202,7 @@
 tags=system.cpu0.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu0.dcache_port
 mem_side=system.cpu0.toL2Bus.slave[1]
 
@@ -643,6 +646,7 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
@@ -659,6 +663,7 @@
 tags=system.cpu0.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu0.icache_port
 mem_side=system.cpu0.toL2Bus.slave[0]
 
@@ -678,6 +683,7 @@
 
 [system.cpu0.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -753,6 +759,7 @@
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -769,6 +776,7 @@
 tags=system.cpu0.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu0.toL2Bus.master[0]
 mem_side=system.toL2Bus.slave[0]
 
@@ -809,12 +817,13 @@
 
 [system.cpu0.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.cpu0.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -822,6 +831,13 @@
 master=system.cpu0.l2cache.cpu_side
 slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side 
system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
 
+[system.cpu0.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu0.tracer]
 type=ExeTracer
 eventq_index=0
@@ -914,6 +930,7 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -930,6 +947,7 @@
 tags=system.cpu1.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu1.dcache_port
 mem_side=system.cpu1.toL2Bus.slave[1]
 
@@ -1373,6 +1391,7 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
@@ -1389,6 +1408,7 @@
 tags=system.cpu1.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu1.icache_port
 mem_side=system.cpu1.toL2Bus.slave[0]
 
@@ -1408,6 +1428,7 @@
 
 [system.cpu1.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -1483,6 +1504,7 @@
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -1499,6 +1521,7 @@
 tags=system.cpu1.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu1.toL2Bus.master[0]
 mem_side=system.toL2Bus.slave[1]
 
@@ -1539,12 +1562,13 @@
 
 [system.cpu1.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.cpu1.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -1552,6 +1576,13 @@
 master=system.cpu1.l2cache.cpu_side
 slave=system.cpu1.icache.mem_side system.cpu1.dcache.mem_side 
system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
 
+[system.cpu1.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu1.tracer]
 type=ExeTracer
 eventq_index=0
@@ -1596,6 +1627,7 @@
 addr_ranges=2147483648:2415919103
 assoc=8
 clk_domain=system.clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
@@ -1612,6 +1644,7 @@
 tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.iobus.master[27]
 mem_side=system.membus.slave[3]
 
@@ -1631,6 +1664,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
@@ -1647,6 +1681,7 @@
 tags=system.l2c.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.toL2Bus.master[0]
 mem_side=system.membus.slave[2]
 
@@ -1774,7 +1809,7 @@
 
 [system.realview]
 type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd 
ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig 
realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake 
usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic 
hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem 
pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake 
uart3_fake usb_fake vgic vram watchdog_fake
 eventq_index=0
 intrctrl=system.intrctrl
 pci_cfg_base=805306368
@@ -1899,6 +1934,77 @@
 dma=system.iobus.slave[1]
 pio=system.iobus.master[4]
 
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.dcc.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.dcc.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to