changeset 54a65799e4c1 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=54a65799e4c1
description:
        ARM: Update stats for default inclusion of CF adapter.

diffstat:

 tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini                  
|  104 +-
 tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout                      
|    6 +-
 tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt                   
|  984 +++++-----
 tests/long/10.linux-boot/ref/arm/linux/realview-o3/system.terminal             
|    0 
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini      
|  104 +-
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout          
|    6 +-
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt       
|  254 +-
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal 
|    0 
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini      
|  104 +-
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout          
|    6 +-
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt       
|  520 ++--
 tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal 
|    0 
 12 files changed, 1104 insertions(+), 984 deletions(-)

diffs (truncated from 3137 to 300 lines):

diff -r 134bd699967a -r 54a65799e4c1 
tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini     Mon Apr 
04 11:42:31 2011 -0500
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini     Mon Apr 
04 11:42:32 2011 -0500
@@ -9,7 +9,7 @@
 type=LinuxArmSystem
 children=bridge cpu diskmem intrctrl iobus iocache l2c membus physmem realview 
terminal toL2Bus vncserver
 boot_cpu_frequency=500
-boot_osflags=earlyprintk mem=128MB console=ttyAMA0 lpj=19988480 norandmaps 
slram=slram0,0x8000000,+0x8000000 mtdparts=slram0:- rw loglevel=8 
root=/dev/mtdblock0
+boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 
mem=128MB slram=slram0,0x8000000,+0x8000000 mtdparts=slram0:- 
root=/dev/mtdblock0 
 init_param=0
 kernel=/chips/pd/randd/dist/binaries/vmlinux.arm
 load_addr_mask=268435455
@@ -515,7 +515,7 @@
 header_cycles=1
 use_default_range=false
 width=64
-port=system.bridge.side_a system.realview.uart.pio 
system.realview.realview_io.pio system.realview.timer0.pio 
system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio 
system.realview.kmi1.pio system.realview.dmac_fake.pio 
system.realview.uart1_fake.pio system.realview.uart2_fake.pio 
system.realview.uart3_fake.pio system.realview.smc_fake.pio 
system.realview.sp810_fake.pio system.realview.watchdog_fake.pio 
system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio 
system.realview.gpio2_fake.pio system.realview.ssp_fake.pio 
system.realview.sci_fake.pio system.realview.aaci_fake.pio 
system.realview.mmc_fake.pio system.realview.rtc_fake.pio 
system.realview.flash_fake.pio system.realview.cf0_fake.pio 
system.iocache.cpu_side system.realview.clcd.dma
+port=system.bridge.side_a system.realview.uart.pio 
system.realview.realview_io.pio system.realview.timer0.pio 
system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio 
system.realview.kmi1.pio system.realview.cf_ctrl.pio 
system.realview.dmac_fake.pio system.realview.uart1_fake.pio 
system.realview.uart2_fake.pio system.realview.uart3_fake.pio 
system.realview.smc_fake.pio system.realview.sp810_fake.pio 
system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio 
system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio 
system.realview.ssp_fake.pio system.realview.sci_fake.pio 
system.realview.aaci_fake.pio system.realview.mmc_fake.pio 
system.realview.rtc_fake.pio system.realview.flash_fake.pio 
system.iocache.cpu_side system.realview.cf_ctrl.config 
system.realview.cf_ctrl.dma system.realview.clcd.dma
 
 [system.iocache]
 type=BaseCache
@@ -621,7 +621,7 @@
 
 [system.realview]
 type=RealView
-children=aaci_fake cf0_fake clcd dmac_fake flash_fake gic gpio0_fake 
gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake mmc_fake realview_io rtc_fake 
sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake 
uart3_fake watchdog_fake
+children=aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake 
gpio2_fake kmi0 kmi1 l2x0_fake mmc_fake realview_io rtc_fake sci_fake smc_fake 
sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake 
watchdog_fake
 intrctrl=system.intrctrl
 system=system
 
@@ -633,23 +633,63 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[20]
+pio=system.iobus.port[21]
 
-[system.realview.cf0_fake]
-type=IsaFake
-pio_addr=402653184
+[system.realview.cf_ctrl]
+type=IdeController
+BAR0=402653184
+BAR0LegacyIO=true
+BAR0Size=16
+BAR1=402653440
+BAR1LegacyIO=true
+BAR1Size=1
+BAR2=1
+BAR2LegacyIO=false
+BAR2Size=8
+BAR3=1
+BAR3LegacyIO=false
+BAR3Size=4
+BAR4=1
+BAR4LegacyIO=false
+BAR4Size=16
+BAR5=1
+BAR5LegacyIO=false
+BAR5Size=0
+BIST=0
+CacheLineSize=0
+CardbusCIS=0
+ClassCode=1
+Command=1
+DeviceID=28945
+ExpansionROM=0
+HeaderType=0
+InterruptLine=31
+InterruptPin=1
+LatencyTimer=0
+MaximumLatency=0
+MinimumGrant=0
+ProgIF=133
+Revision=0
+Status=640
+SubClassCode=1
+SubsystemID=0
+SubsystemVendorID=0
+VendorID=32902
+config_latency=20000
+ctrl_offset=2
+disks=
+io_shift=1
+max_backoff_delay=10000000
+min_backoff_delay=4000
+pci_bus=0
+pci_dev=0
+pci_func=0
 pio_latency=1000
