changeset 7eccd14e2610 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7eccd14e2610
description:
        stats: update stats for ARMv8 changes

diffstat:

 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini       
   |   166 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr           
   |    37 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout           
   |     9 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt        
   |  3032 +++---
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini          
   |   170 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr              
   |     3 -
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout              
   |     9 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt           
   |  4554 +++++----
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini               
   |    87 +-
 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                   
   |     8 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt                
   |  2962 +++---
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini  
   |   233 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simerr      
   |    12 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout      
   |     7 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt   
   |  3347 +++---
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini    
   |   160 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simerr        
   |    20 +-
 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     
   |  3779 ++++---
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini 
  |   160 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr    
   |    38 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout    
   |     6 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt 
   |  2240 ++--
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini                        
   |    78 +-
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout                            
   |     7 +-
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt                         
   |  1344 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-atomic/config.ini                    
   |    78 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-atomic/simout                        
   |     5 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt                     
   |    54 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-timing/config.ini                    
   |    78 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-timing/simout                        
   |     5 +-
 tests/long/se/10.mcf/ref/arm/linux/simple-timing/stats.txt                     
   |    54 +-
 tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini                     
   |    78 +-
 tests/long/se/20.parser/ref/arm/linux/o3-timing/simout                         
   |     7 +-
 tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt                      
   |  1553 +-
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/config.ini                 
   |    78 +-
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/simout                     
   |     5 +-
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt                  
   |    54 +-
 tests/long/se/20.parser/ref/arm/linux/simple-timing/config.ini                 
   |    78 +-
 tests/long/se/20.parser/ref/arm/linux/simple-timing/simout                     
   |     5 +-
 tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt                  
   |    54 +-
 tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini                        
   |    78 +-
 tests/long/se/30.eon/ref/arm/linux/o3-timing/simout                            
   |     7 +-
 tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt                         
   |  1323 +-
 tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini                    
   |    78 +-
 tests/long/se/30.eon/ref/arm/linux/simple-atomic/simout                        
   |     5 +-
 tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt                     
   |    54 +-
 tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini                    
   |    78 +-
 tests/long/se/30.eon/ref/arm/linux/simple-timing/simout                        
   |     5 +-
 tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt                     
   |    54 +-
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini                    
   |    78 +-
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout                        
   |     5 +-
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt                     
   |   382 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-atomic/config.ini                
   |    78 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-atomic/simout                    
   |     5 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-atomic/stats.txt                 
   |    54 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/config.ini                
   |    78 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/simout                    
   |     5 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/stats.txt                 
   |    54 +-
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini                     
   |    78 +-
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr                         
   |     1 +
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout                         
   |     7 +-
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt                      
   |  1739 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-atomic/config.ini                 
   |    78 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-atomic/simout                     
   |     5 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt                  
   |    54 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-timing/config.ini                 
   |    78 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-timing/simout                     
   |     5 +-
 tests/long/se/50.vortex/ref/arm/linux/simple-timing/stats.txt                  
   |    54 +-
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini                      
   |    78 +-
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout                          
   |     7 +-
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt                       
   |  1641 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/config.ini                  
   |    78 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/simout                      
   |     5 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/stats.txt                   
   |    54 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/config.ini                  
   |    78 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/simout                      
   |     5 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/stats.txt                   
   |    54 +-
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini                      
   |    78 +-
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout                          
   |     9 +-
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt                       
   |   762 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-atomic/config.ini                  
   |    78 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-atomic/simout                      
   |     7 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-atomic/stats.txt                   
   |    54 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-timing/config.ini                  
   |    78 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-timing/simout                      
   |     7 +-
 tests/long/se/70.twolf/ref/arm/linux/simple-timing/stats.txt                   
   |    54 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
 |   170 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simerr  
   |     3 -
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout  
   |     9 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
  |   576 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini   
   |    87 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simerr       
   |     2 -
 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    
   |   158 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
 |   170 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simerr  
   |     3 -
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout  
   |     9 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
  |  3016 +++---
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini   
   |    87 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simerr       
   |     2 -
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout       
   |     6 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt    
   |   638 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
  |   160 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simerr   
   |     8 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout   
   |     6 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt 
  |   502 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini             
   |   157 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout                 
   |     6 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt              
   |   100 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini                     
   |    78 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout                         
   |     5 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt                      
   |    58 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini    
   |   151 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout        
   |     6 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt     
   |    96 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini                 
   |    78 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout                     
   |     5 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt                  
   |    54 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini                 
   |    78 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout                     
   |     5 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt                  
   |    54 +-
 123 files changed, 22164 insertions(+), 16696 deletions(-)

