changeset c48c7cc5a522 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c48c7cc5a522
description:
        stats: Update to match ARM ISA changes

diffstat:

 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini       
          |    26 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr           
          |     4 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout           
          |     2 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt        
          |    16 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini          
          |    44 +-
 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              
          |     2 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt           
          |    26 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini               
          |    26 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout                   
          |     2 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt                
          |    16 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini  
          |    44 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simerr      
          |    77 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt   
          |    20 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini    
          |    44 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simerr        
          |    25 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt     
          |    22 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini 
         |    51 +-
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr    
          |  2190 +++++----
 tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt 
          |    18 +-
 
tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal
     |   Bin 
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini                        
          |     9 +
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/simerr                            
          |     1 +
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout                            
          |     2 +-
 tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt                         
          |    16 +-
 tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini                     
          |     9 +
 tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr                         
          |     1 +
 tests/long/se/20.parser/ref/arm/linux/o3-timing/simout                         
          |     2 +-
 tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt                      
          |    16 +-
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/config.ini                 
          |     2 +
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/simerr                     
          |     1 +
 tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt                  
          |    12 +-
 tests/long/se/20.parser/ref/arm/linux/simple-timing/config.ini                 
          |     2 +
 tests/long/se/20.parser/ref/arm/linux/simple-timing/simerr                     
          |     1 +
 tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt                  
          |    12 +-
 tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini                        
          |     9 +
 tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr                            
          |     1 +
 tests/long/se/30.eon/ref/arm/linux/o3-timing/simout                            
          |     2 +-
 tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt                         
          |    16 +-
 tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini                    
          |     6 +
 tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt                     
          |    12 +-
 tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini                    
          |     2 +
 tests/long/se/30.eon/ref/arm/linux/simple-timing/simerr                        
          |     1 +
 tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt                     
          |    12 +-
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini                    
          |     9 +
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simerr                        
          |     1 +
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout                        
          |     2 +-
 tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt                     
          |    16 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-atomic/config.ini                
          |     6 +
 tests/long/se/40.perlbmk/ref/arm/linux/simple-atomic/stats.txt                 
          |    12 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/config.ini                
          |    26 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/simout                    
          |     2 +-
 tests/long/se/40.perlbmk/ref/arm/linux/simple-timing/stats.txt                 
          |    12 +-
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini                     
          |     9 +
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr                         
          |     1 +
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout                         
          |     2 +-
 tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt                      
          |    16 +-
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini                      
          |     9 +
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simerr                          
          |     1 +
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout                          
          |     2 +-
 tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt                       
          |    16 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/config.ini                  
          |     6 +
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/simout                      
          |     3 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-atomic/stats.txt                   
          |    12 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/config.ini                  
          |    26 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/simout                      
          |     5 +-
 tests/long/se/60.bzip2/ref/arm/linux/simple-timing/stats.txt                   
          |    12 +-
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini                      
          |     9 +
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/simerr                          
          |     1 +
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout                          
          |     4 +-
 tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt                       
          |    16 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
  |     3 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
 |     3 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
   |    12 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
        |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout  
          |     4 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
         |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini   
          |     3 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout       
          |     4 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt    
          |    12 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
        |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout  
          |     4 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
         |    14 +-
 
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   
          |     3 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout       
          |     2 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt    
          |    12 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
         |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simerr   
          |     4 -
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout   
          |     2 +
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt 
         |    14 +-
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
         |    14 +-
 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout   
          |     2 +
 
tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt 
         |    14 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout                 
          |     4 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt              
          |    16 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout                         
          |     4 +-
 tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt                      
          |    14 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt     
          |    12 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout                     
          |     2 +
 tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt                  
          |    10 +-
 tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout                     
          |     2 +
 tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt                  
          |    10 +-
 tests/quick/se/03.learning-gem5/ref/arm/linux/learning-gem5-p1-simple/simout   
          |     2 +
 
