stats: updates due to recent changesets including d0934b57735a

3 files changed, 47 insertions, 41 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
index cc1edf626..160a8ac7f 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
 atags_addr=134217728
-boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
+boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
 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=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
+kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5/tests/halt.sh
+readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
+image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
 read_only=true
 
 [system.clk_domain]
@@ -136,7 +136,7 @@ dcache_port=system.cpu.dcache.cpu_side
 icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
-type=BaseCache
+type=Cache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
@@ -212,7 +212,7 @@ sys=system
 port=system.cpu.toL2Bus.slave[3]
 
 [system.cpu.icache]
-type=BaseCache
+type=Cache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=1
@@ -322,7 +322,7 @@ sys=system
 port=system.cpu.toL2Bus.slave[2]
 
 [system.cpu.l2cache]
-type=BaseCache
+type=Cache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
@@ -410,7 +410,7 @@ master=system.realview.uart.pio system.realview.realview_io.pio system.realview.
 slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
 
 [system.iocache]
-type=BaseCache
+type=Cache
 children=tags
 addr_ranges=2147483648:2415919103
 assoc=8
@@ -761,9 +761,12 @@ gic=system.realview.gic
 int_num=117
 pio_addr=721420288
 pio_latency=10000
-pixel_clock=7299
+pixel_buffer_size=2048
+pixel_chunk=32
+pxl_clk=system.realview.realview_io.osc_pxl
 system=system
 vnc=system.vncserver
+workaround_dma_line_count=true
 workaround_swap_rb=true
 dma=system.membus.slave[0]
 pio=system.iobus.master[5]
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
index 1d5cc7d19..96cb18ee3 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
@@ -6,7 +6,7 @@
         "mmap_using_noreserve": false, 
         "kernel_addr_check": true, 
         "highest_el_is_64": false, 
