stats: update stats for thermals, indirect BP

2 files changed, 45 insertions, 18 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
index c979f0275..59c5ae050 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
@@ -47,6 +47,8 @@ phys_addr_range_64=40
 readfile=/z/atgutier/gem5/gem5-commit/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
@@ -146,7 +148,6 @@ clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -224,7 +225,6 @@ clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=true
 max_miss_count=0
@@ -337,7 +337,6 @@ clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=20
 is_read_only=false
 max_miss_count=0
@@ -372,6 +371,7 @@ clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
 snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
@@ -434,7 +434,6 @@ clk_domain=system.clk_domain
 clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=50
 is_read_only=false
 max_miss_count=0
@@ -469,6 +468,7 @@ 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_response_latency=4
@@ -637,6 +637,7 @@ pio=system.iobus.master[5]
 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
@@ -1024,8 +1025,9 @@ pio=system.membus.master[4]
 
 [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
@@ -1071,6 +1073,16 @@ position=0
 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 --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
index 1eb19f804..f56eeb549 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
@@ -64,7 +64,9 @@
         "symbolfile": "", 
         "readfile": "/z/atgutier/gem5/gem5-commit/tests/halt.sh", 
         "have_large_asid_64": false, 
+        "thermal_model": null, 
         "phys_addr_range_64": 40, 
+        "work_begin_exit_count": 0, 
         "have_lpae": false, 
         "cxx_class": "LinuxArmSystem", 
         "load_offset": 2147483648, 
@@ -523,10 +525,6 @@
                     "freq": 20000, 
                     "type": "RealViewOsc"
                 }, 
-                "type": "SubSystem", 
-                "eventq_index": 0, 
-                "cxx_class": "SubSystem", 
-                "path": "system.realview.mcc", 
                 "osc_clcd": {
                     "position": 0, 
                     "name": "osc_clcd", 
@@ -541,6 +539,24 @@
                     "freq": 42105, 
                     "type": "RealViewOsc"
                 }, 
+                "thermal_domain": null, 
+                "eventq_index": 0, 
+                "cxx_class": "SubSystem", 
+                "path": "system.realview.mcc", 
+                "temp_crtl": {
+                    "system": "system", 
+                    "position": 0, 
+                    "name": "temp_crtl", 
+                    "parent": "system.realview.realview_io", 
+                    "dcc": 0, 
+                    "site": 0, 
+                    "eventq_index": 0, 
+                    "cxx_class": "RealViewTemperatureSensor", 
+                    "device": 0, 
+                    "path": "system.realview.mcc.temp_crtl", 
+                    "type": "RealViewTemperatureSensor"
+                }, 
+                "type": "SubSystem", 
                 "osc_system_bus": {
                     "position": 0, 
                     "name": "osc_system_bus", 
@@ -572,6 +588,7 @@
                     "freq": 25000, 
                     "type": "RealViewOsc"
                 }, 
+                "thermal_domain": null, 
                 "osc_sys": {
                     "position": 0, 
                     "name": "osc_sys", 
@@ -1139,6 +1156,7 @@
                 "type": "IsaFake", 
                 "ret_data16": 65535
             }, 
+            "point_of_coherency": true, 
             "snoop_filter": null, 
             "forward_latency": 4, 
             "clk_domain": "system.clk_domain", 
@@ -1200,11 +1218,10 @@
                 "role": "MASTER"
             }, 
             "type": "Cache", 
-            "forward_snoops": false, 
             "writeback_clean": false, 
             "hit_latency": 50, 
-            "tgts_per_mshr": 12, 
             "demand_mshr_reserve": 1, 
+            "tgts_per_mshr": 12, 
             "addr_ranges": [
                 "2147483648:2415919103"
             ], 
@@ -1381,6 +1398,7 @@
                         "role": "SLAVE"
                     }, 
                     "name": "toL2Bus", 
+                    "point_of_coherency": false, 
                     "snoop_filter": {
                         "name": "snoop_filter", 
                         "system": "system", 
@@ -1451,11 +1469,10 @@
                         "role": "MASTER"
                     }, 
                     "type": "Cache", 
-                    "forward_snoops": true, 
                     "writeback_clean": true, 
                     "hit_latency": 2, 
-                    "tgts_per_mshr": 20, 
                     "demand_mshr_reserve": 1, 
+                    "tgts_per_mshr": 20, 
                     "addr_ranges": [
                         "0:18446744073709551615"
                     ], 
@@ -1544,11 +1561,10 @@
                         "role": "MASTER"
                     }, 
                     "type": "Cache", 
-                    "forward_snoops": true, 
                     "writeback_clean": false, 
                     "hit_latency": 20, 
-                    "tgts_per_mshr": 12, 
                     "demand_mshr_reserve": 1, 
+                    "tgts_per_mshr": 12, 
                     "addr_ranges": [
                         "0:18446744073709551615"
                     ], 
@@ -1627,11 +1643,10 @@
                         "role": "MASTER"
                     }, 
                     "type": "Cache", 
-                    "forward_snoops": true, 
                     "writeback_clean": false, 
                     "hit_latency": 2, 
-                    "tgts_per_mshr": 20, 
                     "demand_mshr_reserve": 1, 
+                    "tgts_per_mshr": 20, 
                     "addr_ranges": [
                         "0:18446744073709551615"
                     ], 
@@ -1690,7 +1705,7 @@
         ], 
         "gic_cpu_addr": 738205696, 
         "work_cpus_ckpt_count": 0, 
-        "work_begin_exit_count": 0, 
+        "thermal_components": [], 
         "machine_type": "VExpress_EMM", 
         "flags_addr": 469827632, 
         "path": "system",