tests/quick/se/03.learning-gem5/ref/arm/linux/learning-gem5-p1-simple/stats.txt 
         |    12 +-
 
tests/quick/se/03.learning-gem5/ref/arm/linux/learning-gem5-p1-two-level/simout 
         |     2 +
 
tests/quick/se/03.learning-gem5/ref/arm/linux/learning-gem5-p1-two-level/stats.txt
       |    10 +-
 tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/simout                       
          |     2 +
 tests/quick/se/10.mcf/ref/arm/linux/simple-atomic/stats.txt                    
          |    12 +-
 tests/quick/se/10.mcf/ref/arm/linux/simple-timing/simout                       
          |     2 +
 tests/quick/se/10.mcf/ref/arm/linux/simple-timing/stats.txt                    
          |    12 +-
 tests/quick/se/50.vortex/ref/arm/linux/simple-atomic/stats.txt                 
          |    12 +-
 tests/quick/se/50.vortex/ref/arm/linux/simple-timing/stats.txt                 
          |    12 +-
 tests/quick/se/70.twolf/ref/arm/linux/simple-atomic/simout                     
          |     4 +-
 tests/quick/se/70.twolf/ref/arm/linux/simple-atomic/stats.txt                  
          |    12 +-
 tests/quick/se/70.twolf/ref/arm/linux/simple-timing/simout                     
          |     4 +-
 tests/quick/se/70.twolf/ref/arm/linux/simple-timing/stats.txt                  
          |    12 +-
 117 files changed, 1945 insertions(+), 1460 deletions(-)

diffs (truncated from 6175 to 300 lines):

diff -r eb53b59ea625 -r c48c7cc5a522 
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  
Thu Jun 02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini  
Thu Jun 02 14:14:36 2016 +0100
@@ -24,7 +24,7 @@
 flags_addr=469827632
 gic_cpu_addr=738205696
 have_large_asid_64=false
-have_lpae=false
+have_lpae=true
 have_security=false
 have_virtualization=false
 highest_el_is_64=false
@@ -47,6 +47,8 @@
 readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
+thermal_components=
+thermal_model=Null
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -199,8 +201,15 @@
 eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
+indirectHashGHR=true
+indirectHashTargets=true
+indirectPathLength=3
+indirectSets=256
+indirectTagSize=16
+indirectWays=2
 instShiftAmt=2
 numThreads=1
+useIndirect=true
 
 [system.cpu.checker]
 type=O3Checker
@@ -1181,6 +1190,7 @@
 type=SubSystem
 children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
 eventq_index=0
+thermal_domain=Null
 
 [system.realview.dcc.osc_cpu]
 type=RealViewOsc
@@ -1373,6 +1383,7 @@
 dist_addr=738201600
 dist_pio_delay=10000
 eventq_index=0
+gem5_extensions=true
 int_latency=10000
 it_lines=128
 platform=system.realview
@@ -1568,8 +1579,9 @@
 
 [system.realview.mcc]
 type=SubSystem
-children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus temp_crtl
 eventq_index=0
+thermal_domain=Null
 
 [system.realview.mcc.osc_clcd]
 type=RealViewOsc
@@ -1615,6 +1627,16 @@
 site=0
 voltage_domain=system.voltage_domain
 
+[system.realview.mcc.temp_crtl]
+type=RealViewTemperatureSensor
+dcc=0
+device=0
+eventq_index=0
+parent=system.realview.realview_io
+position=0
+site=0
+system=system
+
 [system.realview.mmc_fake]
 type=AmbaFake
 amba_id=0
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr      
Thu Jun 02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr      
Thu Jun 02 14:14:36 2016 +0100
@@ -16,7 +16,7 @@
 warn:  instruction 'mcr icialluis' unimplemented
 warn:  instruction 'mcr dccimvac' unimplemented
 warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
-warn: 11083490000: Instruction results do not match! (Values may not actually 
be integers) Inst: 0xa, checker: 0
+warn: 11084065000: Instruction results do not match! (Values may not actually 
be integers) Inst: 0xa, checker: 0
 warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
 warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
 warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
