summaryrefslogtreecommitdiff
path: root/util/streamline/m5stats2streamline.py
diff options
context:
space:
mode:
Diffstat (limited to 'util/streamline/m5stats2streamline.py')
-rwxr-xr-xutil/streamline/m5stats2streamline.py53
1 files changed, 18 insertions, 35 deletions
diff --git a/util/streamline/m5stats2streamline.py b/util/streamline/m5stats2streamline.py
index f5ebc0846..96b7432f2 100755
--- a/util/streamline/m5stats2streamline.py
+++ b/util/streamline/m5stats2streamline.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012, 2014 ARM Limited
# All rights reserved
#
# The license below extends only to copyright in the software and shall
@@ -142,18 +142,18 @@ def parseConfig(config_file):
print "ERROR: config file '", config_file, "' not found"
sys.exit(1)
- if config.has_section("system.cpu"):
+ if config.has_section("system.cluster.cpu"):
num_cpus = 1
else:
num_cpus = 0
- while config.has_section("system.cpu" + str(num_cpus)):
+ while config.has_section("system.cluster.cpu" + str(num_cpus)):
num_cpus += 1
- if config.has_section("system.l2"):
+ if config.has_section("system.cluster.l2_cache"):
num_l2 = 1
else:
num_l2 = 0
- while config.has_section("system.l2" + str(num_l2)):
+ while config.has_section("system.cluster.l2_cache" + str(num_l2)):
num_l2 += 1
print "Num CPUs:", num_cpus
@@ -713,7 +713,7 @@ def writeXmlFile(xml, filename):
# StatsEntry that contains individual statistics
class StatsEntry(object):
- def __init__(self, name, group, group_index, per_cpu, per_switchcpu, key):
+ def __init__(self, name, group, group_index, per_cpu, key):
# Full name of statistics
self.name = name
@@ -736,7 +736,6 @@ class StatsEntry(object):
# Whether this stat is use per CPU or not
self.per_cpu = per_cpu
- self.per_switchcpu = per_switchcpu
# Key used in .apc protocol (as described in captured.xml)
self.key = key
@@ -761,16 +760,11 @@ class StatsEntry(object):
self.per_cpu_name = []
self.per_cpu_found = []
for i in range(num_cpus):
- # Resuming from checkpoints results in using "switch_cpus"
- if per_switchcpu:
- per_cpu_name = "system.switch_cpus"
+ if num_cpus > 1:
+ per_cpu_name = re.sub("#", str(i), self.name)
else:
- per_cpu_name = "system.cpu"
+ per_cpu_name = re.sub("#", "", self.name)
- # No CPU number appends if num_cpus == 1
- if num_cpus > 1:
- per_cpu_name += str(i)
- per_cpu_name += "." + self.name
self.per_cpu_name.append(per_cpu_name)
print "\t", per_cpu_name
@@ -795,10 +789,10 @@ class Stats(object):
self.tick_list = []
self.next_key = 1
- def register(self, name, group, group_index, per_cpu, per_switchcpu):
+ def register(self, name, group, group_index, per_cpu):
print "registering stat:", name, "group:", group, group_index
self.stats_list.append(StatsEntry(name, group, group_index, per_cpu, \
- per_switchcpu, self.next_key))
+ self.next_key))
self.next_key += 1
# Union of all stats to accelerate parsing speed
@@ -836,17 +830,7 @@ def registerStats(config_file):
per_cpu_stats_list = config.get('PER_CPU_STATS', group).split('\n')
for item in per_cpu_stats_list:
if item:
- stats.register(item, group, i, True, False)
- i += 1
-
- per_cpu_stat_groups = config.options('PER_SWITCHCPU_STATS')
- for group in per_cpu_stat_groups:
- i = 0
- per_cpu_stats_list = \
- config.get('PER_SWITCHCPU_STATS', group).split('\n')
- for item in per_cpu_stats_list:
- if item:
- stats.register(item, group, i, True, True)
+ stats.register(item, group, i, True)
i += 1
per_l2_stat_groups = config.options('PER_L2_STATS')
@@ -856,13 +840,11 @@ def registerStats(config_file):
for item in per_l2_stats_list:
if item:
for l2 in range(num_l2):
- name = item
- prefix = "system.l2"
if num_l2 > 1:
- prefix += str(l2)
- prefix += "."
- name = prefix + name
- stats.register(name, group, i, False, False)
+ name = re.sub("#", str(l2), item)
+ else:
+ name = re.sub("#", "", item)
+ stats.register(name, group, i, False)
i += 1
other_stat_groups = config.options('OTHER_STATS')
@@ -871,7 +853,7 @@ def registerStats(config_file):
other_stats_list = config.get('OTHER_STATS', group).split('\n')
for item in other_stats_list:
if item:
- stats.register(item, group, i, False, False)
+ stats.register(item, group, i, False)
i += 1
stats.createStatsRegex()
@@ -1046,6 +1028,7 @@ def doCapturedXML(output_path, stats):
for stat in stats.stats_list:
s = ET.SubElement(counters, "counter")
stat_name = re.sub("\.", "_", stat.short_name)
+ stat_name = re.sub("#", "", stat_name)
s.set("title", stat.group)
s.set("name", stat_name)
s.set("color", "0x00000000")