diffs (truncated from 48963 to 300 lines):

diff -r 5cac77888310 -r 7eccd14e2610 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini  
Fri Jan 24 15:29:34 2014 -0600
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini  
Fri Jan 24 15:29:34 2014 -0600
@@ -14,6 +14,7 @@
 atags_addr=256
 boot_loader=/dist/binaries/boot.arm
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 
mem=128MB root=/dev/sda1
+boot_release_addr=65528
 cache_line_size=64
 clk_domain=system.clk_domain
 dtb_filename=
@@ -22,9 +23,16 @@
 eventq_index=0
 flags_addr=268435504
 gic_cpu_addr=520093952
+have_generic_timer=false
+have_large_asid_64=false
+have_lpae=false
+have_security=false
+have_virtualization=false
+highest_el_is_64=false
 init_param=0
 kernel=/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
+load_offset=0
 machine_type=RealView_PBX
 mem_mode=timing
 mem_ranges=0:134217727
@@ -33,7 +41,9 @@
 num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
+phys_addr_range_64=40
 readfile=tests/halt.sh
+reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
@@ -86,7 +96,7 @@
 
 [system.cpu]
 type=DerivO3CPU
-children=branchPred checker dcache dtb fuPool icache interrupts isa itb 
l2cache toL2Bus tracer
+children=branchPred checker dcache dstage2_mmu dtb fuPool icache interrupts 
isa istage2_mmu itb l2cache toL2Bus tracer
 LFSTSize=1024
 LQEntries=32
 LSQCheckLoads=true
@@ -112,6 +122,7 @@
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
+dstage2_mmu=system.cpu.dstage2_mmu
 dtb=system.cpu.dtb
 eventq_index=0
 fetchBufferSize=64
@@ -130,6 +141,7 @@
 isa=system.cpu.isa
 issueToExecuteDelay=1
 issueWidth=8
+istage2_mmu=system.cpu.istage2_mmu
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -191,13 +203,14 @@
 
 [system.cpu.checker]
 type=O3Checker
-children=dtb isa itb tracer
+children=dstage2_mmu dtb isa istage2_mmu itb tracer
 checker=Null
 clk_domain=system.cpu_clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
+dstage2_mmu=system.cpu.checker.dstage2_mmu
 dtb=system.cpu.checker.dtb
 eventq_index=0
 exitOnError=false
@@ -205,6 +218,7 @@
 function_trace_start=0
 interrupts=Null
 isa=system.cpu.checker.isa
+istage2_mmu=system.cpu.checker.istage2_mmu
 itb=system.cpu.checker.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -221,10 +235,35 @@
 warnOnlyOnLoadError=true
 workload=
 
+[system.cpu.checker.dstage2_mmu]
+type=ArmStage2MMU
+children=stage2_tlb
+eventq_index=0
+stage2_tlb=system.cpu.checker.dstage2_mmu.stage2_tlb
+tlb=system.cpu.checker.dtb
+
+[system.cpu.checker.dstage2_mmu.stage2_tlb]
+type=ArmTLB
+children=walker
+eventq_index=0
+is_stage2=true
+size=32
+walker=system.cpu.checker.dstage2_mmu.stage2_tlb.walker
+
+[system.cpu.checker.dstage2_mmu.stage2_tlb.walker]
+type=ArmTableWalker
+clk_domain=system.cpu_clk_domain
+eventq_index=0
+is_stage2=true
+num_squash_per_cycle=2
+sys=system
+port=system.cpu.toL2Bus.slave[9]
+
 [system.cpu.checker.dtb]
 type=ArmTLB
 children=walker
 eventq_index=0
+is_stage2=false
 size=64
 walker=system.cpu.checker.dtb.walker
 
@@ -232,32 +271,69 @@
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
 eventq_index=0
+is_stage2=false
 num_squash_per_cycle=2
 sys=system
-port=system.cpu.toL2Bus.slave[5]
+port=system.cpu.toL2Bus.slave[7]
 
 [system.cpu.checker.isa]
 type=ArmISA
 eventq_index=0
 fpsid=1090793632