@@ -42,6 +42,6 @@
 warn: Ignoring write to miscreg pmovsr
 warn: Ignoring write to miscreg pmcr
 warn: Ignoring write to miscreg pmcr
-warn: 409465425500: Instruction results do not match! (Values may not actually 
be integers) Inst: 0x80000001, checker: 0x80000000
+warn: 409343110000: Instruction results do not match! (Values may not actually 
be integers) Inst: 0x80000001, checker: 0x80000000
 warn:  instruction 'mcr dcisw' unimplemented
 warn:  instruction 'mcr bpiall' unimplemented
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout      
Thu Jun 02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout      
Thu Jun 02 14:14:36 2016 +0100
@@ -44,4 +44,4 @@
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2832922792000 because m5_exit instruction encountered
+Exiting @ tick 2832862976500 because m5_exit instruction encountered
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt   
Thu Jun 02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt   
Thu Jun 02 14:14:36 2016 +0100
@@ -4,11 +4,11 @@
 sim_ticks                                2832862976500                       # 
Number of ticks simulated
 final_tick                               2832862976500                       # 
Number of ticks from beginning of simulation (restored from checkpoints and 
never reset)
 sim_freq                                 1000000000000                       # 
Frequency of simulated ticks
-host_inst_rate                                  63021                       # 
Simulator instruction rate (inst/s)
-host_op_rate                                    76439                       # 
Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1578508192                       # 
Simulator tick rate (ticks/s)
-host_mem_usage                                 579360                       # 
Number of bytes of host memory used
-host_seconds                                  1794.65                       # 
Real time elapsed on the host
+host_inst_rate                                 104475                       # 
Simulator instruction rate (inst/s)
+host_op_rate                                   126719                       # 
Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2616817312                       # 
Simulator tick rate (ticks/s)
+host_mem_usage                                 625044                       # 
Number of bytes of host memory used
+host_seconds                                  1082.56                       # 
Real time elapsed on the host
 sim_insts                                   113100501                       # 
Number of instructions simulated
 sim_ops                                     137180951                       # 
Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # 
Voltage in Volts
@@ -740,7 +740,7 @@
 system.cpu.rename.LQFullEvents                  18530                       # 
Number of times rename has blocked due to LQ full
 system.cpu.rename.SQFullEvents               30752508                       # 
Number of times rename has blocked due to SQ full
 system.cpu.rename.RenamedOperands           150221263                       # 
Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups             676972712                       # 
Number of register rename lookups that rename has made
+system.cpu.rename.RenameLookups             676943612                       # 
Number of register rename lookups that rename has made
 system.cpu.rename.int_rename_lookups        163957736                       # 
Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups             10899                       # 
Number of floating rename lookups
 system.cpu.rename.CommittedMaps             141737618                       # 
Number of HB maps that are committed
@@ -757,7 +757,7 @@
 system.cpu.iq.iqInstsIssued                 143038678                       # 
Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued            260968                       # 
Number of squashed instructions issued
 system.cpu.iq.iqSquashedInstsExamined         8155598                       # 
Number of squashed instructions iterated over during squash; mainly for 
profiling
-system.cpu.iq.iqSquashedOperandsExamined     14296072                       # 
Number of squashed operands that are examined and possibly removed from graph
+system.cpu.iq.iqSquashedOperandsExamined     14294324                       # 
Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved         121861                       # 
Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     270560621                       # 
Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::mean         0.528675                       # 
Number of insts issued each cycle
@@ -979,7 +979,7 @@
 system.cpu.fp_regfile_writes                     2716                       # 
number of floating regfile writes
 system.cpu.cc_regfile_reads                 502156067                       # 
number of cc regfile reads
 system.cpu.cc_regfile_writes                 53129749                       # 
number of cc regfile writes
-system.cpu.misc_regfile_reads               347863701                       # 
number of misc regfile reads
+system.cpu.misc_regfile_reads               347855567                       # 
number of misc regfile reads
 system.cpu.misc_regfile_writes                1521708                       # 