-        "kernel": "/work/gem5/dist/binaries/vmlinux.aarch64.20140821", 
+        "kernel": "/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821", 
         "iobus": {
             "slave": {
                 "peer": [
@@ -68,7 +68,7 @@
             "frontend_latency": 2
         }, 
         "symbolfile": "", 
-        "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh", 
+        "readfile": "/scratch/nilay/GEM5/gem5/tests/halt.sh", 
         "have_large_asid_64": false, 
         "phys_addr_range_64": 40, 
         "have_lpae": false, 
@@ -87,7 +87,7 @@
         "multi_proc": true, 
         "early_kernel_symbols": false, 
         "panic_on_oops": true, 
-        "dtb_filename": "/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb", 
+        "dtb_filename": "/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb", 
         "enable_context_switch_stats_dump": false, 
         "work_begin_ckpt_count": 0, 
         "clk_domain": {
@@ -108,30 +108,33 @@
         ], 
         "realview": {
             "hdlcd": {
-                "dma": {
-                    "peer": "system.membus.slave[0]", 
-                    "role": "MASTER"
-                }, 
-                "pixel_clock": 7299, 
                 "vnc": "system.vncserver", 
+                "pxl_clk": "system.realview.realview_io.osc_pxl", 
                 "name": "hdlcd", 
+                "workaround_dma_line_count": true, 
+                "amba_id": 1314816, 
                 "pio": {
                     "peer": "system.iobus.master[5]", 
                     "role": "SLAVE"
                 }, 
-                "amba_id": 1314816, 
                 "pio_latency": 10000, 
                 "clk_domain": "system.clk_domain", 
                 "system": "system", 
                 "gic": "system.realview.gic", 
                 "int_num": 117, 
                 "eventq_index": 0, 
+                "pixel_buffer_size": 2048, 
                 "cxx_class": "HDLcd", 
                 "enable_capture": true, 
                 "path": "system.realview.hdlcd", 
                 "pio_addr": 721420288, 
                 "workaround_swap_rb": true, 
-                "type": "HDLcd"
+                "type": "HDLcd", 
+                "pixel_chunk": 32, 
+                "dma": {
+                    "peer": "system.membus.slave[0]", 
+                    "role": "MASTER"
+                }
             }, 
             "mmc_fake": {
                 "name": "mmc_fake", 
@@ -893,7 +896,7 @@
                 "MSIXCAPNextCapability": 0, 
                 "PXCAPLinkCtrl": 0, 
                 "Revision": 0, 
-                "hardware_address": "<m5.params.EthernetAddr object at 0x7fd02360a190>", 
+                "hardware_address": "<m5.params.EthernetAddr object at 0x511b690>", 
                 "LegacyIOBase": 0, 
                 "pio_latency": 30000, 
                 "platform": "system.realview", 
@@ -1176,7 +1179,7 @@
             "clk_domain": "system.clk_domain", 
             "write_buffers": 8, 
             "response_latency": 50, 
-            "cxx_class": "BaseCache", 
+            "cxx_class": "Cache", 
             "size": 1024, 
             "tags": {
                 "name": "tags", 
@@ -1210,7 +1213,7 @@
             "prefetch_on_access": false, 
             "path": "system.iocache", 
             "name": "iocache", 
-            "type": "BaseCache", 
+            "type": "Cache", 
             "sequential_access": false, 
             "assoc": 8
         }, 
@@ -1416,7 +1419,7 @@
                     "clk_domain": "system.cpu_clk_domain", 
                     "write_buffers": 8, 
                     "response_latency": 2, 
-                    "cxx_class": "BaseCache", 
+                    "cxx_class": "Cache", 
                     "size": 32768, 
                     "tags": {
                         "name": "tags", 
@@ -1450,7 +1453,7 @@
                     "prefetch_on_access": false, 
                     "path": "system.cpu.icache", 
                     "name": "icache", 
-                    "type": "BaseCache", 
+                    "type": "Cache", 
                     "sequential_access": false, 
                     "assoc": 1
                 }, 
@@ -1505,7 +1508,7 @@
                     "clk_domain": "system.cpu_clk_domain", 
                     "write_buffers": 8, 
                     "response_latency": 20, 
-                    "cxx_class": "BaseCache", 
+                    "cxx_class": "Cache", 
                     "size": 4194304, 
                     "tags": {
                         "name": "tags", 
@@ -1539,7 +1542,7 @@
                     "prefetch_on_access": false, 
                     "path": "system.cpu.l2cache", 
                     "name": "l2cache", 
-                    "type": "BaseCache", 
+                    "type": "Cache", 
                     "sequential_access": false, 
                     "assoc": 8
                 }, 
@@ -1586,7 +1589,7 @@
                     "clk_domain": "system.cpu_clk_domain", 
                     "write_buffers": 8, 
                     "response_latency": 2, 
-                    "cxx_class": "BaseCache", 
+                    "cxx_class": "Cache", 
                     "size": 32768, 
                     "tags": {
                         "name": "tags", 
@@ -1620,7 +1623,7 @@
                     "prefetch_on_access": false, 
                     "path": "system.cpu.dcache", 
                     "name": "dcache", 
-                    "type": "BaseCache", 
+                    "type": "Cache", 
                     "sequential_access": false, 
                     "assoc": 4
                 }, 
@@ -1701,7 +1704,7 @@
                     "eventq_index": 0, 
                     "cxx_class": "RawDiskImage", 
                     "path": "system.cf0.image.child", 
-                    "image_file": "/work/gem5/dist/disks/linaro-minimal-aarch64.img", 
+                    "image_file": "/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img", 
                     "type": "RawDiskImage"
                 }, 
                 "path": "system.cf0.image", 
@@ -1741,7 +1744,7 @@
             "system.realview.vram"
         ], 
         "work_begin_cpu_id_exit": -1, 
-        "boot_loader": "/work/gem5/dist/binaries/boot_emm.arm64", 
+        "boot_loader": "/scratch/nilay/GEM5/system/binaries/boot_emm.arm64", 
         "num_work_ids": 16
     }, 
     "time_sync_period": 100000000000, 
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
index 35e369985..3b35220e8 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                 51.111153                       # Nu
 sim_ticks                                51111152682000                       # Number of ticks simulated
 final_tick                               51111152682000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1040961                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1223300                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            54038486240                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 670940                       # Number of bytes of host memory used
-host_seconds                                   945.83                       # Real time elapsed on the host
+host_inst_rate                                 926984                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1089358                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            48121696814                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 716268                       # Number of bytes of host memory used
+host_seconds                                  1062.12                       # Real time elapsed on the host
 sim_insts                                   984570519                       # Number of instructions simulated
 sim_ops                                    1157031967                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -210,7 +210,7 @@ system.cpu.itb.inst_accesses                985174158                       # IT
 system.cpu.itb.hits                         985047321                       # DTB hits
 system.cpu.itb.misses                          126837                       # DTB misses
 system.cpu.itb.accesses                     985174158                       # DTB accesses
-system.cpu.numCycles                     102222322140                       # number of cpu cycles simulated
+system.cpu.numCycles                     102222325018                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
 system.cpu.numWorkItemsCompleted                    0                       # number of work items this cpu completed
 system.cpu.committedInsts                   984570519                       # Number of instructions committed
@@ -230,8 +230,8 @@ system.cpu.num_cc_register_writes           263829403                       # nu
 system.cpu.num_mem_refs                     352465606                       # number of memory refs
 system.cpu.num_load_insts                   184180431                       # Number of load instructions
 system.cpu.num_store_insts                  168285175                       # Number of store instructions
-system.cpu.num_idle_cycles               101064643603.520065                       # Number of idle cycles
-system.cpu.num_busy_cycles               1157678536.479939                       # Number of busy cycles
+system.cpu.num_idle_cycles               101064646448.926407                       # Number of idle cycles
+system.cpu.num_busy_cycles               1157678569.073592                       # Number of busy cycles
 system.cpu.not_idle_fraction                 0.011325                       # Percentage of non-idle cycles
 system.cpu.idle_fraction                     0.988675                       # Percentage of idle cycles
 system.cpu.Branches                         220088562                       # Number of branches fetched
@@ -271,7 +271,7 @@ system.cpu.op_class::IprAccess                      0      0.00%    100.00% # Cl
 system.cpu.op_class::InstPrefetch                   0      0.00%    100.00% # Class of executed instruction
 system.cpu.op_class::total                 1157666593                       # Class of executed instruction
 system.cpu.kern.inst.arm                            0                       # number of arm instructions executed
-system.cpu.kern.inst.quiesce                    16775                       # number of quiesce instructions executed
+system.cpu.kern.inst.quiesce                    19653                       # number of quiesce instructions executed
 system.cpu.dcache.tags.replacements          11612141                       # number of replacements
 system.cpu.dcache.tags.tagsinuse           511.999719                       # Cycle average of tags in use
 system.cpu.dcache.tags.total_refs           340776008                       # Total number of references to valid blocks.
@@ -787,13 +787,13 @@ system.realview.ethernet.totalRxOrn                 0                       # to
 system.realview.ethernet.coalescedTotal             0                       # average number of interrupts coalesced into each post
 system.realview.ethernet.postedInterrupts           13                       # number of posts to CPU
 system.realview.ethernet.droppedPackets             0                       # number of packets dropped
+system.realview.realview_io.osc_pxl.clock        42105                       # Clock period in ticks
 system.realview.realview_io.osc_clcd.clock        42105                       # Clock period in ticks
 system.realview.realview_io.osc_cpu.clock        16667                       # Clock period in ticks
 system.realview.realview_io.osc_ddr.clock        25000                       # Clock period in ticks
 system.realview.realview_io.osc_hsbm.clock        25000                       # Clock period in ticks
 system.realview.realview_io.osc_mcc.clock        20000                       # Clock period in ticks
 system.realview.realview_io.osc_peripheral.clock        41667                       # Clock period in ticks
-system.realview.realview_io.osc_pxl.clock        42105                       # Clock period in ticks
 system.realview.realview_io.osc_smb.clock        20000                       # Clock period in ticks
 system.realview.realview_io.osc_sys.clock        16667                       # Clock period in ticks
 system.realview.realview_io.osc_system_bus.clock        41667                       # Clock period in ticks