From 411719d58d14250ef7fd9a992a1b3602b3856c88 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Fri, 18 Aug 2017 17:06:28 +0100 Subject: [PATCH] Instrument/gem5power: Rename timestamp channel to match new API To conform with the new DerivedMeasuements API the "sim_seconds" channel has been renamed to "timestamp" so that it can be identified in post processing. As "sim_seconds" needs to be extracted from the gem5 statistics file, an addional mapping has been added to support this. --- devlib/instrument/gem5power.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devlib/instrument/gem5power.py b/devlib/instrument/gem5power.py index 534046e..1e392a8 100644 --- a/devlib/instrument/gem5power.py +++ b/devlib/instrument/gem5power.py @@ -28,6 +28,7 @@ class Gem5PowerInstrument(Instrument): mode = CONTINUOUS roi_label = 'power_instrument' + site_mapping = {'timestamp': 'sim_seconds'} def __init__(self, target, power_sites): ''' @@ -46,7 +47,7 @@ class Gem5PowerInstrument(Instrument): self.power_sites = power_sites else: self.power_sites = [power_sites] - self.add_channel('sim_seconds', 'time') + self.add_channel('timestamp', 'time') for field in self.power_sites: self.add_channel(field, 'power') self.target.gem5stats.book_roi(self.roi_label) @@ -68,7 +69,8 @@ class Gem5PowerInstrument(Instrument): with open(outfile, 'wb') as wfh: writer = csv.writer(wfh) writer.writerow([c.label for c in self.active_channels]) # headers - for rec, rois in self.target.gem5stats.match_iter(active_sites, + sites_to_match = [self.site_mapping.get(s, s) for s in active_sites] + for rec, rois in self.target.gem5stats.match_iter(sites_to_match, [self.roi_label], self._base_stats_dump): writer.writerow([float(rec[s]) for s in active_sites]) return MeasurementsCsv(outfile, self.active_channels)