stats: Update for UDelayEvent quiesce change

3 files changed, 52 insertions, 31 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 160a8ac7f..df266f902 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=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/home/joel/research/gem5/full_system_files/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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/home/joel/research/gem5/full_system_files/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=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/home/joel/research/gem5/full_system_files/binaries/vmlinux.aarch64.20140821
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
@@ -38,11 +38,12 @@ mem_ranges=2147483648:2415919103
 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=/home/joel/research/gem5/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -85,7 +86,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/home/joel/research/gem5/full_system_files/disks/linaro-minimal-aarch64.img
 read_only=true
 
 [system.clk_domain]
@@ -358,12 +359,13 @@ size=4194304
 
 [system.cpu.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.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -371,6 +373,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
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 96cb18ee3..ff17f6ea1 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": "/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821", 
+        "kernel": "/home/joel/research/gem5/full_system_files/binaries/vmlinux.aarch64.20140821", 
         "iobus": {
             "slave": {
                 "peer": [
@@ -68,7 +68,7 @@
             "frontend_latency": 2
         }, 
         "symbolfile": "", 
-        "readfile": "/scratch/nilay/GEM5/gem5/tests/halt.sh", 
+        "readfile": "/home/joel/research/gem5/gem5/tests/halt.sh", 
         "have_large_asid_64": false, 
         "phys_addr_range_64": 40, 
         "have_lpae": false, 
@@ -87,7 +87,8 @@
         "multi_proc": true, 
         "early_kernel_symbols": false, 
         "panic_on_oops": true, 
-        "dtb_filename": "/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb", 
+        "dtb_filename": "/home/joel/research/gem5/full_system_files/binaries/vexpress.aarch64.20140821.dtb", 
+        "panic_on_panic": true, 
         "enable_context_switch_stats_dump": false, 
         "work_begin_ckpt_count": 0, 
         "clk_domain": {
@@ -896,7 +897,7 @@
                 "MSIXCAPNextCapability": 0, 
                 "PXCAPLinkCtrl": 0, 
                 "Revision": 0, 
-                "hardware_address": "<m5.params.EthernetAddr object at 0x511b690>", 
+                "hardware_address": "<m5.params.EthernetAddr object at 0x7f5e39f1b590>", 
                 "LegacyIOBase": 0, 
                 "pio_latency": 30000, 
                 "platform": "system.realview", 
@@ -1168,7 +1169,7 @@
             "use_default_range": false, 
             "frontend_latency": 3
         }, 
-        "panic_on_panic": true, 
+        "multi_thread": false, 
         "eventq_index": 0, 
         "iocache": {
             "cpu_side": {
@@ -1382,7 +1383,16 @@
                         "role": "SLAVE"
                     }, 
                     "name": "toL2Bus", 
-                    "snoop_filter": null, 
+                    "snoop_filter": {
+                        "name": "snoop_filter", 
+                        "system": "system", 
+                        "max_capacity": 8388608, 
+                        "eventq_index": 0, 
+                        "cxx_class": "SnoopFilter", 
+                        "path": "system.cpu.toL2Bus.snoop_filter", 
+                        "type": "SnoopFilter", 
+                        "lookup_latency": 0
+                    }, 
                     "forward_latency": 0, 
                     "clk_domain": "system.cpu_clk_domain", 
                     "system": "system", 
@@ -1457,13 +1467,15 @@
                     "sequential_access": false, 
                     "assoc": 1
                 }, 
-                "interrupts": {
-                    "eventq_index": 0, 
-                    "path": "system.cpu.interrupts", 
-                    "type": "ArmInterrupts", 
-                    "name": "interrupts", 
-                    "cxx_class": "ArmISA::Interrupts"
-                }, 
+                "interrupts": [
+                    {
+                        "eventq_index": 0, 
+                        "path": "system.cpu.interrupts", 
+                        "type": "ArmInterrupts", 
+                        "name": "interrupts", 
+                        "cxx_class": "ArmISA::Interrupts"
+                    }
+                ], 
                 "dcache_port": {
                     "peer": "system.cpu.dcache.cpu_side", 
                     "role": "MASTER"
@@ -1704,7 +1716,7 @@
                     "eventq_index": 0, 
                     "cxx_class": "RawDiskImage", 
                     "path": "system.cf0.image.child", 
-                    "image_file": "/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img", 
+                    "image_file": "/home/joel/research/gem5/full_system_files/disks/linaro-minimal-aarch64.img", 
                     "type": "RawDiskImage"
                 }, 
                 "path": "system.cf0.image", 
@@ -1744,7 +1756,7 @@
             "system.realview.vram"
         ], 
         "work_begin_cpu_id_exit": -1, 
-        "boot_loader": "/scratch/nilay/GEM5/system/binaries/boot_emm.arm64", 
+        "boot_loader": "/home/joel/research/gem5/full_system_files/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 e1c9b6ef6..7ab4128ed 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                                1154147                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1356312                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            59914222846                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 725376                       # Number of bytes of host memory used
-host_seconds                                   853.07                       # Real time elapsed on the host
+host_inst_rate                                 549288                       # Simulator instruction rate (inst/s)
+host_op_rate                                   645503                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            28514691627                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 672288                       # Number of bytes of host memory used
+host_seconds                                  1792.45                       # 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,9 +210,11 @@ 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                     102222325018                       # number of cpu cycles simulated
+system.cpu.numCycles                     102222322140                       # 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.kern.inst.arm                            0                       # number of arm instructions executed
+system.cpu.kern.inst.quiesce                    16775                       # number of quiesce instructions executed
 system.cpu.committedInsts                   984570519                       # Number of instructions committed
 system.cpu.committedOps                    1157031967                       # Number of ops (including micro ops) committed
 system.cpu.num_int_alu_accesses            1060455466                       # Number of integer alu accesses
@@ -230,8 +232,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               101064646448.926407                       # Number of idle cycles
-system.cpu.num_busy_cycles               1157678569.073592                       # Number of busy cycles
+system.cpu.num_idle_cycles               101064643603.520065                       # Number of idle cycles
+system.cpu.num_busy_cycles               1157678536.479939                       # 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
@@ -270,8 +272,6 @@ system.cpu.op_class::MemWrite               168285175     14.54%    100.00% # Cl
 system.cpu.op_class::IprAccess                      0      0.00%    100.00% # Class of executed instruction
 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                    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.