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, 35 insertions, 43 deletions

diff --git a/util/streamline/o3_stat_config.ini b/util/streamline/o3_stat_config.ini
index e5ac094d3..914524e7d 100644
--- a/util/streamline/o3_stat_config.ini
+++ b/util/streamline/o3_stat_config.ini
@@ -40,80 +40,72 @@
 # 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.
 
 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, CPU stats will be kept in system.switch_cpus#.
-# structures.
-# "system.switch_cpus#" will automatically prepended for per-CPU stats.
-# Note: L1 caches and table walker caches will still be connected to
-# system.cpu#!
+    system.cluster.dl1_cache#.overall_hits::total
+    system.cluster.dl1_cache#.overall_misses::total
 
 commit_inst_count =
-    commit.committedInsts
-    commit.commitSquashedInsts
+    system.cluster.cpu#.commit.committedInsts
+    system.cluster.cpu#.commit.commitSquashedInsts
 
 cycles =
-    numCycles
-    idleCycles
+    system.cluster.cpu#.numCycles
+    system.cluster.cpu#.idleCycles
 
 branch_mispredict =
-    commit.branchMispredicts
-
+    system.cluster.cpu#.commit.branchMispredicts
 itb =
-    itb.hits
-    itb.misses
+    system.cluster.cpu#.itb.hits
+    system.cluster.cpu#.itb.misses
 
 dtb =
-    dtb.hits
-    dtb.misses
+    system.cluster.cpu#.dtb.hits
+    system.cluster.cpu#.dtb.misses
 
 commit_inst_breakdown =
-    commit.loads
-    commit.membars
-    commit.branches
-    commit.fp_insts
-    commit.int_insts
+    system.cluster.cpu#.commit.loads
+    system.cluster.cpu#.commit.membars
+    system.cluster.cpu#.commit.branches
+    system.cluster.cpu#.commit.fp_insts
+    system.cluster.cpu#.commit.int_insts
 
 int_regfile =
-    int_regfile_reads
-    int_regfile_writes
+    system.cluster.cpu#.int_regfile_reads
+    system.cluster.cpu#.int_regfile_writes
 
 misc_regfile =
-    misc_regfile_reads
-    misc_regfile_writes
+    system.cluster.cpu#.misc_regfile_reads
+    system.cluster.cpu#.misc_regfile_writes
 
 rename_full =
-    rename.ROBFullEvents
-    rename.IQFullEvents
-    rename.LSQFullEvents
+    system.cluster.cpu#.rename.ROBFullEvents
+    system.cluster.cpu#.rename.IQFullEvents
+    system.cluster.cpu#.rename.LSQFullEvents
 
 [PER_L2_STATS]
-# Automatically adapts to how many l2 caches are in the system
+# '#' 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.bytes_read::total
-    system.physmem.bytes_written::total
+    system.memsys.mem_ctrls.bytes_read::total
+    system.memsys.mem_ctrls.bytes_written::total