i#6020 interval analysis: Fix interval counts regex

clients/drcachesim/tests/offline-interval-count-output.templatex

@@ -1,61 +1,61 @@
 Hello, world!
 Basic counts tool results:
 Total counts:
-     .* total \(fetched\) instructions
-     .* total unique \(fetched\) instructions
-     .* total non-fetched instructions
-     .* total prefetches
-     .* total data loads
-     .* total data stores
-     .* total icache flushes
-     .* total dcache flushes
+     [ 0-9]* total \(fetched\) instructions
+     [ 0-9]* total unique \(fetched\) instructions
+     [ 0-9]* total non-fetched instructions
+     [ 0-9]* total prefetches
+     [ 0-9]* total data loads
+     [ 0-9]* total data stores
+     [ 0-9]* total icache flushes
+     [ 0-9]* total dcache flushes
            1 total threads
-     .* total scheduling markers
-     .* total transfer markers
-     .* total function id markers
-     .* total function return address markers
-     .* total function argument markers
-     .* total function return value markers
+     [ 0-9]* total scheduling markers
+     [ 0-9]* total transfer markers
+     [ 0-9]* total function id markers
+     [ 0-9]* total function return address markers
+     [ 0-9]* total function argument markers
+     [ 0-9]* total function return value markers
            0 total physical address \+ virtual address marker pairs
            0 total physical address unavailable markers
-     .* total other markers
-     .* total encodings
-Thread .* counts:
-     .* \(fetched\) instructions
-     .* unique \(fetched\) instructions
-     .* non-fetched instructions
-     .* prefetches
-     .* data loads
-     .* data stores
-     .* icache flushes
-     .* dcache flushes
-     .* scheduling markers
-     .* transfer markers
-     .* function id markers
-     .* function return address markers
-     .* function argument markers
-     .* function return value markers
+     [ 0-9]* total other markers
+     [ 0-9]* total encodings
+Thread [0-9]* counts:
+     [ 0-9]* \(fetched\) instructions
+     [ 0-9]* unique \(fetched\) instructions
+     [ 0-9]* non-fetched instructions
+     [ 0-9]* prefetches
+     [ 0-9]* data loads
+     [ 0-9]* data stores
+     [ 0-9]* icache flushes
+     [ 0-9]* dcache flushes
+     [ 0-9]* scheduling markers
+     [ 0-9]* transfer markers
+     [ 0-9]* function id markers
+     [ 0-9]* function return address markers
+     [ 0-9]* function argument markers
+     [ 0-9]* function return value markers
            0 physical address \+ virtual address marker pairs
            0 physical address unavailable markers
-     .* other markers
-     .* encodings
+     [ 0-9]* other markers
+     [ 0-9]* encodings
 Counts per trace interval for whole trace:
-Interval #1 ending at timestamp.*
-     .* interval delta \(fetched\) instructions
-     .* interval delta non-fetched instructions
-     .* interval delta prefetches
-     .* interval delta data loads
-     .* interval delta data stores
-     .* interval delta icache flushes
-     .* interval delta dcache flushes
-     .* interval delta scheduling markers
-     .* interval delta transfer markers
-     .* interval delta function id markers
-     .* interval delta function return address markers
-     .* interval delta function argument markers
-     .* interval delta function return value markers
+Interval #1 ending at timestamp [0-9]*:
+     [ 0-9]* interval delta \(fetched\) instructions
+     [ 0-9]* interval delta non-fetched instructions
+     [ 0-9]* interval delta prefetches
+     [ 0-9]* interval delta data loads
+     [ 0-9]* interval delta data stores
+     [ 0-9]* interval delta icache flushes
+     [ 0-9]* interval delta dcache flushes
+     [ 0-9]* interval delta scheduling markers
+     [ 0-9]* interval delta transfer markers
+     [ 0-9]* interval delta function id markers
+     [ 0-9]* interval delta function return address markers
+     [ 0-9]* interval delta function argument markers
+     [ 0-9]* interval delta function return value markers
            0 interval delta physical address \+ virtual address marker pairs
            0 interval delta physical address unavailable markers
-     .* interval delta other markers
-     .* interval delta encodings.*
+     [ 0-9]* interval delta other markers
+     [ 0-9]* interval delta encodings
 .*

clients/drcachesim/tools/basic_counts.cpp

@@ -334,6 +334,13 @@ basic_counts_t::combine_interval_snapshots(
     uint64_t interval_end_timestamp)
 {
     count_snapshot_t *result = new count_snapshot_t;
+    // The snapshots in latest_shard_snapshots do not track unique_pc_addrs, so
+    // the combined result->counters also would not contain any element in the
+    // unique_pc_addrs set. But we still need to explicitly disable
+    // unique_pc_addrs tracking in result->counters using the following function
+    // call. This is so that printing of unique_pc_addrs count is skipped as
+    // intended during print_interval_results.
+    result->counters.stop_tracking_unique_pc_addrs();
     for (const auto snapshot : latest_shard_snapshots) {
         if (snapshot == nullptr)
             continue;