-pio_size=4095
 platform=system.realview
-ret_bad_addr=false
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-ret_data8=255
 system=system
-update_data=false
-warn_access=
-pio=system.iobus.port[24]
+config=system.iobus.port[26]
+dma=system.iobus.port[27]
+pio=system.iobus.port[8]
 
 [system.realview.clcd]
 type=Pl111
@@ -664,7 +704,7 @@
 platform=system.realview
 system=system
 vnc=system.vncserver
-dma=system.iobus.port[26]
+dma=system.iobus.port[28]
 pio=system.iobus.port[5]
 
 [system.realview.dmac_fake]
@@ -675,7 +715,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[8]
+pio=system.iobus.port[9]
 
 [system.realview.flash_fake]
 type=IsaFake
@@ -691,7 +731,7 @@
 system=system
 update_data=false
 warn_access=
-pio=system.iobus.port[23]
+pio=system.iobus.port[24]
 
 [system.realview.gic]
 type=Gic
@@ -712,7 +752,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[15]
+pio=system.iobus.port[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
@@ -722,7 +762,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[16]
+pio=system.iobus.port[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
@@ -732,7 +772,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[17]
+pio=system.iobus.port[18]
 
 [system.realview.kmi0]
 type=Pl050
@@ -786,7 +826,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[21]
+pio=system.iobus.port[22]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -805,7 +845,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[22]
+pio=system.iobus.port[23]
 
 [system.realview.sci_fake]
 type=AmbaFake
@@ -815,7 +855,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[19]
+pio=system.iobus.port[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
@@ -825,7 +865,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[12]
+pio=system.iobus.port[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
@@ -835,7 +875,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[13]
+pio=system.iobus.port[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
@@ -845,7 +885,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[18]
+pio=system.iobus.port[19]
 
 [system.realview.timer0]
 type=Sp804
@@ -896,7 +936,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[9]
+pio=system.iobus.port[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
@@ -906,7 +946,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[10]
+pio=system.iobus.port[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
@@ -916,7 +956,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[11]
+pio=system.iobus.port[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
@@ -926,7 +966,7 @@
 pio_latency=1000
 platform=system.realview
 system=system
-pio=system.iobus.port[14]
+pio=system.iobus.port[15]
 
 [system.terminal]
 type=Terminal
diff -r 134bd699967a -r 54a65799e4c1 
tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout Mon Apr 04 
11:42:31 2011 -0500
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout Mon Apr 04 
11:42:32 2011 -0500
@@ -5,11 +5,11 @@
 All Rights Reserved
 
 
-M5 compiled Mar 31 2011 10:39:48
-M5 started Mar 31 2011 10:41:48
+M5 compiled Apr  4 2011 11:17:23
+M5 started Apr  4 2011 11:17:27
 M5 executing on u200439-lin.austin.arm.com
 command line: build/ARM_FS/m5.opt -d 
build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3 -re 
tests/run.py build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3
 Global frequency set at 1000000000000 ticks per second
 info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 82667402500 because m5_exit instruction encountered
+Exiting @ tick 82662490500 because m5_exit instruction encountered
diff -r 134bd699967a -r 54a65799e4c1 
tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
--- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt      Mon Apr 
04 11:42:31 2011 -0500
+++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt      Mon Apr 
04 11:42:32 2011 -0500
@@ -1,389 +1,389 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                  90803                       # 
Simulator instruction rate (inst/s)
-host_mem_usage                                 385116                       # 
Number of bytes of host memory used
-host_seconds                                   572.31                       # 
Real time elapsed on the host
-host_tick_rate                              144444192                       # 
Simulator tick rate (ticks/s)
+host_inst_rate                                  92348                       # 
Simulator instruction rate (inst/s)
+host_mem_usage                                 389996                       # 
Number of bytes of host memory used
+host_seconds                                   562.86                       # 
Real time elapsed on the host
+host_tick_rate                              146862568                       # 
Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # 
Frequency of simulated ticks
-sim_insts                                    51967991                       # 
Number of instructions simulated
-sim_seconds                                  0.082667                       # 
Number of seconds simulated
-sim_ticks                                 82667402500                       # 
Number of ticks simulated
+sim_insts                                    51978682                       # 
Number of instructions simulated
+sim_seconds                                  0.082662                       # 
Number of seconds simulated
+sim_ticks                                 82662490500                       # 
Number of ticks simulated
 system.cpu.BPredUnit.BTBCorrect                     0                       # 
Number of correct BTB predictions (this stat may not work properly.
-system.cpu.BPredUnit.BTBHits                  9197470                       # 
Number of BTB hits
-system.cpu.BPredUnit.BTBLookups              11720402                       # 
Number of BTB lookups
-system.cpu.BPredUnit.RASInCorrect              155471                       # 
Number of incorrect RAS predictions.
-system.cpu.BPredUnit.condIncorrect             664024                       # 
Number of conditional branches incorrect
-system.cpu.BPredUnit.condPredicted           11242806                       # 
Number of conditional branches predicted
-system.cpu.BPredUnit.lookups                 13225964                       # 
Number of BP lookups
-system.cpu.BPredUnit.usedRAS                   787685                       # 
Number of times the RAS was used to get a target.
-system.cpu.commit.COM:branches                8444335                       # 
Number of branches committed
-system.cpu.commit.COM:bw_lim_events            800394                       # 
number cycles where commit BW limit reached
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to