+id_aa64afr0_el1=0
+id_aa64afr1_el1=0
+id_aa64dfr0_el1=1052678
+id_aa64dfr1_el1=0
+id_aa64isar0_el1=0
+id_aa64isar1_el1=0
+id_aa64mmfr0_el1=15728642
+id_aa64mmfr1_el1=0
+id_aa64pfr0_el1=17
+id_aa64pfr1_el1=0
 id_isar0=34607377
 id_isar1=34677009
 id_isar2=555950401
 id_isar3=17899825
 id_isar4=268501314
 id_isar5=0
-id_mmfr0=3
+id_mmfr0=270536963
 id_mmfr1=0
 id_mmfr2=19070976
-id_mmfr3=4027589137
+id_mmfr3=34611729
 id_pfr0=49
-id_pfr1=1
-midr=890224640
+id_pfr1=4113
+midr=1091551472
+system=system
+
+[system.cpu.checker.istage2_mmu]
+type=ArmStage2MMU
+children=stage2_tlb
+eventq_index=0
+stage2_tlb=system.cpu.checker.istage2_mmu.stage2_tlb
+tlb=system.cpu.checker.itb
+
+[system.cpu.checker.istage2_mmu.stage2_tlb]
+type=ArmTLB
+children=walker
+eventq_index=0
+is_stage2=true
+size=32
+walker=system.cpu.checker.istage2_mmu.stage2_tlb.walker
+
+[system.cpu.checker.istage2_mmu.stage2_tlb.walker]
+type=ArmTableWalker
+clk_domain=system.cpu_clk_domain
+eventq_index=0
+is_stage2=true
+num_squash_per_cycle=2
+sys=system
+port=system.cpu.toL2Bus.slave[8]
 
 [system.cpu.checker.itb]
 type=ArmTLB
 children=walker
 eventq_index=0
+is_stage2=false
 size=64
 walker=system.cpu.checker.itb.walker
 
@@ -265,9 +341,10 @@
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
 eventq_index=0
+is_stage2=false
 num_squash_per_cycle=2
 sys=system
-port=system.cpu.toL2Bus.slave[4]
+port=system.cpu.toL2Bus.slave[6]
 
 [system.cpu.checker.tracer]
 type=ExeTracer
@@ -308,10 +385,35 @@
 sequential_access=false
 size=32768
 
+[system.cpu.dstage2_mmu]
+type=ArmStage2MMU
+children=stage2_tlb
+eventq_index=0
+stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+tlb=system.cpu.dtb
+
+[system.cpu.dstage2_mmu.stage2_tlb]
+type=ArmTLB
+children=walker
+eventq_index=0
+is_stage2=true
+size=32
+walker=system.cpu.dstage2_mmu.stage2_tlb.walker
+
+[system.cpu.dstage2_mmu.stage2_tlb.walker]
+type=ArmTableWalker
+clk_domain=system.cpu_clk_domain
+eventq_index=0
+is_stage2=true
+num_squash_per_cycle=2
+sys=system
+port=system.cpu.toL2Bus.slave[5]
+
 [system.cpu.dtb]
 type=ArmTLB
 children=walker
 eventq_index=0
+is_stage2=false
 size=64
 walker=system.cpu.dtb.walker
 
@@ -319,6 +421,7 @@
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
 eventq_index=0
+is_stage2=false
 num_squash_per_cycle=2
 sys=system
 port=system.cpu.toL2Bus.slave[3]
@@ -673,24 +776,60 @@
 type=ArmISA
 eventq_index=0
 fpsid=1090793632
+id_aa64afr0_el1=0
+id_aa64afr1_el1=0
+id_aa64dfr0_el1=1052678
+id_aa64dfr1_el1=0
+id_aa64isar0_el1=0
+id_aa64isar1_el1=0
+id_aa64mmfr0_el1=15728642
+id_aa64mmfr1_el1=0
+id_aa64pfr0_el1=17
+id_aa64pfr1_el1=0
 id_isar0=34607377
 id_isar1=34677009
 id_isar2=555950401
 id_isar3=17899825
 id_isar4=268501314
 id_isar5=0
-id_mmfr0=3
+id_mmfr0=270536963
 id_mmfr1=0
 id_mmfr2=19070976
-id_mmfr3=4027589137
+id_mmfr3=34611729
 id_pfr0=49
-id_pfr1=1
-midr=890224640
+id_pfr1=4113
+midr=1091551472
+system=system
+
+[system.cpu.istage2_mmu]
+type=ArmStage2MMU
+children=stage2_tlb
+eventq_index=0
+stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+tlb=system.cpu.itb
+
+[system.cpu.istage2_mmu.stage2_tlb]
+type=ArmTLB
+children=walker
+eventq_index=0
+is_stage2=true
+size=32
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to