number of misc regfile writes
 system.cpu.dcache.tags.replacements            838747                       # 
number of replacements
 system.cpu.dcache.tags.tagsinuse           511.925928                       # 
Cycle average of tags in use
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini     
Thu Jun 02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini     
Thu Jun 02 14:14:36 2016 +0100
@@ -24,7 +24,7 @@
 flags_addr=469827632
 gic_cpu_addr=738205696
 have_large_asid_64=false
-have_lpae=false
+have_lpae=true
 have_security=false
 have_virtualization=false
 highest_el_is_64=false
@@ -47,6 +47,8 @@
 readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
+thermal_components=
+thermal_model=Null
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -199,8 +201,15 @@
 eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
+indirectHashGHR=true
+indirectHashTargets=true
+indirectPathLength=3
+indirectSets=256
+indirectTagSize=16
+indirectWays=2
 instShiftAmt=2
 numThreads=1
+useIndirect=true
 
 [system.cpu0.dcache]
 type=Cache
@@ -846,8 +855,15 @@
 eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
+indirectHashGHR=true
+indirectHashTargets=true
+indirectPathLength=3
+indirectSets=256
+indirectTagSize=16
+indirectWays=2
 instShiftAmt=2
 numThreads=1
+useIndirect=true
 
 [system.cpu1.dcache]
 type=Cache
@@ -1499,14 +1515,14 @@
 
 [system.membus]
 type=CoherentXBar
-children=badaddr_responder
+children=badaddr_responder snoop_filter
 clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
 point_of_coherency=true
 response_latency=2
-snoop_filter=Null
+snoop_filter=system.membus.snoop_filter
 snoop_response_latency=4
 system=system
 use_default_range=false
@@ -1533,6 +1549,13 @@
 warn_access=warn
 pio=system.membus.default
 
+[system.membus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=1
+max_capacity=8388608
+system=system
+
 [system.physmem]
 type=DRAMCtrl
 IDD0=0.075000
@@ -1737,6 +1760,7 @@
 type=SubSystem
 children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
 eventq_index=0
+thermal_domain=Null
 
 [system.realview.dcc.osc_cpu]
 type=RealViewOsc
@@ -1929,6 +1953,7 @@
 dist_addr=738201600
 dist_pio_delay=10000
 eventq_index=0
+gem5_extensions=true
 int_latency=10000
 it_lines=128
 platform=system.realview
@@ -2124,8 +2149,9 @@
 
 [system.realview.mcc]
 type=SubSystem
-children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus temp_crtl
 eventq_index=0
+thermal_domain=Null
 
 [system.realview.mcc.osc_clcd]
 type=RealViewOsc
@@ -2171,6 +2197,16 @@
 site=0
 voltage_domain=system.voltage_domain
 
+[system.realview.mcc.temp_crtl]
+type=RealViewTemperatureSensor
+dcc=0
+device=0
+eventq_index=0
+parent=system.realview.realview_io
+position=0
+site=0
+system=system
+
 [system.realview.mmc_fake]
 type=AmbaFake
 amba_id=0
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr Thu Jun 
02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr Thu Jun 
02 14:14:36 2016 +0100
@@ -33,6 +33,7 @@
 warn: CP14 unimplemented crn[0], opc1[0], crm[7], opc2[0]
 warn: CP14 unimplemented crn[1], opc1[0], crm[5], opc2[4]
 warn: allocating bonus target for snoop
+warn: allocating bonus target for snoop
 warn: Returning zero for read from miscreg pmcr
 warn: Ignoring write to miscreg pmcntenclr
 warn: Ignoring write to miscreg pmintenclr
diff -r eb53b59ea625 -r c48c7cc5a522 
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout Thu Jun 
02 13:41:26 2016 +0100
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout Thu Jun 
02 14:14:36 2016 +0100
@@ -29,4 +29,4 @@
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to