config: Update Streamline scripts and configs

Updated the stat_config.ini files to reflect new structure.

Moved to a more generic stat naming scheme that can easily handle
multiple CPUs and L2s by letting the script replace pre-defined #
symbols to CPU or L2 ids.

Removed the previous per_switch_cpus sections. Still can be used by
spelling out the stat names if necessary. (Resuming from checkpoints
no longer use switch_cpus. Only fast-forwarding does.)

1 files changed, 28 insertions, 27 deletions

diff --git a/util/streamline/atomic_stat_config.ini b/util/streamline/atomic_stat_config.ini
index 7cad04543..1095345ed 100644
--- a/util/streamline/atomic_stat_config.ini
+++ b/util/streamline/atomic_stat_config.ini
@@ -40,54 +40,55 @@
 # Stats grouped together will show as grouped in Streamline.
 # E.g.,
 #
-# icache =
-#    icache.overall_hits::total
-#    icache.overall_misses::total
+# commit_inst_count =
+#     system.cluster.cpu#.commit.committedInsts
+#     system.cluster.cpu#.commit.commitSquashedInsts
 #
-# will display the icache as a stacked line chart.
+# will display the inst counts (committed/squashed) as a stacked line chart.
 # Charts will still be configurable in Streamline.
 
 [PER_CPU_STATS]
-# "system.cpu#." will automatically prepended for per-CPU stats
+# '#' will be automatically replaced with the correct CPU id.
+
+commit_inst_count =
+    system.cluster.cpu#.committedInsts
 
 cycles =
-    num_busy_cycles
-    num_idle_cycles
+    system.cluster.cpu#.num_busy_cycles
+    system.cluster.cpu#.num_idle_cycles
 
 register_access =
-    num_int_register_reads
-    num_int_register_writes
+    system.cluster.cpu#.num_int_register_reads
+    system.cluster.cpu#.num_int_register_writes
 
 mem_refs =
-    num_mem_refs
+    system.cluster.cpu#.num_mem_refs
 
 inst_breakdown =
-    num_conditional_control_insts
-    num_int_insts
-    num_fp_insts
-    num_load_insts
-    num_store_insts
+    system.cluster.cpu#.num_conditional_control_insts
+    system.cluster.cpu#.num_int_insts
+    system.cluster.cpu#.num_fp_insts
+    system.cluster.cpu#.num_load_insts
+    system.cluster.cpu#.num_store_insts
 
 icache =
-    icache.overall_hits::total
-    icache.overall_misses::total
+    system.cluster.il1_cache#.overall_hits::total
+    system.cluster.il1_cache#.overall_misses::total
 
 dcache =
-    dcache.overall_hits::total
-    dcache.overall_misses::total
-
-[PER_SWITCHCPU_STATS]
-# If starting from checkpoints, gem5 keeps CPU stats in system.switch_cpus# structures.
-# List per-switchcpu stats here if any
-# "system.switch_cpus#" will automatically prepended for per-CPU stats
+    system.cluster.dl1_cache#.overall_hits::total
+    system.cluster.dl1_cache#.overall_misses::total
 
 [PER_L2_STATS]
+# '#' will be automatically replaced with the correct L2 id.
 
 l2_cache =
-    overall_hits::total
-    overall_misses::total
+    system.cluster.l2_cache#.overall_hits::total
+    system.cluster.l2_cache#.overall_misses::total
 
 [OTHER_STATS]
+# Anything that doesn't belong to CPU or L2 caches
 
 physmem =
-    system.physmem.bw_total::total
+    system.memsys.mem_ctrls.bytes_read::total
+    system.memsys.mem_ctrls.bytes_written::total